change SZR-GW webservice and MIS-STORK webservice for monitoring

36 files changed, 455 insertions, 362 deletions

diff --git a/generatesources.bat b/generatesources.bat
index 6eade9d..73f5f7f 100644
--- a/generatesources.bat
+++ b/generatesources.bat
@@ -14,7 +14,7 @@ REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/zkopf/zuserech.wsdl
 REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/ur/URSucheService.wsdl -b ./src/main/resources/wsdl/ur/unternehmenssuche.xsd -b ./src/main/resources/wsdl/ur/PersonData_20_dt.xsd -b REM ./src/main/resources/wsdl/ur/ur-simpleTypes.xsd -b ./src/main/resources/wsdl/ur/xml-sw.xsd -b ./src/main/resources/wsdl/ur/specific/CustomFault.xsd -b ./src/main/resources/wsdl/custom-bindings/ur-wsdl.xml -b  ./src/main/resources/wsdl/custom-bindings/ur-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
 REM "%JAVA_HOME%\bin\xjc.exe" -b ./src/main/resources/wsdl/custom-bindings/zusespec-schemas.xml -d ./wsdlsources/src ./src/main/resources/wsdl/zusespec/recipientnotification.xsd
 REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/ur_V2/URSucheService.wsdl -b ./src/main/resources/wsdl/custom-bindings/ur_V2-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ur_V2-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
-REM"%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/misstork/misstork.wsdl -b ./src/main/resources/wsdl/custom-bindings/misstork-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/misstork-schemas.xml -b ./src/main/resources/wsdl/custom-bindings/mis-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
+REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/misstork/misstork.wsdl -b ./src/main/resources/wsdl/custom-bindings/misstork-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/misstork-schemas.xml -b ./src/main/resources/wsdl/custom-bindings/mis-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
 REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/szrgw/szrgw.wsdl -b ./src/main/resources/wsdl/custom-bindings/szrgw-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/szrgw-schemas.xml -b ./src/main/resources/wsdl/custom-bindings/mis-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes -target 2.1
 REM "%JAVA_HOME%\bin\xjc.exe" -b ./src/main/resources/wsdl/custom-bindings/stork.xml -d ./wsdlsources/src ./src/main/resources/wsdl/szrgw/stork.xsd
 REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/ERsB/1.1/ErsbService.wsdl -b ./src/main/resources/wsdl/custom-bindings/ersb-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ersb-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
diff --git a/src/main/java/at/gv/util/client/moaspss/MOASPSSClient.java b/src/main/java/at/gv/util/client/moaspss/MOASPSSClient.java
index ab8acd8..947b558 100644
--- a/src/main/java/at/gv/util/client/moaspss/MOASPSSClient.java
+++ b/src/main/java/at/gv/util/client/moaspss/MOASPSSClient.java
@@ -39,6 +39,7 @@ import javax.xml.ws.Service;
 import javax.xml.ws.handler.Handler;
 import javax.xml.ws.soap.SOAPBinding;
 
+import org.apache.xpath.XPathAPI;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
@@ -55,10 +56,10 @@ import at.gv.util.wsdl.SignatureVerificationService;
 import at.gv.util.xsd.moaspss.CreateXMLSignatureRequest;
 import at.gv.util.xsd.moaspss.CreateXMLSignatureResponseType;
 import at.gv.util.xsd.moaspss.ErrorResponseType;
+import at.gv.util.xsd.moaspss.VerifyCMSSignatureResponseType;
 import at.gv.util.xsd.moaspss.VerifyXMLSignatureRequestType;
 import at.gv.util.xsd.moaspss.VerifyXMLSignatureResponseType;
 
-import com.sun.org.apache.xpath.internal.XPathAPI;
 import com.sun.xml.ws.developer.JAXWSProperties;
 
 /**
@@ -203,12 +204,61 @@ public class MOASPSSClient {
 		}
 	}
 
+	public VerifyCMSSignatureResponseType sendCMSSignatureVerificationRequest(
+			String serviceURL, InputStream signatureVerificationRequest)
+	    throws MOASPSSClientException {
+		log.debug("Verifying CMS signature using raw VerifyXMLSignatureRequest.");
+
+		try {			
+			byte[] moaResponse = sendBasicSignatureVerificationRequest(serviceURL, signatureVerificationRequest);
+			
+			JAXBContext ctx = JAXBContext
+			    .newInstance(VerifyCMSSignatureResponseType.class.getPackage()
+			        .getName());
+			JAXBElement<VerifyCMSSignatureResponseType> jaxbElement = (JAXBElement<VerifyCMSSignatureResponseType>) ctx
+			    .createUnmarshaller()
+			    .unmarshal(new ByteArrayInputStream(moaResponse));
+			VerifyCMSSignatureResponseType verifyXMLResponse = jaxbElement.getValue();
+			log.trace(new String(moaResponse));
+			return verifyXMLResponse;
+			
+		} catch (JAXBException e) {
+			throw new MOASPSSClientException(e);
+			
+		}
+		
+		
+	}
+	
+	
 	@SuppressWarnings("unchecked")
 	public VerifyXMLSignatureResponseType sendSignatureVerificationRequest(
 	    String serviceURL, InputStream signatureVerificationRequest)
 	    throws MOASPSSClientException {
 		log.debug("Verifying XML signature using raw VerifyXMLSignatureRequest.");
 
+		try {			
+			byte[] moaResponse = sendBasicSignatureVerificationRequest(serviceURL, signatureVerificationRequest);
+			
+			JAXBContext ctx = JAXBContext
+			    .newInstance(VerifyXMLSignatureRequestType.class.getPackage()
+			        .getName());
+			JAXBElement<VerifyXMLSignatureResponseType> jaxbElement = (JAXBElement<VerifyXMLSignatureResponseType>) ctx
+			    .createUnmarshaller()
+			    .unmarshal(new ByteArrayInputStream(moaResponse));
+			VerifyXMLSignatureResponseType verifyXMLResponse = jaxbElement.getValue();
+			log.trace(new String(moaResponse));
+			return verifyXMLResponse;
+			
+		} catch (JAXBException e) {
+			throw new MOASPSSClientException(e);
+			
+		}
+
+	}
+
+	private byte[] sendBasicSignatureVerificationRequest(String serviceURL, InputStream signatureVerificationRequest)
+		    throws MOASPSSClientException {
 		// check for arguments
 		if (serviceURL == null) {
 			throw new NullPointerException("Argument 'serviceURL' must not be null.");
@@ -281,26 +331,18 @@ public class MOASPSSClient {
 
 			log.trace("Parsing MOA-SP response.");
 			byte[] moaResponse = MiscUtil.sourceToByteArray(response);
-			JAXBContext ctx = JAXBContext
-			    .newInstance(VerifyXMLSignatureRequestType.class.getPackage()
-			        .getName());
-			JAXBElement<VerifyXMLSignatureResponseType> jaxbElement = (JAXBElement<VerifyXMLSignatureResponseType>) ctx
-			    .createUnmarshaller()
-			    .unmarshal(new ByteArrayInputStream(moaResponse));
-			VerifyXMLSignatureResponseType verifyXMLResponse = jaxbElement.getValue();
-			log.trace(new String(moaResponse));
-			return verifyXMLResponse;
+			
+			return moaResponse;
+			
 		} catch (TransformerException e) {
 			throw new MOASPSSClientException(e);
 		} catch (IOException e) {
 			throw new MOASPSSClientException(e);
-		} catch (JAXBException e) {
-			throw new MOASPSSClientException(e);
 		} catch (EgovUtilException e) {
 			throw new MOASPSSClientException(e);
 		}
 	}
-
+	
 	public static boolean isSuccess(VerifyXMLSignatureResponseType verifyResult) {
 		if (verifyResult == null) {
 			throw new NullPointerException(
diff --git a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
index a2b7700..e098ccc 100644
--- a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
+++ b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
@@ -42,17 +42,14 @@ public class MISSTORKService
         super(__getWsdlLocation(), MISSTORKSERVICE_QNAME);
     }
 
-
     public MISSTORKService(URL wsdlLocation) {
         super(wsdlLocation, MISSTORKSERVICE_QNAME);
     }
 
-
     public MISSTORKService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
-
     /**
      * 
      * @return
diff --git a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
index 20ad87c..9562d1c 100644
--- a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
+++ b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
@@ -14,7 +14,7 @@ import javax.xml.ws.WebServiceFeature;
 /**
  * This class was generated by the JAX-WS RI.
  * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.2
+ * Generated source version: 2.1
  * 
  */
 @WebServiceClient(name = "SZRGWService", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", wsdlLocation = "file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/szrgw/szrgw.wsdl")
@@ -42,10 +42,6 @@ public class SZRGWService
         super(__getWsdlLocation(), SZRGWSERVICE_QNAME);
     }
 
-    public SZRGWService(URL wsdlLocation) {
-        super(wsdlLocation, SZRGWSERVICE_QNAME);
-    }
-
     public SZRGWService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
diff --git a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
index 01ca437..9f0a8bd 100644
--- a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
+++ b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
@@ -14,7 +14,7 @@ import at.gv.util.xsd.srzgw.CreateIdentityLinkResponse;
 /**
  * This class was generated by the JAX-WS RI.
  * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.2
+ * Generated source version: 2.1
  * 
  */
 @WebService(name = "SZRGWType", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl")
diff --git a/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java b/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java
index 3cd038f..5e58d91 100644
--- a/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/mis/ObjectFactory.java
@@ -24,8 +24,8 @@ import javax.xml.namespace.QName;
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _MandateIssueResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", "MandateIssueResponse");
     private final static QName _MandateIssueRequest_QNAME = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", "MandateIssueRequest");
+    private final static QName _MandateIssueResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", "MandateIssueResponse");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.mis
@@ -99,21 +99,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MandateIssueResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link MandateIssueRequestType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", name = "MandateIssueResponse")
-    public JAXBElement<MandateIssueResponseType> createMandateIssueResponse(MandateIssueResponseType value) {
-        return new JAXBElement<MandateIssueResponseType>(_MandateIssueResponse_QNAME, MandateIssueResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", name = "MandateIssueRequest")
+    public JAXBElement<MandateIssueRequestType> createMandateIssueRequest(MandateIssueRequestType value) {
+        return new JAXBElement<MandateIssueRequestType>(_MandateIssueRequest_QNAME, MandateIssueRequestType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MandateIssueRequestType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link MandateIssueResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", name = "MandateIssueRequest")
-    public JAXBElement<MandateIssueRequestType> createMandateIssueRequest(MandateIssueRequestType value) {
-        return new JAXBElement<MandateIssueRequestType>(_MandateIssueRequest_QNAME, MandateIssueRequestType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/mandates/mis/1.0/xsd", name = "MandateIssueResponse")
+    public JAXBElement<MandateIssueResponseType> createMandateIssueResponse(MandateIssueResponseType value) {
+        return new JAXBElement<MandateIssueResponseType>(_MandateIssueResponse_QNAME, MandateIssueResponseType.class, null, value);
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java b/src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java
index 52a3a67..78210d5 100644
--- a/src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java
+++ b/src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java
@@ -4,6 +4,7 @@ package at.gv.util.xsd.misstork;
 import java.math.BigInteger;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -72,6 +73,7 @@ import at.gv.util.xsd.persondata.CorporateBodyType;
  *           &lt;/element>
  *         &lt;/sequence>
  *       &lt;/choice>
+ *       &lt;attribute name="reqID" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -110,6 +112,8 @@ public class MisStorkRequest {
     protected MisStorkRequest.Mandator mandator;
     @XmlElement(name = "Representative")
     protected MisStorkRequest.Representative representative;
+    @XmlAttribute(name = "reqID")
+    protected String reqID;
 
     /**
      * Gets the value of the storkMandateType property.
@@ -303,6 +307,30 @@ public class MisStorkRequest {
         this.representative = value;
     }
 
+    /**
+     * Gets the value of the reqID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getReqID() {
+        return reqID;
+    }
+
+    /**
+     * Sets the value of the reqID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setReqID(String value) {
+        this.reqID = value;
+    }
+
 
     /**
      * <p>Java class for anonymous complex type.
diff --git a/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java b/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
index 8aa2dc8..25ee2c2 100644
--- a/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
@@ -62,7 +62,7 @@ public class AbstractPersonType {
 
     @XmlElement(name = "Identification")
     protected List<IdentificationType> identification;
-    @XmlElementRef(name = "AbstractSimpleIdentification", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
+    @XmlElementRef(name = "AbstractSimpleIdentification", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false)
     protected List<JAXBElement<? extends AbstractSimpleIdentificationType>> abstractSimpleIdentification;
     @XmlAttribute(name = "Id")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@@ -120,14 +120,14 @@ public class AbstractPersonType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
-     * {@link JAXBElement }{@code <}{@link Firmenbuchnummer }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ZMRzahl }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ERJPZahl }{@code >}
      * {@link JAXBElement }{@code <}{@link Vereinsnummer }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
+     * {@link JAXBElement }{@code <}{@link ZMRzahl }{@code >}
+     * {@link JAXBElement }{@code <}{@link Firmenbuchnummer }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
+     * {@link JAXBElement }{@code <}{@link ERJPZahl }{@code >}
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java b/src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java
index 0a542e0..bd7d324 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java
@@ -188,8 +188,8 @@ public class CompactCorporateBodyType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link Object }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java b/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
index fb9b0e4..16b0a22 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
@@ -63,7 +63,7 @@ public class CompactPersonDataType
 
     @XmlElementRef(name = "Person", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
     protected JAXBElement<? extends AbstractPersonType> person;
-    @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
+    @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false)
     protected List<JAXBElement<? extends AbstractAddressType>> address;
     @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
     protected List<SignatureType> signature;
@@ -75,11 +75,11 @@ public class CompactPersonDataType
      * 
      * @return
      *     possible object is
-     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
      *     
      */
     public JAXBElement<? extends AbstractPersonType> getPerson() {
@@ -91,11 +91,11 @@ public class CompactPersonDataType
      * 
      * @param value
      *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
      *     
      */
     public void setPerson(JAXBElement<? extends AbstractPersonType> value) {
@@ -120,12 +120,12 @@ public class CompactPersonDataType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
      * 
      * 
      */
@@ -237,8 +237,8 @@ public class CompactPersonDataType
          * 
          * <p>
          * Objects of the following type(s) are allowed in the list
-         * {@link Element }
          * {@link String }
+         * {@link Element }
          * {@link Object }
          * 
          * 
diff --git a/src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java b/src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java
index 94e97ea..1e37799 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java
@@ -240,8 +240,8 @@ public class CompactPhysicalPersonType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link Object }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java b/src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java
index 19d957d..6596ae3 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java
@@ -256,8 +256,8 @@ public class CorporateBodyType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link Object }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/persondata/IdentificationType.java b/src/main/java/at/gv/util/xsd/persondata/IdentificationType.java
index f22d685..df20e77 100644
--- a/src/main/java/at/gv/util/xsd/persondata/IdentificationType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/IdentificationType.java
@@ -172,8 +172,8 @@ public class IdentificationType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link Object }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java b/src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java
index 2afa515..90dfd41 100644
--- a/src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java
@@ -121,8 +121,8 @@ public class InternetAddressType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link Object }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/persondata/NationalityType.java b/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
index 4a426fc..c1d2fef 100644
--- a/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
@@ -52,10 +52,10 @@ import org.w3c.dom.Element;
 public class NationalityType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "ISOCode3", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
+        @XmlElementRef(name = "CountryNameDE", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
         @XmlElementRef(name = "CountryNameEN", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
-        @XmlElementRef(name = "CountryNameFR", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
-        @XmlElementRef(name = "CountryNameDE", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
+        @XmlElementRef(name = "ISOCode3", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class),
+        @XmlElementRef(name = "CountryNameFR", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -79,13 +79,13 @@ public class NationalityType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Object }
-     * {@link String }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link String }
+     * {@link Element }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link Object }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/persondata/ObjectFactory.java b/src/main/java/at/gv/util/xsd/persondata/ObjectFactory.java
index 890abbf..188f09a 100644
--- a/src/main/java/at/gv/util/xsd/persondata/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/persondata/ObjectFactory.java
@@ -26,53 +26,53 @@ import javax.xml.namespace.QName;
 @XmlRegistry
 public class ObjectFactory {
 
+    private final static QName _TypedPostalAddress_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "TypedPostalAddress");
     private final static QName _Extension_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Extension");
     private final static QName _Vereinsnummer_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Vereinsnummer");
     private final static QName _Matrikelnummer_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Matrikelnummer");
     private final static QName _Mobile_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Mobile");
     private final static QName _Sex_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Sex");
     private final static QName _AreaCityCode_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "AreaCityCode");
+    private final static QName _TTYTDD_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "TTYTDD");
+    private final static QName _DateOfDeath_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "DateOfDeath");
     private final static QName _ZMRzahl_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "ZMRzahl");
     private final static QName _InternetAddress_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "InternetAddress");
     private final static QName _Firmenbuchnummer_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Firmenbuchnummer");
+    private final static QName _DateOfBirth_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "DateOfBirth");
     private final static QName _InternationalCountryCode_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "InternationalCountryCode");
     private final static QName _AbstractPersonData_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "AbstractPersonData");
+    private final static QName _CompactName_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "CompactName");
     private final static QName _Pager_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Pager");
+    private final static QName _Confession_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Confession");
     private final static QName _CompactCorporateBody_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "CompactCorporateBody");
+    private final static QName _PersonData_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "PersonData");
+    private final static QName _SubscriberNumber_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "SubscriberNumber");
     private final static QName _ERJPZahl_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "ERJPZahl");
+    private final static QName _Nationality_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Nationality");
     private final static QName _NationalNumber_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "NationalNumber");
     private final static QName _CompactPhysicalPerson_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "CompactPhysicalPerson");
+    private final static QName _Occupation_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Occupation");
     private final static QName _PhysicalPerson_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "PhysicalPerson");
     private final static QName _MaritalStatus_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "MaritalStatus");
     private final static QName _CorporateBody_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "CorporateBody");
     private final static QName _CountryOfBirth_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "CountryOfBirth");
     private final static QName _Sozialversicherungsnummer_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Sozialversicherungsnummer");
-    private final static QName _Steuernummer_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Steuernummer");
-    private final static QName _Name_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Name");
-    private final static QName _StateOfBirth_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "StateOfBirth");
-    private final static QName _Fax_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Fax");
-    private final static QName _TelephoneAddress_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "TelephoneAddress");
-    private final static QName _PlaceOfBirth_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "PlaceOfBirth");
-    private final static QName _FormattedNumber_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "FormattedNumber");
-    private final static QName _TypedPostalAddress_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "TypedPostalAddress");
-    private final static QName _TTYTDD_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "TTYTDD");
-    private final static QName _DateOfDeath_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "DateOfDeath");
-    private final static QName _DateOfBirth_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "DateOfBirth");
-    private final static QName _CompactName_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "CompactName");
-    private final static QName _Confession_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Confession");
-    private final static QName _PersonData_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "PersonData");
-    private final static QName _SubscriberNumber_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "SubscriberNumber");
-    private final static QName _Nationality_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Nationality");
-    private final static QName _Occupation_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Occupation");
     private final static QName _Stammzahl_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Stammzahl");
+    private final static QName _Steuernummer_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Steuernummer");
     private final static QName _Telephone_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Telephone");
     private final static QName _AbstractSimpleIdentification_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "AbstractSimpleIdentification");
     private final static QName _BankConnection_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "BankConnection");
+    private final static QName _Name_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Name");
+    private final static QName _StateOfBirth_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "StateOfBirth");
     private final static QName _Address_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Address");
     private final static QName _Person_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Person");
     private final static QName _CompactPostalAddress_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "CompactPostalAddress");
+    private final static QName _Fax_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Fax");
     private final static QName _PostalAddress_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "PostalAddress");
+    private final static QName _TelephoneAddress_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "TelephoneAddress");
+    private final static QName _PlaceOfBirth_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "PlaceOfBirth");
     private final static QName _Identification_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "Identification");
+    private final static QName _FormattedNumber_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "FormattedNumber");
     private final static QName _NationalityTypeCountryNameDE_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "CountryNameDE");
     private final static QName _NationalityTypeCountryNameFR_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "CountryNameFR");
     private final static QName _NationalityTypeCountryNameEN_QNAME = new QName("http://reference.e-government.gv.at/namespace/persondata/20020228#", "CountryNameEN");
@@ -422,6 +422,15 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "TypedPostalAddress", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "Address")
+    public JAXBElement<TypedPostalAddressType> createTypedPostalAddress(TypedPostalAddressType value) {
+        return new JAXBElement<TypedPostalAddressType>(_TypedPostalAddress_QNAME, TypedPostalAddressType.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
@@ -476,6 +485,24 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link TelcomNumberType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "TTYTDD")
+    public JAXBElement<TelcomNumberType> createTTYTDD(TelcomNumberType value) {
+        return new JAXBElement<TelcomNumberType>(_TTYTDD_QNAME, TelcomNumberType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "DateOfDeath")
+    public JAXBElement<String> createDateOfDeath(String value) {
+        return new JAXBElement<String>(_DateOfDeath_QNAME, String.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link ZMRzahl }{@code >}}
      * 
      */
@@ -506,6 +533,15 @@ public class ObjectFactory {
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "DateOfBirth")
+    public JAXBElement<String> createDateOfBirth(String value) {
+        return new JAXBElement<String>(_DateOfBirth_QNAME, String.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
     @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "InternationalCountryCode")
     public JAXBElement<String> createInternationalCountryCode(String value) {
         return new JAXBElement<String>(_InternationalCountryCode_QNAME, String.class, null, value);
@@ -521,6 +557,15 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link CompactPersonNameType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "CompactName")
+    public JAXBElement<CompactPersonNameType> createCompactName(CompactPersonNameType value) {
+        return new JAXBElement<CompactPersonNameType>(_CompactName_QNAME, CompactPersonNameType.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link TelcomNumberType }{@code >}}
      * 
      */
@@ -530,6 +575,16 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Confession")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    public JAXBElement<String> createConfession(String value) {
+        return new JAXBElement<String>(_Confession_QNAME, String.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}}
      * 
      */
@@ -539,6 +594,24 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link PersonDataType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "PersonData", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "AbstractPersonData")
+    public JAXBElement<PersonDataType> createPersonData(PersonDataType value) {
+        return new JAXBElement<PersonDataType>(_PersonData_QNAME, PersonDataType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "SubscriberNumber")
+    public JAXBElement<String> createSubscriberNumber(String value) {
+        return new JAXBElement<String>(_SubscriberNumber_QNAME, String.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link ERJPZahl }{@code >}}
      * 
      */
@@ -548,6 +621,15 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link NationalityType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Nationality")
+    public JAXBElement<NationalityType> createNationality(NationalityType value) {
+        return new JAXBElement<NationalityType>(_Nationality_QNAME, NationalityType.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
@@ -566,6 +648,15 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Occupation")
+    public JAXBElement<String> createOccupation(String value) {
+        return new JAXBElement<String>(_Occupation_QNAME, String.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}}
      * 
      */
@@ -615,237 +706,146 @@ public class ObjectFactory {
      * Create an instance of {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Steuernummer", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "AbstractSimpleIdentification")
-    public JAXBElement<AbstractSimpleIdentificationType> createSteuernummer(AbstractSimpleIdentificationType value) {
-        return new JAXBElement<AbstractSimpleIdentificationType>(_Steuernummer_QNAME, AbstractSimpleIdentificationType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PersonNameType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Name")
-    public JAXBElement<PersonNameType> createName(PersonNameType value) {
-        return new JAXBElement<PersonNameType>(_Name_QNAME, PersonNameType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "StateOfBirth")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createStateOfBirth(String value) {
-        return new JAXBElement<String>(_StateOfBirth_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TelcomNumberType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Fax")
-    public JAXBElement<TelcomNumberType> createFax(TelcomNumberType value) {
-        return new JAXBElement<TelcomNumberType>(_Fax_QNAME, TelcomNumberType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "TelephoneAddress", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "Address")
-    public JAXBElement<TelephoneAddressType> createTelephoneAddress(TelephoneAddressType value) {
-        return new JAXBElement<TelephoneAddressType>(_TelephoneAddress_QNAME, TelephoneAddressType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "PlaceOfBirth")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createPlaceOfBirth(String value) {
-        return new JAXBElement<String>(_PlaceOfBirth_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "FormattedNumber")
-    public JAXBElement<String> createFormattedNumber(String value) {
-        return new JAXBElement<String>(_FormattedNumber_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Stammzahl", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "AbstractSimpleIdentification")
+    public JAXBElement<AbstractSimpleIdentificationType> createStammzahl(AbstractSimpleIdentificationType value) {
+        return new JAXBElement<AbstractSimpleIdentificationType>(_Stammzahl_QNAME, AbstractSimpleIdentificationType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "TypedPostalAddress", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "Address")
-    public JAXBElement<TypedPostalAddressType> createTypedPostalAddress(TypedPostalAddressType value) {
-        return new JAXBElement<TypedPostalAddressType>(_TypedPostalAddress_QNAME, TypedPostalAddressType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Steuernummer", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "AbstractSimpleIdentification")
+    public JAXBElement<AbstractSimpleIdentificationType> createSteuernummer(AbstractSimpleIdentificationType value) {
+        return new JAXBElement<AbstractSimpleIdentificationType>(_Steuernummer_QNAME, AbstractSimpleIdentificationType.class, null, value);
     }
 
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link TelcomNumberType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "TTYTDD")
-    public JAXBElement<TelcomNumberType> createTTYTDD(TelcomNumberType value) {
-        return new JAXBElement<TelcomNumberType>(_TTYTDD_QNAME, TelcomNumberType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Telephone")
+    public JAXBElement<TelcomNumberType> createTelephone(TelcomNumberType value) {
+        return new JAXBElement<TelcomNumberType>(_Telephone_QNAME, TelcomNumberType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "DateOfDeath")
-    public JAXBElement<String> createDateOfDeath(String value) {
-        return new JAXBElement<String>(_DateOfDeath_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "AbstractSimpleIdentification")
+    public JAXBElement<AbstractSimpleIdentificationType> createAbstractSimpleIdentification(AbstractSimpleIdentificationType value) {
+        return new JAXBElement<AbstractSimpleIdentificationType>(_AbstractSimpleIdentification_QNAME, AbstractSimpleIdentificationType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BankConnectionType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "DateOfBirth")
-    public JAXBElement<String> createDateOfBirth(String value) {
-        return new JAXBElement<String>(_DateOfBirth_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "BankConnection")
+    public JAXBElement<BankConnectionType> createBankConnection(BankConnectionType value) {
+        return new JAXBElement<BankConnectionType>(_BankConnection_QNAME, BankConnectionType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CompactPersonNameType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link PersonNameType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "CompactName")
-    public JAXBElement<CompactPersonNameType> createCompactName(CompactPersonNameType value) {
-        return new JAXBElement<CompactPersonNameType>(_CompactName_QNAME, CompactPersonNameType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Name")
+    public JAXBElement<PersonNameType> createName(PersonNameType value) {
+        return new JAXBElement<PersonNameType>(_Name_QNAME, PersonNameType.class, null, value);
     }
 
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Confession")
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "StateOfBirth")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createConfession(String value) {
-        return new JAXBElement<String>(_Confession_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PersonDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "PersonData", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "AbstractPersonData")
-    public JAXBElement<PersonDataType> createPersonData(PersonDataType value) {
-        return new JAXBElement<PersonDataType>(_PersonData_QNAME, PersonDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "SubscriberNumber")
-    public JAXBElement<String> createSubscriberNumber(String value) {
-        return new JAXBElement<String>(_SubscriberNumber_QNAME, String.class, null, value);
+    public JAXBElement<String> createStateOfBirth(String value) {
+        return new JAXBElement<String>(_StateOfBirth_QNAME, String.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link NationalityType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Nationality")
-    public JAXBElement<NationalityType> createNationality(NationalityType value) {
-        return new JAXBElement<NationalityType>(_Nationality_QNAME, NationalityType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Address")
+    public JAXBElement<AbstractAddressType> createAddress(AbstractAddressType value) {
+        return new JAXBElement<AbstractAddressType>(_Address_QNAME, AbstractAddressType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Occupation")
-    public JAXBElement<String> createOccupation(String value) {
-        return new JAXBElement<String>(_Occupation_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Person")
+    public JAXBElement<AbstractPersonType> createPerson(AbstractPersonType value) {
+        return new JAXBElement<AbstractPersonType>(_Person_QNAME, AbstractPersonType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Stammzahl", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "AbstractSimpleIdentification")
-    public JAXBElement<AbstractSimpleIdentificationType> createStammzahl(AbstractSimpleIdentificationType value) {
-        return new JAXBElement<AbstractSimpleIdentificationType>(_Stammzahl_QNAME, AbstractSimpleIdentificationType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "CompactPostalAddress", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "Address")
+    public JAXBElement<CompactPostalAddressType> createCompactPostalAddress(CompactPostalAddressType value) {
+        return new JAXBElement<CompactPostalAddressType>(_CompactPostalAddress_QNAME, CompactPostalAddressType.class, null, value);
     }
 
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link TelcomNumberType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Telephone")
-    public JAXBElement<TelcomNumberType> createTelephone(TelcomNumberType value) {
-        return new JAXBElement<TelcomNumberType>(_Telephone_QNAME, TelcomNumberType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "AbstractSimpleIdentification")
-    public JAXBElement<AbstractSimpleIdentificationType> createAbstractSimpleIdentification(AbstractSimpleIdentificationType value) {
-        return new JAXBElement<AbstractSimpleIdentificationType>(_AbstractSimpleIdentification_QNAME, AbstractSimpleIdentificationType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BankConnectionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "BankConnection")
-    public JAXBElement<BankConnectionType> createBankConnection(BankConnectionType value) {
-        return new JAXBElement<BankConnectionType>(_BankConnection_QNAME, BankConnectionType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Fax")
+    public JAXBElement<TelcomNumberType> createFax(TelcomNumberType value) {
+        return new JAXBElement<TelcomNumberType>(_Fax_QNAME, TelcomNumberType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Address")
-    public JAXBElement<AbstractAddressType> createAddress(AbstractAddressType value) {
-        return new JAXBElement<AbstractAddressType>(_Address_QNAME, AbstractAddressType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "PostalAddress", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "Address")
+    public JAXBElement<PostalAddressType> createPostalAddress(PostalAddressType value) {
+        return new JAXBElement<PostalAddressType>(_PostalAddress_QNAME, PostalAddressType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Person")
-    public JAXBElement<AbstractPersonType> createPerson(AbstractPersonType value) {
-        return new JAXBElement<AbstractPersonType>(_Person_QNAME, AbstractPersonType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "TelephoneAddress", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "Address")
+    public JAXBElement<TelephoneAddressType> createTelephoneAddress(TelephoneAddressType value) {
+        return new JAXBElement<TelephoneAddressType>(_TelephoneAddress_QNAME, TelephoneAddressType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "CompactPostalAddress", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "Address")
-    public JAXBElement<CompactPostalAddressType> createCompactPostalAddress(CompactPostalAddressType value) {
-        return new JAXBElement<CompactPostalAddressType>(_CompactPostalAddress_QNAME, CompactPostalAddressType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "PlaceOfBirth")
+    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    public JAXBElement<String> createPlaceOfBirth(String value) {
+        return new JAXBElement<String>(_PlaceOfBirth_QNAME, String.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link IdentificationType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "PostalAddress", substitutionHeadNamespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", substitutionHeadName = "Address")
-    public JAXBElement<PostalAddressType> createPostalAddress(PostalAddressType value) {
-        return new JAXBElement<PostalAddressType>(_PostalAddress_QNAME, PostalAddressType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Identification")
+    public JAXBElement<IdentificationType> createIdentification(IdentificationType value) {
+        return new JAXBElement<IdentificationType>(_Identification_QNAME, IdentificationType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IdentificationType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Identification")
-    public JAXBElement<IdentificationType> createIdentification(IdentificationType value) {
-        return new JAXBElement<IdentificationType>(_Identification_QNAME, IdentificationType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "FormattedNumber")
+    public JAXBElement<String> createFormattedNumber(String value) {
+        return new JAXBElement<String>(_FormattedNumber_QNAME, String.class, null, value);
     }
 
     /**
diff --git a/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java b/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
index 1423425..5d0ea67 100644
--- a/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
@@ -63,7 +63,7 @@ public class PersonDataType
 
     @XmlElementRef(name = "Person", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
     protected JAXBElement<? extends AbstractPersonType> person;
-    @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class)
+    @XmlElementRef(name = "Address", namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", type = JAXBElement.class, required = false)
     protected List<JAXBElement<? extends AbstractAddressType>> address;
     @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
     protected List<SignatureType> signature;
@@ -75,11 +75,11 @@ public class PersonDataType
      * 
      * @return
      *     possible object is
-     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
      *     
      */
     public JAXBElement<? extends AbstractPersonType> getPerson() {
@@ -91,11 +91,11 @@ public class PersonDataType
      * 
      * @param value
      *     allowed object is
-     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
-     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CorporateBodyType }{@code >}
      *     {@link JAXBElement }{@code <}{@link CompactCorporateBodyType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link PhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link CompactPhysicalPersonType }{@code >}
+     *     {@link JAXBElement }{@code <}{@link AbstractPersonType }{@code >}
      *     
      */
     public void setPerson(JAXBElement<? extends AbstractPersonType> value) {
@@ -120,12 +120,12 @@ public class PersonDataType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
      * 
      * 
      */
@@ -237,8 +237,8 @@ public class PersonDataType
          * 
          * <p>
          * Objects of the following type(s) are allowed in the list
-         * {@link Element }
          * {@link String }
+         * {@link Element }
          * {@link Object }
          * 
          * 
diff --git a/src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java b/src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java
index f272763..4c5a5e3 100644
--- a/src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java
@@ -484,8 +484,8 @@ public class PhysicalPersonType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link Object }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java b/src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java
index eb76402..2e8e7e6 100644
--- a/src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java
@@ -125,8 +125,8 @@ public class TelephoneAddressType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link Object }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java b/src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java
index c85e2ec..0b53e5e 100644
--- a/src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java
@@ -120,8 +120,8 @@ public class TypedPostalAddressType
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link Object }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java b/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java
index 3375f18..c003fcc 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/AdviceType.java
@@ -41,8 +41,8 @@ import org.w3c.dom.Element;
 public class AdviceType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "Assertion", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class),
-        @XmlElementRef(name = "AssertionIDReference", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class)
+        @XmlElementRef(name = "AssertionIDReference", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class),
+        @XmlElementRef(name = "Assertion", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> assertionIDReferenceOrAssertionOrAny;
@@ -65,10 +65,10 @@ public class AdviceType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link AssertionType }{@code >}
      * {@link Object }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link Element }
+     * {@link JAXBElement }{@code <}{@link AssertionType }{@code >}
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java b/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java
index 89b61c3..9f47967 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/SubjectType.java
@@ -41,8 +41,8 @@ import javax.xml.bind.annotation.XmlType;
 public class SubjectType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "NameIdentifier", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class),
-        @XmlElementRef(name = "SubjectConfirmation", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class)
+        @XmlElementRef(name = "SubjectConfirmation", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class),
+        @XmlElementRef(name = "NameIdentifier", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class)
     })
     protected List<JAXBElement<?>> content;
 
diff --git a/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java b/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
index d191cc6..fccf7b3 100644
--- a/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
+++ b/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
@@ -3,6 +3,7 @@ package at.gv.util.xsd.srzgw;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -42,6 +43,7 @@ import javax.xml.bind.annotation.XmlType;
  *         &lt;element name="Signature" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
  *         &lt;element name="MIS" type="{http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd}MISType" minOccurs="0"/>
  *       &lt;/sequence>
+ *       &lt;attribute name="reqID" type="{http://www.w3.org/2001/XMLSchema}string" />
  *     &lt;/restriction>
  *   &lt;/complexContent>
  * &lt;/complexType>
@@ -64,6 +66,8 @@ public class CreateIdentityLinkRequest {
     protected byte[] signature;
     @XmlElement(name = "MIS")
     protected MISType mis;
+    @XmlAttribute(name = "reqID")
+    protected String reqID;
 
     /**
      * Gets the value of the pepsData property.
@@ -135,6 +139,30 @@ public class CreateIdentityLinkRequest {
         this.mis = value;
     }
 
+    /**
+     * Gets the value of the reqID property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getReqID() {
+        return reqID;
+    }
+
+    /**
+     * Sets the value of the reqID property.
+     * 
+     * @param value
+     *     allowed object is
+     *     {@link String }
+     *     
+     */
+    public void setReqID(String value) {
+        this.reqID = value;
+    }
+
 
     /**
      * <p>Java class for anonymous complex type.
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java b/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
index 630d170..3eb9514 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
@@ -64,8 +64,8 @@ public class DigestMethodType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link String }
+     * {@link Element }
      * {@link Object }
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java b/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
index 416dada..1cea66e 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
@@ -53,13 +53,13 @@ import org.w3c.dom.Element;
 public class KeyInfoType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+        @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -88,15 +88,15 @@ public class KeyInfoType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
      * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
+     * {@link String }
+     * {@link Element }
      * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
      * {@link Object }
-     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
-     * {@link String }
-     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java b/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
index 5bf87d4..73d0b30 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
@@ -42,8 +42,8 @@ import org.w3c.dom.Element;
 public class KeyValueType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+        @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -67,11 +67,11 @@ public class KeyValueType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link String }
      * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
      * {@link Element }
-     * {@link String }
      * {@link Object }
-     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java b/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
index a32d3ba..3a6a69d 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
@@ -27,36 +27,36 @@ public class ObjectFactory {
 
     private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
     private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData");
+    private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
     private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
+    private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
     private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
     private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
     private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
     private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
     private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
     private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData");
-    private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
-    private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
-    private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
-    private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
-    private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
-    private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
-    private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
     private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference");
     private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
     private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
     private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
+    private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
+    private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
     private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
     private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
+    private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
     private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
+    private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
+    private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
     private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
-    private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
+    private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
     private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
     private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
     private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
     private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
     private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
-    private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
     private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
+    private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
     private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
     private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
 
@@ -262,6 +262,15 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
+    public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
+        return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}}
      * 
      */
@@ -271,6 +280,15 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty")
+    public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) {
+        return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}}
      * 
      */
@@ -325,69 +343,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
-    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
-        return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
-    public JAXBElement<ObjectType> createObject(ObjectType value) {
-        return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
-    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
-        return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
-    public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
-        return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
-    public JAXBElement<String> createKeyName(String value) {
-        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
-    public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
-        return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty")
-    public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) {
-        return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value);
-    }
-
-    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}}
      * 
      */
@@ -424,6 +379,24 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
+    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
+        return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
+    public JAXBElement<ObjectType> createObject(ObjectType value) {
+        return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}}
      * 
      */
@@ -442,6 +415,15 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
+    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
+        return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
@@ -451,6 +433,24 @@ public class ObjectFactory {
     }
 
     /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
+    public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
+        return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
+    public JAXBElement<String> createKeyName(String value) {
+        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
+    }
+
+    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}}
      * 
      */
@@ -460,12 +460,12 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
-    public JAXBElement<String> createTransformTypeXPath(String value) {
-        return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
+    public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
+        return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
     }
 
     /**
@@ -514,21 +514,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
-    public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
-        return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
+    public JAXBElement<String> createSPKIDataTypeSPKISexp(String value) {
+        return new JAXBElement<String>(_SPKIDataTypeSPKISexp_QNAME, String.class, SPKIDataType.class, value);
     }
 
     /**
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
-    public JAXBElement<String> createSPKIDataTypeSPKISexp(String value) {
-        return new JAXBElement<String>(_SPKIDataTypeSPKISexp_QNAME, String.class, SPKIDataType.class, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
+    public JAXBElement<String> createTransformTypeXPath(String value) {
+        return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
     }
 
     /**
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java b/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
index 7e60f82..613edf9 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
@@ -76,8 +76,8 @@ public class ObjectType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link String }
+     * {@link Element }
      * {@link Object }
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java b/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
index bab2890..582db74 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
@@ -47,8 +47,8 @@ import org.w3c.dom.Element;
 public class PGPDataType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+        @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> content;
@@ -82,9 +82,9 @@ public class PGPDataType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link Element }
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link Object }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java b/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
index f829d35..e6a187e 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
@@ -60,8 +60,8 @@ public class SPKIDataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link Element }
      * {@link Object }
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java b/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
index 45d08b6..70695af 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
@@ -42,7 +42,7 @@ import javax.xml.bind.annotation.XmlType;
 })
 public class SignatureMethodType {
 
-    @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+    @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     @XmlMixed
     @XmlAnyElement(lax = true)
     protected List<Object> content;
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java b/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
index 23b7c84..deea9c9 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
@@ -73,8 +73,8 @@ public class SignaturePropertyType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link String }
+     * {@link Element }
      * {@link Object }
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java b/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
index 2d6814a..f968ff2 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
@@ -42,7 +42,7 @@ import org.w3c.dom.Element;
 })
 public class TransformType {
 
-    @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+    @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     @XmlMixed
     @XmlAnyElement(lax = true)
     protected List<Object> content;
@@ -69,8 +69,8 @@ public class TransformType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Element }
      * {@link String }
+     * {@link Element }
      * {@link Object }
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java b/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
index bfea4d1..05c0081 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
@@ -46,11 +46,11 @@ import org.w3c.dom.Element;
 public class X509DataType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+        @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
@@ -73,11 +73,11 @@ public class X509DataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link Element }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link Object }
+     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
diff --git a/src/main/resources/wsdl/misstork/misstork-1.0.xsd b/src/main/resources/wsdl/misstork/misstork-1.0.xsd
index 68d62b8..dde3e8a 100644
--- a/src/main/resources/wsdl/misstork/misstork-1.0.xsd
+++ b/src/main/resources/wsdl/misstork/misstork-1.0.xsd
@@ -42,6 +42,7 @@
 					</xs:element>
 				</xs:sequence>
 			</xs:choice>
+			<xs:attribute name="reqID" type="xs:string" use="optional"/>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="MisStorkResponse">
diff --git a/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd b/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd
index c978224..ab7e07b 100644
--- a/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd
+++ b/src/main/resources/wsdl/szrgw/szr-gw-0.0.3.xsd
@@ -27,6 +27,7 @@
 				<xs:element name="Signature" type="xs:base64Binary" minOccurs="1" maxOccurs="1"/>
 				<xs:element name="MIS" type="sgw:MISType" minOccurs="0" maxOccurs="1"/>
 			</xs:sequence>
+			<xs:attribute name="reqID" type="xs:string" use="optional"/>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="MISType">