change more client implementations to APACHE CXF

222 files changed, 3148 insertions, 3317 deletions

diff --git a/generatesources.bat b/generatesources.bat
index ffd144e..25f2b5a 100644
--- a/generatesources.bat
+++ b/generatesources.bat
@@ -1,29 +1,40 @@
 set JAVA_HOME=C:\Program Files\Java\jdk1.7.0_17
 set APACHE_CXF=D:\Downloads\apache-cxf-3.0.1\apache-cxf-3.0.1
 
-REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl -b ./src/main/resources/wsdl/MOA-SPSS-1.3.xsd -b ./src/main/resources/wsdl/custom-bindings/moa-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/moa-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
-REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/MOA-ID-1.x.wsdl -b ./src/main/resources/wsdl/MOA-SPSS-1.3.xsd -b ./src/main/resources/wsdl/cs-sstc-schema-protocol-01.xsd -b ./src/main/resources/wsdl/cs-sstc-schema-assertion-01.xsd -b ./src/main/resources/wsdl/custom-bindings/moa-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/moa-schemas.xml -b ./src/main/resources/wsdl/PersonData_20_en_moaWID.xsd -s ./wsdlsources/src -d ./wsdlsources/classes
-REM "%JAVA_HOME%\bin\wsimport.exe" -extension ./src/main/resources/wsdl/szr/SZR_v2.0.wsdl -b ./src/main/resources/wsdl/custom-bindings/szr-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/szr-schemas.xml -b ./src/main/resources/wsdl/szr/szr_ecdsa.xsd -b ./src/main/resources/wsdl/szr/szr_persondata.xsd -b ./src/main/resources/wsdl/szr/szr_pvp_sec.xsd -b ./src/main/resources/wsdl/szr/szr_pvp.xsd -b ./src/main/resources/wsdl/szr/szr_v2.0.xsd -b ./src/main/resources/wsdl/szr/szr_xmldsig.xsd -s ./wsdlsources/src -d ./wsdlsources/classes
+REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/custom-bindings/moa-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/moa-schemas.xml -b ./src/main/resources/wsdl/MOA-SPSS-1.3.xsd  -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl
+
+REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/MOA-SPSS-1.3.xsd -b ./src/main/resources/wsdl/cs-sstc-schema-protocol-01.xsd -b ./src/main/resources/wsdl/cs-sstc-schema-assertion-01.xsd -b ./src/main/resources/wsdl/custom-bindings/moa-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/moa-schemas.xml -b ./src/main/resources/wsdl/PersonData_20_en_moaWID.xsd -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/MOA-ID-1.x.wsdl
+
 REM "%JAVA_HOME%\bin\xjc.exe" -b ./src/main/resources/wsdl/custom-bindings/mandate-schemas.xml -d ./wsdlsources/src ./src/main/resources/wsdl/mandate/Mandate_1.0.0.xsd
-REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/mis/mis-1.0.3.wsdl -b ./src/main/resources/wsdl/mis/mis-1.0.3.xsd -b ./src/main/resources/wsdl/custom-bindings/mis-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mis-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
+
+REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/mis/mis-1.0.3.xsd -b ./src/main/resources/wsdl/custom-bindings/mis-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mis-schemas.xml -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/mis/mis-1.0.3.wsdl
+
 REM "%JAVA_HOME%\bin\xjc.exe" -b ./src/main/resources/wsdl/custom-bindings/sl-schemas.xml -d ./wsdlsources/src ./src/main/resources/wsdl/sl/sl-1.2.xsd 
+
 REM "%JAVA_HOME%\bin\xjc.exe" -b ./src/main/resources/wsdl/custom-bindings/omsp-schemas.xml -d ./wsdlsources/src ./src/main/resources/wsdl/omsp/omsp.xsd
-REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/mms/mms.wsdl -b ./src/main/resources/wsdl/mms/mms-1.0.xsd -b ./src/main/resources/wsdl/custom-bindings/mms-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mms-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
-REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/mzs/app2mzs.wsdl -b ./src/main/resources/wsdl/mzs/app2mzs.xsd -b ./src/main/resources/wsdl/custom-bindings/mzs-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mzs-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
-REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl -b ./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.xsd -b ./src/main/resources/wsdl/custom-bindings/mis-usp-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mis-usp-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
+
+REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/mms/mms-1.0.xsd -b ./src/main/resources/wsdl/custom-bindings/mms-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mms-schemas.xml -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/mms/mms.wsdl
+
+REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/mzs/app2mzs.xsd -b ./src/main/resources/wsdl/custom-bindings/mzs-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mzs-schemas.xml -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/mzs/app2mzs.wsdl
+
+"%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.xsd -b ./src/main/resources/wsdl/custom-bindings/mis-usp-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/mis-usp-schemas.xml  -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl
+
 REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/zkopf/zkopf.wsdl -b ./src/main/resources/wsdl/zkopf/zkopf.xsd -b ./src/main/resources/wsdl/custom-bindings/zkopf-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/zkopf-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
+
 REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/zkopf/zuserech.wsdl -b ./src/main/resources/wsdl/zkopf/zuserech.xsd -b ./src/main/resources/wsdl/custom-bindings/zuserech-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/zuserech-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
-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/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 "%APACHE_CXF%\bin\wsdl2java.bat" -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 -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/misstork/misstork.wsdl
+
 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
-REM "%JAVA_HOME%\bin\wsimport.exe" ./src/main/resources/wsdl/ur_V5/URSucheService.wsdl -b ./src/main/resources/wsdl/custom-bindings/ur_V5-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ur_V5-schemas.xml -s ./wsdlsources/src -d ./wsdlsources/classes
 
 REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/custom-bindings/ur_V2-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ur_V2-schemas.xml -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/ur_V2/URSucheService.wsdl
 
-"%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/custom-bindings/ur_V5-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ur_V5-schemas.xml -d ./wsdlsources -encoding utf-8 ./src/main/resources/wsdl/ur_V5/URSucheService.wsdl
+REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/custom-bindings/ur_V5-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ur_V5-schemas.xml -d ./wsdlsources -encoding utf-8 ./src/main/resources/wsdl/ur_V5/URSucheService.wsdl
+
+REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/custom-bindings/ersb-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ersb-schemas.xml -d ./wsdlsources -encoding utf-8 ./src/main/resources/wsdl/ERsB/1.1/ErsbService.wsdl
+
+REM "%APACHE_CXF%\bin\wsdl2java.bat" -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 -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/szrgw/szrgw.wsdl
 
-"%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/custom-bindings/ersb-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/ersb-schemas.xml -d ./wsdlsources -encoding utf-8 ./src/main/resources/wsdl/ERsB/1.1/ErsbService.wsdl
+REM "%APACHE_CXF%\bin\wsdl2java.bat" -b ./src/main/resources/wsdl/custom-bindings/szr-wsdl.xml -b ./src/main/resources/wsdl/custom-bindings/szr-schemas.xml -b ./src/main/resources/wsdl/szr/szr_pvp.xsd -b ./src/main/resources/wsdl/szr/szr_pvp_sec.xsd -encoding utf-8 -d ./wsdlsources ./src/main/resources/wsdl/szr/SZR_v2.0.wsdl
\ No newline at end of file
diff --git a/src/main/java/at/gv/util/client/szr/SZRClient.java b/src/main/java/at/gv/util/client/szr/SZRClient.java
index 956cebc..159f718 100644
--- a/src/main/java/at/gv/util/client/szr/SZRClient.java
+++ b/src/main/java/at/gv/util/client/szr/SZRClient.java
@@ -31,8 +31,16 @@ import at.gv.util.wsdl.szr.SZRException;
 import at.gv.util.wsdl.szr.SZRService;
 import at.gv.util.xsd.szr.FremdBPKRequestType;
 import at.gv.util.xsd.szr.FremdBPKType;
+import at.gv.util.xsd.szr.GetBPK;
+import at.gv.util.xsd.szr.GetBPKResponse;
+import at.gv.util.xsd.szr.GetIdentityLink;
+import at.gv.util.xsd.szr.GetIdentityLinkResponse;
+import at.gv.util.xsd.szr.GetStammzahl;
+import at.gv.util.xsd.szr.GetStammzahlResponse;
 import at.gv.util.xsd.szr.IdentityLinkType;
 import at.gv.util.xsd.szr.PersonInfoType;
+import at.gv.util.xsd.szr.TransformBPK;
+import at.gv.util.xsd.szr.TransformBPKResponse;
 import at.gv.util.xsd.szr.pvp.PvpTokenType;
 import at.gv.util.xsd.szr.xmldsig.KeyValueType;
 
@@ -55,12 +63,22 @@ public class SZRClient {
 	public IdentityLinkType getIdentityLink(PersonInfoType personInfo, List<KeyValueType> keyValue, Boolean insertERnP) throws SZRException {
 		MiscUtil.assertNotNull(personInfo, "personInfo");
 		MiscUtil.assertNotNull(keyValue, "keyValue");
-		return this.szr.getIdentityLink(personInfo, keyValue, insertERnP);
+		
+		GetIdentityLink idlReq = new GetIdentityLink();
+		idlReq.setInsertERnP(insertERnP);
+		idlReq.setPersonInfo(personInfo);
+		idlReq.getKeyValue().addAll(keyValue);
+		
+		GetIdentityLinkResponse idlResp = this.szr.getIdentityLink(idlReq);		
+		return idlResp.getGetIdentityLinkReturn(); 
 	}
 	
-  public String getStammzahl(PersonInfoType personInfo) throws SZRException {
-  	MiscUtil.assertNotNull(personInfo, "personInfo");
-		return this.szr.getStammzahl(personInfo);
+  public String getStammzahl(PersonInfoType personInfo) throws SZRException {	  
+  		MiscUtil.assertNotNull(personInfo, "personInfo");  	
+  		GetStammzahl req = new GetStammzahl();
+  		req.setPersonInfo(personInfo);
+		GetStammzahlResponse resp = this.szr.getStammzahl(req );  	
+		return resp.getStammzahl();
 	}
   
   public String getBPK(PersonInfoType personInfo, String target, String vkz) throws SZRException, EgovUtilException {
@@ -75,11 +93,15 @@ public class SZRClient {
   	} else {
     	targetString = target;
   	}
-  	Holder<String> returnBPK = new Holder<String>();
   	
-  	this.szr.getBPK(personInfo, targetString, vkz, null, false, returnBPK, null, null);
-  	
-  	return returnBPK.value;
+  	GetBPK req = new GetBPK();
+  	req.setPersonInfo(personInfo);
+  	req.setBereichsKennung(targetString);
+  	req.setVKZ(vkz);
+  	req.setListMultiplePersons(false);
+	GetBPKResponse resp = this.szr.getBPK(req);  	
+	return resp.getGetBPKReturn();
+
   }
   
   public String transformBPK(PersonInfoType personInfo, String inputBpk, String inputTarget, String target, String vkz) throws SZRException, EgovUtilException {
@@ -100,7 +122,14 @@ public class SZRClient {
   	rt.setVKZ(vkz);
   	List<FremdBPKRequestType> list = new ArrayList<FremdBPKRequestType>();
   	list.add(rt);
-  	List<FremdBPKType> response = this.szr.transformBPK(personInfo, inputBpk, inputTarget, "kt", list);
+  	
+  	TransformBPK req = new TransformBPK();
+  	req.setPersonInfo(personInfo);
+  	req.setInputBereichsKennung(targetString);
+  	req.setInputBPK(inputBpk);
+  	req.setBegruendung("kt");
+	TransformBPKResponse resp = this.szr.transformBPK(req );
+	List<FremdBPKType> response = resp.getTransformBPKReturn();
   	if (response == null) {
   		return null;
   	}
diff --git a/src/main/java/at/gv/util/wsdl/GetAuthenticationDataService.java b/src/main/java/at/gv/util/wsdl/GetAuthenticationDataService.java
index 4fa21e7..ad635ac 100644
--- a/src/main/java/at/gv/util/wsdl/GetAuthenticationDataService.java
+++ b/src/main/java/at/gv/util/wsdl/GetAuthenticationDataService.java
@@ -1,41 +1,42 @@
-
 package at.gv.util.wsdl;
 
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.logging.Logger;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
 import javax.xml.ws.WebServiceFeature;
-
+import javax.xml.ws.Service;
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:46:23.751+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "GetAuthenticationDataService", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", wsdlLocation = "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-ID-1.x.wsdl")
-public class GetAuthenticationDataService
-    extends Service
-{
+@WebServiceClient(name = "GetAuthenticationDataService", 
+                  wsdlLocation = "./src/main/resources/wsdl/MOA-ID-1.x.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#") 
+public class GetAuthenticationDataService extends Service {
 
-    private final static URL GETAUTHENTICATIONDATASERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.GetAuthenticationDataService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "GetAuthenticationDataService");
+    public final static QName IdentificationPort = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "IdentificationPort");
     static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.GetAuthenticationDataService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-ID-1.x.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-ID-1.x.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        GETAUTHENTICATIONDATASERVICE_WSDL_LOCATION = url;
+        URL url = GetAuthenticationDataService.class.getResource("./src/main/resources/wsdl/MOA-ID-1.x.wsdl");
+        if (url == null) {
+            url = GetAuthenticationDataService.class.getClassLoader().getResource("./src/main/resources/wsdl/MOA-ID-1.x.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(GetAuthenticationDataService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/MOA-ID-1.x.wsdl");
+        }       
+        WSDL_LOCATION = url;
+    }
+
+    public GetAuthenticationDataService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public GetAuthenticationDataService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +44,38 @@ public class GetAuthenticationDataService
     }
 
     public GetAuthenticationDataService() {
-        super(GETAUTHENTICATIONDATASERVICE_WSDL_LOCATION, new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "GetAuthenticationDataService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetAuthenticationDataService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetAuthenticationDataService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
     }
 
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetAuthenticationDataService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns IdentificationPortType
      */
     @WebEndpoint(name = "IdentificationPort")
     public IdentificationPortType getIdentificationPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "IdentificationPort"), IdentificationPortType.class);
+        return super.getPort(IdentificationPort, IdentificationPortType.class);
     }
 
     /**
@@ -65,7 +87,7 @@ public class GetAuthenticationDataService
      */
     @WebEndpoint(name = "IdentificationPort")
     public IdentificationPortType getIdentificationPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "IdentificationPort"), IdentificationPortType.class, features);
+        return super.getPort(IdentificationPort, IdentificationPortType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/IdentificationPortType.java b/src/main/java/at/gv/util/wsdl/IdentificationPortType.java
index ff10855..1c0c755 100644
--- a/src/main/java/at/gv/util/wsdl/IdentificationPortType.java
+++ b/src/main/java/at/gv/util/wsdl/IdentificationPortType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl;
 
 import javax.jws.WebMethod;
@@ -7,41 +6,22 @@ import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
-import at.gv.util.xsd.saml.protocol.RequestType;
-import at.gv.util.xsd.saml.protocol.ResponseType;
-
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:46:23.741+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "IdentificationPortType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "IdentificationPortType")
+@XmlSeeAlso({at.gv.util.xsd.persondata.ObjectFactory.class, at.gv.util.xsd.saml.protocol.ObjectFactory.class, at.gv.util.xsd.saml.assertion.ObjectFactory.class, at.gv.util.xsd.moaspss.ObjectFactory.class, at.gv.util.xsd.xmldsig.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.saml.protocol.ObjectFactory.class,
-    at.gv.util.xsd.persondata.ObjectFactory.class,
-    at.gv.util.xsd.xmldsig.ObjectFactory.class,
-    at.gv.util.xsd.saml.assertion.ObjectFactory.class,
-    at.gv.util.xsd.moaspss.ObjectFactory.class
-})
 public interface IdentificationPortType {
 
-
-    /**
-     * 
-     * @param body
-     * @return
-     *     returns at.gv.util.xsd.saml.protocol.ResponseType
-     * @throws MOAFault
-     */
-    @WebMethod(action = "urn:GetAuthenticationDataAction")
     @WebResult(name = "Response", targetNamespace = "urn:oasis:names:tc:SAML:1.0:protocol", partName = "body")
-    public ResponseType getAuthenticationData(
-        @WebParam(name = "Request", targetNamespace = "urn:oasis:names:tc:SAML:1.0:protocol", partName = "body")
-        RequestType body)
-        throws MOAFault
-    ;
-
+    @WebMethod(action = "urn:GetAuthenticationDataAction")
+    public at.gv.util.xsd.saml.protocol.ResponseType getAuthenticationData(
+        @WebParam(partName = "body", name = "Request", targetNamespace = "urn:oasis:names:tc:SAML:1.0:protocol")
+        at.gv.util.xsd.saml.protocol.RequestType body
+    ) throws MOAFault;
 }
diff --git a/src/main/java/at/gv/util/wsdl/MOAFault.java b/src/main/java/at/gv/util/wsdl/MOAFault.java
index e631845..f279560 100644
--- a/src/main/java/at/gv/util/wsdl/MOAFault.java
+++ b/src/main/java/at/gv/util/wsdl/MOAFault.java
@@ -2,54 +2,42 @@
 package at.gv.util.wsdl;
 
 import javax.xml.ws.WebFault;
-import at.gv.util.xsd.moaspss.ErrorResponseType;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
- * 
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:46:23.711+01:00
+ * Generated source version: 3.0.1
  */
+
 @WebFault(name = "ErrorResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
-public class MOAFault
-    extends Exception
-{
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     * 
-     */
-    private ErrorResponseType faultInfo;
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     */
-    public MOAFault(String message, ErrorResponseType faultInfo) {
+public class MOAFault extends Exception {
+    
+    private at.gv.util.xsd.moaspss.ErrorResponseType errorResponse;
+
+    public MOAFault() {
+        super();
+    }
+    
+    public MOAFault(String message) {
         super(message);
-        this.faultInfo = faultInfo;
     }
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     * @param cause
-     */
-    public MOAFault(String message, ErrorResponseType faultInfo, Throwable cause) {
+    
+    public MOAFault(String message, Throwable cause) {
         super(message, cause);
-        this.faultInfo = faultInfo;
     }
 
-    /**
-     * 
-     * @return
-     *     returns fault bean: at.gv.util.xsd.moaspss.ErrorResponseType
-     */
-    public ErrorResponseType getFaultInfo() {
-        return faultInfo;
+    public MOAFault(String message, at.gv.util.xsd.moaspss.ErrorResponseType errorResponse) {
+        super(message);
+        this.errorResponse = errorResponse;
     }
 
+    public MOAFault(String message, at.gv.util.xsd.moaspss.ErrorResponseType errorResponse, Throwable cause) {
+        super(message, cause);
+        this.errorResponse = errorResponse;
+    }
+
+    public at.gv.util.xsd.moaspss.ErrorResponseType getFaultInfo() {
+        return this.errorResponse;
+    }
 }
diff --git a/src/main/java/at/gv/util/wsdl/SignatureCreationPortType.java b/src/main/java/at/gv/util/wsdl/SignatureCreationPortType.java
index b4cd5cc..050720b 100644
--- a/src/main/java/at/gv/util/wsdl/SignatureCreationPortType.java
+++ b/src/main/java/at/gv/util/wsdl/SignatureCreationPortType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl;
 
 import javax.jws.WebMethod;
@@ -8,38 +7,21 @@ import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
 
-import at.gv.util.xsd.moaspss.CreateXMLSignatureRequest;
-import at.gv.util.xsd.moaspss.CreateXMLSignatureResponseType;
-
-
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:44:05.519+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "SignatureCreationPortType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", name = "SignatureCreationPortType")
+@XmlSeeAlso({at.gv.util.xsd.moaspss.ObjectFactory.class, at.gv.util.xsd.xmldsig.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.xmldsig.ObjectFactory.class,
-    at.gv.util.xsd.moaspss.ObjectFactory.class
-})
 public interface SignatureCreationPortType {
 
-
-    /**
-     * 
-     * @param body
-     * @return
-     *     returns at.gv.zustellung.util.xsd.moaspss.CreateXMLSignatureResponseType
-     * @throws MOAFault
-     */
-    @WebMethod(action = "urn:CreateXMLSignatureAction")
     @WebResult(name = "CreateXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-    public CreateXMLSignatureResponseType createXMLSignature(
-        @WebParam(name = "CreateXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-        CreateXMLSignatureRequest body)
-        throws MOAFault
-    ;
-
+    @WebMethod(action = "urn:CreateXMLSignatureAction")
+    public at.gv.util.xsd.moaspss.CreateXMLSignatureResponseType createXMLSignature(
+        @WebParam(partName = "body", name = "CreateXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
+        at.gv.util.xsd.moaspss.CreateXMLSignatureRequest body
+    ) throws MOAFault;
 }
diff --git a/src/main/java/at/gv/util/wsdl/SignatureCreationService.java b/src/main/java/at/gv/util/wsdl/SignatureCreationService.java
index e8d2777..96c4035 100644
--- a/src/main/java/at/gv/util/wsdl/SignatureCreationService.java
+++ b/src/main/java/at/gv/util/wsdl/SignatureCreationService.java
@@ -1,41 +1,42 @@
-
 package at.gv.util.wsdl;
 
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.logging.Logger;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
 import javax.xml.ws.WebServiceFeature;
-
+import javax.xml.ws.Service;
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:44:05.539+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "SignatureCreationService", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", wsdlLocation = "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl")
-public class SignatureCreationService
-    extends Service
-{
+@WebServiceClient(name = "SignatureCreationService", 
+                  wsdlLocation = "./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl") 
+public class SignatureCreationService extends Service {
 
-    private final static URL SIGNATURECREATIONSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.SignatureCreationService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureCreationService");
+    public final static QName SignatureCreationPort = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureCreationPort");
     static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.SignatureCreationService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        SIGNATURECREATIONSERVICE_WSDL_LOCATION = url;
+        URL url = SignatureCreationService.class.getResource("./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        if (url == null) {
+            url = SignatureCreationService.class.getClassLoader().getResource("./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(SignatureCreationService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        }       
+        WSDL_LOCATION = url;
+    }
+
+    public SignatureCreationService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public SignatureCreationService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +44,38 @@ public class SignatureCreationService
     }
 
     public SignatureCreationService() {
-        super(SIGNATURECREATIONSERVICE_WSDL_LOCATION, new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureCreationService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureCreationService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureCreationService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
     }
 
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureCreationService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns SignatureCreationPortType
      */
     @WebEndpoint(name = "SignatureCreationPort")
     public SignatureCreationPortType getSignatureCreationPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureCreationPort"), SignatureCreationPortType.class);
+        return super.getPort(SignatureCreationPort, SignatureCreationPortType.class);
     }
 
     /**
@@ -65,7 +87,7 @@ public class SignatureCreationService
      */
     @WebEndpoint(name = "SignatureCreationPort")
     public SignatureCreationPortType getSignatureCreationPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureCreationPort"), SignatureCreationPortType.class, features);
+        return super.getPort(SignatureCreationPort, SignatureCreationPortType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/SignatureVerificationPortType.java b/src/main/java/at/gv/util/wsdl/SignatureVerificationPortType.java
index 04145aa..ce33a35 100644
--- a/src/main/java/at/gv/util/wsdl/SignatureVerificationPortType.java
+++ b/src/main/java/at/gv/util/wsdl/SignatureVerificationPortType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl;
 
 import javax.jws.WebMethod;
@@ -8,55 +7,28 @@ import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
 
-import at.gv.util.xsd.moaspss.VerifyCMSSignatureRequest;
-import at.gv.util.xsd.moaspss.VerifyCMSSignatureResponseType;
-import at.gv.util.xsd.moaspss.VerifyXMLSignatureRequestType;
-import at.gv.util.xsd.moaspss.VerifyXMLSignatureResponseType;
-
-
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:44:05.509+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "SignatureVerificationPortType", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", name = "SignatureVerificationPortType")
+@XmlSeeAlso({at.gv.util.xsd.moaspss.ObjectFactory.class, at.gv.util.xsd.xmldsig.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.xmldsig.ObjectFactory.class,
-    at.gv.util.xsd.moaspss.ObjectFactory.class
-})
 public interface SignatureVerificationPortType {
 
-
-    /**
-     * 
-     * @param body
-     * @return
-     *     returns at.gv.zustellung.util.xsd.moaspss.VerifyCMSSignatureResponseType
-     * @throws MOAFault
-     */
-    @WebMethod(action = "urn:VerifyCMSSignatureAction")
-    @WebResult(name = "VerifyCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-    public VerifyCMSSignatureResponseType verifyCMSSignature(
-        @WebParam(name = "VerifyCMSSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-        VerifyCMSSignatureRequest body)
-        throws MOAFault
-    ;
-
-    /**
-     * 
-     * @param body
-     * @return
-     *     returns at.gv.zustellung.util.xsd.moaspss.VerifyXMLSignatureResponseType
-     * @throws MOAFault
-     */
-    @WebMethod(action = "urn:VerifyXMLSignatureAction")
     @WebResult(name = "VerifyXMLSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-    public VerifyXMLSignatureResponseType verifyXMLSignature(
-        @WebParam(name = "VerifyXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
-        VerifyXMLSignatureRequestType body)
-        throws MOAFault
-    ;
+    @WebMethod(action = "urn:VerifyXMLSignatureAction")
+    public at.gv.util.xsd.moaspss.VerifyXMLSignatureResponseType verifyXMLSignature(
+        @WebParam(partName = "body", name = "VerifyXMLSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
+        at.gv.util.xsd.moaspss.VerifyXMLSignatureRequestType body
+    ) throws MOAFault;
 
+    @WebResult(name = "VerifyCMSSignatureResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", partName = "body")
+    @WebMethod(action = "urn:VerifyCMSSignatureAction")
+    public at.gv.util.xsd.moaspss.VerifyCMSSignatureResponseType verifyCMSSignature(
+        @WebParam(partName = "body", name = "VerifyCMSSignatureRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#")
+        at.gv.util.xsd.moaspss.VerifyCMSSignatureRequest body
+    ) throws MOAFault;
 }
diff --git a/src/main/java/at/gv/util/wsdl/SignatureVerificationService.java b/src/main/java/at/gv/util/wsdl/SignatureVerificationService.java
index 9643c35..7b58455 100644
--- a/src/main/java/at/gv/util/wsdl/SignatureVerificationService.java
+++ b/src/main/java/at/gv/util/wsdl/SignatureVerificationService.java
@@ -1,41 +1,42 @@
-
 package at.gv.util.wsdl;
 
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.logging.Logger;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
 import javax.xml.ws.WebServiceFeature;
-
+import javax.xml.ws.Service;
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:44:05.529+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "SignatureVerificationService", targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", wsdlLocation = "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl")
-public class SignatureVerificationService
-    extends Service
-{
+@WebServiceClient(name = "SignatureVerificationService", 
+                  wsdlLocation = "./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl") 
+public class SignatureVerificationService extends Service {
 
-    private final static URL SIGNATUREVERIFICATIONSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.SignatureVerificationService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureVerificationService");
+    public final static QName SignatureVerificationPort = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureVerificationPort");
     static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.SignatureVerificationService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/openzuse/trunk/zuseutil/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        SIGNATUREVERIFICATIONSERVICE_WSDL_LOCATION = url;
+        URL url = SignatureVerificationService.class.getResource("./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        if (url == null) {
+            url = SignatureVerificationService.class.getClassLoader().getResource("./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(SignatureVerificationService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/MOA-SPSS-1.3.wsdl");
+        }       
+        WSDL_LOCATION = url;
+    }
+
+    public SignatureVerificationService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public SignatureVerificationService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +44,38 @@ public class SignatureVerificationService
     }
 
     public SignatureVerificationService() {
-        super(SIGNATUREVERIFICATIONSERVICE_WSDL_LOCATION, new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureVerificationService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureVerificationService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureVerificationService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
     }
 
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SignatureVerificationService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns SignatureVerificationPortType
      */
     @WebEndpoint(name = "SignatureVerificationPort")
     public SignatureVerificationPortType getSignatureVerificationPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureVerificationPort"), SignatureVerificationPortType.class);
+        return super.getPort(SignatureVerificationPort, SignatureVerificationPortType.class);
     }
 
     /**
@@ -65,7 +87,7 @@ public class SignatureVerificationService
      */
     @WebEndpoint(name = "SignatureVerificationPort")
     public SignatureVerificationPortType getSignatureVerificationPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl", "SignatureVerificationPort"), SignatureVerificationPortType.class, features);
+        return super.getPort(SignatureVerificationPort, SignatureVerificationPortType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesPortType.java b/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesPortType.java
index 22a970a..a31a546 100644
--- a/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesPortType.java
+++ b/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesPortType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl.mis.usp;
 
 import javax.jws.WebMethod;
@@ -7,35 +6,22 @@ import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
-import at.gv.util.xsd.mis.usp.GetMandatesRequest;
-import at.gv.util.xsd.mis.usp.GetMandatesResponse;
-import at.gv.util.xsd.mis.usp.ObjectFactory;
-
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:50:38.720+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "GetMandatesPortType", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", name = "GetMandatesPortType")
+@XmlSeeAlso({at.gv.util.xsd.mis.usp.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    ObjectFactory.class
-})
 public interface GetMandatesPortType {
 
-
-    /**
-     * 
-     * @param getMandatesRequest
-     * @return
-     *     returns at.gv.util.xsd.mis.usp.GetMandatesResponse
-     */
-    @WebMethod(operationName = "GetMandatesOperation", action = "usp:GetMandatesPortType#GetMandatesOperation")
     @WebResult(name = "GetMandatesResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd", partName = "GetMandatesResponse")
-    public GetMandatesResponse getMandatesOperation(
-        @WebParam(name = "GetMandatesRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd", partName = "GetMandatesRequest")
-        GetMandatesRequest getMandatesRequest);
-
+    @WebMethod(operationName = "GetMandatesOperation", action = "usp:GetMandatesPortType#GetMandatesOperation")
+    public at.gv.util.xsd.mis.usp.GetMandatesResponse getMandatesOperation(
+        @WebParam(partName = "GetMandatesRequest", name = "GetMandatesRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd")
+        at.gv.util.xsd.mis.usp.GetMandatesRequest getMandatesRequest
+    );
 }
diff --git a/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesService.java b/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesService.java
index 778922f..7e9e012 100644
--- a/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesService.java
+++ b/src/main/java/at/gv/util/wsdl/mis/usp/GetMandatesService.java
@@ -1,41 +1,42 @@
-
 package at.gv.util.wsdl.mis.usp;
 
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.logging.Logger;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
 import javax.xml.ws.WebServiceFeature;
-
+import javax.xml.ws.Service;
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:50:38.761+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "GetMandatesService", targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", wsdlLocation = "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl")
-public class GetMandatesService
-    extends Service
-{
+@WebServiceClient(name = "GetMandatesService", 
+                  wsdlLocation = "./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl") 
+public class GetMandatesService extends Service {
 
-    private final static URL GETMANDATESSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.mis.usp.GetMandatesService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", "GetMandatesService");
+    public final static QName GetMandatesPort = new QName("http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", "GetMandatesPort");
     static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.mis.usp.GetMandatesService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        GETMANDATESSERVICE_WSDL_LOCATION = url;
+        URL url = GetMandatesService.class.getResource("./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl");
+        if (url == null) {
+            url = GetMandatesService.class.getClassLoader().getResource("./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(GetMandatesService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl");
+        }       
+        WSDL_LOCATION = url;
+    }
+
+    public GetMandatesService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public GetMandatesService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +44,38 @@ public class GetMandatesService
     }
 
     public GetMandatesService() {
-        super(GETMANDATESSERVICE_WSDL_LOCATION, new QName("http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", "GetMandatesService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetMandatesService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetMandatesService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
     }
 
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public GetMandatesService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns GetMandatesPortType
      */
     @WebEndpoint(name = "GetMandatesPort")
     public GetMandatesPortType getGetMandatesPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", "GetMandatesPort"), GetMandatesPortType.class);
+        return super.getPort(GetMandatesPort, GetMandatesPortType.class);
     }
 
     /**
@@ -65,7 +87,7 @@ public class GetMandatesService
      */
     @WebEndpoint(name = "GetMandatesPort")
     public GetMandatesPortType getGetMandatesPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl", "GetMandatesPort"), GetMandatesPortType.class, features);
+        return super.getPort(GetMandatesPort, GetMandatesPortType.class, features);
     }
 
 }
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 e098ccc..e1b4052 100644
--- a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
+++ b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKService.java
@@ -1,63 +1,81 @@
-
 package at.gv.util.wsdl.misstork;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
 import javax.xml.ws.WebServiceFeature;
-
+import javax.xml.ws.Service;
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.2
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:28:32.624+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "MISSTORKService", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", wsdlLocation = "file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/misstork/misstork.wsdl")
-public class MISSTORKService
-    extends Service
-{
+@WebServiceClient(name = "MISSTORKService", 
+                  wsdlLocation = "./src/main/resources/wsdl/misstork/misstork.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl") 
+public class MISSTORKService extends Service {
 
-    private final static URL MISSTORKSERVICE_WSDL_LOCATION;
-    private final static WebServiceException MISSTORKSERVICE_EXCEPTION;
-    private final static QName MISSTORKSERVICE_QNAME = new QName("http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", "MISSTORKService");
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", "MISSTORKService");
+    public final static QName MISSTORKPort = new QName("http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", "MISSTORKPort");
     static {
-        URL url = null;
-        WebServiceException e = null;
-        try {
-            url = new URL("file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/misstork/misstork.wsdl");
-        } catch (MalformedURLException ex) {
-            e = new WebServiceException(ex);
-        }
-        MISSTORKSERVICE_WSDL_LOCATION = url;
-        MISSTORKSERVICE_EXCEPTION = e;
-    }
-
-    public MISSTORKService() {
-        super(__getWsdlLocation(), MISSTORKSERVICE_QNAME);
+        URL url = MISSTORKService.class.getResource("./src/main/resources/wsdl/misstork/misstork.wsdl");
+        if (url == null) {
+            url = MISSTORKService.class.getClassLoader().getResource("./src/main/resources/wsdl/misstork/misstork.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(MISSTORKService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/misstork/misstork.wsdl");
+        }       
+        WSDL_LOCATION = url;
     }
 
     public MISSTORKService(URL wsdlLocation) {
-        super(wsdlLocation, MISSTORKSERVICE_QNAME);
+        super(wsdlLocation, SERVICE);
     }
 
     public MISSTORKService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
+    public MISSTORKService() {
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public MISSTORKService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public MISSTORKService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public MISSTORKService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns MISSTORKType
      */
     @WebEndpoint(name = "MISSTORKPort")
     public MISSTORKType getMISSTORKPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", "MISSTORKPort"), MISSTORKType.class);
+        return super.getPort(MISSTORKPort, MISSTORKType.class);
     }
 
     /**
@@ -69,14 +87,7 @@ public class MISSTORKService
      */
     @WebEndpoint(name = "MISSTORKPort")
     public MISSTORKType getMISSTORKPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", "MISSTORKPort"), MISSTORKType.class, features);
-    }
-
-    private static URL __getWsdlLocation() {
-        if (MISSTORKSERVICE_EXCEPTION!= null) {
-            throw MISSTORKSERVICE_EXCEPTION;
-        }
-        return MISSTORKSERVICE_WSDL_LOCATION;
+        return super.getPort(MISSTORKPort, MISSTORKType.class, features);
     }
 
 }
diff --git a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKType.java b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKType.java
index eb807e6..f5fc08f 100644
--- a/src/main/java/at/gv/util/wsdl/misstork/MISSTORKType.java
+++ b/src/main/java/at/gv/util/wsdl/misstork/MISSTORKType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl.misstork;
 
 import javax.jws.WebMethod;
@@ -7,40 +6,22 @@ import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
-import at.gv.util.xsd.misstork.MisStorkRequest;
-import at.gv.util.xsd.misstork.MisStorkResponse;
-
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.2
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:28:32.614+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "MISSTORKType", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/wsdl", name = "MISSTORKType")
+@XmlSeeAlso({at.gv.util.xsd.persondata.ObjectFactory.class, at.gv.util.xsd.mis.ObjectFactory.class, at.gv.util.xsd.misstork.ObjectFactory.class, at.gv.util.xsd.xmldsig.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.misstork.ObjectFactory.class,
-    at.gv.util.xsd.persondata.ObjectFactory.class,
-    at.gv.util.xsd.mis.ObjectFactory.class,
-    at.gv.util.xsd.xmldsig.ObjectFactory.class
-})
 public interface MISSTORKType {
 
-
-    /**
-     * 
-     * @param misStorkRequest
-     * @return
-     *     returns at.gv.util.xsd.misstork.MisStorkResponse
-     * @throws MisStorkError
-     */
-    @WebMethod(operationName = "MISSTORKOperation", action = "ms:MISSTORKType#MISSTORKOperation")
     @WebResult(name = "MisStorkResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/xsd", partName = "MisStorkResponse")
-    public MisStorkResponse misstorkOperation(
-        @WebParam(name = "MisStorkRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/xsd", partName = "MisStorkRequest")
-        MisStorkRequest misStorkRequest)
-        throws MisStorkError
-    ;
-
+    @WebMethod(operationName = "MISSTORKOperation", action = "ms:MISSTORKType#MISSTORKOperation")
+    public at.gv.util.xsd.misstork.MisStorkResponse misstorkOperation(
+        @WebParam(partName = "MisStorkRequest", name = "MisStorkRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/xsd")
+        at.gv.util.xsd.misstork.MisStorkRequest misStorkRequest
+    ) throws MisStorkError;
 }
diff --git a/src/main/java/at/gv/util/wsdl/misstork/MisStorkError.java b/src/main/java/at/gv/util/wsdl/misstork/MisStorkError.java
index 6b3ecac..15d009d 100644
--- a/src/main/java/at/gv/util/wsdl/misstork/MisStorkError.java
+++ b/src/main/java/at/gv/util/wsdl/misstork/MisStorkError.java
@@ -5,50 +5,39 @@ import javax.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.2
- * 
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:28:32.584+01:00
+ * Generated source version: 3.0.1
  */
+
 @WebFault(name = "MisStorkError", targetNamespace = "http://reference.e-government.gv.at/namespace/misstork/20131126/xsd")
-public class MisStorkError
-    extends Exception
-{
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     * 
-     */
-    private at.gv.util.xsd.misstork.MisStorkError faultInfo;
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     */
-    public MisStorkError(String message, at.gv.util.xsd.misstork.MisStorkError faultInfo) {
+public class MisStorkError extends Exception {
+    
+    private at.gv.util.xsd.misstork.MisStorkError misStorkError;
+
+    public MisStorkError() {
+        super();
+    }
+    
+    public MisStorkError(String message) {
         super(message);
-        this.faultInfo = faultInfo;
+    }
+    
+    public MisStorkError(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     * @param cause
-     */
-    public MisStorkError(String message, at.gv.util.xsd.misstork.MisStorkError faultInfo, Throwable cause) {
+    public MisStorkError(String message, at.gv.util.xsd.misstork.MisStorkError misStorkError) {
+        super(message);
+        this.misStorkError = misStorkError;
+    }
+
+    public MisStorkError(String message, at.gv.util.xsd.misstork.MisStorkError misStorkError, Throwable cause) {
         super(message, cause);
-        this.faultInfo = faultInfo;
+        this.misStorkError = misStorkError;
     }
 
-    /**
-     * 
-     * @return
-     *     returns fault bean: at.gv.util.xsd.misstork.MisStorkError
-     */
     public at.gv.util.xsd.misstork.MisStorkError getFaultInfo() {
-        return faultInfo;
+        return this.misStorkError;
     }
-
 }
diff --git a/src/main/java/at/gv/util/wsdl/szr/SZR.java b/src/main/java/at/gv/util/wsdl/szr/SZR.java
index 381617b..e2ed77c 100644
--- a/src/main/java/at/gv/util/wsdl/szr/SZR.java
+++ b/src/main/java/at/gv/util/wsdl/szr/SZR.java
@@ -1,270 +1,90 @@
-
 package at.gv.util.wsdl.szr;
 
-import java.util.List;
 import javax.jws.WebMethod;
 import javax.jws.WebParam;
 import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-import at.gv.util.xsd.szr.BasiszahlZuBPKReturnType;
-import at.gv.util.xsd.szr.FremdBPKRequestType;
-import at.gv.util.xsd.szr.FremdBPKType;
-import at.gv.util.xsd.szr.GetBPKKombiRequestType;
-import at.gv.util.xsd.szr.GetBPKKombiResponseType;
-import at.gv.util.xsd.szr.GetVersionResponse;
-import at.gv.util.xsd.szr.IdentityLinkType;
-import at.gv.util.xsd.szr.PersonInfoType;
-import at.gv.util.xsd.szr.ZMRAnwendungsIntegrationReturnType;
-import at.gv.util.xsd.szr.xmldsig.KeyValueType;
-
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:23:34.032+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "SZR", targetNamespace = "urn:SZRServices")
-@XmlSeeAlso({
-    at.gv.util.xsd.szr.persondata.ObjectFactory.class,
-    at.gv.util.xsd.szr.ObjectFactory.class,
-    at.gv.util.xsd.szr.ecdsa.ObjectFactory.class,
-    at.gv.util.xsd.szr.xmldsig.ObjectFactory.class,
-    at.gv.util.xsd.szr.pvp.sec.ObjectFactory.class,
-    at.gv.util.xsd.szr.pvp.ObjectFactory.class
-})
+@WebService(targetNamespace = "urn:SZRServices", name = "SZR")
+@XmlSeeAlso({at.gv.util.xsd.szr.xmldsig.ObjectFactory.class, at.gv.util.xsd.szr.persondata.ObjectFactory.class, at.gv.util.xsd.szr.pvp.sec.ObjectFactory.class, at.gv.util.xsd.szr.ecdsa.ObjectFactory.class, at.gv.util.xsd.szr.ObjectFactory.class, at.gv.util.xsd.szr.pvp.ObjectFactory.class})
+@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
 public interface SZR {
 
+    @WebResult(name = "TransformBPKResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "TransformBPK")
+    public at.gv.util.xsd.szr.TransformBPKResponse transformBPK(
+        @WebParam(partName = "parameters", name = "TransformBPK", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.TransformBPK parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param insertERnP
-     * @param personInfo
-     * @param keyValue
-     * @return
-     *     returns at.gv.util.xsd.szr.IdentityLinkType
-     * @throws SZRException
-     */
+    @WebResult(name = "GetIdentityLinkResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
     @WebMethod(operationName = "GetIdentityLink")
-    @WebResult(name = "GetIdentityLinkReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "GetIdentityLink", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetIdentityLink")
-    @ResponseWrapper(localName = "GetIdentityLinkResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetIdentityLinkResponse")
-    public IdentityLinkType getIdentityLink(
-        @WebParam(name = "PersonInfo", targetNamespace = "urn:SZRServices")
-        PersonInfoType personInfo,
-        @WebParam(name = "KeyValue", targetNamespace = "urn:SZRServices")
-        List<KeyValueType> keyValue,
-        @WebParam(name = "InsertERnP", targetNamespace = "urn:SZRServices")
-        Boolean insertERnP)
-        throws SZRException
-    ;
-
-    /**
-     * 
-     * @param listMultiplePersons
-     * @param target
-     * @param personInfo0
-     * @param bereichsKennung
-     * @param getBPKReturn
-     * @param fremdBPK
-     * @param vkz
-     * @param personInfo
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "GetBPK")
-    @RequestWrapper(localName = "GetBPK", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetBPK")
-    @ResponseWrapper(localName = "GetBPKResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetBPKResponse")
-    public void getBPK(
-        @WebParam(name = "PersonInfo", targetNamespace = "urn:SZRServices")
-        PersonInfoType personInfo,
-        @WebParam(name = "BereichsKennung", targetNamespace = "urn:SZRServices")
-        String bereichsKennung,
-        @WebParam(name = "VKZ", targetNamespace = "urn:SZRServices")
-        String vkz,
-        @WebParam(name = "Target", targetNamespace = "urn:SZRServices")
-        List<FremdBPKRequestType> target,
-        @WebParam(name = "ListMultiplePersons", targetNamespace = "urn:SZRServices")
-        Boolean listMultiplePersons,
-        @WebParam(name = "GetBPKReturn", targetNamespace = "urn:SZRServices", mode = WebParam.Mode.OUT)
-        Holder<String> getBPKReturn,
-        @WebParam(name = "FremdBPK", targetNamespace = "urn:SZRServices", mode = WebParam.Mode.OUT)
-        Holder<List<FremdBPKType>> fremdBPK,
-        @WebParam(name = "PersonInfo", targetNamespace = "urn:SZRServices", mode = WebParam.Mode.OUT)
-        Holder<List<PersonInfoType>> personInfo0)
-        throws SZRException
-    ;
+    public at.gv.util.xsd.szr.GetIdentityLinkResponse getIdentityLink(
+        @WebParam(partName = "parameters", name = "GetIdentityLink", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.GetIdentityLink parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param getBPKKombiRequest
-     * @return
-     *     returns at.gv.util.xsd.szr.GetBPKKombiResponseType
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "GetBPKKombi")
-    @WebResult(name = "GetBPKKombiResponse", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "GetBPKKombi", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetBPKKombi")
-    @ResponseWrapper(localName = "GetBPKKombiResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetBPKKombiResponse")
-    public GetBPKKombiResponseType getBPKKombi(
-        @WebParam(name = "GetBPKKombiRequest", targetNamespace = "urn:SZRServices")
-        GetBPKKombiRequestType getBPKKombiRequest)
-        throws SZRException
-    ;
-
-    /**
-     * 
-     * @param identityLink
-     * @param bereichsKennung
-     * @return
-     *     returns java.lang.String
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "ValidateIdentityLink")
-    @WebResult(name = "ValidateIdentityLinkReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "ValidateIdentityLink", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.ValidateIdentityLink")
-    @ResponseWrapper(localName = "ValidateIdentityLinkResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.ValidateIdentityLinkResponse")
-    public String validateIdentityLink(
-        @WebParam(name = "IdentityLink", targetNamespace = "urn:SZRServices")
-        IdentityLinkType identityLink,
-        @WebParam(name = "BereichsKennung", targetNamespace = "urn:SZRServices")
-        String bereichsKennung)
-        throws SZRException
-    ;
-
-    /**
-     * 
-     * @param begruendung
-     * @param inputBereichsKennung
-     * @param inputBPK
-     * @param target
-     * @param personInfo
-     * @return
-     *     returns java.util.List<at.gv.util.xsd.szr.FremdBPKType>
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "TransformBPK")
-    @WebResult(name = "TransformBPKReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "TransformBPK", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.TransformBPK")
-    @ResponseWrapper(localName = "TransformBPKResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.TransformBPKResponse")
-    public List<FremdBPKType> transformBPK(
-        @WebParam(name = "PersonInfo", targetNamespace = "urn:SZRServices")
-        PersonInfoType personInfo,
-        @WebParam(name = "InputBPK", targetNamespace = "urn:SZRServices")
-        String inputBPK,
-        @WebParam(name = "InputBereichsKennung", targetNamespace = "urn:SZRServices")
-        String inputBereichsKennung,
-        @WebParam(name = "Begruendung", targetNamespace = "urn:SZRServices")
-        String begruendung,
-        @WebParam(name = "Target", targetNamespace = "urn:SZRServices")
-        List<FremdBPKRequestType> target)
-        throws SZRException
-    ;
+    @WebResult(name = "ZMRAnwendungsIntegrationResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "ZMRAnwendungsIntegration")
+    public at.gv.util.xsd.szr.ZMRAnwendungsIntegrationResponse zmrAnwendungsIntegration(
+        @WebParam(partName = "parameters", name = "ZMRAnwendungsIntegration", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.ZMRAnwendungsIntegration parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param basisZahl
-     * @param bpk
-     * @param bereich
-     * @return
-     *     returns java.lang.String
-     * @throws SZRException
-     */
+    @WebResult(name = "BPKzuBasiszahlResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
     @WebMethod(operationName = "BPKzuBasiszahl")
-    @WebResult(name = "BPKzuBasiszahlReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "BPKzuBasiszahl", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.BPKzuBasiszahl")
-    @ResponseWrapper(localName = "BPKzuBasiszahlResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.BPKzuBasiszahlResponse")
-    public String bpKzuBasiszahl(
-        @WebParam(name = "Bereich", targetNamespace = "urn:SZRServices")
-        String bereich,
-        @WebParam(name = "BPK", targetNamespace = "urn:SZRServices")
-        String bpk,
-        @WebParam(name = "BasisZahl", targetNamespace = "urn:SZRServices")
-        List<String> basisZahl)
-        throws SZRException
-    ;
+    public at.gv.util.xsd.szr.BPKzuBasiszahlResponse bpKzuBasiszahl(
+        @WebParam(partName = "parameters", name = "BPKzuBasiszahl", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.BPKzuBasiszahl parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param fremdBPKTargets
-     * @param basisZahl
-     * @param bereich
-     * @return
-     *     returns java.util.List<at.gv.util.xsd.szr.BasiszahlZuBPKReturnType>
-     * @throws SZRException
-     */
+    @WebResult(name = "BasiszahlZuBPKResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
     @WebMethod(operationName = "BasiszahlZuBPK")
-    @WebResult(name = "BasiszahlZuBPKReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "BasiszahlZuBPK", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.BasiszahlZuBPK")
-    @ResponseWrapper(localName = "BasiszahlZuBPKResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.BasiszahlZuBPKResponse")
-    public List<BasiszahlZuBPKReturnType> basiszahlZuBPK(
-        @WebParam(name = "BasisZahl", targetNamespace = "urn:SZRServices")
-        List<String> basisZahl,
-        @WebParam(name = "Bereich", targetNamespace = "urn:SZRServices")
-        String bereich,
-        @WebParam(name = "FremdBPKTargets", targetNamespace = "urn:SZRServices")
-        List<FremdBPKRequestType> fremdBPKTargets)
-        throws SZRException
-    ;
+    public at.gv.util.xsd.szr.BasiszahlZuBPKResponse basiszahlZuBPK(
+        @WebParam(partName = "parameters", name = "BasiszahlZuBPK", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.BasiszahlZuBPK parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param zmRfremdbPK
-     * @param fremdBPKTargets
-     * @param bereich
-     * @return
-     *     returns java.util.List<at.gv.util.xsd.szr.ZMRAnwendungsIntegrationReturnType>
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "ZMRAnwendungsIntegration")
-    @WebResult(name = "ZMRAnwendungsIntegrationReturn", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "ZMRAnwendungsIntegration", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.ZMRAnwendungsIntegration")
-    @ResponseWrapper(localName = "ZMRAnwendungsIntegrationResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.ZMRAnwendungsIntegrationResponse")
-    public List<ZMRAnwendungsIntegrationReturnType> zmrAnwendungsIntegration(
-        @WebParam(name = "Bereich", targetNamespace = "urn:SZRServices")
-        String bereich,
-        @WebParam(name = "FremdBPKTargets", targetNamespace = "urn:SZRServices")
-        List<FremdBPKRequestType> fremdBPKTargets,
-        @WebParam(name = "ZMRfremdbPK", targetNamespace = "urn:SZRServices")
-        List<String> zmRfremdbPK)
-        throws SZRException
-    ;
+    @WebResult(name = "GetBPKKombiResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "GetBPKKombi")
+    public at.gv.util.xsd.szr.GetBPKKombiResponse getBPKKombi(
+        @WebParam(partName = "parameters", name = "GetBPKKombi", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.GetBPKKombi parameters
+    ) throws SZRException;
+
+    @WebResult(name = "GetVersionResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "GetVersion")
+    public at.gv.util.xsd.szr.GetVersionResponse getVersion(
+        @WebParam(partName = "parameters", name = "GetVersion", targetNamespace = "urn:SZRServices")
+        java.lang.Object parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param personInfo
-     * @return
-     *     returns java.lang.String
-     * @throws SZRException
-     */
+    @WebResult(name = "GetStammzahlResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
     @WebMethod(operationName = "GetStammzahl")
-    @WebResult(name = "Stammzahl", targetNamespace = "urn:SZRServices")
-    @RequestWrapper(localName = "GetStammzahl", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetStammzahl")
-    @ResponseWrapper(localName = "GetStammzahlResponse", targetNamespace = "urn:SZRServices", className = "at.gv.util.xsd.szr.GetStammzahlResponse")
-    public String getStammzahl(
-        @WebParam(name = "PersonInfo", targetNamespace = "urn:SZRServices")
-        PersonInfoType personInfo)
-        throws SZRException
-    ;
+    public at.gv.util.xsd.szr.GetStammzahlResponse getStammzahl(
+        @WebParam(partName = "parameters", name = "GetStammzahl", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.GetStammzahl parameters
+    ) throws SZRException;
 
-    /**
-     * 
-     * @param parameters
-     * @return
-     *     returns at.gv.util.xsd.szr.GetVersionResponse
-     * @throws SZRException
-     */
-    @WebMethod(operationName = "GetVersion")
-    @WebResult(name = "GetVersionResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
-    @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-    public GetVersionResponse getVersion(
-        @WebParam(name = "GetVersion", targetNamespace = "urn:SZRServices", partName = "parameters")
-        Object parameters)
-        throws SZRException
-    ;
+    @WebResult(name = "GetBPKResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "GetBPK")
+    public at.gv.util.xsd.szr.GetBPKResponse getBPK(
+        @WebParam(partName = "parameters", name = "GetBPK", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.GetBPK parameters
+    ) throws SZRException;
 
+    @WebResult(name = "ValidateIdentityLinkResponse", targetNamespace = "urn:SZRServices", partName = "parameters")
+    @WebMethod(operationName = "ValidateIdentityLink")
+    public at.gv.util.xsd.szr.ValidateIdentityLinkResponse validateIdentityLink(
+        @WebParam(partName = "parameters", name = "ValidateIdentityLink", targetNamespace = "urn:SZRServices")
+        at.gv.util.xsd.szr.ValidateIdentityLink parameters
+    ) throws SZRException;
 }
diff --git a/src/main/java/at/gv/util/wsdl/szr/SZRException.java b/src/main/java/at/gv/util/wsdl/szr/SZRException.java
index f8bdf70..59ded4e 100644
--- a/src/main/java/at/gv/util/wsdl/szr/SZRException.java
+++ b/src/main/java/at/gv/util/wsdl/szr/SZRException.java
@@ -5,50 +5,39 @@ import javax.xml.ws.WebFault;
 
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
- * 
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:23:34.012+01:00
+ * Generated source version: 3.0.1
  */
+
 @WebFault(name = "SZRException", targetNamespace = "urn:SZRServices")
-public class SZRException
-    extends Exception
-{
-
-    /**
-     * Java type that goes as soapenv:Fault detail element.
-     * 
-     */
-    private at.gv.util.xsd.szr.SZRException faultInfo;
-
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     */
-    public SZRException(String message, at.gv.util.xsd.szr.SZRException faultInfo) {
+public class SZRException extends Exception {
+    
+    private at.gv.util.xsd.szr.SZRException szrException;
+
+    public SZRException() {
+        super();
+    }
+    
+    public SZRException(String message) {
         super(message);
-        this.faultInfo = faultInfo;
+    }
+    
+    public SZRException(String message, Throwable cause) {
+        super(message, cause);
     }
 
-    /**
-     * 
-     * @param message
-     * @param faultInfo
-     * @param cause
-     */
-    public SZRException(String message, at.gv.util.xsd.szr.SZRException faultInfo, Throwable cause) {
+    public SZRException(String message, at.gv.util.xsd.szr.SZRException szrException) {
+        super(message);
+        this.szrException = szrException;
+    }
+
+    public SZRException(String message, at.gv.util.xsd.szr.SZRException szrException, Throwable cause) {
         super(message, cause);
-        this.faultInfo = faultInfo;
+        this.szrException = szrException;
     }
 
-    /**
-     * 
-     * @return
-     *     returns fault bean: at.gv.util.xsd.szr.SZRException
-     */
     public at.gv.util.xsd.szr.SZRException getFaultInfo() {
-        return faultInfo;
+        return this.szrException;
     }
-
 }
diff --git a/src/main/java/at/gv/util/wsdl/szr/SZRService.java b/src/main/java/at/gv/util/wsdl/szr/SZRService.java
index adc728c..160e22c 100644
--- a/src/main/java/at/gv/util/wsdl/szr/SZRService.java
+++ b/src/main/java/at/gv/util/wsdl/szr/SZRService.java
@@ -1,41 +1,43 @@
-
 package at.gv.util.wsdl.szr;
 
-import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.logging.Logger;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
 import javax.xml.ws.WebServiceFeature;
-
+import javax.xml.ws.Service;
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.6 in JDK 6
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:23:34.052+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebServiceClient(name = "SZRService", targetNamespace = "urn:SZRServices", wsdlLocation = "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/szr/SZR_v2.0.wsdl")
-public class SZRService
-    extends Service
-{
+@WebServiceClient(name = "SZRService", 
+                  wsdlLocation = "./src/main/resources/wsdl/szr/SZR_v2.0.wsdl",
+                  targetNamespace = "urn:SZRServices") 
+public class SZRService extends Service {
 
-    private final static URL SZRSERVICE_WSDL_LOCATION;
-    private final static Logger logger = Logger.getLogger(at.gv.util.wsdl.szr.SZRService.class.getName());
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("urn:SZRServices", "SZRService");
+    public final static QName SZRTestumgebung = new QName("urn:SZRServices", "SZRTestumgebung");
+    public final static QName SZRProduktionsumgebung = new QName("urn:SZRServices", "SZRProduktionsumgebung");
     static {
-        URL url = null;
-        try {
-            URL baseUrl;
-            baseUrl = at.gv.util.wsdl.szr.SZRService.class.getResource(".");
-            url = new URL(baseUrl, "file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/szr/SZR_v2.0.wsdl");
-        } catch (MalformedURLException e) {
-            logger.warning("Failed to create URL for the wsdl Location: 'file:/D:/eclipse/development/egovutils/src/main/resources/wsdl/szr/SZR_v2.0.wsdl', retrying as a local file");
-            logger.warning(e.getMessage());
-        }
-        SZRSERVICE_WSDL_LOCATION = url;
+        URL url = SZRService.class.getResource("./src/main/resources/wsdl/szr/SZR_v2.0.wsdl");
+        if (url == null) {
+            url = SZRService.class.getClassLoader().getResource("./src/main/resources/wsdl/szr/SZR_v2.0.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(SZRService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/szr/SZR_v2.0.wsdl");
+        }       
+        WSDL_LOCATION = url;
+    }
+
+    public SZRService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public SZRService(URL wsdlLocation, QName serviceName) {
@@ -43,17 +45,38 @@ public class SZRService
     }
 
     public SZRService() {
-        super(SZRSERVICE_WSDL_LOCATION, new QName("urn:SZRServices", "SZRService"));
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
     }
 
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns SZR
      */
     @WebEndpoint(name = "SZRTestumgebung")
     public SZR getSZRTestumgebung() {
-        return super.getPort(new QName("urn:SZRServices", "SZRTestumgebung"), SZR.class);
+        return super.getPort(SZRTestumgebung, SZR.class);
     }
 
     /**
@@ -65,17 +88,16 @@ public class SZRService
      */
     @WebEndpoint(name = "SZRTestumgebung")
     public SZR getSZRTestumgebung(WebServiceFeature... features) {
-        return super.getPort(new QName("urn:SZRServices", "SZRTestumgebung"), SZR.class, features);
+        return super.getPort(SZRTestumgebung, SZR.class, features);
     }
-
     /**
-     * 
+     *
      * @return
      *     returns SZR
      */
     @WebEndpoint(name = "SZRProduktionsumgebung")
     public SZR getSZRProduktionsumgebung() {
-        return super.getPort(new QName("urn:SZRServices", "SZRProduktionsumgebung"), SZR.class);
+        return super.getPort(SZRProduktionsumgebung, SZR.class);
     }
 
     /**
@@ -87,7 +109,7 @@ public class SZRService
      */
     @WebEndpoint(name = "SZRProduktionsumgebung")
     public SZR getSZRProduktionsumgebung(WebServiceFeature... features) {
-        return super.getPort(new QName("urn:SZRServices", "SZRProduktionsumgebung"), SZR.class, features);
+        return super.getPort(SZRProduktionsumgebung, SZR.class, features);
     }
 
 }
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 9562d1c..fb08d8e 100644
--- a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
+++ b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWService.java
@@ -1,59 +1,81 @@
-
 package at.gv.util.wsdl.szrgw;
 
-import java.net.MalformedURLException;
 import java.net.URL;
 import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
 import javax.xml.ws.WebEndpoint;
 import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceException;
 import javax.xml.ws.WebServiceFeature;
-
+import javax.xml.ws.Service;
 
 /**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.2.4-b01
- * Generated source version: 2.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:23:47.331+01:00
+ * Generated source version: 3.0.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")
-public class SZRGWService
-    extends Service
-{
+@WebServiceClient(name = "SZRGWService", 
+                  wsdlLocation = "./src/main/resources/wsdl/szrgw/szrgw.wsdl",
+                  targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl") 
+public class SZRGWService extends Service {
 
-    private final static URL SZRGWSERVICE_WSDL_LOCATION;
-    private final static WebServiceException SZRGWSERVICE_EXCEPTION;
-    private final static QName SZRGWSERVICE_QNAME = new QName("http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", "SZRGWService");
+    public final static URL WSDL_LOCATION;
 
+    public final static QName SERVICE = new QName("http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", "SZRGWService");
+    public final static QName SZRGWPort = new QName("http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", "SZRGWPort");
     static {
-        URL url = null;
-        WebServiceException e = null;
-        try {
-            url = new URL("file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/szrgw/szrgw.wsdl");
-        } catch (MalformedURLException ex) {
-            e = new WebServiceException(ex);
-        }
-        SZRGWSERVICE_WSDL_LOCATION = url;
-        SZRGWSERVICE_EXCEPTION = e;
+        URL url = SZRGWService.class.getResource("./src/main/resources/wsdl/szrgw/szrgw.wsdl");
+        if (url == null) {
+            url = SZRGWService.class.getClassLoader().getResource("./src/main/resources/wsdl/szrgw/szrgw.wsdl");
+        } 
+        if (url == null) {
+            java.util.logging.Logger.getLogger(SZRGWService.class.getName())
+                .log(java.util.logging.Level.INFO, 
+                     "Can not initialize the default wsdl from {0}", "./src/main/resources/wsdl/szrgw/szrgw.wsdl");
+        }       
+        WSDL_LOCATION = url;
     }
 
-    public SZRGWService() {
-        super(__getWsdlLocation(), SZRGWSERVICE_QNAME);
+    public SZRGWService(URL wsdlLocation) {
+        super(wsdlLocation, SERVICE);
     }
 
     public SZRGWService(URL wsdlLocation, QName serviceName) {
         super(wsdlLocation, serviceName);
     }
 
+    public SZRGWService() {
+        super(WSDL_LOCATION, SERVICE);
+    }
+    
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRGWService(WebServiceFeature ... features) {
+        super(WSDL_LOCATION, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRGWService(URL wsdlLocation, WebServiceFeature ... features) {
+        super(wsdlLocation, SERVICE, features);
+    }
+
+    //This constructor requires JAX-WS API 2.2. You will need to endorse the 2.2
+    //API jar or re-run wsdl2java with "-frontend jaxws21" to generate JAX-WS 2.1
+    //compliant code instead.
+    public SZRGWService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
+        super(wsdlLocation, serviceName, features);
+    }    
+
     /**
-     * 
+     *
      * @return
      *     returns SZRGWType
      */
     @WebEndpoint(name = "SZRGWPort")
     public SZRGWType getSZRGWPort() {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", "SZRGWPort"), SZRGWType.class);
+        return super.getPort(SZRGWPort, SZRGWType.class);
     }
 
     /**
@@ -65,14 +87,7 @@ public class SZRGWService
      */
     @WebEndpoint(name = "SZRGWPort")
     public SZRGWType getSZRGWPort(WebServiceFeature... features) {
-        return super.getPort(new QName("http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", "SZRGWPort"), SZRGWType.class, features);
-    }
-
-    private static URL __getWsdlLocation() {
-        if (SZRGWSERVICE_EXCEPTION!= null) {
-            throw SZRGWSERVICE_EXCEPTION;
-        }
-        return SZRGWSERVICE_WSDL_LOCATION;
+        return super.getPort(SZRGWPort, SZRGWType.class, features);
     }
 
 }
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 9f0a8bd..88c2505 100644
--- a/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
+++ b/src/main/java/at/gv/util/wsdl/szrgw/SZRGWType.java
@@ -1,4 +1,3 @@
-
 package at.gv.util.wsdl.szrgw;
 
 import javax.jws.WebMethod;
@@ -7,38 +6,22 @@ import javax.jws.WebResult;
 import javax.jws.WebService;
 import javax.jws.soap.SOAPBinding;
 import javax.xml.bind.annotation.XmlSeeAlso;
-import at.gv.util.xsd.srzgw.CreateIdentityLinkRequest;
-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.1
+ * This class was generated by Apache CXF 3.0.1
+ * 2014-10-28T17:23:47.301+01:00
+ * Generated source version: 3.0.1
  * 
  */
-@WebService(name = "SZRGWType", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl")
+@WebService(targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/wsdl", name = "SZRGWType")
+@XmlSeeAlso({at.gv.util.xsd.persondata.ObjectFactory.class, at.gv.util.xsd.saml.assertion.ObjectFactory.class, at.gv.util.xsd.mis.ObjectFactory.class, at.gv.util.xsd.xmldsig.ObjectFactory.class, at.gv.util.xsd.srzgw.ObjectFactory.class})
 @SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
-@XmlSeeAlso({
-    at.gv.util.xsd.srzgw.ObjectFactory.class,
-    at.gv.util.xsd.persondata.ObjectFactory.class,
-    at.gv.util.xsd.mis.ObjectFactory.class,
-    at.gv.util.xsd.saml.assertion.ObjectFactory.class,
-    at.gv.util.xsd.xmldsig.ObjectFactory.class
-})
 public interface SZRGWType {
 
-
-    /**
-     * 
-     * @param createIdentityLinkRequest
-     * @return
-     *     returns at.gv.util.xsd.srzgw.CreateIdentityLinkResponse
-     */
-    @WebMethod(operationName = "SZRGWOperation", action = "szrgw:SZRGWType#SZRGWOperation")
     @WebResult(name = "CreateIdentityLinkResponse", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd", partName = "CreateIdentityLinkResponse")
-    public CreateIdentityLinkResponse szrgwOperation(
-        @WebParam(name = "CreateIdentityLinkRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd", partName = "CreateIdentityLinkRequest")
-        CreateIdentityLinkRequest createIdentityLinkRequest);
-
+    @WebMethod(operationName = "SZRGWOperation", action = "szrgw:SZRGWType#SZRGWOperation")
+    public at.gv.util.xsd.srzgw.CreateIdentityLinkResponse szrgwOperation(
+        @WebParam(partName = "CreateIdentityLinkRequest", name = "CreateIdentityLinkRequest", targetNamespace = "http://reference.e-government.gv.at/namespace/szrgw/20070807/xsd")
+        at.gv.util.xsd.srzgw.CreateIdentityLinkRequest createIdentityLinkRequest
+    );
 }
diff --git a/src/main/java/at/gv/util/xsd/mis/MandateIdentifiers.java b/src/main/java/at/gv/util/xsd/mis/MandateIdentifiers.java
index 7aa6dcd..fcef061 100644
--- a/src/main/java/at/gv/util/xsd/mis/MandateIdentifiers.java
+++ b/src/main/java/at/gv/util/xsd/mis/MandateIdentifiers.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
diff --git a/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java b/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java
index 86c8e52..23e1d24 100644
--- a/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java
+++ b/src/main/java/at/gv/util/xsd/mis/MandateIssueRequestType.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for MandateIssueRequestType complex type.
+ * <p>Java-Klasse für MandateIssueRequestType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="MandateIssueRequestType">
@@ -91,7 +91,7 @@ public class MandateIssueRequestType {
     protected String sessionID;
 
     /**
-     * Gets the value of the identityLink property.
+     * Ruft den Wert der identityLink-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -102,7 +102,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Sets the value of the identityLink property.
+     * Legt den Wert der identityLink-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -113,7 +113,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Gets the value of the x509SignatureCertificate property.
+     * Ruft den Wert der x509SignatureCertificate-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -124,7 +124,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Sets the value of the x509SignatureCertificate property.
+     * Legt den Wert der x509SignatureCertificate-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -135,7 +135,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Gets the value of the oaFriendlyName property.
+     * Ruft den Wert der oaFriendlyName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -147,7 +147,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Sets the value of the oaFriendlyName property.
+     * Legt den Wert der oaFriendlyName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -159,7 +159,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Gets the value of the redirectURL property.
+     * Ruft den Wert der redirectURL-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -171,7 +171,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Sets the value of the redirectURL property.
+     * Legt den Wert der redirectURL-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -183,7 +183,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Gets the value of the referenceValue property.
+     * Ruft den Wert der referenceValue-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -195,7 +195,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Sets the value of the referenceValue property.
+     * Legt den Wert der referenceValue-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -207,7 +207,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Gets the value of the filters property.
+     * Ruft den Wert der filters-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -219,7 +219,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Sets the value of the filters property.
+     * Legt den Wert der filters-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -231,7 +231,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Gets the value of the target property.
+     * Ruft den Wert der target-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -243,7 +243,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Sets the value of the target property.
+     * Legt den Wert der target-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -255,7 +255,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Gets the value of the authBlock property.
+     * Ruft den Wert der authBlock-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -266,7 +266,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Sets the value of the authBlock property.
+     * Legt den Wert der authBlock-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -277,7 +277,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Gets the value of the sessionID property.
+     * Ruft den Wert der sessionID-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -289,7 +289,7 @@ public class MandateIssueRequestType {
     }
 
     /**
-     * Sets the value of the sessionID property.
+     * Legt den Wert der sessionID-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -302,9 +302,9 @@ public class MandateIssueRequestType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -330,7 +330,7 @@ public class MandateIssueRequestType {
         protected MandateIdentifiers mandateIdentifiers;
 
         /**
-         * Gets the value of the mandateIdentifiers property.
+         * Ruft den Wert der mandateIdentifiers-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -342,7 +342,7 @@ public class MandateIssueRequestType {
         }
 
         /**
-         * Sets the value of the mandateIdentifiers property.
+         * Legt den Wert der mandateIdentifiers-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/mis/MandateIssueResponseType.java b/src/main/java/at/gv/util/xsd/mis/MandateIssueResponseType.java
index 7e55bec..0522995 100644
--- a/src/main/java/at/gv/util/xsd/mis/MandateIssueResponseType.java
+++ b/src/main/java/at/gv/util/xsd/mis/MandateIssueResponseType.java
@@ -14,9 +14,9 @@ import javax.xml.bind.annotation.XmlValue;
 
 
 /**
- * <p>Java class for MandateIssueResponseType complex type.
+ * <p>Java-Klasse für MandateIssueResponseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="MandateIssueResponseType">
@@ -87,7 +87,7 @@ public class MandateIssueResponseType {
     protected MandateIssueResponseType.Error error;
 
     /**
-     * Gets the value of the sessionID property.
+     * Ruft den Wert der sessionID-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -99,7 +99,7 @@ public class MandateIssueResponseType {
     }
 
     /**
-     * Sets the value of the sessionID property.
+     * Legt den Wert der sessionID-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -111,7 +111,7 @@ public class MandateIssueResponseType {
     }
 
     /**
-     * Gets the value of the guiRedirectURL property.
+     * Ruft den Wert der guiRedirectURL-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -123,7 +123,7 @@ public class MandateIssueResponseType {
     }
 
     /**
-     * Sets the value of the guiRedirectURL property.
+     * Legt den Wert der guiRedirectURL-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -135,7 +135,7 @@ public class MandateIssueResponseType {
     }
 
     /**
-     * Gets the value of the mandates property.
+     * Ruft den Wert der mandates-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -147,7 +147,7 @@ public class MandateIssueResponseType {
     }
 
     /**
-     * Sets the value of the mandates property.
+     * Legt den Wert der mandates-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -159,7 +159,7 @@ public class MandateIssueResponseType {
     }
 
     /**
-     * Gets the value of the error property.
+     * Ruft den Wert der error-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -171,7 +171,7 @@ public class MandateIssueResponseType {
     }
 
     /**
-     * Sets the value of the error property.
+     * Legt den Wert der error-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -184,9 +184,9 @@ public class MandateIssueResponseType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -217,7 +217,7 @@ public class MandateIssueResponseType {
         protected String text;
 
         /**
-         * Gets the value of the code property.
+         * Ruft den Wert der code-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -229,7 +229,7 @@ public class MandateIssueResponseType {
         }
 
         /**
-         * Sets the value of the code property.
+         * Legt den Wert der code-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -241,7 +241,7 @@ public class MandateIssueResponseType {
         }
 
         /**
-         * Gets the value of the text property.
+         * Ruft den Wert der text-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -253,7 +253,7 @@ public class MandateIssueResponseType {
         }
 
         /**
-         * Sets the value of the text property.
+         * Legt den Wert der text-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -268,9 +268,9 @@ public class MandateIssueResponseType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -335,9 +335,9 @@ public class MandateIssueResponseType {
 
 
         /**
-         * <p>Java class for anonymous complex type.
+         * <p>Java-Klasse für anonymous complex type.
          * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
+         * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
          * 
          * <pre>
          * &lt;complexType>
@@ -366,7 +366,7 @@ public class MandateIssueResponseType {
             protected String oWbPK;
 
             /**
-             * Gets the value of the value property.
+             * Ruft den Wert der value-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -377,7 +377,7 @@ public class MandateIssueResponseType {
             }
 
             /**
-             * Sets the value of the value property.
+             * Legt den Wert der value-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -388,7 +388,7 @@ public class MandateIssueResponseType {
             }
 
             /**
-             * Gets the value of the professionalRepresentative property.
+             * Ruft den Wert der professionalRepresentative-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -400,7 +400,7 @@ public class MandateIssueResponseType {
             }
 
             /**
-             * Sets the value of the professionalRepresentative property.
+             * Legt den Wert der professionalRepresentative-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -412,7 +412,7 @@ public class MandateIssueResponseType {
             }
 
             /**
-             * Gets the value of the oWbPK property.
+             * Ruft den Wert der oWbPK-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -424,7 +424,7 @@ public class MandateIssueResponseType {
             }
 
             /**
-             * Sets the value of the oWbPK property.
+             * Legt den Wert der oWbPK-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/mis/Target.java b/src/main/java/at/gv/util/xsd/mis/Target.java
index c853769..9e4b667 100644
--- a/src/main/java/at/gv/util/xsd/mis/Target.java
+++ b/src/main/java/at/gv/util/xsd/mis/Target.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -44,7 +44,7 @@ public class Target {
     protected String value;
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -56,7 +56,7 @@ public class Target {
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -68,7 +68,7 @@ public class Target {
     }
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -80,7 +80,7 @@ public class Target {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/mis/usp/GetMandatesRequest.java b/src/main/java/at/gv/util/xsd/mis/usp/GetMandatesRequest.java
index edc96a9..8adddf1 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp/GetMandatesRequest.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp/GetMandatesRequest.java
@@ -16,9 +16,9 @@ import javax.xml.datatype.XMLGregorianCalendar;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -71,7 +71,7 @@ public class GetMandatesRequest {
     protected String applicationId;
 
     /**
-     * Gets the value of the identification property.
+     * Ruft den Wert der identification-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -83,7 +83,7 @@ public class GetMandatesRequest {
     }
 
     /**
-     * Sets the value of the identification property.
+     * Legt den Wert der identification-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -95,7 +95,7 @@ public class GetMandatesRequest {
     }
 
     /**
-     * Gets the value of the mandateFilters property.
+     * Ruft den Wert der mandateFilters-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -107,7 +107,7 @@ public class GetMandatesRequest {
     }
 
     /**
-     * Sets the value of the mandateFilters property.
+     * Legt den Wert der mandateFilters-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -119,7 +119,7 @@ public class GetMandatesRequest {
     }
 
     /**
-     * Gets the value of the requestId property.
+     * Ruft den Wert der requestId-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -131,7 +131,7 @@ public class GetMandatesRequest {
     }
 
     /**
-     * Sets the value of the requestId property.
+     * Legt den Wert der requestId-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -143,7 +143,7 @@ public class GetMandatesRequest {
     }
 
     /**
-     * Gets the value of the timestamp property.
+     * Ruft den Wert der timestamp-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -155,7 +155,7 @@ public class GetMandatesRequest {
     }
 
     /**
-     * Sets the value of the timestamp property.
+     * Legt den Wert der timestamp-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -167,7 +167,7 @@ public class GetMandatesRequest {
     }
 
     /**
-     * Gets the value of the applicationId property.
+     * Ruft den Wert der applicationId-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -179,7 +179,7 @@ public class GetMandatesRequest {
     }
 
     /**
-     * Sets the value of the applicationId property.
+     * Legt den Wert der applicationId-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -192,9 +192,9 @@ public class GetMandatesRequest {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
diff --git a/src/main/java/at/gv/util/xsd/mis/usp/GetMandatesResponse.java b/src/main/java/at/gv/util/xsd/mis/usp/GetMandatesResponse.java
index 016aff0..8605fce 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp/GetMandatesResponse.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp/GetMandatesResponse.java
@@ -15,9 +15,9 @@ import javax.xml.bind.annotation.XmlValue;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -81,7 +81,7 @@ public class GetMandatesResponse {
     protected GetMandatesResponse.Error error;
 
     /**
-     * Gets the value of the mandates property.
+     * Ruft den Wert der mandates-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -93,7 +93,7 @@ public class GetMandatesResponse {
     }
 
     /**
-     * Sets the value of the mandates property.
+     * Legt den Wert der mandates-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -105,7 +105,7 @@ public class GetMandatesResponse {
     }
 
     /**
-     * Gets the value of the error property.
+     * Ruft den Wert der error-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -117,7 +117,7 @@ public class GetMandatesResponse {
     }
 
     /**
-     * Sets the value of the error property.
+     * Legt den Wert der error-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -130,9 +130,9 @@ public class GetMandatesResponse {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -163,7 +163,7 @@ public class GetMandatesResponse {
         protected String info;
 
         /**
-         * Gets the value of the code property.
+         * Ruft den Wert der code-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -175,7 +175,7 @@ public class GetMandatesResponse {
         }
 
         /**
-         * Sets the value of the code property.
+         * Legt den Wert der code-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -187,7 +187,7 @@ public class GetMandatesResponse {
         }
 
         /**
-         * Gets the value of the info property.
+         * Ruft den Wert der info-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -199,7 +199,7 @@ public class GetMandatesResponse {
         }
 
         /**
-         * Sets the value of the info property.
+         * Legt den Wert der info-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -214,9 +214,9 @@ public class GetMandatesResponse {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -280,9 +280,9 @@ public class GetMandatesResponse {
 
 
         /**
-         * <p>Java class for anonymous complex type.
+         * <p>Java-Klasse für anonymous complex type.
          * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
+         * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
          * 
          * <pre>
          * &lt;complexType>
@@ -309,7 +309,7 @@ public class GetMandatesResponse {
             protected String mandateFilter;
 
             /**
-             * Gets the value of the value property.
+             * Ruft den Wert der value-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -320,18 +320,18 @@ public class GetMandatesResponse {
             }
 
             /**
-             * Sets the value of the value property.
+             * Legt den Wert der value-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
              *     byte[]
              */
             public void setValue(byte[] value) {
-                this.value = ((byte[]) value);
+                this.value = value;
             }
 
             /**
-             * Gets the value of the mandateFilter property.
+             * Ruft den Wert der mandateFilter-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -343,7 +343,7 @@ public class GetMandatesResponse {
             }
 
             /**
-             * Sets the value of the mandateFilter property.
+             * Legt den Wert der mandateFilter-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/mis/usp/IdentificationType.java b/src/main/java/at/gv/util/xsd/mis/usp/IdentificationType.java
index 69cbb1d..5acd8f7 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp/IdentificationType.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp/IdentificationType.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for IdentificationType complex type.
+ * <p>Java-Klasse für IdentificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="IdentificationType">
@@ -42,7 +42,7 @@ public class IdentificationType {
     protected String type;
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class IdentificationType {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -66,7 +66,7 @@ public class IdentificationType {
     }
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -78,7 +78,7 @@ public class IdentificationType {
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/mis/usp/ObjectFactory.java b/src/main/java/at/gv/util/xsd/mis/usp/ObjectFactory.java
index 3098483..fcd87bf 100644
--- a/src/main/java/at/gv/util/xsd/mis/usp/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/mis/usp/ObjectFactory.java
@@ -30,19 +30,19 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link GetMandatesResponse.Mandates.Mandate }
+     * Create an instance of {@link GetMandatesRequest }
      * 
      */
-    public GetMandatesResponse.Mandates.Mandate createGetMandatesResponseMandatesMandate() {
-        return new GetMandatesResponse.Mandates.Mandate();
+    public GetMandatesRequest createGetMandatesRequest() {
+        return new GetMandatesRequest();
     }
 
     /**
-     * Create an instance of {@link GetMandatesResponse.Error }
+     * Create an instance of {@link GetMandatesResponse }
      * 
      */
-    public GetMandatesResponse.Error createGetMandatesResponseError() {
-        return new GetMandatesResponse.Error();
+    public GetMandatesResponse createGetMandatesResponse() {
+        return new GetMandatesResponse();
     }
 
     /**
@@ -54,35 +54,35 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link GetMandatesResponse }
+     * Create an instance of {@link IdentificationType }
      * 
      */
-    public GetMandatesResponse createGetMandatesResponse() {
-        return new GetMandatesResponse();
+    public IdentificationType createIdentificationType() {
+        return new IdentificationType();
     }
 
     /**
-     * Create an instance of {@link IdentificationType }
+     * Create an instance of {@link GetMandatesRequest.MandateFilters }
      * 
      */
-    public IdentificationType createIdentificationType() {
-        return new IdentificationType();
+    public GetMandatesRequest.MandateFilters createGetMandatesRequestMandateFilters() {
+        return new GetMandatesRequest.MandateFilters();
     }
 
     /**
-     * Create an instance of {@link GetMandatesRequest }
+     * Create an instance of {@link GetMandatesResponse.Error }
      * 
      */
-    public GetMandatesRequest createGetMandatesRequest() {
-        return new GetMandatesRequest();
+    public GetMandatesResponse.Error createGetMandatesResponseError() {
+        return new GetMandatesResponse.Error();
     }
 
     /**
-     * Create an instance of {@link GetMandatesRequest.MandateFilters }
+     * Create an instance of {@link GetMandatesResponse.Mandates.Mandate }
      * 
      */
-    public GetMandatesRequest.MandateFilters createGetMandatesRequestMandateFilters() {
-        return new GetMandatesRequest.MandateFilters();
+    public GetMandatesResponse.Mandates.Mandate createGetMandatesResponseMandatesMandate() {
+        return new GetMandatesResponse.Mandates.Mandate();
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/misstork/MisStorkError.java b/src/main/java/at/gv/util/xsd/misstork/MisStorkError.java
index e56e7ce..639473e 100644
--- a/src/main/java/at/gv/util/xsd/misstork/MisStorkError.java
+++ b/src/main/java/at/gv/util/xsd/misstork/MisStorkError.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -42,7 +42,7 @@ public class MisStorkError {
     protected Object info;
 
     /**
-     * Gets the value of the errorCode property.
+     * Ruft den Wert der errorCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class MisStorkError {
     }
 
     /**
-     * Sets the value of the errorCode property.
+     * Legt den Wert der errorCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -66,7 +66,7 @@ public class MisStorkError {
     }
 
     /**
-     * Gets the value of the info property.
+     * Ruft den Wert der info-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -78,7 +78,7 @@ public class MisStorkError {
     }
 
     /**
-     * Sets the value of the info property.
+     * Legt den Wert der info-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 78210d5..26b7c31 100644
--- a/src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java
+++ b/src/main/java/at/gv/util/xsd/misstork/MisStorkRequest.java
@@ -16,9 +16,9 @@ import at.gv.util.xsd.persondata.CorporateBodyType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -116,7 +116,7 @@ public class MisStorkRequest {
     protected String reqID;
 
     /**
-     * Gets the value of the storkMandateType property.
+     * Ruft den Wert der storkMandateType-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -128,7 +128,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Sets the value of the storkMandateType property.
+     * Legt den Wert der storkMandateType-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -140,7 +140,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Gets the value of the mandatorType property.
+     * Ruft den Wert der mandatorType-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -152,7 +152,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Sets the value of the mandatorType property.
+     * Legt den Wert der mandatorType-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -164,7 +164,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Gets the value of the filters property.
+     * Ruft den Wert der filters-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -176,7 +176,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Sets the value of the filters property.
+     * Legt den Wert der filters-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -188,7 +188,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Gets the value of the target property.
+     * Ruft den Wert der target-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -200,7 +200,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Sets the value of the target property.
+     * Legt den Wert der target-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -212,7 +212,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Gets the value of the oaFriendlyName property.
+     * Ruft den Wert der oaFriendlyName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -224,7 +224,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Sets the value of the oaFriendlyName property.
+     * Legt den Wert der oaFriendlyName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -236,7 +236,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Gets the value of the referenceValue property.
+     * Ruft den Wert der referenceValue-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -248,7 +248,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Sets the value of the referenceValue property.
+     * Legt den Wert der referenceValue-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -260,7 +260,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Gets the value of the mandator property.
+     * Ruft den Wert der mandator-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -272,7 +272,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Sets the value of the mandator property.
+     * Legt den Wert der mandator-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -284,7 +284,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Gets the value of the representative property.
+     * Ruft den Wert der representative-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -296,7 +296,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Sets the value of the representative property.
+     * Legt den Wert der representative-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -308,7 +308,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Gets the value of the reqID property.
+     * Ruft den Wert der reqID-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -320,7 +320,7 @@ public class MisStorkRequest {
     }
 
     /**
-     * Sets the value of the reqID property.
+     * Legt den Wert der reqID-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -333,9 +333,9 @@ public class MisStorkRequest {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -361,7 +361,7 @@ public class MisStorkRequest {
         protected MandateIdentifiers mandateIdentifiers;
 
         /**
-         * Gets the value of the mandateIdentifiers property.
+         * Ruft den Wert der mandateIdentifiers-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -373,7 +373,7 @@ public class MisStorkRequest {
         }
 
         /**
-         * Sets the value of the mandateIdentifiers property.
+         * Legt den Wert der mandateIdentifiers-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -388,9 +388,9 @@ public class MisStorkRequest {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -424,7 +424,7 @@ public class MisStorkRequest {
         protected CorporateBodyType corporateBody;
 
         /**
-         * Gets the value of the identityLink property.
+         * Ruft den Wert der identityLink-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -435,7 +435,7 @@ public class MisStorkRequest {
         }
 
         /**
-         * Sets the value of the identityLink property.
+         * Legt den Wert der identityLink-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -446,7 +446,7 @@ public class MisStorkRequest {
         }
 
         /**
-         * Gets the value of the corporateBody property.
+         * Ruft den Wert der corporateBody-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -458,7 +458,7 @@ public class MisStorkRequest {
         }
 
         /**
-         * Sets the value of the corporateBody property.
+         * Legt den Wert der corporateBody-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -473,9 +473,9 @@ public class MisStorkRequest {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -501,7 +501,7 @@ public class MisStorkRequest {
         protected byte[] identityLink;
 
         /**
-         * Gets the value of the identityLink property.
+         * Ruft den Wert der identityLink-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -512,7 +512,7 @@ public class MisStorkRequest {
         }
 
         /**
-         * Sets the value of the identityLink property.
+         * Legt den Wert der identityLink-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/misstork/MisStorkResponse.java b/src/main/java/at/gv/util/xsd/misstork/MisStorkResponse.java
index 4059843..19f575d 100644
--- a/src/main/java/at/gv/util/xsd/misstork/MisStorkResponse.java
+++ b/src/main/java/at/gv/util/xsd/misstork/MisStorkResponse.java
@@ -14,9 +14,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -60,7 +60,7 @@ public class MisStorkResponse {
     protected List<byte[]> mandate;
 
     /**
-     * Gets the value of the misMandateType property.
+     * Ruft den Wert der misMandateType-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -72,7 +72,7 @@ public class MisStorkResponse {
     }
 
     /**
-     * Sets the value of the misMandateType property.
+     * Legt den Wert der misMandateType-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -84,7 +84,7 @@ public class MisStorkResponse {
     }
 
     /**
-     * Gets the value of the referenceValue property.
+     * Ruft den Wert der referenceValue-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -96,7 +96,7 @@ public class MisStorkResponse {
     }
 
     /**
-     * Sets the value of the referenceValue property.
+     * Legt den Wert der referenceValue-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -108,7 +108,7 @@ public class MisStorkResponse {
     }
 
     /**
-     * Gets the value of the eRsBMandateType property.
+     * Ruft den Wert der eRsBMandateType-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -120,7 +120,7 @@ public class MisStorkResponse {
     }
 
     /**
-     * Sets the value of the eRsBMandateType property.
+     * Legt den Wert der eRsBMandateType-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/AllSignatoriesType.java b/src/main/java/at/gv/util/xsd/moaspss/AllSignatoriesType.java
index 47278c8..85d031b 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/AllSignatoriesType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/AllSignatoriesType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AllSignatoriesType.
+ * <p>Java-Klasse für AllSignatoriesType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * <p>
  * <pre>
  * &lt;simpleType name="AllSignatoriesType">
diff --git a/src/main/java/at/gv/util/xsd/moaspss/AnyChildrenType.java b/src/main/java/at/gv/util/xsd/moaspss/AnyChildrenType.java
index 84943f1..1c23bde 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/AnyChildrenType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/AnyChildrenType.java
@@ -13,9 +13,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for AnyChildrenType complex type.
+ * <p>Java-Klasse für AnyChildrenType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AnyChildrenType">
@@ -64,9 +64,9 @@ public class AnyChildrenType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link Element }
      * {@link Object }
      * {@link String }
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/moaspss/CMSContentBaseType.java b/src/main/java/at/gv/util/xsd/moaspss/CMSContentBaseType.java
index ee60f0c..3fd7758 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/CMSContentBaseType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/CMSContentBaseType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for CMSContentBaseType complex type.
+ * <p>Java-Klasse für CMSContentBaseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CMSContentBaseType">
diff --git a/src/main/java/at/gv/util/xsd/moaspss/CMSDataObjectOptionalMetaType.java b/src/main/java/at/gv/util/xsd/moaspss/CMSDataObjectOptionalMetaType.java
index 9bd6204..124bf25 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/CMSDataObjectOptionalMetaType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/CMSDataObjectOptionalMetaType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for CMSDataObjectOptionalMetaType complex type.
+ * <p>Java-Klasse für CMSDataObjectOptionalMetaType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CMSDataObjectOptionalMetaType">
@@ -40,7 +40,7 @@ public class CMSDataObjectOptionalMetaType {
     protected CMSContentBaseType content;
 
     /**
-     * Gets the value of the metaInfo property.
+     * Ruft den Wert der metaInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class CMSDataObjectOptionalMetaType {
     }
 
     /**
-     * Sets the value of the metaInfo property.
+     * Legt den Wert der metaInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -64,7 +64,7 @@ public class CMSDataObjectOptionalMetaType {
     }
 
     /**
-     * Gets the value of the content property.
+     * Ruft den Wert der content-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class CMSDataObjectOptionalMetaType {
     }
 
     /**
-     * Sets the value of the content property.
+     * Legt den Wert der content-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/CheckResultType.java b/src/main/java/at/gv/util/xsd/moaspss/CheckResultType.java
index 9240325..1d7d734 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/CheckResultType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/CheckResultType.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for CheckResultType complex type.
+ * <p>Java-Klasse für CheckResultType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CheckResultType">
@@ -48,7 +48,7 @@ public class CheckResultType {
     protected AnyChildrenType info;
 
     /**
-     * Gets the value of the code property.
+     * Ruft den Wert der code-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -60,7 +60,7 @@ public class CheckResultType {
     }
 
     /**
-     * Sets the value of the code property.
+     * Legt den Wert der code-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -72,7 +72,7 @@ public class CheckResultType {
     }
 
     /**
-     * Gets the value of the info property.
+     * Ruft den Wert der info-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -84,7 +84,7 @@ public class CheckResultType {
     }
 
     /**
-     * Sets the value of the info property.
+     * Legt den Wert der info-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/ContentBaseType.java b/src/main/java/at/gv/util/xsd/moaspss/ContentBaseType.java
index 9089d53..3b97e5b 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/ContentBaseType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/ContentBaseType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ContentBaseType complex type.
+ * <p>Java-Klasse für ContentBaseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ContentBaseType">
@@ -51,7 +51,7 @@ public class ContentBaseType {
     protected String locRefContent;
 
     /**
-     * Gets the value of the base64Content property.
+     * Ruft den Wert der base64Content-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -62,18 +62,18 @@ public class ContentBaseType {
     }
 
     /**
-     * Sets the value of the base64Content property.
+     * Legt den Wert der base64Content-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
      *     byte[]
      */
     public void setBase64Content(byte[] value) {
-        this.base64Content = ((byte[]) value);
+        this.base64Content = value;
     }
 
     /**
-     * Gets the value of the xmlContent property.
+     * Ruft den Wert der xmlContent-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -85,7 +85,7 @@ public class ContentBaseType {
     }
 
     /**
-     * Sets the value of the xmlContent property.
+     * Legt den Wert der xmlContent-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -97,7 +97,7 @@ public class ContentBaseType {
     }
 
     /**
-     * Gets the value of the locRefContent property.
+     * Ruft den Wert der locRefContent-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -109,7 +109,7 @@ public class ContentBaseType {
     }
 
     /**
-     * Sets the value of the locRefContent property.
+     * Legt den Wert der locRefContent-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/ContentExLocRefBaseType.java b/src/main/java/at/gv/util/xsd/moaspss/ContentExLocRefBaseType.java
index 7533231..e134136 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/ContentExLocRefBaseType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/ContentExLocRefBaseType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ContentExLocRefBaseType complex type.
+ * <p>Java-Klasse für ContentExLocRefBaseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ContentExLocRefBaseType">
diff --git a/src/main/java/at/gv/util/xsd/moaspss/ContentOptionalRefType.java b/src/main/java/at/gv/util/xsd/moaspss/ContentOptionalRefType.java
index fb40e2f..fc6f87d 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/ContentOptionalRefType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/ContentOptionalRefType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ContentOptionalRefType complex type.
+ * <p>Java-Klasse für ContentOptionalRefType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ContentOptionalRefType">
@@ -42,7 +42,7 @@ public class ContentOptionalRefType
     protected String reference;
 
     /**
-     * Gets the value of the reference property.
+     * Ruft den Wert der reference-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class ContentOptionalRefType
     }
 
     /**
-     * Sets the value of the reference property.
+     * Legt den Wert der reference-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/ContentRequiredRefType.java b/src/main/java/at/gv/util/xsd/moaspss/ContentRequiredRefType.java
index fbc3967..96a4d1a 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/ContentRequiredRefType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/ContentRequiredRefType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ContentRequiredRefType complex type.
+ * <p>Java-Klasse für ContentRequiredRefType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ContentRequiredRefType">
diff --git a/src/main/java/at/gv/util/xsd/moaspss/CreateSignatureEnvironmentProfile.java b/src/main/java/at/gv/util/xsd/moaspss/CreateSignatureEnvironmentProfile.java
index 44d6ebb..fe6ad58 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/CreateSignatureEnvironmentProfile.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/CreateSignatureEnvironmentProfile.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -44,7 +44,7 @@ public class CreateSignatureEnvironmentProfile {
     protected List<XMLDataObjectAssociationType> supplement;
 
     /**
-     * Gets the value of the createSignatureLocation property.
+     * Ruft den Wert der createSignatureLocation-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -56,7 +56,7 @@ public class CreateSignatureEnvironmentProfile {
     }
 
     /**
-     * Sets the value of the createSignatureLocation property.
+     * Legt den Wert der createSignatureLocation-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/CreateSignatureLocationType.java b/src/main/java/at/gv/util/xsd/moaspss/CreateSignatureLocationType.java
index 99189c3..aa8e614 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/CreateSignatureLocationType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/CreateSignatureLocationType.java
@@ -13,9 +13,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for CreateSignatureLocationType complex type.
+ * <p>Java-Klasse für CreateSignatureLocationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CreateSignatureLocationType">
@@ -43,7 +43,7 @@ public class CreateSignatureLocationType {
     protected BigInteger index;
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -55,7 +55,7 @@ public class CreateSignatureLocationType {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -67,7 +67,7 @@ public class CreateSignatureLocationType {
     }
 
     /**
-     * Gets the value of the index property.
+     * Ruft den Wert der index-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -79,7 +79,7 @@ public class CreateSignatureLocationType {
     }
 
     /**
-     * Sets the value of the index property.
+     * Legt den Wert der index-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/CreateTransformsInfoProfile.java b/src/main/java/at/gv/util/xsd/moaspss/CreateTransformsInfoProfile.java
index 736988d..fd3f878 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/CreateTransformsInfoProfile.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/CreateTransformsInfoProfile.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -44,7 +44,7 @@ public class CreateTransformsInfoProfile {
     protected List<XMLDataObjectAssociationType> supplement;
 
     /**
-     * Gets the value of the createTransformsInfo property.
+     * Ruft den Wert der createTransformsInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -56,7 +56,7 @@ public class CreateTransformsInfoProfile {
     }
 
     /**
-     * Sets the value of the createTransformsInfo property.
+     * Legt den Wert der createTransformsInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureRequest.java b/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureRequest.java
index ed5f54f..c501dee 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureRequest.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureRequest.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
diff --git a/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureRequestType.java b/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureRequestType.java
index 5a0cf5e..bc1b7cd 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureRequestType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureRequestType.java
@@ -7,6 +7,7 @@ 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.XmlSchemaType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
@@ -14,9 +15,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for CreateXMLSignatureRequestType complex type.
+ * <p>Java-Klasse für CreateXMLSignatureRequestType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CreateXMLSignatureRequestType">
@@ -83,7 +84,7 @@ public class CreateXMLSignatureRequestType {
     protected List<CreateXMLSignatureRequestType.SingleSignatureInfo> singleSignatureInfo;
 
     /**
-     * Gets the value of the keyIdentifier property.
+     * Ruft den Wert der keyIdentifier-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -95,7 +96,7 @@ public class CreateXMLSignatureRequestType {
     }
 
     /**
-     * Sets the value of the keyIdentifier property.
+     * Legt den Wert der keyIdentifier-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -137,9 +138,9 @@ public class CreateXMLSignatureRequestType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -223,7 +224,7 @@ public class CreateXMLSignatureRequestType {
         }
 
         /**
-         * Gets the value of the createSignatureInfo property.
+         * Ruft den Wert der createSignatureInfo-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -235,7 +236,7 @@ public class CreateXMLSignatureRequestType {
         }
 
         /**
-         * Sets the value of the createSignatureInfo property.
+         * Legt den Wert der createSignatureInfo-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -247,7 +248,7 @@ public class CreateXMLSignatureRequestType {
         }
 
         /**
-         * Gets the value of the securityLayerConformity property.
+         * Ruft den Wert der securityLayerConformity-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -263,7 +264,7 @@ public class CreateXMLSignatureRequestType {
         }
 
         /**
-         * Sets the value of the securityLayerConformity property.
+         * Legt den Wert der securityLayerConformity-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -276,9 +277,9 @@ public class CreateXMLSignatureRequestType {
 
 
         /**
-         * <p>Java class for anonymous complex type.
+         * <p>Java-Klasse für anonymous complex type.
          * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
+         * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
          * 
          * <pre>
          * &lt;complexType>
@@ -312,10 +313,11 @@ public class CreateXMLSignatureRequestType {
             protected CreateSignatureEnvironmentProfile createSignatureEnvironmentProfile;
             @XmlElement(name = "CreateSignatureEnvironmentProfileID")
             @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+            @XmlSchemaType(name = "token")
             protected String createSignatureEnvironmentProfileID;
 
             /**
-             * Gets the value of the createSignatureEnvironment property.
+             * Ruft den Wert der createSignatureEnvironment-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -327,7 +329,7 @@ public class CreateXMLSignatureRequestType {
             }
 
             /**
-             * Sets the value of the createSignatureEnvironment property.
+             * Legt den Wert der createSignatureEnvironment-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -339,7 +341,7 @@ public class CreateXMLSignatureRequestType {
             }
 
             /**
-             * Gets the value of the createSignatureEnvironmentProfile property.
+             * Ruft den Wert der createSignatureEnvironmentProfile-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -351,7 +353,7 @@ public class CreateXMLSignatureRequestType {
             }
 
             /**
-             * Sets the value of the createSignatureEnvironmentProfile property.
+             * Legt den Wert der createSignatureEnvironmentProfile-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -363,7 +365,7 @@ public class CreateXMLSignatureRequestType {
             }
 
             /**
-             * Gets the value of the createSignatureEnvironmentProfileID property.
+             * Ruft den Wert der createSignatureEnvironmentProfileID-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -375,7 +377,7 @@ public class CreateXMLSignatureRequestType {
             }
 
             /**
-             * Sets the value of the createSignatureEnvironmentProfileID property.
+             * Legt den Wert der createSignatureEnvironmentProfileID-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -390,9 +392,9 @@ public class CreateXMLSignatureRequestType {
 
 
         /**
-         * <p>Java class for anonymous complex type.
+         * <p>Java-Klasse für anonymous complex type.
          * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
+         * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
          * 
          * <pre>
          * &lt;complexType>
@@ -416,7 +418,7 @@ public class CreateXMLSignatureRequestType {
             protected Boolean childOfManifest;
 
             /**
-             * Gets the value of the childOfManifest property.
+             * Ruft den Wert der childOfManifest-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -432,7 +434,7 @@ public class CreateXMLSignatureRequestType {
             }
 
             /**
-             * Sets the value of the childOfManifest property.
+             * Legt den Wert der childOfManifest-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureResponseType.java b/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureResponseType.java
index 972b64e..ac3ae41 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureResponseType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/CreateXMLSignatureResponseType.java
@@ -13,9 +13,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for CreateXMLSignatureResponseType complex type.
+ * <p>Java-Klasse für CreateXMLSignatureResponseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CreateXMLSignatureResponseType">
@@ -49,8 +49,8 @@ import org.w3c.dom.Element;
 public class CreateXMLSignatureResponseType {
 
     @XmlElements({
-        @XmlElement(name = "ErrorResponse", type = ErrorResponseType.class),
-        @XmlElement(name = "SignatureEnvironment", type = CreateXMLSignatureResponseType.SignatureEnvironment.class)
+        @XmlElement(name = "SignatureEnvironment", type = CreateXMLSignatureResponseType.SignatureEnvironment.class),
+        @XmlElement(name = "ErrorResponse", type = ErrorResponseType.class)
     })
     protected List<Object> signatureEnvironmentOrErrorResponse;
 
@@ -72,8 +72,8 @@ public class CreateXMLSignatureResponseType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link ErrorResponseType }
      * {@link CreateXMLSignatureResponseType.SignatureEnvironment }
+     * {@link ErrorResponseType }
      * 
      * 
      */
@@ -86,9 +86,9 @@ public class CreateXMLSignatureResponseType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -114,12 +114,12 @@ public class CreateXMLSignatureResponseType {
         protected Object any;
 
         /**
-         * Gets the value of the any property.
+         * Ruft den Wert der any-Eigenschaft ab.
          * 
          * @return
          *     possible object is
-         *     {@link Element }
          *     {@link Object }
+         *     {@link Element }
          *     
          */
         public Object getAny() {
@@ -127,12 +127,12 @@ public class CreateXMLSignatureResponseType {
         }
 
         /**
-         * Sets the value of the any property.
+         * Legt den Wert der any-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
-         *     {@link Element }
          *     {@link Object }
+         *     {@link Element }
          *     
          */
         public void setAny(Object value) {
diff --git a/src/main/java/at/gv/util/xsd/moaspss/DataObjectInfoType.java b/src/main/java/at/gv/util/xsd/moaspss/DataObjectInfoType.java
index da97f75..df2d18e 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/DataObjectInfoType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/DataObjectInfoType.java
@@ -5,6 +5,7 @@ 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.XmlSchemaType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
@@ -12,9 +13,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for DataObjectInfoType complex type.
+ * <p>Java-Klasse für DataObjectInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="DataObjectInfoType">
@@ -66,12 +67,13 @@ public class DataObjectInfoType {
     protected CreateTransformsInfoProfile createTransformsInfoProfile;
     @XmlElement(name = "CreateTransformsInfoProfileID")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
     protected String createTransformsInfoProfileID;
     @XmlAttribute(name = "Structure", required = true)
     protected String structure;
 
     /**
-     * Gets the value of the dataObject property.
+     * Ruft den Wert der dataObject-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -83,7 +85,7 @@ public class DataObjectInfoType {
     }
 
     /**
-     * Sets the value of the dataObject property.
+     * Legt den Wert der dataObject-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -95,7 +97,7 @@ public class DataObjectInfoType {
     }
 
     /**
-     * Gets the value of the createTransformsInfoProfile property.
+     * Ruft den Wert der createTransformsInfoProfile-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -107,7 +109,7 @@ public class DataObjectInfoType {
     }
 
     /**
-     * Sets the value of the createTransformsInfoProfile property.
+     * Legt den Wert der createTransformsInfoProfile-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -119,7 +121,7 @@ public class DataObjectInfoType {
     }
 
     /**
-     * Gets the value of the createTransformsInfoProfileID property.
+     * Ruft den Wert der createTransformsInfoProfileID-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -131,7 +133,7 @@ public class DataObjectInfoType {
     }
 
     /**
-     * Sets the value of the createTransformsInfoProfileID property.
+     * Legt den Wert der createTransformsInfoProfileID-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -143,7 +145,7 @@ public class DataObjectInfoType {
     }
 
     /**
-     * Gets the value of the structure property.
+     * Ruft den Wert der structure-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -155,7 +157,7 @@ public class DataObjectInfoType {
     }
 
     /**
-     * Sets the value of the structure property.
+     * Legt den Wert der structure-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -168,9 +170,9 @@ public class DataObjectInfoType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
diff --git a/src/main/java/at/gv/util/xsd/moaspss/ErrorResponseType.java b/src/main/java/at/gv/util/xsd/moaspss/ErrorResponseType.java
index 08e644f..250bc39 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/ErrorResponseType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/ErrorResponseType.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ErrorResponseType complex type.
+ * <p>Java-Klasse für ErrorResponseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ErrorResponseType">
@@ -41,7 +41,7 @@ public class ErrorResponseType {
     protected String info;
 
     /**
-     * Gets the value of the errorCode property.
+     * Ruft den Wert der errorCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -53,7 +53,7 @@ public class ErrorResponseType {
     }
 
     /**
-     * Sets the value of the errorCode property.
+     * Legt den Wert der errorCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -65,7 +65,7 @@ public class ErrorResponseType {
     }
 
     /**
-     * Gets the value of the info property.
+     * Ruft den Wert der info-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -77,7 +77,7 @@ public class ErrorResponseType {
     }
 
     /**
-     * Sets the value of the info property.
+     * Legt den Wert der info-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/FinalDataMetaInfoType.java b/src/main/java/at/gv/util/xsd/moaspss/FinalDataMetaInfoType.java
index 6b41bd2..914f7d5 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/FinalDataMetaInfoType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/FinalDataMetaInfoType.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for FinalDataMetaInfoType complex type.
+ * <p>Java-Klasse für FinalDataMetaInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="FinalDataMetaInfoType">
@@ -40,7 +40,7 @@ public class FinalDataMetaInfoType
     protected String type;
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class FinalDataMetaInfoType
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/InputDataType.java b/src/main/java/at/gv/util/xsd/moaspss/InputDataType.java
index 27f3c14..8fa67ec 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/InputDataType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/InputDataType.java
@@ -12,9 +12,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for InputDataType complex type.
+ * <p>Java-Klasse für InputDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="InputDataType">
@@ -50,7 +50,7 @@ public class InputDataType
     protected BigInteger referringSigReference;
 
     /**
-     * Gets the value of the partOf property.
+     * Ruft den Wert der partOf-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -66,7 +66,7 @@ public class InputDataType
     }
 
     /**
-     * Sets the value of the partOf property.
+     * Legt den Wert der partOf-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -78,7 +78,7 @@ public class InputDataType
     }
 
     /**
-     * Gets the value of the referringSigReference property.
+     * Ruft den Wert der referringSigReference-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -90,7 +90,7 @@ public class InputDataType
     }
 
     /**
-     * Sets the value of the referringSigReference property.
+     * Legt den Wert der referringSigReference-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/KeyStorageType.java b/src/main/java/at/gv/util/xsd/moaspss/KeyStorageType.java
index 39cd4ed..55096ed 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/KeyStorageType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/KeyStorageType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for KeyStorageType.
+ * <p>Java-Klasse für KeyStorageType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * <p>
  * <pre>
  * &lt;simpleType name="KeyStorageType">
diff --git a/src/main/java/at/gv/util/xsd/moaspss/ManifestRefsCheckResultInfoType.java b/src/main/java/at/gv/util/xsd/moaspss/ManifestRefsCheckResultInfoType.java
index 94a1e9b..20280b0 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/ManifestRefsCheckResultInfoType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/ManifestRefsCheckResultInfoType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ManifestRefsCheckResultInfoType complex type.
+ * <p>Java-Klasse für ManifestRefsCheckResultInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ManifestRefsCheckResultInfoType">
diff --git a/src/main/java/at/gv/util/xsd/moaspss/ManifestRefsCheckResultType.java b/src/main/java/at/gv/util/xsd/moaspss/ManifestRefsCheckResultType.java
index 9d95616..b5f90d1 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/ManifestRefsCheckResultType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/ManifestRefsCheckResultType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ManifestRefsCheckResultType complex type.
+ * <p>Java-Klasse für ManifestRefsCheckResultType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ManifestRefsCheckResultType">
diff --git a/src/main/java/at/gv/util/xsd/moaspss/MetaInfoType.java b/src/main/java/at/gv/util/xsd/moaspss/MetaInfoType.java
index 492780c..03a6b57 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/MetaInfoType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/MetaInfoType.java
@@ -15,9 +15,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for MetaInfoType complex type.
+ * <p>Java-Klasse für MetaInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="MetaInfoType">
@@ -48,6 +48,7 @@ public class MetaInfoType {
 
     @XmlElement(name = "MimeType", required = true)
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+    @XmlSchemaType(name = "token")
     protected String mimeType;
     @XmlElement(name = "Description")
     @XmlSchemaType(name = "anyURI")
@@ -56,7 +57,7 @@ public class MetaInfoType {
     protected List<Object> any;
 
     /**
-     * Gets the value of the mimeType property.
+     * Ruft den Wert der mimeType-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -68,7 +69,7 @@ public class MetaInfoType {
     }
 
     /**
-     * Sets the value of the mimeType property.
+     * Legt den Wert der mimeType-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -80,7 +81,7 @@ public class MetaInfoType {
     }
 
     /**
-     * Gets the value of the description property.
+     * Ruft den Wert der description-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -92,7 +93,7 @@ public class MetaInfoType {
     }
 
     /**
-     * Sets the value of the description property.
+     * Legt den Wert der description-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/ObjectFactory.java b/src/main/java/at/gv/util/xsd/moaspss/ObjectFactory.java
index 3825695..16eeca3 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/ObjectFactory.java
@@ -5,14 +5,13 @@ import javax.xml.bind.JAXBElement;
 import javax.xml.bind.annotation.XmlElementDecl;
 import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
-
 import at.gv.util.xsd.xmldsig.KeyInfoType;
 
 
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the at.gv.zustellung.util.xsd.moaspss package. 
+ * generated in the at.gv.util.xsd.moaspss package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -26,40 +25,40 @@ import at.gv.util.xsd.xmldsig.KeyInfoType;
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreateXMLSignatureResponse");
-    private final static QName _VerifyCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyCMSSignatureResponse");
-    private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SupplementProfile");
     private final static QName _PublicAuthority_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "PublicAuthority");
     private final static QName _QualifiedCertificate_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "QualifiedCertificate");
     private final static QName _VerifyXMLSignatureRequest_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureRequest");
+    private final static QName _CreateXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CreateXMLSignatureResponse");
+    private final static QName _VerifyCMSSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyCMSSignatureResponse");
+    private final static QName _SupplementProfile_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SupplementProfile");
     private final static QName _ErrorResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "ErrorResponse");
     private final static QName _VerifyXMLSignatureResponse_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "VerifyXMLSignatureResponse");
     private final static QName _Supplement_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "Supplement");
-    private final static QName _VerifyCMSSignatureResponseTypeSignerInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SignerInfo");
     private final static QName _VerifyCMSSignatureResponseTypeCertificateCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "CertificateCheck");
+    private final static QName _VerifyCMSSignatureResponseTypeSignerInfo_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SignerInfo");
     private final static QName _VerifyCMSSignatureResponseTypeSignatureCheck_QNAME = new QName("http://reference.e-government.gv.at/namespace/moa/20020822#", "SignatureCheck");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.zustellung.util.xsd.moaspss
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.moaspss
      * 
      */
     public ObjectFactory() {
     }
 
     /**
-     * Create an instance of {@link InputDataType }
+     * Create an instance of {@link CreateXMLSignatureRequestType }
      * 
      */
-    public InputDataType createInputDataType() {
-        return new InputDataType();
+    public CreateXMLSignatureRequestType createCreateXMLSignatureRequestType() {
+        return new CreateXMLSignatureRequestType();
     }
 
     /**
-     * Create an instance of {@link ManifestRefsCheckResultType }
+     * Create an instance of {@link DataObjectInfoType }
      * 
      */
-    public ManifestRefsCheckResultType createManifestRefsCheckResultType() {
-        return new ManifestRefsCheckResultType();
+    public DataObjectInfoType createDataObjectInfoType() {
+        return new DataObjectInfoType();
     }
 
     /**
@@ -71,187 +70,187 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link CheckResultType }
+     * Create an instance of {@link CreateXMLSignatureResponseType }
      * 
      */
-    public CheckResultType createCheckResultType() {
-        return new CheckResultType();
+    public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() {
+        return new CreateXMLSignatureResponseType();
     }
 
     /**
-     * Create an instance of {@link TransformParameterType.Hash }
+     * Create an instance of {@link TransformParameterType }
      * 
      */
-    public TransformParameterType.Hash createTransformParameterTypeHash() {
-        return new TransformParameterType.Hash();
+    public TransformParameterType createTransformParameterType() {
+        return new TransformParameterType();
     }
 
     /**
-     * Create an instance of {@link ContentExLocRefBaseType }
+     * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo }
      * 
      */
-    public ContentExLocRefBaseType createContentExLocRefBaseType() {
-        return new ContentExLocRefBaseType();
+    public CreateXMLSignatureRequestType.SingleSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfo() {
+        return new CreateXMLSignatureRequestType.SingleSignatureInfo();
     }
 
     /**
-     * Create an instance of {@link CMSDataObjectOptionalMetaType }
+     * Create an instance of {@link VerifyXMLSignatureResponseType }
      * 
      */
-    public CMSDataObjectOptionalMetaType createCMSDataObjectOptionalMetaType() {
-        return new CMSDataObjectOptionalMetaType();
+    public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() {
+        return new VerifyXMLSignatureResponseType();
     }
 
     /**
-     * Create an instance of {@link CreateXMLSignatureRequest }
+     * Create an instance of {@link PublicAuthorityType }
      * 
      */
-    public CreateXMLSignatureRequest createCreateXMLSignatureRequest() {
-        return new CreateXMLSignatureRequest();
+    public PublicAuthorityType createPublicAuthorityType() {
+        return new PublicAuthorityType();
     }
 
     /**
-     * Create an instance of {@link ContentBaseType }
+     * Create an instance of {@link VerifyCMSSignatureRequest }
      * 
      */
-    public ContentBaseType createContentBaseType() {
-        return new ContentBaseType();
+    public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest() {
+        return new VerifyCMSSignatureRequest();
     }
 
     /**
-     * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo }
+     * Create an instance of {@link VerifyCMSSignatureRequestType }
      * 
      */
-    public CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoCreateSignatureInfo() {
-        return new CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo();
+    public VerifyCMSSignatureRequestType createVerifyCMSSignatureRequestType() {
+        return new VerifyCMSSignatureRequestType();
     }
 
     /**
-     * Create an instance of {@link TransformsInfoType }
+     * Create an instance of {@link CMSDataObjectOptionalMetaType }
      * 
      */
-    public TransformsInfoType createTransformsInfoType() {
-        return new TransformsInfoType();
+    public CMSDataObjectOptionalMetaType createCMSDataObjectOptionalMetaType() {
+        return new CMSDataObjectOptionalMetaType();
     }
 
     /**
-     * Create an instance of {@link TransformParameterType }
+     * Create an instance of {@link XMLDataObjectAssociationType }
      * 
      */
-    public TransformParameterType createTransformParameterType() {
-        return new TransformParameterType();
+    public XMLDataObjectAssociationType createXMLDataObjectAssociationType() {
+        return new XMLDataObjectAssociationType();
     }
 
     /**
-     * Create an instance of {@link CreateXMLSignatureResponseType }
+     * Create an instance of {@link CreateXMLSignatureRequest }
      * 
      */
-    public CreateXMLSignatureResponseType createCreateXMLSignatureResponseType() {
-        return new CreateXMLSignatureResponseType();
+    public CreateXMLSignatureRequest createCreateXMLSignatureRequest() {
+        return new CreateXMLSignatureRequest();
     }
 
     /**
-     * Create an instance of {@link CreateXMLSignatureResponseType.SignatureEnvironment }
+     * Create an instance of {@link VerifyTransformsInfoProfile }
      * 
      */
-    public CreateXMLSignatureResponseType.SignatureEnvironment createCreateXMLSignatureResponseTypeSignatureEnvironment() {
-        return new CreateXMLSignatureResponseType.SignatureEnvironment();
+    public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile() {
+        return new VerifyTransformsInfoProfile();
     }
 
     /**
-     * Create an instance of {@link CMSContentBaseType }
+     * Create an instance of {@link ErrorResponseType }
      * 
      */
-    public CMSContentBaseType createCMSContentBaseType() {
-        return new CMSContentBaseType();
+    public ErrorResponseType createErrorResponseType() {
+        return new ErrorResponseType();
     }
 
     /**
-     * Create an instance of {@link VerifyCMSSignatureRequestType }
+     * Create an instance of {@link CreateSignatureEnvironmentProfile }
      * 
      */
-    public VerifyCMSSignatureRequestType createVerifyCMSSignatureRequestType() {
-        return new VerifyCMSSignatureRequestType();
+    public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile() {
+        return new CreateSignatureEnvironmentProfile();
     }
 
     /**
-     * Create an instance of {@link PublicAuthorityType }
+     * Create an instance of {@link CreateSignatureLocationType }
      * 
      */
-    public PublicAuthorityType createPublicAuthorityType() {
-        return new PublicAuthorityType();
+    public CreateSignatureLocationType createCreateSignatureLocationType() {
+        return new CreateSignatureLocationType();
     }
 
     /**
-     * Create an instance of {@link DataObjectInfoType }
+     * Create an instance of {@link VerifyCMSSignatureResponseType }
      * 
      */
-    public DataObjectInfoType createDataObjectInfoType() {
-        return new DataObjectInfoType();
+    public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() {
+        return new VerifyCMSSignatureResponseType();
     }
 
     /**
-     * Create an instance of {@link VerifyXMLSignatureRequestType.SignatureManifestCheckParams }
+     * Create an instance of {@link CreateTransformsInfoProfile }
      * 
      */
-    public VerifyXMLSignatureRequestType.SignatureManifestCheckParams createVerifyXMLSignatureRequestTypeSignatureManifestCheckParams() {
-        return new VerifyXMLSignatureRequestType.SignatureManifestCheckParams();
+    public CreateTransformsInfoProfile createCreateTransformsInfoProfile() {
+        return new CreateTransformsInfoProfile();
     }
 
     /**
-     * Create an instance of {@link VerifyTransformsInfoProfile }
+     * Create an instance of {@link TransformsInfoType }
      * 
      */
-    public VerifyTransformsInfoProfile createVerifyTransformsInfoProfile() {
-        return new VerifyTransformsInfoProfile();
+    public TransformsInfoType createTransformsInfoType() {
+        return new TransformsInfoType();
     }
 
     /**
-     * Create an instance of {@link VerifyXMLSignatureResponseType }
+     * Create an instance of {@link CMSContentBaseType }
      * 
      */
-    public VerifyXMLSignatureResponseType createVerifyXMLSignatureResponseType() {
-        return new VerifyXMLSignatureResponseType();
+    public CMSContentBaseType createCMSContentBaseType() {
+        return new CMSContentBaseType();
     }
 
     /**
-     * Create an instance of {@link DataObjectInfoType.DataObject }
+     * Create an instance of {@link ManifestRefsCheckResultType }
      * 
      */
-    public DataObjectInfoType.DataObject createDataObjectInfoTypeDataObject() {
-        return new DataObjectInfoType.DataObject();
+    public ManifestRefsCheckResultType createManifestRefsCheckResultType() {
+        return new ManifestRefsCheckResultType();
     }
 
     /**
-     * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo }
+     * Create an instance of {@link InputDataType }
      * 
      */
-    public CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoDataObjectInfo() {
-        return new CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo();
+    public InputDataType createInputDataType() {
+        return new InputDataType();
     }
 
     /**
-     * Create an instance of {@link VerifyXMLSignatureRequestType.VerifySignatureInfo }
+     * Create an instance of {@link CheckResultType }
      * 
      */
-    public VerifyXMLSignatureRequestType.VerifySignatureInfo createVerifyXMLSignatureRequestTypeVerifySignatureInfo() {
-        return new VerifyXMLSignatureRequestType.VerifySignatureInfo();
+    public CheckResultType createCheckResultType() {
+        return new CheckResultType();
     }
 
     /**
-     * Create an instance of {@link FinalDataMetaInfoType }
+     * Create an instance of {@link ContentBaseType }
      * 
      */
-    public FinalDataMetaInfoType createFinalDataMetaInfoType() {
-        return new FinalDataMetaInfoType();
+    public ContentBaseType createContentBaseType() {
+        return new ContentBaseType();
     }
 
     /**
-     * Create an instance of {@link CreateSignatureEnvironmentProfile }
+     * Create an instance of {@link FinalDataMetaInfoType }
      * 
      */
-    public CreateSignatureEnvironmentProfile createCreateSignatureEnvironmentProfile() {
-        return new CreateSignatureEnvironmentProfile();
+    public FinalDataMetaInfoType createFinalDataMetaInfoType() {
+        return new FinalDataMetaInfoType();
     }
 
     /**
@@ -263,27 +262,27 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link CreateXMLSignatureRequestType }
+     * Create an instance of {@link XMLContentType }
      * 
      */
-    public CreateXMLSignatureRequestType createCreateXMLSignatureRequestType() {
-        return new CreateXMLSignatureRequestType();
+    public XMLContentType createXMLContentType() {
+        return new XMLContentType();
     }
 
     /**
-     * Create an instance of {@link ContentOptionalRefType }
+     * Create an instance of {@link MetaInfoType }
      * 
      */
-    public ContentOptionalRefType createContentOptionalRefType() {
-        return new ContentOptionalRefType();
+    public MetaInfoType createMetaInfoType() {
+        return new MetaInfoType();
     }
 
     /**
-     * Create an instance of {@link ErrorResponseType }
+     * Create an instance of {@link ContentExLocRefBaseType }
      * 
      */
-    public ErrorResponseType createErrorResponseType() {
-        return new ErrorResponseType();
+    public ContentExLocRefBaseType createContentExLocRefBaseType() {
+        return new ContentExLocRefBaseType();
     }
 
     /**
@@ -295,27 +294,27 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link CreateTransformsInfoProfile }
+     * Create an instance of {@link ReferencesCheckResultType }
      * 
      */
-    public CreateTransformsInfoProfile createCreateTransformsInfoProfile() {
-        return new CreateTransformsInfoProfile();
+    public ReferencesCheckResultType createReferencesCheckResultType() {
+        return new ReferencesCheckResultType();
     }
 
     /**
-     * Create an instance of {@link MetaInfoType }
+     * Create an instance of {@link ManifestRefsCheckResultInfoType }
      * 
      */
-    public MetaInfoType createMetaInfoType() {
-        return new MetaInfoType();
+    public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() {
+        return new ManifestRefsCheckResultInfoType();
     }
 
     /**
-     * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo }
+     * Create an instance of {@link VerifyTransformsDataType }
      * 
      */
-    public CreateXMLSignatureRequestType.SingleSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfo() {
-        return new CreateXMLSignatureRequestType.SingleSignatureInfo();
+    public VerifyTransformsDataType createVerifyTransformsDataType() {
+        return new VerifyTransformsDataType();
     }
 
     /**
@@ -327,121 +326,121 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link VerifyTransformsDataType }
+     * Create an instance of {@link ContentOptionalRefType }
      * 
      */
-    public VerifyTransformsDataType createVerifyTransformsDataType() {
-        return new VerifyTransformsDataType();
+    public ContentOptionalRefType createContentOptionalRefType() {
+        return new ContentOptionalRefType();
     }
 
     /**
-     * Create an instance of {@link ReferencesCheckResultType }
+     * Create an instance of {@link DataObjectInfoType.DataObject }
      * 
      */
-    public ReferencesCheckResultType createReferencesCheckResultType() {
-        return new ReferencesCheckResultType();
+    public DataObjectInfoType.DataObject createDataObjectInfoTypeDataObject() {
+        return new DataObjectInfoType.DataObject();
     }
 
     /**
-     * Create an instance of {@link XMLDataObjectAssociationType }
+     * Create an instance of {@link VerifyXMLSignatureRequestType.VerifySignatureInfo }
      * 
      */
-    public XMLDataObjectAssociationType createXMLDataObjectAssociationType() {
-        return new XMLDataObjectAssociationType();
+    public VerifyXMLSignatureRequestType.VerifySignatureInfo createVerifyXMLSignatureRequestTypeVerifySignatureInfo() {
+        return new VerifyXMLSignatureRequestType.VerifySignatureInfo();
     }
 
     /**
-     * Create an instance of {@link VerifyCMSSignatureResponseType }
+     * Create an instance of {@link VerifyXMLSignatureRequestType.SignatureManifestCheckParams }
      * 
      */
-    public VerifyCMSSignatureResponseType createVerifyCMSSignatureResponseType() {
-        return new VerifyCMSSignatureResponseType();
+    public VerifyXMLSignatureRequestType.SignatureManifestCheckParams createVerifyXMLSignatureRequestTypeSignatureManifestCheckParams() {
+        return new VerifyXMLSignatureRequestType.SignatureManifestCheckParams();
     }
 
     /**
-     * Create an instance of {@link CreateSignatureLocationType }
+     * Create an instance of {@link CreateXMLSignatureResponseType.SignatureEnvironment }
      * 
      */
-    public CreateSignatureLocationType createCreateSignatureLocationType() {
-        return new CreateSignatureLocationType();
+    public CreateXMLSignatureResponseType.SignatureEnvironment createCreateXMLSignatureResponseTypeSignatureEnvironment() {
+        return new CreateXMLSignatureResponseType.SignatureEnvironment();
     }
 
     /**
-     * Create an instance of {@link XMLContentType }
+     * Create an instance of {@link TransformParameterType.Hash }
      * 
      */
-    public XMLContentType createXMLContentType() {
-        return new XMLContentType();
+    public TransformParameterType.Hash createTransformParameterTypeHash() {
+        return new TransformParameterType.Hash();
     }
 
     /**
-     * Create an instance of {@link ManifestRefsCheckResultInfoType }
+     * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo }
      * 
      */
-    public ManifestRefsCheckResultInfoType createManifestRefsCheckResultInfoType() {
-        return new ManifestRefsCheckResultInfoType();
+    public CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoDataObjectInfo() {
+        return new CreateXMLSignatureRequestType.SingleSignatureInfo.DataObjectInfo();
     }
 
     /**
-     * Create an instance of {@link VerifyCMSSignatureRequest }
+     * Create an instance of {@link CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo }
      * 
      */
-    public VerifyCMSSignatureRequest createVerifyCMSSignatureRequest() {
-        return new VerifyCMSSignatureRequest();
+    public CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo createCreateXMLSignatureRequestTypeSingleSignatureInfoCreateSignatureInfo() {
+        return new CreateXMLSignatureRequestType.SingleSignatureInfo.CreateSignatureInfo();
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link PublicAuthorityType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CreateXMLSignatureResponse")
-    public JAXBElement<CreateXMLSignatureResponseType> createCreateXMLSignatureResponse(CreateXMLSignatureResponseType value) {
-        return new JAXBElement<CreateXMLSignatureResponseType>(_CreateXMLSignatureResponse_QNAME, CreateXMLSignatureResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "PublicAuthority")
+    public JAXBElement<PublicAuthorityType> createPublicAuthority(PublicAuthorityType value) {
+        return new JAXBElement<PublicAuthorityType>(_PublicAuthority_QNAME, PublicAuthorityType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VerifyCMSSignatureResponseType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyCMSSignatureResponse")
-    public JAXBElement<VerifyCMSSignatureResponseType> createVerifyCMSSignatureResponse(VerifyCMSSignatureResponseType value) {
-        return new JAXBElement<VerifyCMSSignatureResponseType>(_VerifyCMSSignatureResponse_QNAME, VerifyCMSSignatureResponseType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "QualifiedCertificate")
+    public JAXBElement<Object> createQualifiedCertificate(Object value) {
+        return new JAXBElement<Object>(_QualifiedCertificate_QNAME, Object.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureRequestType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SupplementProfile")
-    public JAXBElement<XMLDataObjectAssociationType> createSupplementProfile(XMLDataObjectAssociationType value) {
-        return new JAXBElement<XMLDataObjectAssociationType>(_SupplementProfile_QNAME, XMLDataObjectAssociationType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureRequest")
+    public JAXBElement<VerifyXMLSignatureRequestType> createVerifyXMLSignatureRequest(VerifyXMLSignatureRequestType value) {
+        return new JAXBElement<VerifyXMLSignatureRequestType>(_VerifyXMLSignatureRequest_QNAME, VerifyXMLSignatureRequestType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PublicAuthorityType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CreateXMLSignatureResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "PublicAuthority")
-    public JAXBElement<PublicAuthorityType> createPublicAuthority(PublicAuthorityType value) {
-        return new JAXBElement<PublicAuthorityType>(_PublicAuthority_QNAME, PublicAuthorityType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CreateXMLSignatureResponse")
+    public JAXBElement<CreateXMLSignatureResponseType> createCreateXMLSignatureResponse(CreateXMLSignatureResponseType value) {
+        return new JAXBElement<CreateXMLSignatureResponseType>(_CreateXMLSignatureResponse_QNAME, CreateXMLSignatureResponseType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link VerifyCMSSignatureResponseType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "QualifiedCertificate")
-    public JAXBElement<Object> createQualifiedCertificate(Object value) {
-        return new JAXBElement<Object>(_QualifiedCertificate_QNAME, Object.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyCMSSignatureResponse")
+    public JAXBElement<VerifyCMSSignatureResponseType> createVerifyCMSSignatureResponse(VerifyCMSSignatureResponseType value) {
+        return new JAXBElement<VerifyCMSSignatureResponseType>(_VerifyCMSSignatureResponse_QNAME, VerifyCMSSignatureResponseType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link VerifyXMLSignatureRequestType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link XMLDataObjectAssociationType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "VerifyXMLSignatureRequest")
-    public JAXBElement<VerifyXMLSignatureRequestType> createVerifyXMLSignatureRequest(VerifyXMLSignatureRequestType value) {
-        return new JAXBElement<VerifyXMLSignatureRequestType>(_VerifyXMLSignatureRequest_QNAME, VerifyXMLSignatureRequestType.class, null, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SupplementProfile")
+    public JAXBElement<XMLDataObjectAssociationType> createSupplementProfile(XMLDataObjectAssociationType value) {
+        return new JAXBElement<XMLDataObjectAssociationType>(_SupplementProfile_QNAME, XMLDataObjectAssociationType.class, null, value);
     }
 
     /**
@@ -472,21 +471,21 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignerInfo", scope = VerifyCMSSignatureResponseType.class)
-    public JAXBElement<KeyInfoType> createVerifyCMSSignatureResponseTypeSignerInfo(KeyInfoType value) {
-        return new JAXBElement<KeyInfoType>(_VerifyCMSSignatureResponseTypeSignerInfo_QNAME, KeyInfoType.class, VerifyCMSSignatureResponseType.class, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CertificateCheck", scope = VerifyCMSSignatureResponseType.class)
+    public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeCertificateCheck(CheckResultType value) {
+        return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeCertificateCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "CertificateCheck", scope = VerifyCMSSignatureResponseType.class)
-    public JAXBElement<CheckResultType> createVerifyCMSSignatureResponseTypeCertificateCheck(CheckResultType value) {
-        return new JAXBElement<CheckResultType>(_VerifyCMSSignatureResponseTypeCertificateCheck_QNAME, CheckResultType.class, VerifyCMSSignatureResponseType.class, value);
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", name = "SignerInfo", scope = VerifyCMSSignatureResponseType.class)
+    public JAXBElement<KeyInfoType> createVerifyCMSSignatureResponseTypeSignerInfo(KeyInfoType value) {
+        return new JAXBElement<KeyInfoType>(_VerifyCMSSignatureResponseTypeSignerInfo_QNAME, KeyInfoType.class, VerifyCMSSignatureResponseType.class, value);
     }
 
     /**
diff --git a/src/main/java/at/gv/util/xsd/moaspss/PublicAuthorityType.java b/src/main/java/at/gv/util/xsd/moaspss/PublicAuthorityType.java
index 12e20c4..cb8d7db 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/PublicAuthorityType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/PublicAuthorityType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for PublicAuthorityType complex type.
+ * <p>Java-Klasse für PublicAuthorityType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PublicAuthorityType">
@@ -36,7 +36,7 @@ public class PublicAuthorityType {
     protected String code;
 
     /**
-     * Gets the value of the code property.
+     * Ruft den Wert der code-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -48,7 +48,7 @@ public class PublicAuthorityType {
     }
 
     /**
-     * Sets the value of the code property.
+     * Legt den Wert der code-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/ReferencesCheckResultInfoType.java b/src/main/java/at/gv/util/xsd/moaspss/ReferencesCheckResultInfoType.java
index 8673241..3ad8543 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/ReferencesCheckResultInfoType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/ReferencesCheckResultInfoType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ReferencesCheckResultInfoType complex type.
+ * <p>Java-Klasse für ReferencesCheckResultInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ReferencesCheckResultInfoType">
diff --git a/src/main/java/at/gv/util/xsd/moaspss/ReferencesCheckResultType.java b/src/main/java/at/gv/util/xsd/moaspss/ReferencesCheckResultType.java
index 4ea8f43..f13700d 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/ReferencesCheckResultType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/ReferencesCheckResultType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ReferencesCheckResultType complex type.
+ * <p>Java-Klasse für ReferencesCheckResultType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ReferencesCheckResultType">
diff --git a/src/main/java/at/gv/util/xsd/moaspss/TransformParameterType.java b/src/main/java/at/gv/util/xsd/moaspss/TransformParameterType.java
index 36c8d1b..547ab5f 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/TransformParameterType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/TransformParameterType.java
@@ -7,14 +7,13 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
-
 import at.gv.util.xsd.xmldsig.DigestMethodType;
 
 
 /**
- * <p>Java class for TransformParameterType complex type.
+ * <p>Java-Klasse für TransformParameterType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="TransformParameterType">
@@ -59,7 +58,7 @@ public class TransformParameterType {
     protected String uri;
 
     /**
-     * Gets the value of the base64Content property.
+     * Ruft den Wert der base64Content-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -70,18 +69,18 @@ public class TransformParameterType {
     }
 
     /**
-     * Sets the value of the base64Content property.
+     * Legt den Wert der base64Content-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
      *     byte[]
      */
     public void setBase64Content(byte[] value) {
-        this.base64Content = ((byte[]) value);
+        this.base64Content = value;
     }
 
     /**
-     * Gets the value of the hash property.
+     * Ruft den Wert der hash-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -93,7 +92,7 @@ public class TransformParameterType {
     }
 
     /**
-     * Sets the value of the hash property.
+     * Legt den Wert der hash-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -105,7 +104,7 @@ public class TransformParameterType {
     }
 
     /**
-     * Gets the value of the uri property.
+     * Ruft den Wert der uri-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -117,7 +116,7 @@ public class TransformParameterType {
     }
 
     /**
-     * Sets the value of the uri property.
+     * Legt den Wert der uri-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -130,9 +129,9 @@ public class TransformParameterType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -162,7 +161,7 @@ public class TransformParameterType {
         protected String digestValue;
 
         /**
-         * Gets the value of the digestMethod property.
+         * Ruft den Wert der digestMethod-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -174,7 +173,7 @@ public class TransformParameterType {
         }
 
         /**
-         * Sets the value of the digestMethod property.
+         * Legt den Wert der digestMethod-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -186,7 +185,7 @@ public class TransformParameterType {
         }
 
         /**
-         * Gets the value of the digestValue property.
+         * Ruft den Wert der digestValue-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -198,7 +197,7 @@ public class TransformParameterType {
         }
 
         /**
-         * Sets the value of the digestValue property.
+         * Legt den Wert der digestValue-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/TransformsInfoType.java b/src/main/java/at/gv/util/xsd/moaspss/TransformsInfoType.java
index 3d4ae7e..6a5ceb2 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/TransformsInfoType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/TransformsInfoType.java
@@ -5,14 +5,13 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-
 import at.gv.util.xsd.xmldsig.TransformsType;
 
 
 /**
- * <p>Java class for TransformsInfoType complex type.
+ * <p>Java-Klasse für TransformsInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="TransformsInfoType">
@@ -42,7 +41,7 @@ public class TransformsInfoType {
     protected FinalDataMetaInfoType finalDataMetaInfo;
 
     /**
-     * Gets the value of the transforms property.
+     * Ruft den Wert der transforms-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +53,7 @@ public class TransformsInfoType {
     }
 
     /**
-     * Sets the value of the transforms property.
+     * Legt den Wert der transforms-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -66,7 +65,7 @@ public class TransformsInfoType {
     }
 
     /**
-     * Gets the value of the finalDataMetaInfo property.
+     * Ruft den Wert der finalDataMetaInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -78,7 +77,7 @@ public class TransformsInfoType {
     }
 
     /**
-     * Sets the value of the finalDataMetaInfo property.
+     * Legt den Wert der finalDataMetaInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureRequest.java b/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureRequest.java
index bfb406c..a7b97bc 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureRequest.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureRequest.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
diff --git a/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureRequestType.java b/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureRequestType.java
index c9a073e..2cb800e 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureRequestType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureRequestType.java
@@ -13,9 +13,9 @@ import javax.xml.datatype.XMLGregorianCalendar;
 
 
 /**
- * <p>Java class for VerifyCMSSignatureRequestType complex type.
+ * <p>Java-Klasse für VerifyCMSSignatureRequestType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="VerifyCMSSignatureRequestType">
@@ -59,7 +59,7 @@ public class VerifyCMSSignatureRequestType {
     protected String trustProfileID;
 
     /**
-     * Gets the value of the dateTime property.
+     * Ruft den Wert der dateTime-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -71,7 +71,7 @@ public class VerifyCMSSignatureRequestType {
     }
 
     /**
-     * Sets the value of the dateTime property.
+     * Legt den Wert der dateTime-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -83,7 +83,7 @@ public class VerifyCMSSignatureRequestType {
     }
 
     /**
-     * Gets the value of the cmsSignature property.
+     * Ruft den Wert der cmsSignature-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -94,18 +94,18 @@ public class VerifyCMSSignatureRequestType {
     }
 
     /**
-     * Sets the value of the cmsSignature property.
+     * Legt den Wert der cmsSignature-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
      *     byte[]
      */
     public void setCMSSignature(byte[] value) {
-        this.cmsSignature = ((byte[]) value);
+        this.cmsSignature = value;
     }
 
     /**
-     * Gets the value of the dataObject property.
+     * Ruft den Wert der dataObject-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -117,7 +117,7 @@ public class VerifyCMSSignatureRequestType {
     }
 
     /**
-     * Sets the value of the dataObject property.
+     * Legt den Wert der dataObject-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -129,7 +129,7 @@ public class VerifyCMSSignatureRequestType {
     }
 
     /**
-     * Gets the value of the trustProfileID property.
+     * Ruft den Wert der trustProfileID-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -141,7 +141,7 @@ public class VerifyCMSSignatureRequestType {
     }
 
     /**
-     * Sets the value of the trustProfileID property.
+     * Legt den Wert der trustProfileID-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureResponseType.java b/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureResponseType.java
index 3b767a4..19a79cd 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureResponseType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/VerifyCMSSignatureResponseType.java
@@ -9,14 +9,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlElementRefs;
 import javax.xml.bind.annotation.XmlType;
-
 import at.gv.util.xsd.xmldsig.KeyInfoType;
 
 
 /**
- * <p>Java class for VerifyCMSSignatureResponseType complex type.
+ * <p>Java-Klasse für VerifyCMSSignatureResponseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="VerifyCMSSignatureResponseType">
@@ -41,9 +40,9 @@ import at.gv.util.xsd.xmldsig.KeyInfoType;
 public class VerifyCMSSignatureResponseType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class),
+        @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class),
         @XmlElementRef(name = "CertificateCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class),
-        @XmlElementRef(name = "SignerInfo", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class)
+        @XmlElementRef(name = "SignatureCheck", namespace = "http://reference.e-government.gv.at/namespace/moa/20020822#", type = JAXBElement.class)
     })
     protected List<JAXBElement<?>> signerInfoAndSignatureCheckAndCertificateCheck;
 
@@ -65,8 +64,8 @@ public class VerifyCMSSignatureResponseType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}
      * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}
+     * {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}
      * {@link JAXBElement }{@code <}{@link CheckResultType }{@code >}
      * 
      * 
diff --git a/src/main/java/at/gv/util/xsd/moaspss/VerifyTransformsDataType.java b/src/main/java/at/gv/util/xsd/moaspss/VerifyTransformsDataType.java
index c234244..baea290 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/VerifyTransformsDataType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/VerifyTransformsDataType.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for VerifyTransformsDataType complex type.
+ * <p>Java-Klasse für VerifyTransformsDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="VerifyTransformsDataType">
@@ -37,8 +37,8 @@ import javax.xml.bind.annotation.XmlType;
 public class VerifyTransformsDataType {
 
     @XmlElements({
-        @XmlElement(name = "VerifyTransformsInfoProfileID", type = String.class),
-        @XmlElement(name = "VerifyTransformsInfoProfile", type = VerifyTransformsInfoProfile.class)
+        @XmlElement(name = "VerifyTransformsInfoProfile", type = VerifyTransformsInfoProfile.class),
+        @XmlElement(name = "VerifyTransformsInfoProfileID", type = String.class)
     })
     protected List<Object> verifyTransformsInfoProfileOrVerifyTransformsInfoProfileID;
 
@@ -60,8 +60,8 @@ public class VerifyTransformsDataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link String }
      * {@link VerifyTransformsInfoProfile }
+     * {@link String }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/moaspss/VerifyTransformsInfoProfile.java b/src/main/java/at/gv/util/xsd/moaspss/VerifyTransformsInfoProfile.java
index 7352231..7be3562 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/VerifyTransformsInfoProfile.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/VerifyTransformsInfoProfile.java
@@ -8,14 +8,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
-
 import at.gv.util.xsd.xmldsig.TransformsType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -46,7 +45,7 @@ public class VerifyTransformsInfoProfile {
     protected List<TransformParameterType> transformParameter;
 
     /**
-     * Gets the value of the transforms property.
+     * Ruft den Wert der transforms-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -58,7 +57,7 @@ public class VerifyTransformsInfoProfile {
     }
 
     /**
-     * Sets the value of the transforms property.
+     * Legt den Wert der transforms-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/VerifyXMLSignatureRequestType.java b/src/main/java/at/gv/util/xsd/moaspss/VerifyXMLSignatureRequestType.java
index 323aa4a..4477d9a 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/VerifyXMLSignatureRequestType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/VerifyXMLSignatureRequestType.java
@@ -16,9 +16,9 @@ import javax.xml.datatype.XMLGregorianCalendar;
 
 
 /**
- * <p>Java class for VerifyXMLSignatureRequestType complex type.
+ * <p>Java-Klasse für VerifyXMLSignatureRequestType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="VerifyXMLSignatureRequestType">
@@ -95,7 +95,7 @@ public class VerifyXMLSignatureRequestType {
     protected String trustProfileID;
 
     /**
-     * Gets the value of the dateTime property.
+     * Ruft den Wert der dateTime-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -107,7 +107,7 @@ public class VerifyXMLSignatureRequestType {
     }
 
     /**
-     * Sets the value of the dateTime property.
+     * Legt den Wert der dateTime-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -119,7 +119,7 @@ public class VerifyXMLSignatureRequestType {
     }
 
     /**
-     * Gets the value of the verifySignatureInfo property.
+     * Ruft den Wert der verifySignatureInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -131,7 +131,7 @@ public class VerifyXMLSignatureRequestType {
     }
 
     /**
-     * Sets the value of the verifySignatureInfo property.
+     * Legt den Wert der verifySignatureInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -173,7 +173,7 @@ public class VerifyXMLSignatureRequestType {
     }
 
     /**
-     * Gets the value of the signatureManifestCheckParams property.
+     * Ruft den Wert der signatureManifestCheckParams-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -185,7 +185,7 @@ public class VerifyXMLSignatureRequestType {
     }
 
     /**
-     * Sets the value of the signatureManifestCheckParams property.
+     * Legt den Wert der signatureManifestCheckParams-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -197,7 +197,7 @@ public class VerifyXMLSignatureRequestType {
     }
 
     /**
-     * Gets the value of the returnHashInputData property.
+     * Ruft den Wert der returnHashInputData-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -209,7 +209,7 @@ public class VerifyXMLSignatureRequestType {
     }
 
     /**
-     * Sets the value of the returnHashInputData property.
+     * Legt den Wert der returnHashInputData-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -221,7 +221,7 @@ public class VerifyXMLSignatureRequestType {
     }
 
     /**
-     * Gets the value of the trustProfileID property.
+     * Ruft den Wert der trustProfileID-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -233,7 +233,7 @@ public class VerifyXMLSignatureRequestType {
     }
 
     /**
-     * Sets the value of the trustProfileID property.
+     * Legt den Wert der trustProfileID-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -246,9 +246,9 @@ public class VerifyXMLSignatureRequestType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -306,7 +306,7 @@ public class VerifyXMLSignatureRequestType {
         }
 
         /**
-         * Gets the value of the returnReferenceInputData property.
+         * Ruft den Wert der returnReferenceInputData-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -322,7 +322,7 @@ public class VerifyXMLSignatureRequestType {
         }
 
         /**
-         * Sets the value of the returnReferenceInputData property.
+         * Legt den Wert der returnReferenceInputData-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -337,9 +337,9 @@ public class VerifyXMLSignatureRequestType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -371,7 +371,7 @@ public class VerifyXMLSignatureRequestType {
         protected String verifySignatureLocation;
 
         /**
-         * Gets the value of the verifySignatureEnvironment property.
+         * Ruft den Wert der verifySignatureEnvironment-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -383,7 +383,7 @@ public class VerifyXMLSignatureRequestType {
         }
 
         /**
-         * Sets the value of the verifySignatureEnvironment property.
+         * Legt den Wert der verifySignatureEnvironment-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -395,7 +395,7 @@ public class VerifyXMLSignatureRequestType {
         }
 
         /**
-         * Gets the value of the verifySignatureLocation property.
+         * Ruft den Wert der verifySignatureLocation-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -407,7 +407,7 @@ public class VerifyXMLSignatureRequestType {
         }
 
         /**
-         * Sets the value of the verifySignatureLocation property.
+         * Legt den Wert der verifySignatureLocation-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/VerifyXMLSignatureResponseType.java b/src/main/java/at/gv/util/xsd/moaspss/VerifyXMLSignatureResponseType.java
index 2c68f71..897f9fc 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/VerifyXMLSignatureResponseType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/VerifyXMLSignatureResponseType.java
@@ -7,14 +7,13 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-
 import at.gv.util.xsd.xmldsig.KeyInfoType;
 
 
 /**
- * <p>Java class for VerifyXMLSignatureResponseType complex type.
+ * <p>Java-Klasse für VerifyXMLSignatureResponseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="VerifyXMLSignatureResponseType">
@@ -64,7 +63,7 @@ public class VerifyXMLSignatureResponseType {
     protected CheckResultType certificateCheck;
 
     /**
-     * Gets the value of the signerInfo property.
+     * Ruft den Wert der signerInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +75,7 @@ public class VerifyXMLSignatureResponseType {
     }
 
     /**
-     * Sets the value of the signerInfo property.
+     * Legt den Wert der signerInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -146,7 +145,7 @@ public class VerifyXMLSignatureResponseType {
     }
 
     /**
-     * Gets the value of the signatureCheck property.
+     * Ruft den Wert der signatureCheck-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -158,7 +157,7 @@ public class VerifyXMLSignatureResponseType {
     }
 
     /**
-     * Sets the value of the signatureCheck property.
+     * Legt den Wert der signatureCheck-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -170,7 +169,7 @@ public class VerifyXMLSignatureResponseType {
     }
 
     /**
-     * Gets the value of the signatureManifestCheck property.
+     * Ruft den Wert der signatureManifestCheck-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -182,7 +181,7 @@ public class VerifyXMLSignatureResponseType {
     }
 
     /**
-     * Sets the value of the signatureManifestCheck property.
+     * Legt den Wert der signatureManifestCheck-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -223,7 +222,7 @@ public class VerifyXMLSignatureResponseType {
     }
 
     /**
-     * Gets the value of the certificateCheck property.
+     * Ruft den Wert der certificateCheck-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -235,7 +234,7 @@ public class VerifyXMLSignatureResponseType {
     }
 
     /**
-     * Sets the value of the certificateCheck property.
+     * Legt den Wert der certificateCheck-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/XMLContentType.java b/src/main/java/at/gv/util/xsd/moaspss/XMLContentType.java
index b6a1b58..75d0dbe 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/XMLContentType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/XMLContentType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for XMLContentType complex type.
+ * <p>Java-Klasse für XMLContentType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="XMLContentType">
@@ -32,12 +32,12 @@ public class XMLContentType
     extends AnyChildrenType
 {
 
-    @XmlAttribute(namespace = "http://www.w3.org/XML/1998/namespace")
+    @XmlAttribute(name = "space", namespace = "http://www.w3.org/XML/1998/namespace")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
     protected String space;
 
     /**
-     * Gets the value of the space property.
+     * Ruft den Wert der space-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -49,7 +49,7 @@ public class XMLContentType
     }
 
     /**
-     * Sets the value of the space property.
+     * Legt den Wert der space-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/moaspss/XMLDataObjectAssociationType.java b/src/main/java/at/gv/util/xsd/moaspss/XMLDataObjectAssociationType.java
index 96c5212..f8d3038 100644
--- a/src/main/java/at/gv/util/xsd/moaspss/XMLDataObjectAssociationType.java
+++ b/src/main/java/at/gv/util/xsd/moaspss/XMLDataObjectAssociationType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for XMLDataObjectAssociationType complex type.
+ * <p>Java-Klasse für XMLDataObjectAssociationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="XMLDataObjectAssociationType">
@@ -40,7 +40,7 @@ public class XMLDataObjectAssociationType {
     protected ContentRequiredRefType content;
 
     /**
-     * Gets the value of the metaInfo property.
+     * Ruft den Wert der metaInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class XMLDataObjectAssociationType {
     }
 
     /**
-     * Sets the value of the metaInfo property.
+     * Legt den Wert der metaInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -64,7 +64,7 @@ public class XMLDataObjectAssociationType {
     }
 
     /**
-     * Gets the value of the content property.
+     * Ruft den Wert der content-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class XMLDataObjectAssociationType {
     }
 
     /**
-     * Sets the value of the content property.
+     * Legt den Wert der content-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/AbstractAddressType.java b/src/main/java/at/gv/util/xsd/persondata/AbstractAddressType.java
index 8243311..0a45dff 100644
--- a/src/main/java/at/gv/util/xsd/persondata/AbstractAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/AbstractAddressType.java
@@ -22,9 +22,9 @@ import javax.xml.namespace.QName;
 /**
  * main structure of address data
  * 
- * <p>Java class for AbstractAddressType complex type.
+ * <p>Java-Klasse für AbstractAddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AbstractAddressType">
@@ -95,7 +95,7 @@ public class AbstractAddressType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -107,7 +107,7 @@ public class AbstractAddressType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 711376e..eb45694 100644
--- a/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/AbstractPersonType.java
@@ -24,9 +24,9 @@ import javax.xml.namespace.QName;
 /**
  * main structure of person data
  * 
- * <p>Java class for AbstractPersonType complex type.
+ * <p>Java-Klasse für AbstractPersonType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AbstractPersonType">
@@ -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)
@@ -122,12 +122,12 @@ public class AbstractPersonType {
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
      * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
-     * {@link JAXBElement }{@code <}{@link Vereinsnummer }{@code >}
-     * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
+     * {@link JAXBElement }{@code <}{@link ERJPZahl }{@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 >}
+     * {@link JAXBElement }{@code <}{@link Vereinsnummer }{@code >}
+     * {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@code >}
      * 
      * 
      */
@@ -139,7 +139,7 @@ public class AbstractPersonType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -151,7 +151,7 @@ public class AbstractPersonType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/AbstractSimpleIdentificationType.java b/src/main/java/at/gv/util/xsd/persondata/AbstractSimpleIdentificationType.java
index fb9201b..568289e 100644
--- a/src/main/java/at/gv/util/xsd/persondata/AbstractSimpleIdentificationType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/AbstractSimpleIdentificationType.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlValue;
 
 
 /**
- * <p>Java class for AbstractSimpleIdentificationType complex type.
+ * <p>Java-Klasse für AbstractSimpleIdentificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AbstractSimpleIdentificationType">
@@ -40,7 +40,7 @@ public class AbstractSimpleIdentificationType {
     protected String value;
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class AbstractSimpleIdentificationType {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/AlternativeName.java b/src/main/java/at/gv/util/xsd/persondata/AlternativeName.java
index 9768cad..3939aac 100644
--- a/src/main/java/at/gv/util/xsd/persondata/AlternativeName.java
+++ b/src/main/java/at/gv/util/xsd/persondata/AlternativeName.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -36,7 +36,7 @@ public class AlternativeName
     protected String type;
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -48,7 +48,7 @@ public class AlternativeName
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/BankConnectionType.java b/src/main/java/at/gv/util/xsd/persondata/BankConnectionType.java
index aaf3ce9..827a547 100644
--- a/src/main/java/at/gv/util/xsd/persondata/BankConnectionType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/BankConnectionType.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 /**
  * compare BankverbindungTyp
  * 
- * <p>Java class for BankConnectionType complex type.
+ * <p>Java-Klasse für BankConnectionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="BankConnectionType">
@@ -75,7 +75,7 @@ public class BankConnectionType {
     protected BankConnectionType.InternationalBankConnection internationalBankConnection;
 
     /**
-     * Gets the value of the holder property.
+     * Ruft den Wert der holder-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -87,7 +87,7 @@ public class BankConnectionType {
     }
 
     /**
-     * Sets the value of the holder property.
+     * Legt den Wert der holder-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -99,7 +99,7 @@ public class BankConnectionType {
     }
 
     /**
-     * Gets the value of the bankName property.
+     * Ruft den Wert der bankName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -111,7 +111,7 @@ public class BankConnectionType {
     }
 
     /**
-     * Sets the value of the bankName property.
+     * Legt den Wert der bankName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -123,7 +123,7 @@ public class BankConnectionType {
     }
 
     /**
-     * Gets the value of the nationalBankConnection property.
+     * Ruft den Wert der nationalBankConnection-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -135,7 +135,7 @@ public class BankConnectionType {
     }
 
     /**
-     * Sets the value of the nationalBankConnection property.
+     * Legt den Wert der nationalBankConnection-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -147,7 +147,7 @@ public class BankConnectionType {
     }
 
     /**
-     * Gets the value of the internationalBankConnection property.
+     * Ruft den Wert der internationalBankConnection-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -159,7 +159,7 @@ public class BankConnectionType {
     }
 
     /**
-     * Sets the value of the internationalBankConnection property.
+     * Legt den Wert der internationalBankConnection-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -172,9 +172,9 @@ public class BankConnectionType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -204,7 +204,7 @@ public class BankConnectionType {
         protected String bic;
 
         /**
-         * Gets the value of the iban property.
+         * Ruft den Wert der iban-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -216,7 +216,7 @@ public class BankConnectionType {
         }
 
         /**
-         * Sets the value of the iban property.
+         * Legt den Wert der iban-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -228,7 +228,7 @@ public class BankConnectionType {
         }
 
         /**
-         * Gets the value of the bic property.
+         * Ruft den Wert der bic-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -240,7 +240,7 @@ public class BankConnectionType {
         }
 
         /**
-         * Sets the value of the bic property.
+         * Legt den Wert der bic-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -255,9 +255,9 @@ public class BankConnectionType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -287,7 +287,7 @@ public class BankConnectionType {
         protected BigInteger bankCode;
 
         /**
-         * Gets the value of the accountNumber property.
+         * Ruft den Wert der accountNumber-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -299,7 +299,7 @@ public class BankConnectionType {
         }
 
         /**
-         * Sets the value of the accountNumber property.
+         * Legt den Wert der accountNumber-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -311,7 +311,7 @@ public class BankConnectionType {
         }
 
         /**
-         * Gets the value of the bankCode property.
+         * Ruft den Wert der bankCode-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -323,7 +323,7 @@ public class BankConnectionType {
         }
 
         /**
-         * Sets the value of the bankCode property.
+         * Legt den Wert der bankCode-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
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 bd7d324..be60166 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactCorporateBodyType.java
@@ -17,9 +17,9 @@ import org.w3c.dom.Element;
 /**
  * juridical person, organisation, compare NichtNatuerlichePersonTyp
  * 
- * <p>Java class for CompactCorporateBodyType complex type.
+ * <p>Java-Klasse für CompactCorporateBodyType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CompactCorporateBodyType">
@@ -99,7 +99,7 @@ public class CompactCorporateBodyType
     }
 
     /**
-     * Gets the value of the fullName property.
+     * Ruft den Wert der fullName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -111,7 +111,7 @@ public class CompactCorporateBodyType
     }
 
     /**
-     * Sets the value of the fullName property.
+     * Legt den Wert der fullName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -123,7 +123,7 @@ public class CompactCorporateBodyType
     }
 
     /**
-     * Gets the value of the legalForm property.
+     * Ruft den Wert der legalForm-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -135,7 +135,7 @@ public class CompactCorporateBodyType
     }
 
     /**
-     * Sets the value of the legalForm property.
+     * Legt den Wert der legalForm-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -147,7 +147,7 @@ public class CompactCorporateBodyType
     }
 
     /**
-     * Gets the value of the organization property.
+     * Ruft den Wert der organization-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -159,7 +159,7 @@ public class CompactCorporateBodyType
     }
 
     /**
-     * Sets the value of the organization property.
+     * Legt den Wert der organization-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/CompactPersonData.java b/src/main/java/at/gv/util/xsd/persondata/CompactPersonData.java
index 5c563ce..59eab1e 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactPersonData.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactPersonData.java
@@ -12,9 +12,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -59,7 +59,7 @@ public class CompactPersonData {
     protected List<AbstractAddressType> internetAddressOrTelephoneAddressOrCompactPostalAddress;
 
     /**
-     * Gets the value of the compactPhysicalPerson property.
+     * Ruft den Wert der compactPhysicalPerson-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -71,7 +71,7 @@ public class CompactPersonData {
     }
 
     /**
-     * Sets the value of the compactPhysicalPerson property.
+     * Legt den Wert der compactPhysicalPerson-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -83,7 +83,7 @@ public class CompactPersonData {
     }
 
     /**
-     * Gets the value of the compactCorporateBody property.
+     * Ruft den Wert der compactCorporateBody-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -95,7 +95,7 @@ public class CompactPersonData {
     }
 
     /**
-     * Sets the value of the compactCorporateBody property.
+     * Legt den Wert der compactCorporateBody-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 a8b7caf..f4296a8 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactPersonDataType.java
@@ -18,9 +18,9 @@ import org.w3c.dom.Element;
 /**
  * signed person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).
  * 
- * <p>Java class for CompactPersonDataType complex type.
+ * <p>Java-Klasse für CompactPersonDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CompactPersonDataType">
@@ -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;
@@ -71,15 +71,15 @@ public class CompactPersonDataType
     protected CompactPersonDataType.AdditionalData additionalData;
 
     /**
-     * Gets the value of the person property.
+     * Ruft den Wert der person-Eigenschaft ab.
      * 
      * @return
      *     possible object is
+     *     {@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() {
@@ -87,15 +87,15 @@ public class CompactPersonDataType
     }
 
     /**
-     * Sets the value of the person property.
+     * Legt den Wert der person-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
+     *     {@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 TypedPostalAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
      * 
      * 
      */
@@ -166,7 +166,7 @@ public class CompactPersonDataType
     }
 
     /**
-     * Gets the value of the additionalData property.
+     * Ruft den Wert der additionalData-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -178,7 +178,7 @@ public class CompactPersonDataType
     }
 
     /**
-     * Sets the value of the additionalData property.
+     * Legt den Wert der additionalData-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -191,9 +191,9 @@ public class CompactPersonDataType
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -237,9 +237,9 @@ public class CompactPersonDataType
          * 
          * <p>
          * Objects of the following type(s) are allowed in the list
+         * {@link Object }
          * {@link String }
          * {@link Element }
-         * {@link Object }
          * 
          * 
          */
diff --git a/src/main/java/at/gv/util/xsd/persondata/CompactPersonNameType.java b/src/main/java/at/gv/util/xsd/persondata/CompactPersonNameType.java
index 08aabd4..39047cd 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactPersonNameType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactPersonNameType.java
@@ -14,9 +14,9 @@ import javax.xml.bind.annotation.XmlValue;
 /**
  * container for parts of a name, comapre PersonenNameTyp
  * 
- * <p>Java class for CompactPersonNameType complex type.
+ * <p>Java-Klasse für CompactPersonNameType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CompactPersonNameType">
@@ -184,9 +184,9 @@ public class CompactPersonNameType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -235,7 +235,7 @@ public class CompactPersonNameType {
         protected String position;
 
         /**
-         * Gets the value of the value property.
+         * Ruft den Wert der value-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -247,7 +247,7 @@ public class CompactPersonNameType {
         }
 
         /**
-         * Sets the value of the value property.
+         * Legt den Wert der value-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -259,7 +259,7 @@ public class CompactPersonNameType {
         }
 
         /**
-         * Gets the value of the type property.
+         * Ruft den Wert der type-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -271,7 +271,7 @@ public class CompactPersonNameType {
         }
 
         /**
-         * Sets the value of the type property.
+         * Legt den Wert der type-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -283,7 +283,7 @@ public class CompactPersonNameType {
         }
 
         /**
-         * Gets the value of the position property.
+         * Ruft den Wert der position-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -295,7 +295,7 @@ public class CompactPersonNameType {
         }
 
         /**
-         * Sets the value of the position property.
+         * Legt den Wert der position-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -310,9 +310,9 @@ public class CompactPersonNameType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -349,7 +349,7 @@ public class CompactPersonNameType {
         protected String prefix;
 
         /**
-         * Gets the value of the value property.
+         * Ruft den Wert der value-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -361,7 +361,7 @@ public class CompactPersonNameType {
         }
 
         /**
-         * Sets the value of the value property.
+         * Legt den Wert der value-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -373,7 +373,7 @@ public class CompactPersonNameType {
         }
 
         /**
-         * Gets the value of the primary property.
+         * Ruft den Wert der primary-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -389,7 +389,7 @@ public class CompactPersonNameType {
         }
 
         /**
-         * Sets the value of the primary property.
+         * Legt den Wert der primary-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -401,7 +401,7 @@ public class CompactPersonNameType {
         }
 
         /**
-         * Gets the value of the prefix property.
+         * Ruft den Wert der prefix-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -413,7 +413,7 @@ public class CompactPersonNameType {
         }
 
         /**
-         * Sets the value of the prefix property.
+         * Legt den Wert der prefix-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
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 1e37799..01b56d6 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactPhysicalPersonType.java
@@ -17,9 +17,9 @@ import org.w3c.dom.Element;
 /**
  * physical person, compare NatuerlichePersonTyp
  * 
- * <p>Java class for CompactPhysicalPersonType complex type.
+ * <p>Java-Klasse für CompactPhysicalPersonType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CompactPhysicalPersonType">
@@ -59,10 +59,13 @@ public class CompactPhysicalPersonType
     @XmlElement(name = "CompactName")
     protected CompactPersonNameType compactName;
     @XmlElement(name = "MaritalStatus")
+    @XmlSchemaType(name = "token")
     protected MaritalStatusType maritalStatus;
     @XmlElement(name = "Sex")
+    @XmlSchemaType(name = "token")
     protected SexType sex;
     @XmlElement(name = "DateOfBirth")
+    @XmlSchemaType(name = "anySimpleType")
     protected String dateOfBirth;
     @XmlElement(name = "PlaceOfBirth")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@@ -74,7 +77,7 @@ public class CompactPhysicalPersonType
     protected List<Object> any;
 
     /**
-     * Gets the value of the compactName property.
+     * Ruft den Wert der compactName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -86,7 +89,7 @@ public class CompactPhysicalPersonType
     }
 
     /**
-     * Sets the value of the compactName property.
+     * Legt den Wert der compactName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -98,7 +101,7 @@ public class CompactPhysicalPersonType
     }
 
     /**
-     * Gets the value of the maritalStatus property.
+     * Ruft den Wert der maritalStatus-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -110,7 +113,7 @@ public class CompactPhysicalPersonType
     }
 
     /**
-     * Sets the value of the maritalStatus property.
+     * Legt den Wert der maritalStatus-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -122,7 +125,7 @@ public class CompactPhysicalPersonType
     }
 
     /**
-     * Gets the value of the sex property.
+     * Ruft den Wert der sex-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -134,7 +137,7 @@ public class CompactPhysicalPersonType
     }
 
     /**
-     * Sets the value of the sex property.
+     * Legt den Wert der sex-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -146,7 +149,7 @@ public class CompactPhysicalPersonType
     }
 
     /**
-     * Gets the value of the dateOfBirth property.
+     * Ruft den Wert der dateOfBirth-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -158,7 +161,7 @@ public class CompactPhysicalPersonType
     }
 
     /**
-     * Sets the value of the dateOfBirth property.
+     * Legt den Wert der dateOfBirth-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -170,7 +173,7 @@ public class CompactPhysicalPersonType
     }
 
     /**
-     * Gets the value of the placeOfBirth property.
+     * Ruft den Wert der placeOfBirth-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -182,7 +185,7 @@ public class CompactPhysicalPersonType
     }
 
     /**
-     * Sets the value of the placeOfBirth property.
+     * Legt den Wert der placeOfBirth-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/CompactPostalAddressType.java b/src/main/java/at/gv/util/xsd/persondata/CompactPostalAddressType.java
index 51e3491..ab5f72e 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CompactPostalAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CompactPostalAddressType.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 /**
  * compare PostAdresseTyp
  * 
- * <p>Java class for CompactPostalAddressType complex type.
+ * <p>Java-Klasse für CompactPostalAddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CompactPostalAddressType">
@@ -89,7 +89,7 @@ public class CompactPostalAddressType
     protected String type;
 
     /**
-     * Gets the value of the countryCode property.
+     * Ruft den Wert der countryCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -101,7 +101,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Sets the value of the countryCode property.
+     * Legt den Wert der countryCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -113,7 +113,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Gets the value of the countryName property.
+     * Ruft den Wert der countryName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -125,7 +125,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Sets the value of the countryName property.
+     * Legt den Wert der countryName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -137,7 +137,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Gets the value of the postalCode property.
+     * Ruft den Wert der postalCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -149,7 +149,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Sets the value of the postalCode property.
+     * Legt den Wert der postalCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -161,7 +161,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Gets the value of the municipality property.
+     * Ruft den Wert der municipality-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -173,7 +173,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Sets the value of the municipality property.
+     * Legt den Wert der municipality-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -185,7 +185,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Gets the value of the deliveryAddress property.
+     * Ruft den Wert der deliveryAddress-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -197,7 +197,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Sets the value of the deliveryAddress property.
+     * Legt den Wert der deliveryAddress-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -209,7 +209,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -225,7 +225,7 @@ public class CompactPostalAddressType
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -238,9 +238,9 @@ public class CompactPostalAddressType
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -278,7 +278,7 @@ public class CompactPostalAddressType
         protected String doorNumber;
 
         /**
-         * Gets the value of the streetName property.
+         * Ruft den Wert der streetName-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -290,7 +290,7 @@ public class CompactPostalAddressType
         }
 
         /**
-         * Sets the value of the streetName property.
+         * Legt den Wert der streetName-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -302,7 +302,7 @@ public class CompactPostalAddressType
         }
 
         /**
-         * Gets the value of the buildingNumber property.
+         * Ruft den Wert der buildingNumber-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -314,7 +314,7 @@ public class CompactPostalAddressType
         }
 
         /**
-         * Sets the value of the buildingNumber property.
+         * Legt den Wert der buildingNumber-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -326,7 +326,7 @@ public class CompactPostalAddressType
         }
 
         /**
-         * Gets the value of the unit property.
+         * Ruft den Wert der unit-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -338,7 +338,7 @@ public class CompactPostalAddressType
         }
 
         /**
-         * Sets the value of the unit property.
+         * Legt den Wert der unit-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -350,7 +350,7 @@ public class CompactPostalAddressType
         }
 
         /**
-         * Gets the value of the doorNumber property.
+         * Ruft den Wert der doorNumber-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -362,7 +362,7 @@ public class CompactPostalAddressType
         }
 
         /**
-         * Sets the value of the doorNumber property.
+         * Legt den Wert der doorNumber-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
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 6596ae3..43aeaed 100644
--- a/src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/CorporateBodyType.java
@@ -17,9 +17,9 @@ import org.w3c.dom.Element;
 /**
  * juridical person, organisation, compare NichtNatuerlichePersonTyp
  * 
- * <p>Java class for CorporateBodyType complex type.
+ * <p>Java-Klasse für CorporateBodyType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CorporateBodyType">
@@ -109,7 +109,7 @@ public class CorporateBodyType
     }
 
     /**
-     * Gets the value of the fullName property.
+     * Ruft den Wert der fullName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -121,7 +121,7 @@ public class CorporateBodyType
     }
 
     /**
-     * Sets the value of the fullName property.
+     * Legt den Wert der fullName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -162,7 +162,7 @@ public class CorporateBodyType
     }
 
     /**
-     * Gets the value of the legalForm property.
+     * Ruft den Wert der legalForm-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -174,7 +174,7 @@ public class CorporateBodyType
     }
 
     /**
-     * Sets the value of the legalForm property.
+     * Legt den Wert der legalForm-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -186,7 +186,7 @@ public class CorporateBodyType
     }
 
     /**
-     * Gets the value of the organization property.
+     * Ruft den Wert der organization-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -198,7 +198,7 @@ public class CorporateBodyType
     }
 
     /**
-     * Sets the value of the organization property.
+     * Legt den Wert der organization-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/DefinedAlternativeNameTypeType.java b/src/main/java/at/gv/util/xsd/persondata/DefinedAlternativeNameTypeType.java
index 41a2fc7..de95cd9 100644
--- a/src/main/java/at/gv/util/xsd/persondata/DefinedAlternativeNameTypeType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/DefinedAlternativeNameTypeType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DefinedAlternativeNameTypeType.
+ * <p>Java-Klasse für DefinedAlternativeNameTypeType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * <p>
  * <pre>
  * &lt;simpleType name="DefinedAlternativeNameTypeType">
diff --git a/src/main/java/at/gv/util/xsd/persondata/DefinedRelationType.java b/src/main/java/at/gv/util/xsd/persondata/DefinedRelationType.java
index 96e6cb4..f273a0b 100644
--- a/src/main/java/at/gv/util/xsd/persondata/DefinedRelationType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/DefinedRelationType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DefinedRelationType.
+ * <p>Java-Klasse für DefinedRelationType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * <p>
  * <pre>
  * &lt;simpleType name="DefinedRelationType">
diff --git a/src/main/java/at/gv/util/xsd/persondata/ERJPZahl.java b/src/main/java/at/gv/util/xsd/persondata/ERJPZahl.java
index 3c181a8..af455c2 100644
--- a/src/main/java/at/gv/util/xsd/persondata/ERJPZahl.java
+++ b/src/main/java/at/gv/util/xsd/persondata/ERJPZahl.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -34,7 +34,7 @@ public class ERJPZahl
     protected String identifier;
 
     /**
-     * Gets the value of the identifier property.
+     * Ruft den Wert der identifier-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class ERJPZahl
     }
 
     /**
-     * Sets the value of the identifier property.
+     * Legt den Wert der identifier-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/FederalStateType.java b/src/main/java/at/gv/util/xsd/persondata/FederalStateType.java
index 88577e3..72b7b9f 100644
--- a/src/main/java/at/gv/util/xsd/persondata/FederalStateType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/FederalStateType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for FederalStateType.
+ * <p>Java-Klasse für FederalStateType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * <p>
  * <pre>
  * &lt;simpleType name="FederalStateType">
diff --git a/src/main/java/at/gv/util/xsd/persondata/Firmenbuchnummer.java b/src/main/java/at/gv/util/xsd/persondata/Firmenbuchnummer.java
index bd67587..5238a29 100644
--- a/src/main/java/at/gv/util/xsd/persondata/Firmenbuchnummer.java
+++ b/src/main/java/at/gv/util/xsd/persondata/Firmenbuchnummer.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -34,7 +34,7 @@ public class Firmenbuchnummer
     protected String identifier;
 
     /**
-     * Gets the value of the identifier property.
+     * Ruft den Wert der identifier-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class Firmenbuchnummer
     }
 
     /**
-     * Sets the value of the identifier property.
+     * Legt den Wert der identifier-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 df20e77..e9dca96 100644
--- a/src/main/java/at/gv/util/xsd/persondata/IdentificationType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/IdentificationType.java
@@ -24,9 +24,9 @@ import org.w3c.dom.Element;
 /**
  * unique identifier
  * 
- * <p>Java class for IdentificationType complex type.
+ * <p>Java-Klasse für IdentificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="IdentificationType">
@@ -83,7 +83,7 @@ public class IdentificationType {
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -95,7 +95,7 @@ public class IdentificationType {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -107,7 +107,7 @@ public class IdentificationType {
     }
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -119,7 +119,7 @@ public class IdentificationType {
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -131,7 +131,7 @@ public class IdentificationType {
     }
 
     /**
-     * Gets the value of the authority property.
+     * Ruft den Wert der authority-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -143,7 +143,7 @@ public class IdentificationType {
     }
 
     /**
-     * Sets the value of the authority property.
+     * Legt den Wert der authority-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -185,7 +185,7 @@ public class IdentificationType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -197,7 +197,7 @@ public class IdentificationType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -228,9 +228,9 @@ public class IdentificationType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -259,7 +259,7 @@ public class IdentificationType {
         protected String id;
 
         /**
-         * Gets the value of the value property.
+         * Ruft den Wert der value-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -271,7 +271,7 @@ public class IdentificationType {
         }
 
         /**
-         * Sets the value of the value property.
+         * Legt den Wert der value-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -283,7 +283,7 @@ public class IdentificationType {
         }
 
         /**
-         * Gets the value of the id property.
+         * Ruft den Wert der id-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -295,7 +295,7 @@ public class IdentificationType {
         }
 
         /**
-         * Sets the value of the id property.
+         * Legt den Wert der id-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
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 90dfd41..207d0f6 100644
--- a/src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/InternetAddressType.java
@@ -16,9 +16,9 @@ import org.w3c.dom.Element;
 /**
  * e.g. e-mail, webiste, compare InternetAdresseTyp
  * 
- * <p>Java class for InternetAddressType complex type.
+ * <p>Java-Klasse für InternetAddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="InternetAddressType">
@@ -68,7 +68,7 @@ public class InternetAddressType
     }
 
     /**
-     * Sets the value of the keyInfo property.
+     * Legt den Wert der keyInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -80,7 +80,7 @@ public class InternetAddressType
     }
 
     /**
-     * Gets the value of the address property.
+     * Ruft den Wert der address-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -92,7 +92,7 @@ public class InternetAddressType
     }
 
     /**
-     * Sets the value of the address property.
+     * Legt den Wert der address-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/MaritalStatusType.java b/src/main/java/at/gv/util/xsd/persondata/MaritalStatusType.java
index 7f908d4..4d452dd 100644
--- a/src/main/java/at/gv/util/xsd/persondata/MaritalStatusType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/MaritalStatusType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for MaritalStatusType.
+ * <p>Java-Klasse für MaritalStatusType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * <p>
  * <pre>
  * &lt;simpleType name="MaritalStatusType">
diff --git a/src/main/java/at/gv/util/xsd/persondata/MobileTelcomNumberType.java b/src/main/java/at/gv/util/xsd/persondata/MobileTelcomNumberType.java
index 3abde42..561b9a2 100644
--- a/src/main/java/at/gv/util/xsd/persondata/MobileTelcomNumberType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/MobileTelcomNumberType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 /**
  * like TelephoneAddresseType but with additional smsEnabled attribute
  * 
- * <p>Java class for MobileTelcomNumberType complex type.
+ * <p>Java-Klasse für MobileTelcomNumberType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="MobileTelcomNumberType">
@@ -36,7 +36,7 @@ public class MobileTelcomNumberType
     protected Boolean smsEnabled;
 
     /**
-     * Gets the value of the smsEnabled property.
+     * Ruft den Wert der smsEnabled-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -48,7 +48,7 @@ public class MobileTelcomNumberType
     }
 
     /**
-     * Sets the value of the smsEnabled property.
+     * Legt den Wert der smsEnabled-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 c1d2fef..abbcf97 100644
--- a/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/NationalityType.java
@@ -17,9 +17,9 @@ import org.w3c.dom.Element;
 /**
  * comapre, StaatsangehoerigkeitTyp
  * 
- * <p>Java class for NationalityType complex type.
+ * <p>Java-Klasse für NationalityType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="NationalityType">
@@ -52,10 +52,10 @@ import org.w3c.dom.Element;
 public class NationalityType {
 
     @XmlElementRefs({
-        @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 = "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)
+        @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)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -80,12 +80,12 @@ public class NationalityType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link String }
-     * {@link Element }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link Element }
      * {@link Object }
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
      * 
      */
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 188f09a..890abbf 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 _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 _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 _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,15 +422,6 @@ 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 >}}
      * 
      */
@@ -485,24 +476,6 @@ 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 >}}
      * 
      */
@@ -533,15 +506,6 @@ 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);
@@ -557,15 +521,6 @@ 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 >}}
      * 
      */
@@ -575,16 +530,6 @@ 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 >}}
      * 
      */
@@ -594,24 +539,6 @@ 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 >}}
      * 
      */
@@ -621,15 +548,6 @@ 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 >}}
      * 
      */
@@ -648,15 +566,6 @@ 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 >}}
      * 
      */
@@ -706,146 +615,237 @@ 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 = "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 = "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 AbstractSimpleIdentificationType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link PersonNameType }{@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);
+    @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 = "Telephone")
-    public JAXBElement<TelcomNumberType> createTelephone(TelcomNumberType value) {
-        return new JAXBElement<TelcomNumberType>(_Telephone_QNAME, TelcomNumberType.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 AbstractSimpleIdentificationType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@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);
+    @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 BankConnectionType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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 = "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 PersonNameType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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);
+    @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);
+    }
+
+    /**
+     * 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 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 = "StateOfBirth")
+    @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 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 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 String }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", name = "Confession")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createStateOfBirth(String value) {
-        return new JAXBElement<String>(_StateOfBirth_QNAME, String.class, null, value);
+    public JAXBElement<String> createConfession(String value) {
+        return new JAXBElement<String>(_Confession_QNAME, String.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link PersonDataType }{@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 = "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 AbstractPersonType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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 = "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 CompactPostalAddressType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link NationalityType }{@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 = "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 >}}
+     * 
+     */
+    @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 AbstractSimpleIdentificationType }{@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);
     }
 
     /**
      * 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);
+    @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 PostalAddressType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractSimpleIdentificationType }{@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 = "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 TelephoneAddressType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link BankConnectionType }{@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);
+    @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 String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractAddressType }{@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);
+    @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 IdentificationType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link AbstractPersonType }{@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 = "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 String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@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 = "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 PostalAddressType }{@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);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link IdentificationType }{@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);
     }
 
     /**
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 94f21e8..8801fa8 100644
--- a/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/PersonDataType.java
@@ -18,9 +18,9 @@ import org.w3c.dom.Element;
 /**
  * signed person datastructure. The first Identification elements (from the base type) denote the record as such (e.g. database key for this record) - not to be mistaken for identifiers of the person or of an address (they have their own Identification elements).
  * 
- * <p>Java class for PersonDataType complex type.
+ * <p>Java-Klasse für PersonDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PersonDataType">
@@ -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;
@@ -71,15 +71,15 @@ public class PersonDataType
     protected PersonDataType.AdditionalData additionalData;
 
     /**
-     * Gets the value of the person property.
+     * Ruft den Wert der person-Eigenschaft ab.
      * 
      * @return
      *     possible object is
+     *     {@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() {
@@ -87,15 +87,15 @@ public class PersonDataType
     }
 
     /**
-     * Sets the value of the person property.
+     * Legt den Wert der person-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
+     *     {@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 TypedPostalAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link InternetAddressType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link TypedPostalAddressType }{@code >}
      * {@link JAXBElement }{@code <}{@link CompactPostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link PostalAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link AbstractAddressType }{@code >}
+     * {@link JAXBElement }{@code <}{@link TelephoneAddressType }{@code >}
      * 
      * 
      */
@@ -166,7 +166,7 @@ public class PersonDataType
     }
 
     /**
-     * Gets the value of the additionalData property.
+     * Ruft den Wert der additionalData-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -178,7 +178,7 @@ public class PersonDataType
     }
 
     /**
-     * Sets the value of the additionalData property.
+     * Legt den Wert der additionalData-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -191,9 +191,9 @@ public class PersonDataType
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -237,9 +237,9 @@ public class PersonDataType
          * 
          * <p>
          * Objects of the following type(s) are allowed in the list
+         * {@link Object }
          * {@link String }
          * {@link Element }
-         * {@link Object }
          * 
          * 
          */
diff --git a/src/main/java/at/gv/util/xsd/persondata/PersonNameType.java b/src/main/java/at/gv/util/xsd/persondata/PersonNameType.java
index 3b148fc..ee6f287 100644
--- a/src/main/java/at/gv/util/xsd/persondata/PersonNameType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/PersonNameType.java
@@ -15,9 +15,9 @@ import javax.xml.bind.annotation.XmlValue;
 /**
  * container for parts of a name, comapre PersonenNameTyp
  * 
- * <p>Java class for PersonNameType complex type.
+ * <p>Java-Klasse für PersonNameType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PersonNameType">
@@ -161,7 +161,7 @@ public class PersonNameType {
     }
 
     /**
-     * Gets the value of the legalName property.
+     * Ruft den Wert der legalName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -173,7 +173,7 @@ public class PersonNameType {
     }
 
     /**
-     * Sets the value of the legalName property.
+     * Legt den Wert der legalName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -214,7 +214,7 @@ public class PersonNameType {
     }
 
     /**
-     * Gets the value of the preferredGivenName property.
+     * Ruft den Wert der preferredGivenName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -226,7 +226,7 @@ public class PersonNameType {
     }
 
     /**
-     * Sets the value of the preferredGivenName property.
+     * Legt den Wert der preferredGivenName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -238,7 +238,7 @@ public class PersonNameType {
     }
 
     /**
-     * Gets the value of the middleName property.
+     * Ruft den Wert der middleName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -250,7 +250,7 @@ public class PersonNameType {
     }
 
     /**
-     * Sets the value of the middleName property.
+     * Legt den Wert der middleName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -321,9 +321,9 @@ public class PersonNameType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -372,7 +372,7 @@ public class PersonNameType {
         protected String position;
 
         /**
-         * Gets the value of the value property.
+         * Ruft den Wert der value-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -384,7 +384,7 @@ public class PersonNameType {
         }
 
         /**
-         * Sets the value of the value property.
+         * Legt den Wert der value-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -396,7 +396,7 @@ public class PersonNameType {
         }
 
         /**
-         * Gets the value of the type property.
+         * Ruft den Wert der type-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -408,7 +408,7 @@ public class PersonNameType {
         }
 
         /**
-         * Sets the value of the type property.
+         * Legt den Wert der type-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -420,7 +420,7 @@ public class PersonNameType {
         }
 
         /**
-         * Gets the value of the position property.
+         * Ruft den Wert der position-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -432,7 +432,7 @@ public class PersonNameType {
         }
 
         /**
-         * Sets the value of the position property.
+         * Legt den Wert der position-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -447,9 +447,9 @@ public class PersonNameType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -486,7 +486,7 @@ public class PersonNameType {
         protected String prefix;
 
         /**
-         * Gets the value of the value property.
+         * Ruft den Wert der value-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -498,7 +498,7 @@ public class PersonNameType {
         }
 
         /**
-         * Sets the value of the value property.
+         * Legt den Wert der value-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -510,7 +510,7 @@ public class PersonNameType {
         }
 
         /**
-         * Gets the value of the primary property.
+         * Ruft den Wert der primary-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -526,7 +526,7 @@ public class PersonNameType {
         }
 
         /**
-         * Sets the value of the primary property.
+         * Legt den Wert der primary-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -538,7 +538,7 @@ public class PersonNameType {
         }
 
         /**
-         * Gets the value of the prefix property.
+         * Ruft den Wert der prefix-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -550,7 +550,7 @@ public class PersonNameType {
         }
 
         /**
-         * Sets the value of the prefix property.
+         * Legt den Wert der prefix-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -565,9 +565,9 @@ public class PersonNameType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -601,7 +601,7 @@ public class PersonNameType {
         protected String type;
 
         /**
-         * Gets the value of the value property.
+         * Ruft den Wert der value-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -613,7 +613,7 @@ public class PersonNameType {
         }
 
         /**
-         * Sets the value of the value property.
+         * Legt den Wert der value-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -625,7 +625,7 @@ public class PersonNameType {
         }
 
         /**
-         * Gets the value of the type property.
+         * Ruft den Wert der type-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -641,7 +641,7 @@ public class PersonNameType {
         }
 
         /**
-         * Sets the value of the type property.
+         * Legt den Wert der type-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
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 4c5a5e3..386dbe7 100644
--- a/src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/PhysicalPersonType.java
@@ -17,9 +17,9 @@ import org.w3c.dom.Element;
 /**
  * physical person, compare NatuerlichePersonTyp
  * 
- * <p>Java class for PhysicalPersonType complex type.
+ * <p>Java-Klasse für PhysicalPersonType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PhysicalPersonType">
@@ -77,10 +77,13 @@ public class PhysicalPersonType
     @XmlElement(name = "AlternativeName")
     protected List<AlternativeName> alternativeName;
     @XmlElement(name = "MaritalStatus")
+    @XmlSchemaType(name = "token")
     protected MaritalStatusType maritalStatus;
     @XmlElement(name = "Sex")
+    @XmlSchemaType(name = "token")
     protected SexType sex;
     @XmlElement(name = "DateOfBirth")
+    @XmlSchemaType(name = "anySimpleType")
     protected String dateOfBirth;
     @XmlElement(name = "PlaceOfBirth")
     @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
@@ -95,6 +98,7 @@ public class PhysicalPersonType
     @XmlSchemaType(name = "token")
     protected String countryOfBirth;
     @XmlElement(name = "DateOfDeath")
+    @XmlSchemaType(name = "anySimpleType")
     protected String dateOfDeath;
     @XmlElement(name = "Nationality")
     protected List<NationalityType> nationality;
@@ -111,7 +115,7 @@ public class PhysicalPersonType
     protected List<Object> any;
 
     /**
-     * Gets the value of the name property.
+     * Ruft den Wert der name-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -123,7 +127,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Sets the value of the name property.
+     * Legt den Wert der name-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -164,7 +168,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Gets the value of the maritalStatus property.
+     * Ruft den Wert der maritalStatus-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -176,7 +180,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Sets the value of the maritalStatus property.
+     * Legt den Wert der maritalStatus-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -188,7 +192,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Gets the value of the sex property.
+     * Ruft den Wert der sex-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -200,7 +204,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Sets the value of the sex property.
+     * Legt den Wert der sex-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -212,7 +216,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Gets the value of the dateOfBirth property.
+     * Ruft den Wert der dateOfBirth-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -224,7 +228,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Sets the value of the dateOfBirth property.
+     * Legt den Wert der dateOfBirth-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -236,7 +240,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Gets the value of the placeOfBirth property.
+     * Ruft den Wert der placeOfBirth-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -248,7 +252,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Sets the value of the placeOfBirth property.
+     * Legt den Wert der placeOfBirth-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -260,7 +264,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Gets the value of the stateOfBirth property.
+     * Ruft den Wert der stateOfBirth-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -272,7 +276,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Sets the value of the stateOfBirth property.
+     * Legt den Wert der stateOfBirth-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -284,7 +288,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Gets the value of the countryOfBirth property.
+     * Ruft den Wert der countryOfBirth-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -296,7 +300,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Sets the value of the countryOfBirth property.
+     * Legt den Wert der countryOfBirth-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -308,7 +312,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Gets the value of the dateOfDeath property.
+     * Ruft den Wert der dateOfDeath-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -320,7 +324,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Sets the value of the dateOfDeath property.
+     * Legt den Wert der dateOfDeath-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -361,7 +365,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Gets the value of the confession property.
+     * Ruft den Wert der confession-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -373,7 +377,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Sets the value of the confession property.
+     * Legt den Wert der confession-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -385,7 +389,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Gets the value of the occupation property.
+     * Ruft den Wert der occupation-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -397,7 +401,7 @@ public class PhysicalPersonType
     }
 
     /**
-     * Sets the value of the occupation property.
+     * Legt den Wert der occupation-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/PostalAddressType.java b/src/main/java/at/gv/util/xsd/persondata/PostalAddressType.java
index d5ba413..7dcd5d5 100644
--- a/src/main/java/at/gv/util/xsd/persondata/PostalAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/PostalAddressType.java
@@ -13,9 +13,9 @@ import javax.xml.bind.annotation.XmlType;
 /**
  * compare PostAdresseTyp
  * 
- * <p>Java class for PostalAddressType complex type.
+ * <p>Java-Klasse für PostalAddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PostalAddressType">
@@ -146,7 +146,7 @@ public class PostalAddressType
     protected String type;
 
     /**
-     * Gets the value of the countryCode property.
+     * Ruft den Wert der countryCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -158,7 +158,7 @@ public class PostalAddressType
     }
 
     /**
-     * Sets the value of the countryCode property.
+     * Legt den Wert der countryCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -170,7 +170,7 @@ public class PostalAddressType
     }
 
     /**
-     * Gets the value of the countryName property.
+     * Ruft den Wert der countryName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -182,7 +182,7 @@ public class PostalAddressType
     }
 
     /**
-     * Sets the value of the countryName property.
+     * Legt den Wert der countryName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -194,7 +194,7 @@ public class PostalAddressType
     }
 
     /**
-     * Gets the value of the postalCode property.
+     * Ruft den Wert der postalCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -206,7 +206,7 @@ public class PostalAddressType
     }
 
     /**
-     * Sets the value of the postalCode property.
+     * Legt den Wert der postalCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -247,7 +247,7 @@ public class PostalAddressType
     }
 
     /**
-     * Gets the value of the state property.
+     * Ruft den Wert der state-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -259,7 +259,7 @@ public class PostalAddressType
     }
 
     /**
-     * Sets the value of the state property.
+     * Legt den Wert der state-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -271,7 +271,7 @@ public class PostalAddressType
     }
 
     /**
-     * Gets the value of the municipality property.
+     * Ruft den Wert der municipality-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -283,7 +283,7 @@ public class PostalAddressType
     }
 
     /**
-     * Sets the value of the municipality property.
+     * Legt den Wert der municipality-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -295,7 +295,7 @@ public class PostalAddressType
     }
 
     /**
-     * Gets the value of the municipalityNumber property.
+     * Ruft den Wert der municipalityNumber-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -307,7 +307,7 @@ public class PostalAddressType
     }
 
     /**
-     * Sets the value of the municipalityNumber property.
+     * Legt den Wert der municipalityNumber-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -319,7 +319,7 @@ public class PostalAddressType
     }
 
     /**
-     * Gets the value of the hamlet property.
+     * Ruft den Wert der hamlet-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -331,7 +331,7 @@ public class PostalAddressType
     }
 
     /**
-     * Sets the value of the hamlet property.
+     * Legt den Wert der hamlet-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -343,7 +343,7 @@ public class PostalAddressType
     }
 
     /**
-     * Gets the value of the hamletBilingual property.
+     * Ruft den Wert der hamletBilingual-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -355,7 +355,7 @@ public class PostalAddressType
     }
 
     /**
-     * Sets the value of the hamletBilingual property.
+     * Legt den Wert der hamletBilingual-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -367,7 +367,7 @@ public class PostalAddressType
     }
 
     /**
-     * Gets the value of the deliveryAddress property.
+     * Ruft den Wert der deliveryAddress-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -379,7 +379,7 @@ public class PostalAddressType
     }
 
     /**
-     * Sets the value of the deliveryAddress property.
+     * Legt den Wert der deliveryAddress-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -420,7 +420,7 @@ public class PostalAddressType
     }
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -436,7 +436,7 @@ public class PostalAddressType
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -449,9 +449,9 @@ public class PostalAddressType
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -554,7 +554,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the streetName property.
+         * Ruft den Wert der streetName-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -566,7 +566,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the streetName property.
+         * Legt den Wert der streetName-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -578,7 +578,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the buildingNumber property.
+         * Ruft den Wert der buildingNumber-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -590,7 +590,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the buildingNumber property.
+         * Legt den Wert der buildingNumber-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -602,7 +602,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the unit property.
+         * Ruft den Wert der unit-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -614,7 +614,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the unit property.
+         * Legt den Wert der unit-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -626,7 +626,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the doorNumber property.
+         * Ruft den Wert der doorNumber-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -638,7 +638,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the doorNumber property.
+         * Legt den Wert der doorNumber-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -650,7 +650,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the postOfficeBox property.
+         * Ruft den Wert der postOfficeBox-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -662,7 +662,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the postOfficeBox property.
+         * Legt den Wert der postOfficeBox-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -674,7 +674,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the livingQuality property.
+         * Ruft den Wert der livingQuality-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -686,7 +686,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the livingQuality property.
+         * Legt den Wert der livingQuality-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -698,7 +698,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the dropOffPoint property.
+         * Ruft den Wert der dropOffPoint-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -710,7 +710,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the dropOffPoint property.
+         * Legt den Wert der dropOffPoint-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -722,7 +722,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the areaNumber property.
+         * Ruft den Wert der areaNumber-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -734,7 +734,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the areaNumber property.
+         * Legt den Wert der areaNumber-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -746,7 +746,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the addressRegisterEntry property.
+         * Ruft den Wert der addressRegisterEntry-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -758,7 +758,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the addressRegisterEntry property.
+         * Legt den Wert der addressRegisterEntry-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -771,9 +771,9 @@ public class PostalAddressType
 
 
         /**
-         * <p>Java class for anonymous complex type.
+         * <p>Java-Klasse für anonymous complex type.
          * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
+         * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
          * 
          * <pre>
          * &lt;complexType>
@@ -807,7 +807,7 @@ public class PostalAddressType
             protected String objectNumber;
 
             /**
-             * Gets the value of the addressCode property.
+             * Ruft den Wert der addressCode-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -819,7 +819,7 @@ public class PostalAddressType
             }
 
             /**
-             * Sets the value of the addressCode property.
+             * Legt den Wert der addressCode-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -831,7 +831,7 @@ public class PostalAddressType
             }
 
             /**
-             * Gets the value of the subCode property.
+             * Ruft den Wert der subCode-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -843,7 +843,7 @@ public class PostalAddressType
             }
 
             /**
-             * Sets the value of the subCode property.
+             * Legt den Wert der subCode-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -855,7 +855,7 @@ public class PostalAddressType
             }
 
             /**
-             * Gets the value of the objectNumber property.
+             * Ruft den Wert der objectNumber-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -867,7 +867,7 @@ public class PostalAddressType
             }
 
             /**
-             * Sets the value of the objectNumber property.
+             * Legt den Wert der objectNumber-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -884,9 +884,9 @@ public class PostalAddressType
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -924,7 +924,7 @@ public class PostalAddressType
         protected String organizationName;
 
         /**
-         * Gets the value of the personName property.
+         * Ruft den Wert der personName-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -936,7 +936,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the personName property.
+         * Legt den Wert der personName-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -977,7 +977,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the organization property.
+         * Ruft den Wert der organization-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -989,7 +989,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the organization property.
+         * Legt den Wert der organization-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -1001,7 +1001,7 @@ public class PostalAddressType
         }
 
         /**
-         * Gets the value of the organizationName property.
+         * Ruft den Wert der organizationName-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -1013,7 +1013,7 @@ public class PostalAddressType
         }
 
         /**
-         * Sets the value of the organizationName property.
+         * Legt den Wert der organizationName-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/RelatedPerson.java b/src/main/java/at/gv/util/xsd/persondata/RelatedPerson.java
index 8a20960..f895bfd 100644
--- a/src/main/java/at/gv/util/xsd/persondata/RelatedPerson.java
+++ b/src/main/java/at/gv/util/xsd/persondata/RelatedPerson.java
@@ -7,13 +7,14 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -39,6 +40,7 @@ import javax.xml.bind.annotation.XmlType;
 public class RelatedPerson {
 
     @XmlElement(name = "TypeOfRelation")
+    @XmlSchemaType(name = "anySimpleType")
     protected List<String> typeOfRelation;
     @XmlElement(name = "PhysicalPerson", required = true)
     protected PhysicalPersonType physicalPerson;
@@ -73,7 +75,7 @@ public class RelatedPerson {
     }
 
     /**
-     * Gets the value of the physicalPerson property.
+     * Ruft den Wert der physicalPerson-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -85,7 +87,7 @@ public class RelatedPerson {
     }
 
     /**
-     * Sets the value of the physicalPerson property.
+     * Legt den Wert der physicalPerson-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/SexType.java b/src/main/java/at/gv/util/xsd/persondata/SexType.java
index eacf4a1..c2f5b99 100644
--- a/src/main/java/at/gv/util/xsd/persondata/SexType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/SexType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SexType.
+ * <p>Java-Klasse für SexType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * <p>
  * <pre>
  * &lt;simpleType name="SexType">
diff --git a/src/main/java/at/gv/util/xsd/persondata/TelcomNumberType.java b/src/main/java/at/gv/util/xsd/persondata/TelcomNumberType.java
index 76664ac..ee3af30 100644
--- a/src/main/java/at/gv/util/xsd/persondata/TelcomNumberType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/TelcomNumberType.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 /**
  * formated number or set of telephone number parts
  * 
- * <p>Java class for TelcomNumberType complex type.
+ * <p>Java-Klasse für TelcomNumberType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="TelcomNumberType">
@@ -58,7 +58,7 @@ public class TelcomNumberType {
     protected String extension;
 
     /**
-     * Gets the value of the formattedNumber property.
+     * Ruft den Wert der formattedNumber-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -70,7 +70,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Sets the value of the formattedNumber property.
+     * Legt den Wert der formattedNumber-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -82,7 +82,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Gets the value of the internationalCountryCode property.
+     * Ruft den Wert der internationalCountryCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -94,7 +94,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Sets the value of the internationalCountryCode property.
+     * Legt den Wert der internationalCountryCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -106,7 +106,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Gets the value of the nationalNumber property.
+     * Ruft den Wert der nationalNumber-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -118,7 +118,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Sets the value of the nationalNumber property.
+     * Legt den Wert der nationalNumber-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -130,7 +130,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Gets the value of the areaCityCode property.
+     * Ruft den Wert der areaCityCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -142,7 +142,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Sets the value of the areaCityCode property.
+     * Legt den Wert der areaCityCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -154,7 +154,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Gets the value of the subscriberNumber property.
+     * Ruft den Wert der subscriberNumber-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -166,7 +166,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Sets the value of the subscriberNumber property.
+     * Legt den Wert der subscriberNumber-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -178,7 +178,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Gets the value of the extension property.
+     * Ruft den Wert der extension-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -190,7 +190,7 @@ public class TelcomNumberType {
     }
 
     /**
-     * Sets the value of the extension property.
+     * Legt den Wert der extension-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 2e8e7e6..f921f29 100644
--- a/src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/TelephoneAddressType.java
@@ -15,9 +15,9 @@ import org.w3c.dom.Element;
 /**
  * phone numbers, conmpare TelephoneAdresseTyp
  * 
- * <p>Java class for TelephoneAddressType complex type.
+ * <p>Java-Klasse für TelephoneAddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="TelephoneAddressType">
@@ -84,7 +84,7 @@ public class TelephoneAddressType
     }
 
     /**
-     * Gets the value of the number property.
+     * Ruft den Wert der number-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -96,7 +96,7 @@ public class TelephoneAddressType
     }
 
     /**
-     * Sets the value of the number property.
+     * Legt den Wert der number-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 0b53e5e..b075417 100644
--- a/src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java
+++ b/src/main/java/at/gv/util/xsd/persondata/TypedPostalAddressType.java
@@ -15,9 +15,9 @@ import org.w3c.dom.Element;
 /**
  * postal address with type information, compare TypisiertePostAdresseTyp
  * 
- * <p>Java class for TypedPostalAddressType complex type.
+ * <p>Java-Klasse für TypedPostalAddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="TypedPostalAddressType">
@@ -55,7 +55,7 @@ public class TypedPostalAddressType
     protected List<Object> any;
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -67,7 +67,7 @@ public class TypedPostalAddressType
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -79,7 +79,7 @@ public class TypedPostalAddressType
     }
 
     /**
-     * Gets the value of the postalAddress property.
+     * Ruft den Wert der postalAddress-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -91,7 +91,7 @@ public class TypedPostalAddressType
     }
 
     /**
-     * Sets the value of the postalAddress property.
+     * Legt den Wert der postalAddress-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/Vereinsnummer.java b/src/main/java/at/gv/util/xsd/persondata/Vereinsnummer.java
index 08edceb..5aa2875 100644
--- a/src/main/java/at/gv/util/xsd/persondata/Vereinsnummer.java
+++ b/src/main/java/at/gv/util/xsd/persondata/Vereinsnummer.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -34,7 +34,7 @@ public class Vereinsnummer
     protected String identifier;
 
     /**
-     * Gets the value of the identifier property.
+     * Ruft den Wert der identifier-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class Vereinsnummer
     }
 
     /**
-     * Sets the value of the identifier property.
+     * Legt den Wert der identifier-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/ZMRzahl.java b/src/main/java/at/gv/util/xsd/persondata/ZMRzahl.java
index 42f0bea..b6b7f57 100644
--- a/src/main/java/at/gv/util/xsd/persondata/ZMRzahl.java
+++ b/src/main/java/at/gv/util/xsd/persondata/ZMRzahl.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -34,7 +34,7 @@ public class ZMRzahl
     protected String identifier;
 
     /**
-     * Gets the value of the identifier property.
+     * Ruft den Wert der identifier-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class ZMRzahl
     }
 
     /**
-     * Sets the value of the identifier property.
+     * Legt den Wert der identifier-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/persondata/package-info.java b/src/main/java/at/gv/util/xsd/persondata/package-info.java
index 1c9b9e5..42f2b8d 100644
--- a/src/main/java/at/gv/util/xsd/persondata/package-info.java
+++ b/src/main/java/at/gv/util/xsd/persondata/package-info.java
@@ -1,2 +1,6 @@
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
+@javax.xml.bind.annotation.XmlSchema(namespace = "http://reference.e-government.gv.at/namespace/persondata/20020228#",
+	xmlns = {
+		@javax.xml.bind.annotation.XmlNs(namespaceURI = "http://reference.e-government.gv.at/namespace/persondata/20020228#", prefix = "pr")		
+	},
+	elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package at.gv.util.xsd.persondata;
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/ActionType.java b/src/main/java/at/gv/util/xsd/saml/assertion/ActionType.java
index 36a5ef4..d50df5b 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/ActionType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/ActionType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlValue;
 
 
 /**
- * <p>Java class for ActionType complex type.
+ * <p>Java-Klasse für ActionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ActionType">
@@ -39,7 +39,7 @@ public class ActionType {
     protected String namespace;
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -51,7 +51,7 @@ public class ActionType {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -63,7 +63,7 @@ public class ActionType {
     }
 
     /**
-     * Gets the value of the namespace property.
+     * Ruft den Wert der namespace-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -75,7 +75,7 @@ public class ActionType {
     }
 
     /**
-     * Sets the value of the namespace property.
+     * Legt den Wert der namespace-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 c003fcc..be3a185 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
@@ -14,9 +14,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for AdviceType complex type.
+ * <p>Java-Klasse für AdviceType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AdviceType">
@@ -41,8 +41,8 @@ import org.w3c.dom.Element;
 public class AdviceType {
 
     @XmlElementRefs({
-        @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)
+        @XmlElementRef(name = "Assertion", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "AssertionIDReference", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> assertionIDReferenceOrAssertionOrAny;
@@ -67,8 +67,8 @@ public class AdviceType {
      * Objects of the following type(s) are allowed in the list
      * {@link Object }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Element }
      * {@link JAXBElement }{@code <}{@link AssertionType }{@code >}
+     * {@link Element }
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/AssertionType.java b/src/main/java/at/gv/util/xsd/saml/assertion/AssertionType.java
index 027a40f..ba3ca58 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/AssertionType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/AssertionType.java
@@ -16,9 +16,9 @@ import at.gv.util.xsd.xmldsig.SignatureType;
 
 
 /**
- * <p>Java class for AssertionType complex type.
+ * <p>Java-Klasse für AssertionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AssertionType">
@@ -84,7 +84,7 @@ public class AssertionType {
     protected XMLGregorianCalendar issueInstant;
 
     /**
-     * Gets the value of the conditions property.
+     * Ruft den Wert der conditions-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -96,7 +96,7 @@ public class AssertionType {
     }
 
     /**
-     * Sets the value of the conditions property.
+     * Legt den Wert der conditions-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -108,7 +108,7 @@ public class AssertionType {
     }
 
     /**
-     * Gets the value of the advice property.
+     * Ruft den Wert der advice-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -120,7 +120,7 @@ public class AssertionType {
     }
 
     /**
-     * Sets the value of the advice property.
+     * Legt den Wert der advice-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -165,7 +165,7 @@ public class AssertionType {
     }
 
     /**
-     * Gets the value of the signature property.
+     * Ruft den Wert der signature-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -177,7 +177,7 @@ public class AssertionType {
     }
 
     /**
-     * Sets the value of the signature property.
+     * Legt den Wert der signature-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -189,7 +189,7 @@ public class AssertionType {
     }
 
     /**
-     * Gets the value of the majorVersion property.
+     * Ruft den Wert der majorVersion-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -201,7 +201,7 @@ public class AssertionType {
     }
 
     /**
-     * Sets the value of the majorVersion property.
+     * Legt den Wert der majorVersion-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -213,7 +213,7 @@ public class AssertionType {
     }
 
     /**
-     * Gets the value of the minorVersion property.
+     * Ruft den Wert der minorVersion-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -225,7 +225,7 @@ public class AssertionType {
     }
 
     /**
-     * Sets the value of the minorVersion property.
+     * Legt den Wert der minorVersion-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -237,7 +237,7 @@ public class AssertionType {
     }
 
     /**
-     * Gets the value of the assertionID property.
+     * Ruft den Wert der assertionID-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -249,7 +249,7 @@ public class AssertionType {
     }
 
     /**
-     * Sets the value of the assertionID property.
+     * Legt den Wert der assertionID-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -261,7 +261,7 @@ public class AssertionType {
     }
 
     /**
-     * Gets the value of the issuer property.
+     * Ruft den Wert der issuer-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -273,7 +273,7 @@ public class AssertionType {
     }
 
     /**
-     * Sets the value of the issuer property.
+     * Legt den Wert der issuer-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -285,7 +285,7 @@ public class AssertionType {
     }
 
     /**
-     * Gets the value of the issueInstant property.
+     * Ruft den Wert der issueInstant-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -297,7 +297,7 @@ public class AssertionType {
     }
 
     /**
-     * Sets the value of the issueInstant property.
+     * Legt den Wert der issueInstant-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/AttributeDesignatorType.java b/src/main/java/at/gv/util/xsd/saml/assertion/AttributeDesignatorType.java
index 4f03b19..48e1f01 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/AttributeDesignatorType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/AttributeDesignatorType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AttributeDesignatorType complex type.
+ * <p>Java-Klasse für AttributeDesignatorType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AttributeDesignatorType">
@@ -41,7 +41,7 @@ public class AttributeDesignatorType {
     protected String attributeNamespace;
 
     /**
-     * Gets the value of the attributeName property.
+     * Ruft den Wert der attributeName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -53,7 +53,7 @@ public class AttributeDesignatorType {
     }
 
     /**
-     * Sets the value of the attributeName property.
+     * Legt den Wert der attributeName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -65,7 +65,7 @@ public class AttributeDesignatorType {
     }
 
     /**
-     * Gets the value of the attributeNamespace property.
+     * Ruft den Wert der attributeNamespace-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -77,7 +77,7 @@ public class AttributeDesignatorType {
     }
 
     /**
-     * Sets the value of the attributeNamespace property.
+     * Legt den Wert der attributeNamespace-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/AttributeStatementType.java b/src/main/java/at/gv/util/xsd/saml/assertion/AttributeStatementType.java
index 8e499c4..33c0757 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/AttributeStatementType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/AttributeStatementType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AttributeStatementType complex type.
+ * <p>Java-Klasse für AttributeStatementType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AttributeStatementType">
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/AttributeType.java b/src/main/java/at/gv/util/xsd/saml/assertion/AttributeType.java
index 0f25e48..2ae4ebf 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/AttributeType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/AttributeType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AttributeType complex type.
+ * <p>Java-Klasse für AttributeType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AttributeType">
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/AudienceRestrictionConditionType.java b/src/main/java/at/gv/util/xsd/saml/assertion/AudienceRestrictionConditionType.java
index 7088eaa..525521c 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/AudienceRestrictionConditionType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/AudienceRestrictionConditionType.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AudienceRestrictionConditionType complex type.
+ * <p>Java-Klasse für AudienceRestrictionConditionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AudienceRestrictionConditionType">
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/AuthenticationStatementType.java b/src/main/java/at/gv/util/xsd/saml/assertion/AuthenticationStatementType.java
index 48ae6e4..358f42d 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/AuthenticationStatementType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/AuthenticationStatementType.java
@@ -13,9 +13,9 @@ import javax.xml.datatype.XMLGregorianCalendar;
 
 
 /**
- * <p>Java class for AuthenticationStatementType complex type.
+ * <p>Java-Klasse für AuthenticationStatementType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AuthenticationStatementType">
@@ -55,7 +55,7 @@ public class AuthenticationStatementType
     protected XMLGregorianCalendar authenticationInstant;
 
     /**
-     * Gets the value of the subjectLocality property.
+     * Ruft den Wert der subjectLocality-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -67,7 +67,7 @@ public class AuthenticationStatementType
     }
 
     /**
-     * Sets the value of the subjectLocality property.
+     * Legt den Wert der subjectLocality-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -108,7 +108,7 @@ public class AuthenticationStatementType
     }
 
     /**
-     * Gets the value of the authenticationMethod property.
+     * Ruft den Wert der authenticationMethod-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -120,7 +120,7 @@ public class AuthenticationStatementType
     }
 
     /**
-     * Sets the value of the authenticationMethod property.
+     * Legt den Wert der authenticationMethod-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -132,7 +132,7 @@ public class AuthenticationStatementType
     }
 
     /**
-     * Gets the value of the authenticationInstant property.
+     * Ruft den Wert der authenticationInstant-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -144,7 +144,7 @@ public class AuthenticationStatementType
     }
 
     /**
-     * Sets the value of the authenticationInstant property.
+     * Legt den Wert der authenticationInstant-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/AuthorityBindingType.java b/src/main/java/at/gv/util/xsd/saml/assertion/AuthorityBindingType.java
index 809411c..cfee5f5 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/AuthorityBindingType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/AuthorityBindingType.java
@@ -10,9 +10,9 @@ import javax.xml.namespace.QName;
 
 
 /**
- * <p>Java class for AuthorityBindingType complex type.
+ * <p>Java-Klasse für AuthorityBindingType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AuthorityBindingType">
@@ -42,7 +42,7 @@ public class AuthorityBindingType {
     protected String binding;
 
     /**
-     * Gets the value of the authorityKind property.
+     * Ruft den Wert der authorityKind-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class AuthorityBindingType {
     }
 
     /**
-     * Sets the value of the authorityKind property.
+     * Legt den Wert der authorityKind-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -66,7 +66,7 @@ public class AuthorityBindingType {
     }
 
     /**
-     * Gets the value of the location property.
+     * Ruft den Wert der location-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -78,7 +78,7 @@ public class AuthorityBindingType {
     }
 
     /**
-     * Sets the value of the location property.
+     * Legt den Wert der location-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -90,7 +90,7 @@ public class AuthorityBindingType {
     }
 
     /**
-     * Gets the value of the binding property.
+     * Ruft den Wert der binding-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -102,7 +102,7 @@ public class AuthorityBindingType {
     }
 
     /**
-     * Sets the value of the binding property.
+     * Legt den Wert der binding-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/AuthorizationDecisionStatementType.java b/src/main/java/at/gv/util/xsd/saml/assertion/AuthorizationDecisionStatementType.java
index 035e3a0..3845826 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/AuthorizationDecisionStatementType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/AuthorizationDecisionStatementType.java
@@ -12,9 +12,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AuthorizationDecisionStatementType complex type.
+ * <p>Java-Klasse für AuthorizationDecisionStatementType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AuthorizationDecisionStatementType">
@@ -82,7 +82,7 @@ public class AuthorizationDecisionStatementType
     }
 
     /**
-     * Gets the value of the evidence property.
+     * Ruft den Wert der evidence-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -94,7 +94,7 @@ public class AuthorizationDecisionStatementType
     }
 
     /**
-     * Sets the value of the evidence property.
+     * Legt den Wert der evidence-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -106,7 +106,7 @@ public class AuthorizationDecisionStatementType
     }
 
     /**
-     * Gets the value of the resource property.
+     * Ruft den Wert der resource-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -118,7 +118,7 @@ public class AuthorizationDecisionStatementType
     }
 
     /**
-     * Sets the value of the resource property.
+     * Legt den Wert der resource-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -130,7 +130,7 @@ public class AuthorizationDecisionStatementType
     }
 
     /**
-     * Gets the value of the decision property.
+     * Ruft den Wert der decision-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -142,7 +142,7 @@ public class AuthorizationDecisionStatementType
     }
 
     /**
-     * Sets the value of the decision property.
+     * Legt den Wert der decision-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/ConditionAbstractType.java b/src/main/java/at/gv/util/xsd/saml/assertion/ConditionAbstractType.java
index 31033e0..8b71c2a 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/ConditionAbstractType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/ConditionAbstractType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ConditionAbstractType complex type.
+ * <p>Java-Klasse für ConditionAbstractType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ConditionAbstractType">
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/ConditionsType.java b/src/main/java/at/gv/util/xsd/saml/assertion/ConditionsType.java
index 93689f5..3777198 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/ConditionsType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/ConditionsType.java
@@ -14,9 +14,9 @@ import javax.xml.datatype.XMLGregorianCalendar;
 
 
 /**
- * <p>Java class for ConditionsType complex type.
+ * <p>Java-Klasse für ConditionsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ConditionsType">
@@ -84,7 +84,7 @@ public class ConditionsType {
     }
 
     /**
-     * Gets the value of the notBefore property.
+     * Ruft den Wert der notBefore-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -96,7 +96,7 @@ public class ConditionsType {
     }
 
     /**
-     * Sets the value of the notBefore property.
+     * Legt den Wert der notBefore-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -108,7 +108,7 @@ public class ConditionsType {
     }
 
     /**
-     * Gets the value of the notOnOrAfter property.
+     * Ruft den Wert der notOnOrAfter-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -120,7 +120,7 @@ public class ConditionsType {
     }
 
     /**
-     * Sets the value of the notOnOrAfter property.
+     * Legt den Wert der notOnOrAfter-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/DecisionType.java b/src/main/java/at/gv/util/xsd/saml/assertion/DecisionType.java
index 01befe4..b7d8678 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/DecisionType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/DecisionType.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DecisionType.
+ * <p>Java-Klasse für DecisionType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * <p>
  * <pre>
  * &lt;simpleType name="DecisionType">
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/EvidenceType.java b/src/main/java/at/gv/util/xsd/saml/assertion/EvidenceType.java
index 9a25910..f2c562b 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/EvidenceType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/EvidenceType.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for EvidenceType complex type.
+ * <p>Java-Klasse für EvidenceType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="EvidenceType">
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/NameIdentifierType.java b/src/main/java/at/gv/util/xsd/saml/assertion/NameIdentifierType.java
index fd14e84..d7f6b15 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/NameIdentifierType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/NameIdentifierType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlValue;
 
 
 /**
- * <p>Java class for NameIdentifierType complex type.
+ * <p>Java-Klasse für NameIdentifierType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="NameIdentifierType">
@@ -42,7 +42,7 @@ public class NameIdentifierType {
     protected String format;
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class NameIdentifierType {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -66,7 +66,7 @@ public class NameIdentifierType {
     }
 
     /**
-     * Gets the value of the nameQualifier property.
+     * Ruft den Wert der nameQualifier-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -78,7 +78,7 @@ public class NameIdentifierType {
     }
 
     /**
-     * Sets the value of the nameQualifier property.
+     * Legt den Wert der nameQualifier-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -90,7 +90,7 @@ public class NameIdentifierType {
     }
 
     /**
-     * Gets the value of the format property.
+     * Ruft den Wert der format-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -102,7 +102,7 @@ public class NameIdentifierType {
     }
 
     /**
-     * Sets the value of the format property.
+     * Legt den Wert der format-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/StatementAbstractType.java b/src/main/java/at/gv/util/xsd/saml/assertion/StatementAbstractType.java
index b9dfff5..62c3bab 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/StatementAbstractType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/StatementAbstractType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for StatementAbstractType complex type.
+ * <p>Java-Klasse für StatementAbstractType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="StatementAbstractType">
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/SubjectConfirmationType.java b/src/main/java/at/gv/util/xsd/saml/assertion/SubjectConfirmationType.java
index 76e8a9b..de11a65 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/SubjectConfirmationType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/SubjectConfirmationType.java
@@ -12,9 +12,9 @@ import at.gv.util.xsd.xmldsig.KeyInfoType;
 
 
 /**
- * <p>Java class for SubjectConfirmationType complex type.
+ * <p>Java-Klasse für SubjectConfirmationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SubjectConfirmationType">
@@ -78,7 +78,7 @@ public class SubjectConfirmationType {
     }
 
     /**
-     * Gets the value of the subjectConfirmationData property.
+     * Ruft den Wert der subjectConfirmationData-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -90,7 +90,7 @@ public class SubjectConfirmationType {
     }
 
     /**
-     * Sets the value of the subjectConfirmationData property.
+     * Legt den Wert der subjectConfirmationData-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -102,7 +102,7 @@ public class SubjectConfirmationType {
     }
 
     /**
-     * Gets the value of the keyInfo property.
+     * Ruft den Wert der keyInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -114,7 +114,7 @@ public class SubjectConfirmationType {
     }
 
     /**
-     * Sets the value of the keyInfo property.
+     * Legt den Wert der keyInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/SubjectLocalityType.java b/src/main/java/at/gv/util/xsd/saml/assertion/SubjectLocalityType.java
index 1bd0eb7..1d5e6df 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/SubjectLocalityType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/SubjectLocalityType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SubjectLocalityType complex type.
+ * <p>Java-Klasse für SubjectLocalityType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SubjectLocalityType">
@@ -35,7 +35,7 @@ public class SubjectLocalityType {
     protected String dnsAddress;
 
     /**
-     * Gets the value of the ipAddress property.
+     * Ruft den Wert der ipAddress-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -47,7 +47,7 @@ public class SubjectLocalityType {
     }
 
     /**
-     * Sets the value of the ipAddress property.
+     * Legt den Wert der ipAddress-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -59,7 +59,7 @@ public class SubjectLocalityType {
     }
 
     /**
-     * Gets the value of the dnsAddress property.
+     * Ruft den Wert der dnsAddress-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -71,7 +71,7 @@ public class SubjectLocalityType {
     }
 
     /**
-     * Sets the value of the dnsAddress property.
+     * Legt den Wert der dnsAddress-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/assertion/SubjectStatementAbstractType.java b/src/main/java/at/gv/util/xsd/saml/assertion/SubjectStatementAbstractType.java
index 601815a..a92aeb6 100644
--- a/src/main/java/at/gv/util/xsd/saml/assertion/SubjectStatementAbstractType.java
+++ b/src/main/java/at/gv/util/xsd/saml/assertion/SubjectStatementAbstractType.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SubjectStatementAbstractType complex type.
+ * <p>Java-Klasse für SubjectStatementAbstractType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SubjectStatementAbstractType">
@@ -44,7 +44,7 @@ public abstract class SubjectStatementAbstractType
     protected SubjectType subject;
 
     /**
-     * Gets the value of the subject property.
+     * Ruft den Wert der subject-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -56,7 +56,7 @@ public abstract class SubjectStatementAbstractType
     }
 
     /**
-     * Sets the value of the subject property.
+     * Legt den Wert der subject-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 9f47967..1af4b9f 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
@@ -12,9 +12,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SubjectType complex type.
+ * <p>Java-Klasse für SubjectType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SubjectType">
@@ -41,22 +41,22 @@ import javax.xml.bind.annotation.XmlType;
 public class SubjectType {
 
     @XmlElementRefs({
-        @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)
+        @XmlElementRef(name = "NameIdentifier", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "SubjectConfirmation", namespace = "urn:oasis:names:tc:SAML:1.0:assertion", type = JAXBElement.class, required = false)
     })
     protected List<JAXBElement<?>> content;
 
     /**
-     * Gets the rest of the content model. 
+     * Ruft das restliche Contentmodell ab. 
      * 
      * <p>
-     * You are getting this "catch-all" property because of the following reason: 
-     * The field name "SubjectConfirmation" is used by two different parts of a schema. See: 
-     * line 94 of file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/cs-sstc-schema-assertion-01.xsd
-     * line 92 of file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/cs-sstc-schema-assertion-01.xsd
+     * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: 
+     * Der Feldname "SubjectConfirmation" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: 
+     * Zeile 94 von file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/cs-sstc-schema-assertion-01.xsd
+     * Zeile 92 von file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/cs-sstc-schema-assertion-01.xsd
      * <p>
-     * To get rid of this property, apply a property customization to one 
-     * of both of the following declarations to change their names: 
+     * Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine
+     * der beiden folgenden Deklarationen an, um deren Namen zu ändern: 
      * Gets the value of the content property.
      * 
      * <p>
@@ -74,8 +74,8 @@ public class SubjectType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link NameIdentifierType }{@code >}
      * {@link JAXBElement }{@code <}{@link SubjectConfirmationType }{@code >}
+     * {@link JAXBElement }{@code <}{@link NameIdentifierType }{@code >}
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/AttributeQueryType.java b/src/main/java/at/gv/util/xsd/saml/protocol/AttributeQueryType.java
index e1beeb4..23b7923 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/AttributeQueryType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/AttributeQueryType.java
@@ -9,14 +9,13 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
-
 import at.gv.util.xsd.saml.assertion.AttributeDesignatorType;
 
 
 /**
- * <p>Java class for AttributeQueryType complex type.
+ * <p>Java-Klasse für AttributeQueryType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AttributeQueryType">
@@ -77,7 +76,7 @@ public class AttributeQueryType
     }
 
     /**
-     * Gets the value of the resource property.
+     * Ruft den Wert der resource-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -89,7 +88,7 @@ public class AttributeQueryType
     }
 
     /**
-     * Sets the value of the resource property.
+     * Legt den Wert der resource-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/AuthenticationQueryType.java b/src/main/java/at/gv/util/xsd/saml/protocol/AuthenticationQueryType.java
index d5e0be0..1ea23e6 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/AuthenticationQueryType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/AuthenticationQueryType.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AuthenticationQueryType complex type.
+ * <p>Java-Klasse für AuthenticationQueryType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AuthenticationQueryType">
@@ -36,7 +36,7 @@ public class AuthenticationQueryType
     protected String authenticationMethod;
 
     /**
-     * Gets the value of the authenticationMethod property.
+     * Ruft den Wert der authenticationMethod-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -48,7 +48,7 @@ public class AuthenticationQueryType
     }
 
     /**
-     * Sets the value of the authenticationMethod property.
+     * Legt den Wert der authenticationMethod-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/AuthorizationDecisionQueryType.java b/src/main/java/at/gv/util/xsd/saml/protocol/AuthorizationDecisionQueryType.java
index 78b7c31..57dd27f 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/AuthorizationDecisionQueryType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/AuthorizationDecisionQueryType.java
@@ -9,15 +9,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
-
 import at.gv.util.xsd.saml.assertion.ActionType;
 import at.gv.util.xsd.saml.assertion.EvidenceType;
 
 
 /**
- * <p>Java class for AuthorizationDecisionQueryType complex type.
+ * <p>Java-Klasse für AuthorizationDecisionQueryType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AuthorizationDecisionQueryType">
@@ -82,7 +81,7 @@ public class AuthorizationDecisionQueryType
     }
 
     /**
-     * Gets the value of the evidence property.
+     * Ruft den Wert der evidence-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -94,7 +93,7 @@ public class AuthorizationDecisionQueryType
     }
 
     /**
-     * Sets the value of the evidence property.
+     * Legt den Wert der evidence-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -106,7 +105,7 @@ public class AuthorizationDecisionQueryType
     }
 
     /**
-     * Gets the value of the resource property.
+     * Ruft den Wert der resource-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -118,7 +117,7 @@ public class AuthorizationDecisionQueryType
     }
 
     /**
-     * Sets the value of the resource property.
+     * Legt den Wert der resource-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/ObjectFactory.java b/src/main/java/at/gv/util/xsd/saml/protocol/ObjectFactory.java
index fc3010d..772546b 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/ObjectFactory.java
@@ -10,7 +10,7 @@ import javax.xml.namespace.QName;
 /**
  * This object contains factory methods for each 
  * Java content interface and Java element interface 
- * generated in the at.gv.zustellung.util.xsd.saml.protocol package. 
+ * generated in the at.gv.util.xsd.saml.protocol package. 
  * <p>An ObjectFactory allows you to programatically 
  * construct new instances of the Java representation 
  * for XML content. The Java representation of XML 
@@ -24,22 +24,22 @@ import javax.xml.namespace.QName;
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _Query_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "Query");
     private final static QName _Request_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "Request");
-    private final static QName _Status_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "Status");
     private final static QName _SubjectQuery_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "SubjectQuery");
     private final static QName _AttributeQuery_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "AttributeQuery");
-    private final static QName _AuthorizationDecisionQuery_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "AuthorizationDecisionQuery");
     private final static QName _Response_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "Response");
-    private final static QName _AuthenticationQuery_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "AuthenticationQuery");
     private final static QName _AssertionArtifact_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "AssertionArtifact");
-    private final static QName _StatusCode_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "StatusCode");
     private final static QName _RespondWith_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "RespondWith");
     private final static QName _StatusMessage_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "StatusMessage");
     private final static QName _StatusDetail_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "StatusDetail");
+    private final static QName _Query_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "Query");
+    private final static QName _Status_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "Status");
+    private final static QName _AuthorizationDecisionQuery_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "AuthorizationDecisionQuery");
+    private final static QName _AuthenticationQuery_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "AuthenticationQuery");
+    private final static QName _StatusCode_QNAME = new QName("urn:oasis:names:tc:SAML:1.0:protocol", "StatusCode");
 
     /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.zustellung.util.xsd.saml.protocol
+     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.saml.protocol
      * 
      */
     public ObjectFactory() {
@@ -54,19 +54,19 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link RequestType }
+     * Create an instance of {@link AuthorizationDecisionQueryType }
      * 
      */
-    public RequestType createRequestType() {
-        return new RequestType();
+    public AuthorizationDecisionQueryType createAuthorizationDecisionQueryType() {
+        return new AuthorizationDecisionQueryType();
     }
 
     /**
-     * Create an instance of {@link AuthenticationQueryType }
+     * Create an instance of {@link StatusType }
      * 
      */
-    public AuthenticationQueryType createAuthenticationQueryType() {
-        return new AuthenticationQueryType();
+    public StatusType createStatusType() {
+        return new StatusType();
     }
 
     /**
@@ -78,44 +78,35 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link AttributeQueryType }
-     * 
-     */
-    public AttributeQueryType createAttributeQueryType() {
-        return new AttributeQueryType();
-    }
-
-    /**
-     * Create an instance of {@link StatusType }
+     * Create an instance of {@link RequestType }
      * 
      */
-    public StatusType createStatusType() {
-        return new StatusType();
+    public RequestType createRequestType() {
+        return new RequestType();
     }
 
     /**
-     * Create an instance of {@link AuthorizationDecisionQueryType }
+     * Create an instance of {@link StatusDetailType }
      * 
      */
-    public AuthorizationDecisionQueryType createAuthorizationDecisionQueryType() {
-        return new AuthorizationDecisionQueryType();
+    public StatusDetailType createStatusDetailType() {
+        return new StatusDetailType();
     }
 
     /**
-     * Create an instance of {@link StatusDetailType }
+     * Create an instance of {@link AttributeQueryType }
      * 
      */
-    public StatusDetailType createStatusDetailType() {
-        return new StatusDetailType();
+    public AttributeQueryType createAttributeQueryType() {
+        return new AttributeQueryType();
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link QueryAbstractType }{@code >}}
+     * Create an instance of {@link AuthenticationQueryType }
      * 
      */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:1.0:protocol", name = "Query")
-    public JAXBElement<QueryAbstractType> createQuery(QueryAbstractType value) {
-        return new JAXBElement<QueryAbstractType>(_Query_QNAME, QueryAbstractType.class, null, value);
+    public AuthenticationQueryType createAuthenticationQueryType() {
+        return new AuthenticationQueryType();
     }
 
     /**
@@ -128,15 +119,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link StatusType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:1.0:protocol", name = "Status")
-    public JAXBElement<StatusType> createStatus(StatusType value) {
-        return new JAXBElement<StatusType>(_Status_QNAME, StatusType.class, null, value);
-    }
-
-    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link SubjectQueryAbstractType }{@code >}}
      * 
      */
@@ -155,15 +137,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AuthorizationDecisionQueryType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:1.0:protocol", name = "AuthorizationDecisionQuery")
-    public JAXBElement<AuthorizationDecisionQueryType> createAuthorizationDecisionQuery(AuthorizationDecisionQueryType value) {
-        return new JAXBElement<AuthorizationDecisionQueryType>(_AuthorizationDecisionQuery_QNAME, AuthorizationDecisionQueryType.class, null, value);
-    }
-
-    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link ResponseType }{@code >}}
      * 
      */
@@ -173,15 +146,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AuthenticationQueryType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:1.0:protocol", name = "AuthenticationQuery")
-    public JAXBElement<AuthenticationQueryType> createAuthenticationQuery(AuthenticationQueryType value) {
-        return new JAXBElement<AuthenticationQueryType>(_AuthenticationQuery_QNAME, AuthenticationQueryType.class, null, value);
-    }
-
-    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
@@ -191,15 +155,6 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link StatusCodeType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:1.0:protocol", name = "StatusCode")
-    public JAXBElement<StatusCodeType> createStatusCode(StatusCodeType value) {
-        return new JAXBElement<StatusCodeType>(_StatusCode_QNAME, StatusCodeType.class, null, value);
-    }
-
-    /**
      * Create an instance of {@link JAXBElement }{@code <}{@link QName }{@code >}}
      * 
      */
@@ -226,4 +181,49 @@ public class ObjectFactory {
         return new JAXBElement<StatusDetailType>(_StatusDetail_QNAME, StatusDetailType.class, null, value);
     }
 
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link QueryAbstractType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:1.0:protocol", name = "Query")
+    public JAXBElement<QueryAbstractType> createQuery(QueryAbstractType value) {
+        return new JAXBElement<QueryAbstractType>(_Query_QNAME, QueryAbstractType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link StatusType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:1.0:protocol", name = "Status")
+    public JAXBElement<StatusType> createStatus(StatusType value) {
+        return new JAXBElement<StatusType>(_Status_QNAME, StatusType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AuthorizationDecisionQueryType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:1.0:protocol", name = "AuthorizationDecisionQuery")
+    public JAXBElement<AuthorizationDecisionQueryType> createAuthorizationDecisionQuery(AuthorizationDecisionQueryType value) {
+        return new JAXBElement<AuthorizationDecisionQueryType>(_AuthorizationDecisionQuery_QNAME, AuthorizationDecisionQueryType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link AuthenticationQueryType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:1.0:protocol", name = "AuthenticationQuery")
+    public JAXBElement<AuthenticationQueryType> createAuthenticationQuery(AuthenticationQueryType value) {
+        return new JAXBElement<AuthenticationQueryType>(_AuthenticationQuery_QNAME, AuthenticationQueryType.class, null, value);
+    }
+
+    /**
+     * Create an instance of {@link JAXBElement }{@code <}{@link StatusCodeType }{@code >}}
+     * 
+     */
+    @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:1.0:protocol", name = "StatusCode")
+    public JAXBElement<StatusCodeType> createStatusCode(StatusCodeType value) {
+        return new JAXBElement<StatusCodeType>(_StatusCode_QNAME, StatusCodeType.class, null, value);
+    }
+
 }
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/QueryAbstractType.java b/src/main/java/at/gv/util/xsd/saml/protocol/QueryAbstractType.java
index a6b82ae..788c2be 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/QueryAbstractType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/QueryAbstractType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for QueryAbstractType complex type.
+ * <p>Java-Klasse für QueryAbstractType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="QueryAbstractType">
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/RequestAbstractType.java b/src/main/java/at/gv/util/xsd/saml/protocol/RequestAbstractType.java
index 337ebd5..3384b40 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/RequestAbstractType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/RequestAbstractType.java
@@ -13,14 +13,13 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 import javax.xml.namespace.QName;
-
 import at.gv.util.xsd.xmldsig.SignatureType;
 
 
 /**
- * <p>Java class for RequestAbstractType complex type.
+ * <p>Java-Klasse für RequestAbstractType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="RequestAbstractType">
@@ -95,7 +94,7 @@ public abstract class RequestAbstractType {
     }
 
     /**
-     * Gets the value of the signature property.
+     * Ruft den Wert der signature-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -107,7 +106,7 @@ public abstract class RequestAbstractType {
     }
 
     /**
-     * Sets the value of the signature property.
+     * Legt den Wert der signature-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -119,7 +118,7 @@ public abstract class RequestAbstractType {
     }
 
     /**
-     * Gets the value of the requestID property.
+     * Ruft den Wert der requestID-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -131,7 +130,7 @@ public abstract class RequestAbstractType {
     }
 
     /**
-     * Sets the value of the requestID property.
+     * Legt den Wert der requestID-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -143,7 +142,7 @@ public abstract class RequestAbstractType {
     }
 
     /**
-     * Gets the value of the majorVersion property.
+     * Ruft den Wert der majorVersion-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -155,7 +154,7 @@ public abstract class RequestAbstractType {
     }
 
     /**
-     * Sets the value of the majorVersion property.
+     * Legt den Wert der majorVersion-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -167,7 +166,7 @@ public abstract class RequestAbstractType {
     }
 
     /**
-     * Gets the value of the minorVersion property.
+     * Ruft den Wert der minorVersion-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -179,7 +178,7 @@ public abstract class RequestAbstractType {
     }
 
     /**
-     * Sets the value of the minorVersion property.
+     * Legt den Wert der minorVersion-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -191,7 +190,7 @@ public abstract class RequestAbstractType {
     }
 
     /**
-     * Gets the value of the issueInstant property.
+     * Ruft den Wert der issueInstant-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -203,7 +202,7 @@ public abstract class RequestAbstractType {
     }
 
     /**
-     * Sets the value of the issueInstant property.
+     * Legt den Wert der issueInstant-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/RequestType.java b/src/main/java/at/gv/util/xsd/saml/protocol/RequestType.java
index 1d08847..35f8b5e 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/RequestType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/RequestType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for RequestType complex type.
+ * <p>Java-Klasse für RequestType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="RequestType">
@@ -64,7 +64,7 @@ public class RequestType
     protected List<String> assertionArtifact;
 
     /**
-     * Gets the value of the query property.
+     * Ruft den Wert der query-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class RequestType
     }
 
     /**
-     * Sets the value of the query property.
+     * Legt den Wert der query-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -88,7 +88,7 @@ public class RequestType
     }
 
     /**
-     * Gets the value of the subjectQuery property.
+     * Ruft den Wert der subjectQuery-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -100,7 +100,7 @@ public class RequestType
     }
 
     /**
-     * Sets the value of the subjectQuery property.
+     * Legt den Wert der subjectQuery-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -112,7 +112,7 @@ public class RequestType
     }
 
     /**
-     * Gets the value of the authenticationQuery property.
+     * Ruft den Wert der authenticationQuery-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -124,7 +124,7 @@ public class RequestType
     }
 
     /**
-     * Sets the value of the authenticationQuery property.
+     * Legt den Wert der authenticationQuery-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -136,7 +136,7 @@ public class RequestType
     }
 
     /**
-     * Gets the value of the attributeQuery property.
+     * Ruft den Wert der attributeQuery-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -148,7 +148,7 @@ public class RequestType
     }
 
     /**
-     * Sets the value of the attributeQuery property.
+     * Legt den Wert der attributeQuery-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -160,7 +160,7 @@ public class RequestType
     }
 
     /**
-     * Gets the value of the authorizationDecisionQuery property.
+     * Ruft den Wert der authorizationDecisionQuery-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -172,7 +172,7 @@ public class RequestType
     }
 
     /**
-     * Sets the value of the authorizationDecisionQuery property.
+     * Legt den Wert der authorizationDecisionQuery-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/ResponseAbstractType.java b/src/main/java/at/gv/util/xsd/saml/protocol/ResponseAbstractType.java
index 6e35e87..c446452 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/ResponseAbstractType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/ResponseAbstractType.java
@@ -10,14 +10,13 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
-
 import at.gv.util.xsd.xmldsig.SignatureType;
 
 
 /**
- * <p>Java class for ResponseAbstractType complex type.
+ * <p>Java-Klasse für ResponseAbstractType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ResponseAbstractType">
@@ -66,7 +65,7 @@ public abstract class ResponseAbstractType {
     protected String recipient;
 
     /**
-     * Gets the value of the signature property.
+     * Ruft den Wert der signature-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -78,7 +77,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Sets the value of the signature property.
+     * Legt den Wert der signature-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -90,7 +89,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Gets the value of the responseID property.
+     * Ruft den Wert der responseID-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -102,7 +101,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Sets the value of the responseID property.
+     * Legt den Wert der responseID-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -114,7 +113,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Gets the value of the inResponseTo property.
+     * Ruft den Wert der inResponseTo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -126,7 +125,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Sets the value of the inResponseTo property.
+     * Legt den Wert der inResponseTo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -138,7 +137,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Gets the value of the majorVersion property.
+     * Ruft den Wert der majorVersion-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -150,7 +149,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Sets the value of the majorVersion property.
+     * Legt den Wert der majorVersion-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -162,7 +161,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Gets the value of the minorVersion property.
+     * Ruft den Wert der minorVersion-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -174,7 +173,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Sets the value of the minorVersion property.
+     * Legt den Wert der minorVersion-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -186,7 +185,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Gets the value of the issueInstant property.
+     * Ruft den Wert der issueInstant-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -198,7 +197,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Sets the value of the issueInstant property.
+     * Legt den Wert der issueInstant-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -210,7 +209,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Gets the value of the recipient property.
+     * Ruft den Wert der recipient-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -222,7 +221,7 @@ public abstract class ResponseAbstractType {
     }
 
     /**
-     * Sets the value of the recipient property.
+     * Legt den Wert der recipient-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/ResponseType.java b/src/main/java/at/gv/util/xsd/saml/protocol/ResponseType.java
index f69b0d5..0d92209 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/ResponseType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/ResponseType.java
@@ -7,14 +7,13 @@ import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
-
 import at.gv.util.xsd.saml.assertion.AssertionType;
 
 
 /**
- * <p>Java class for ResponseType complex type.
+ * <p>Java-Klasse für ResponseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ResponseType">
@@ -46,7 +45,7 @@ public class ResponseType
     protected List<AssertionType> assertion;
 
     /**
-     * Gets the value of the status property.
+     * Ruft den Wert der status-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -58,7 +57,7 @@ public class ResponseType
     }
 
     /**
-     * Sets the value of the status property.
+     * Legt den Wert der status-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/StatusCodeType.java b/src/main/java/at/gv/util/xsd/saml/protocol/StatusCodeType.java
index 7ec76d6..c0273cf 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/StatusCodeType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/StatusCodeType.java
@@ -10,9 +10,9 @@ import javax.xml.namespace.QName;
 
 
 /**
- * <p>Java class for StatusCodeType complex type.
+ * <p>Java-Klasse für StatusCodeType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="StatusCodeType">
@@ -41,7 +41,7 @@ public class StatusCodeType {
     protected QName value;
 
     /**
-     * Gets the value of the statusCode property.
+     * Ruft den Wert der statusCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -53,7 +53,7 @@ public class StatusCodeType {
     }
 
     /**
-     * Sets the value of the statusCode property.
+     * Legt den Wert der statusCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -65,7 +65,7 @@ public class StatusCodeType {
     }
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -77,7 +77,7 @@ public class StatusCodeType {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/StatusDetailType.java b/src/main/java/at/gv/util/xsd/saml/protocol/StatusDetailType.java
index 635afd8..878d556 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/StatusDetailType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/StatusDetailType.java
@@ -11,9 +11,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for StatusDetailType complex type.
+ * <p>Java-Klasse für StatusDetailType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="StatusDetailType">
@@ -56,8 +56,8 @@ public class StatusDetailType {
      * 
      * <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/protocol/StatusType.java b/src/main/java/at/gv/util/xsd/saml/protocol/StatusType.java
index efad7bb..f5caceb 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/StatusType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/StatusType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for StatusType complex type.
+ * <p>Java-Klasse für StatusType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="StatusType">
@@ -44,7 +44,7 @@ public class StatusType {
     protected StatusDetailType statusDetail;
 
     /**
-     * Gets the value of the statusCode property.
+     * Ruft den Wert der statusCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -56,7 +56,7 @@ public class StatusType {
     }
 
     /**
-     * Sets the value of the statusCode property.
+     * Legt den Wert der statusCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -68,7 +68,7 @@ public class StatusType {
     }
 
     /**
-     * Gets the value of the statusMessage property.
+     * Ruft den Wert der statusMessage-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -80,7 +80,7 @@ public class StatusType {
     }
 
     /**
-     * Sets the value of the statusMessage property.
+     * Legt den Wert der statusMessage-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -92,7 +92,7 @@ public class StatusType {
     }
 
     /**
-     * Gets the value of the statusDetail property.
+     * Ruft den Wert der statusDetail-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -104,7 +104,7 @@ public class StatusType {
     }
 
     /**
-     * Sets the value of the statusDetail property.
+     * Legt den Wert der statusDetail-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/saml/protocol/SubjectQueryAbstractType.java b/src/main/java/at/gv/util/xsd/saml/protocol/SubjectQueryAbstractType.java
index 9cb28cb..5568bf5 100644
--- a/src/main/java/at/gv/util/xsd/saml/protocol/SubjectQueryAbstractType.java
+++ b/src/main/java/at/gv/util/xsd/saml/protocol/SubjectQueryAbstractType.java
@@ -6,14 +6,13 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
-
 import at.gv.util.xsd.saml.assertion.SubjectType;
 
 
 /**
- * <p>Java class for SubjectQueryAbstractType complex type.
+ * <p>Java-Klasse für SubjectQueryAbstractType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SubjectQueryAbstractType">
@@ -35,8 +34,8 @@ import at.gv.util.xsd.saml.assertion.SubjectType;
 })
 @XmlSeeAlso({
     AuthorizationDecisionQueryType.class,
-    AuthenticationQueryType.class,
-    AttributeQueryType.class
+    AttributeQueryType.class,
+    AuthenticationQueryType.class
 })
 public abstract class SubjectQueryAbstractType
     extends QueryAbstractType
@@ -46,7 +45,7 @@ public abstract class SubjectQueryAbstractType
     protected SubjectType subject;
 
     /**
-     * Gets the value of the subject property.
+     * Ruft den Wert der subject-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -58,7 +57,7 @@ public abstract class SubjectQueryAbstractType
     }
 
     /**
-     * Sets the value of the subject property.
+     * Legt den Wert der subject-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 fccf7b3..a14bac7 100644
--- a/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
+++ b/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkRequest.java
@@ -6,13 +6,14 @@ 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.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -70,7 +71,7 @@ public class CreateIdentityLinkRequest {
     protected String reqID;
 
     /**
-     * Gets the value of the pepsData property.
+     * Ruft den Wert der pepsData-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -82,7 +83,7 @@ public class CreateIdentityLinkRequest {
     }
 
     /**
-     * Sets the value of the pepsData property.
+     * Legt den Wert der pepsData-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -94,7 +95,7 @@ public class CreateIdentityLinkRequest {
     }
 
     /**
-     * Gets the value of the signature property.
+     * Ruft den Wert der signature-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -105,7 +106,7 @@ public class CreateIdentityLinkRequest {
     }
 
     /**
-     * Sets the value of the signature property.
+     * Legt den Wert der signature-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -116,7 +117,7 @@ public class CreateIdentityLinkRequest {
     }
 
     /**
-     * Gets the value of the mis property.
+     * Ruft den Wert der mis-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -128,7 +129,7 @@ public class CreateIdentityLinkRequest {
     }
 
     /**
-     * Sets the value of the mis property.
+     * Legt den Wert der mis-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -140,7 +141,7 @@ public class CreateIdentityLinkRequest {
     }
 
     /**
-     * Gets the value of the reqID property.
+     * Ruft den Wert der reqID-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -152,7 +153,7 @@ public class CreateIdentityLinkRequest {
     }
 
     /**
-     * Sets the value of the reqID property.
+     * Legt den Wert der reqID-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -165,9 +166,9 @@ public class CreateIdentityLinkRequest {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -216,6 +217,7 @@ public class CreateIdentityLinkRequest {
         @XmlElement(name = "Familyname")
         protected String familyname;
         @XmlElement(name = "DateOfBirth")
+        @XmlSchemaType(name = "anySimpleType")
         protected String dateOfBirth;
         @XmlElement(name = "Gender")
         protected String gender;
@@ -233,7 +235,7 @@ public class CreateIdentityLinkRequest {
         protected String mandateContent;
 
         /**
-         * Gets the value of the identifier property.
+         * Ruft den Wert der identifier-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -245,7 +247,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the identifier property.
+         * Legt den Wert der identifier-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -257,7 +259,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Gets the value of the firstname property.
+         * Ruft den Wert der firstname-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -269,7 +271,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the firstname property.
+         * Legt den Wert der firstname-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -281,7 +283,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Gets the value of the familyname property.
+         * Ruft den Wert der familyname-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -293,7 +295,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the familyname property.
+         * Legt den Wert der familyname-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -305,7 +307,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Gets the value of the dateOfBirth property.
+         * Ruft den Wert der dateOfBirth-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -317,7 +319,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the dateOfBirth property.
+         * Legt den Wert der dateOfBirth-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -329,7 +331,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Gets the value of the gender property.
+         * Ruft den Wert der gender-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -341,7 +343,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the gender property.
+         * Legt den Wert der gender-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -353,7 +355,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Gets the value of the fiscalNumber property.
+         * Ruft den Wert der fiscalNumber-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -365,7 +367,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the fiscalNumber property.
+         * Legt den Wert der fiscalNumber-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -377,7 +379,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Gets the value of the legalPersonTranslatableType property.
+         * Ruft den Wert der legalPersonTranslatableType-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -389,7 +391,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the legalPersonTranslatableType property.
+         * Legt den Wert der legalPersonTranslatableType-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -401,7 +403,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Gets the value of the legalPersonCanonicalRegisteredAddress property.
+         * Ruft den Wert der legalPersonCanonicalRegisteredAddress-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -413,7 +415,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the legalPersonCanonicalRegisteredAddress property.
+         * Legt den Wert der legalPersonCanonicalRegisteredAddress-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -425,7 +427,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Gets the value of the representative property.
+         * Ruft den Wert der representative-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -437,7 +439,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the representative property.
+         * Legt den Wert der representative-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -449,7 +451,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Gets the value of the represented property.
+         * Ruft den Wert der represented-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -461,7 +463,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the represented property.
+         * Legt den Wert der represented-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -473,7 +475,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Gets the value of the mandateContent property.
+         * Ruft den Wert der mandateContent-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -485,7 +487,7 @@ public class CreateIdentityLinkRequest {
         }
 
         /**
-         * Sets the value of the mandateContent property.
+         * Legt den Wert der mandateContent-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkResponse.java b/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkResponse.java
index 255bd84..d9c9d65 100644
--- a/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkResponse.java
+++ b/src/main/java/at/gv/util/xsd/srzgw/CreateIdentityLinkResponse.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -52,7 +52,7 @@ public class CreateIdentityLinkResponse {
     protected ErrorResponseType errorResponse;
 
     /**
-     * Gets the value of the identityLink property.
+     * Ruft den Wert der identityLink-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -63,7 +63,7 @@ public class CreateIdentityLinkResponse {
     }
 
     /**
-     * Sets the value of the identityLink property.
+     * Legt den Wert der identityLink-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -102,7 +102,7 @@ public class CreateIdentityLinkResponse {
     }
 
     /**
-     * Gets the value of the errorResponse property.
+     * Ruft den Wert der errorResponse-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -114,7 +114,7 @@ public class CreateIdentityLinkResponse {
     }
 
     /**
-     * Sets the value of the errorResponse property.
+     * Legt den Wert der errorResponse-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/srzgw/ErrorResponseType.java b/src/main/java/at/gv/util/xsd/srzgw/ErrorResponseType.java
index 294e59b..93c59e7 100644
--- a/src/main/java/at/gv/util/xsd/srzgw/ErrorResponseType.java
+++ b/src/main/java/at/gv/util/xsd/srzgw/ErrorResponseType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 /**
  * Allgemeiner Typ fuer ErrorResponse
  * 
- * <p>Java class for ErrorResponseType complex type.
+ * <p>Java-Klasse für ErrorResponseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ErrorResponseType">
@@ -42,7 +42,7 @@ public class ErrorResponseType {
     protected Object info;
 
     /**
-     * Gets the value of the errorCode property.
+     * Ruft den Wert der errorCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class ErrorResponseType {
     }
 
     /**
-     * Sets the value of the errorCode property.
+     * Legt den Wert der errorCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -66,7 +66,7 @@ public class ErrorResponseType {
     }
 
     /**
-     * Gets the value of the info property.
+     * Ruft den Wert der info-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -78,7 +78,7 @@ public class ErrorResponseType {
     }
 
     /**
-     * Sets the value of the info property.
+     * Legt den Wert der info-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/srzgw/MISType.java b/src/main/java/at/gv/util/xsd/srzgw/MISType.java
index 7b626ce..42473ca 100644
--- a/src/main/java/at/gv/util/xsd/srzgw/MISType.java
+++ b/src/main/java/at/gv/util/xsd/srzgw/MISType.java
@@ -10,9 +10,9 @@ import at.gv.util.xsd.mis.Target;
 
 
 /**
- * <p>Java class for MISType complex type.
+ * <p>Java-Klasse für MISType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="MISType">
@@ -56,7 +56,7 @@ public class MISType {
     protected String oaFriendlyName;
 
     /**
-     * Gets the value of the filters property.
+     * Ruft den Wert der filters-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -68,7 +68,7 @@ public class MISType {
     }
 
     /**
-     * Sets the value of the filters property.
+     * Legt den Wert der filters-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -80,7 +80,7 @@ public class MISType {
     }
 
     /**
-     * Gets the value of the target property.
+     * Ruft den Wert der target-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -92,7 +92,7 @@ public class MISType {
     }
 
     /**
-     * Sets the value of the target property.
+     * Legt den Wert der target-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -104,7 +104,7 @@ public class MISType {
     }
 
     /**
-     * Gets the value of the oaFriendlyName property.
+     * Ruft den Wert der oaFriendlyName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -116,7 +116,7 @@ public class MISType {
     }
 
     /**
-     * Sets the value of the oaFriendlyName property.
+     * Legt den Wert der oaFriendlyName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -129,9 +129,9 @@ public class MISType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -157,7 +157,7 @@ public class MISType {
         protected MandateIdentifiers mandateIdentifiers;
 
         /**
-         * Gets the value of the mandateIdentifiers property.
+         * Ruft den Wert der mandateIdentifiers-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -169,7 +169,7 @@ public class MISType {
         }
 
         /**
-         * Sets the value of the mandateIdentifiers property.
+         * Legt den Wert der mandateIdentifiers-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/AddressCodesType.java b/src/main/java/at/gv/util/xsd/szr/AddressCodesType.java
index a748c71..74f67fe 100644
--- a/src/main/java/at/gv/util/xsd/szr/AddressCodesType.java
+++ b/src/main/java/at/gv/util/xsd/szr/AddressCodesType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AddressCodesType complex type.
+ * <p>Java-Klasse für AddressCodesType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AddressCodesType">
@@ -60,7 +60,7 @@ public class AddressCodesType {
     protected String ntzlnr;
 
     /**
-     * Gets the value of the gkz property.
+     * Ruft den Wert der gkz-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -72,7 +72,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Sets the value of the gkz property.
+     * Legt den Wert der gkz-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -84,7 +84,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Gets the value of the okz property.
+     * Ruft den Wert der okz-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -96,7 +96,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Sets the value of the okz property.
+     * Legt den Wert der okz-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -108,7 +108,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Gets the value of the skz property.
+     * Ruft den Wert der skz-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -120,7 +120,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Sets the value of the skz property.
+     * Legt den Wert der skz-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -132,7 +132,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Gets the value of the adrcd property.
+     * Ruft den Wert der adrcd-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -144,7 +144,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Sets the value of the adrcd property.
+     * Legt den Wert der adrcd-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -156,7 +156,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Gets the value of the subcd property.
+     * Ruft den Wert der subcd-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -168,7 +168,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Sets the value of the subcd property.
+     * Legt den Wert der subcd-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -180,7 +180,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Gets the value of the objnr property.
+     * Ruft den Wert der objnr-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -192,7 +192,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Sets the value of the objnr property.
+     * Legt den Wert der objnr-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -204,7 +204,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Gets the value of the ntzlnr property.
+     * Ruft den Wert der ntzlnr-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -216,7 +216,7 @@ public class AddressCodesType {
     }
 
     /**
-     * Sets the value of the ntzlnr property.
+     * Legt den Wert der ntzlnr-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/BPKzuBasiszahl.java b/src/main/java/at/gv/util/xsd/szr/BPKzuBasiszahl.java
index c201f68..51e8767 100644
--- a/src/main/java/at/gv/util/xsd/szr/BPKzuBasiszahl.java
+++ b/src/main/java/at/gv/util/xsd/szr/BPKzuBasiszahl.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -48,7 +48,7 @@ public class BPKzuBasiszahl {
     protected List<String> basisZahl;
 
     /**
-     * Gets the value of the bereich property.
+     * Ruft den Wert der bereich-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -60,7 +60,7 @@ public class BPKzuBasiszahl {
     }
 
     /**
-     * Sets the value of the bereich property.
+     * Legt den Wert der bereich-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -72,7 +72,7 @@ public class BPKzuBasiszahl {
     }
 
     /**
-     * Gets the value of the bpk property.
+     * Ruft den Wert der bpk-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -84,7 +84,7 @@ public class BPKzuBasiszahl {
     }
 
     /**
-     * Sets the value of the bpk property.
+     * Legt den Wert der bpk-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/BPKzuBasiszahlResponse.java b/src/main/java/at/gv/util/xsd/szr/BPKzuBasiszahlResponse.java
index dec4714..bad7dfb 100644
--- a/src/main/java/at/gv/util/xsd/szr/BPKzuBasiszahlResponse.java
+++ b/src/main/java/at/gv/util/xsd/szr/BPKzuBasiszahlResponse.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -38,7 +38,7 @@ public class BPKzuBasiszahlResponse {
     protected String bpKzuBasiszahlReturn;
 
     /**
-     * Gets the value of the bpKzuBasiszahlReturn property.
+     * Ruft den Wert der bpKzuBasiszahlReturn-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class BPKzuBasiszahlResponse {
     }
 
     /**
-     * Sets the value of the bpKzuBasiszahlReturn property.
+     * Legt den Wert der bpKzuBasiszahlReturn-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPK.java b/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPK.java
index fb3a1fa..e9795b9 100644
--- a/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPK.java
+++ b/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPK.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -77,7 +77,7 @@ public class BasiszahlZuBPK {
     }
 
     /**
-     * Gets the value of the bereich property.
+     * Ruft den Wert der bereich-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -89,7 +89,7 @@ public class BasiszahlZuBPK {
     }
 
     /**
-     * Sets the value of the bereich property.
+     * Legt den Wert der bereich-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPKResponse.java b/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPKResponse.java
index ed2b23b..de4e5ef 100644
--- a/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPKResponse.java
+++ b/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPKResponse.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
diff --git a/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPKReturnType.java b/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPKReturnType.java
index 2755e56..512ac1c 100644
--- a/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPKReturnType.java
+++ b/src/main/java/at/gv/util/xsd/szr/BasiszahlZuBPKReturnType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for BasiszahlZuBPKReturnType complex type.
+ * <p>Java-Klasse für BasiszahlZuBPKReturnType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="BasiszahlZuBPKReturnType">
@@ -42,7 +42,7 @@ public class BasiszahlZuBPKReturnType {
     protected List<FremdBPKType> fremdBPKs;
 
     /**
-     * Gets the value of the bpk property.
+     * Ruft den Wert der bpk-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class BasiszahlZuBPKReturnType {
     }
 
     /**
-     * Sets the value of the bpk property.
+     * Legt den Wert der bpk-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/FremdBPKRequestType.java b/src/main/java/at/gv/util/xsd/szr/FremdBPKRequestType.java
index 7039b63..7469c3b 100644
--- a/src/main/java/at/gv/util/xsd/szr/FremdBPKRequestType.java
+++ b/src/main/java/at/gv/util/xsd/szr/FremdBPKRequestType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for FremdBPKRequestType complex type.
+ * <p>Java-Klasse für FremdBPKRequestType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="FremdBPKRequestType">
@@ -40,7 +40,7 @@ public class FremdBPKRequestType {
     protected String vkz;
 
     /**
-     * Gets the value of the bereichsKennung property.
+     * Ruft den Wert der bereichsKennung-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class FremdBPKRequestType {
     }
 
     /**
-     * Sets the value of the bereichsKennung property.
+     * Legt den Wert der bereichsKennung-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -64,7 +64,7 @@ public class FremdBPKRequestType {
     }
 
     /**
-     * Gets the value of the vkz property.
+     * Ruft den Wert der vkz-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class FremdBPKRequestType {
     }
 
     /**
-     * Sets the value of the vkz property.
+     * Legt den Wert der vkz-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/FremdBPKType.java b/src/main/java/at/gv/util/xsd/szr/FremdBPKType.java
index ba7c084..d688bb3 100644
--- a/src/main/java/at/gv/util/xsd/szr/FremdBPKType.java
+++ b/src/main/java/at/gv/util/xsd/szr/FremdBPKType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for FremdBPKType complex type.
+ * <p>Java-Klasse für FremdBPKType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="FremdBPKType">
@@ -40,7 +40,7 @@ public class FremdBPKType {
     protected String fremdBPK;
 
     /**
-     * Gets the value of the bereichsKennung property.
+     * Ruft den Wert der bereichsKennung-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class FremdBPKType {
     }
 
     /**
-     * Sets the value of the bereichsKennung property.
+     * Legt den Wert der bereichsKennung-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -64,7 +64,7 @@ public class FremdBPKType {
     }
 
     /**
-     * Gets the value of the fremdBPK property.
+     * Ruft den Wert der fremdBPK-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class FremdBPKType {
     }
 
     /**
-     * Sets the value of the fremdBPK property.
+     * Legt den Wert der fremdBPK-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetBPK.java b/src/main/java/at/gv/util/xsd/szr/GetBPK.java
index 179b007..1c57415 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetBPK.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetBPK.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -56,7 +56,7 @@ public class GetBPK {
     protected Boolean listMultiplePersons;
 
     /**
-     * Gets the value of the personInfo property.
+     * Ruft den Wert der personInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -68,7 +68,7 @@ public class GetBPK {
     }
 
     /**
-     * Sets the value of the personInfo property.
+     * Legt den Wert der personInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -80,7 +80,7 @@ public class GetBPK {
     }
 
     /**
-     * Gets the value of the bereichsKennung property.
+     * Ruft den Wert der bereichsKennung-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -92,7 +92,7 @@ public class GetBPK {
     }
 
     /**
-     * Sets the value of the bereichsKennung property.
+     * Legt den Wert der bereichsKennung-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -104,7 +104,7 @@ public class GetBPK {
     }
 
     /**
-     * Gets the value of the vkz property.
+     * Ruft den Wert der vkz-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -116,7 +116,7 @@ public class GetBPK {
     }
 
     /**
-     * Sets the value of the vkz property.
+     * Legt den Wert der vkz-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -157,7 +157,7 @@ public class GetBPK {
     }
 
     /**
-     * Gets the value of the listMultiplePersons property.
+     * Ruft den Wert der listMultiplePersons-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -169,7 +169,7 @@ public class GetBPK {
     }
 
     /**
-     * Sets the value of the listMultiplePersons property.
+     * Legt den Wert der listMultiplePersons-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetBPKKombi.java b/src/main/java/at/gv/util/xsd/szr/GetBPKKombi.java
index ad486a8..2c1fa8b 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetBPKKombi.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetBPKKombi.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -38,7 +38,7 @@ public class GetBPKKombi {
     protected GetBPKKombiRequestType getBPKKombiRequest;
 
     /**
-     * Gets the value of the getBPKKombiRequest property.
+     * Ruft den Wert der getBPKKombiRequest-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class GetBPKKombi {
     }
 
     /**
-     * Sets the value of the getBPKKombiRequest property.
+     * Legt den Wert der getBPKKombiRequest-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetBPKKombiRequestType.java b/src/main/java/at/gv/util/xsd/szr/GetBPKKombiRequestType.java
index a04262e..b1de561 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetBPKKombiRequestType.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetBPKKombiRequestType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for GetBPKKombiRequestType complex type.
+ * <p>Java-Klasse für GetBPKKombiRequestType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="GetBPKKombiRequestType">
@@ -74,7 +74,7 @@ public class GetBPKKombiRequestType {
     protected String sessionid;
 
     /**
-     * Gets the value of the personInfo property.
+     * Ruft den Wert der personInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -86,7 +86,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Sets the value of the personInfo property.
+     * Legt den Wert der personInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -98,7 +98,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Gets the value of the insertERnP property.
+     * Ruft den Wert der insertERnP-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -110,7 +110,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Sets the value of the insertERnP property.
+     * Legt den Wert der insertERnP-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -122,7 +122,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Gets the value of the suchwizard property.
+     * Ruft den Wert der suchwizard-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -134,7 +134,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Sets the value of the suchwizard property.
+     * Legt den Wert der suchwizard-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -146,7 +146,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Gets the value of the vkz property.
+     * Ruft den Wert der vkz-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -158,7 +158,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Sets the value of the vkz property.
+     * Legt den Wert der vkz-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -170,7 +170,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Gets the value of the behoerdenKennzeichen property.
+     * Ruft den Wert der behoerdenKennzeichen-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -182,7 +182,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Sets the value of the behoerdenKennzeichen property.
+     * Legt den Wert der behoerdenKennzeichen-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -194,7 +194,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Gets the value of the bereichsKennung property.
+     * Ruft den Wert der bereichsKennung-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -206,7 +206,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Sets the value of the bereichsKennung property.
+     * Legt den Wert der bereichsKennung-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -247,7 +247,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Gets the value of the sessionid property.
+     * Ruft den Wert der sessionid-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -259,7 +259,7 @@ public class GetBPKKombiRequestType {
     }
 
     /**
-     * Sets the value of the sessionid property.
+     * Legt den Wert der sessionid-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetBPKKombiResponse.java b/src/main/java/at/gv/util/xsd/szr/GetBPKKombiResponse.java
index 6335cee..a89d19c 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetBPKKombiResponse.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetBPKKombiResponse.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -38,7 +38,7 @@ public class GetBPKKombiResponse {
     protected GetBPKKombiResponseType getBPKKombiResponse;
 
     /**
-     * Gets the value of the getBPKKombiResponse property.
+     * Ruft den Wert der getBPKKombiResponse-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class GetBPKKombiResponse {
     }
 
     /**
-     * Sets the value of the getBPKKombiResponse property.
+     * Legt den Wert der getBPKKombiResponse-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetBPKKombiResponseType.java b/src/main/java/at/gv/util/xsd/szr/GetBPKKombiResponseType.java
index d010526..2d6022e 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetBPKKombiResponseType.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetBPKKombiResponseType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for GetBPKKombiResponseType complex type.
+ * <p>Java-Klasse für GetBPKKombiResponseType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="GetBPKKombiResponseType">
@@ -92,7 +92,7 @@ public class GetBPKKombiResponseType {
     }
 
     /**
-     * Gets the value of the insertERnPResult property.
+     * Ruft den Wert der insertERnPResult-Eigenschaft ab.
      * 
      */
     public boolean isInsertERnPResult() {
@@ -100,7 +100,7 @@ public class GetBPKKombiResponseType {
     }
 
     /**
-     * Sets the value of the insertERnPResult property.
+     * Legt den Wert der insertERnPResult-Eigenschaft fest.
      * 
      */
     public void setInsertERnPResult(boolean value) {
@@ -108,7 +108,7 @@ public class GetBPKKombiResponseType {
     }
 
     /**
-     * Gets the value of the foundWithSuchwizard property.
+     * Ruft den Wert der foundWithSuchwizard-Eigenschaft ab.
      * 
      */
     public boolean isFoundWithSuchwizard() {
@@ -116,7 +116,7 @@ public class GetBPKKombiResponseType {
     }
 
     /**
-     * Sets the value of the foundWithSuchwizard property.
+     * Legt den Wert der foundWithSuchwizard-Eigenschaft fest.
      * 
      */
     public void setFoundWithSuchwizard(boolean value) {
@@ -124,7 +124,7 @@ public class GetBPKKombiResponseType {
     }
 
     /**
-     * Gets the value of the sessionid property.
+     * Ruft den Wert der sessionid-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -136,7 +136,7 @@ public class GetBPKKombiResponseType {
     }
 
     /**
-     * Sets the value of the sessionid property.
+     * Legt den Wert der sessionid-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -149,9 +149,9 @@ public class GetBPKKombiResponseType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -189,7 +189,7 @@ public class GetBPKKombiResponseType {
         protected List<FremdBPKType> fremdBPK;
 
         /**
-         * Gets the value of the personInfo property.
+         * Ruft den Wert der personInfo-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -201,7 +201,7 @@ public class GetBPKKombiResponseType {
         }
 
         /**
-         * Sets the value of the personInfo property.
+         * Legt den Wert der personInfo-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -213,7 +213,7 @@ public class GetBPKKombiResponseType {
         }
 
         /**
-         * Gets the value of the register property.
+         * Ruft den Wert der register-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -225,7 +225,7 @@ public class GetBPKKombiResponseType {
         }
 
         /**
-         * Sets the value of the register property.
+         * Legt den Wert der register-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -237,7 +237,7 @@ public class GetBPKKombiResponseType {
         }
 
         /**
-         * Gets the value of the bpk property.
+         * Ruft den Wert der bpk-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -249,7 +249,7 @@ public class GetBPKKombiResponseType {
         }
 
         /**
-         * Sets the value of the bpk property.
+         * Legt den Wert der bpk-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetBPKResponse.java b/src/main/java/at/gv/util/xsd/szr/GetBPKResponse.java
index 96d6ab9..84310b7 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetBPKResponse.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetBPKResponse.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -48,7 +48,7 @@ public class GetBPKResponse {
     protected List<PersonInfoType> personInfo;
 
     /**
-     * Gets the value of the getBPKReturn property.
+     * Ruft den Wert der getBPKReturn-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -60,7 +60,7 @@ public class GetBPKResponse {
     }
 
     /**
-     * Sets the value of the getBPKReturn property.
+     * Legt den Wert der getBPKReturn-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetIdentityLink.java b/src/main/java/at/gv/util/xsd/szr/GetIdentityLink.java
index c718338..b8dfe51 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetIdentityLink.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetIdentityLink.java
@@ -12,9 +12,9 @@ import at.gv.util.xsd.szr.xmldsig.KeyValueType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -49,7 +49,7 @@ public class GetIdentityLink {
     protected Boolean insertERnP;
 
     /**
-     * Gets the value of the personInfo property.
+     * Ruft den Wert der personInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -61,7 +61,7 @@ public class GetIdentityLink {
     }
 
     /**
-     * Sets the value of the personInfo property.
+     * Legt den Wert der personInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -102,7 +102,7 @@ public class GetIdentityLink {
     }
 
     /**
-     * Gets the value of the insertERnP property.
+     * Ruft den Wert der insertERnP-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -114,7 +114,7 @@ public class GetIdentityLink {
     }
 
     /**
-     * Sets the value of the insertERnP property.
+     * Legt den Wert der insertERnP-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetIdentityLinkResponse.java b/src/main/java/at/gv/util/xsd/szr/GetIdentityLinkResponse.java
index b20b371..3515056 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetIdentityLinkResponse.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetIdentityLinkResponse.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -38,7 +38,7 @@ public class GetIdentityLinkResponse {
     protected IdentityLinkType getIdentityLinkReturn;
 
     /**
-     * Gets the value of the getIdentityLinkReturn property.
+     * Ruft den Wert der getIdentityLinkReturn-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class GetIdentityLinkResponse {
     }
 
     /**
-     * Sets the value of the getIdentityLinkReturn property.
+     * Legt den Wert der getIdentityLinkReturn-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetStammzahl.java b/src/main/java/at/gv/util/xsd/szr/GetStammzahl.java
index c4bb690..0952210 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetStammzahl.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetStammzahl.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -38,7 +38,7 @@ public class GetStammzahl {
     protected PersonInfoType personInfo;
 
     /**
-     * Gets the value of the personInfo property.
+     * Ruft den Wert der personInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class GetStammzahl {
     }
 
     /**
-     * Sets the value of the personInfo property.
+     * Legt den Wert der personInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetStammzahlResponse.java b/src/main/java/at/gv/util/xsd/szr/GetStammzahlResponse.java
index d1ff252..4b906bf 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetStammzahlResponse.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetStammzahlResponse.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -38,7 +38,7 @@ public class GetStammzahlResponse {
     protected String stammzahl;
 
     /**
-     * Gets the value of the stammzahl property.
+     * Ruft den Wert der stammzahl-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class GetStammzahlResponse {
     }
 
     /**
-     * Sets the value of the stammzahl property.
+     * Legt den Wert der stammzahl-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/GetVersionResponse.java b/src/main/java/at/gv/util/xsd/szr/GetVersionResponse.java
index eccfb9e..ab58bd3 100644
--- a/src/main/java/at/gv/util/xsd/szr/GetVersionResponse.java
+++ b/src/main/java/at/gv/util/xsd/szr/GetVersionResponse.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -38,7 +38,7 @@ public class GetVersionResponse {
     protected String version;
 
     /**
-     * Gets the value of the version property.
+     * Ruft den Wert der version-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class GetVersionResponse {
     }
 
     /**
-     * Sets the value of the version property.
+     * Legt den Wert der version-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/IdentityLinkType.java b/src/main/java/at/gv/util/xsd/szr/IdentityLinkType.java
index 42feaad..755bdbd 100644
--- a/src/main/java/at/gv/util/xsd/szr/IdentityLinkType.java
+++ b/src/main/java/at/gv/util/xsd/szr/IdentityLinkType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for IdentityLinkType complex type.
+ * <p>Java-Klasse für IdentityLinkType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="IdentityLinkType">
@@ -44,7 +44,7 @@ public class IdentityLinkType {
     protected String additionalInfo;
 
     /**
-     * Gets the value of the personInfo property.
+     * Ruft den Wert der personInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -56,7 +56,7 @@ public class IdentityLinkType {
     }
 
     /**
-     * Sets the value of the personInfo property.
+     * Legt den Wert der personInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -68,7 +68,7 @@ public class IdentityLinkType {
     }
 
     /**
-     * Gets the value of the assertion property.
+     * Ruft den Wert der assertion-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -80,7 +80,7 @@ public class IdentityLinkType {
     }
 
     /**
-     * Sets the value of the assertion property.
+     * Legt den Wert der assertion-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -92,7 +92,7 @@ public class IdentityLinkType {
     }
 
     /**
-     * Gets the value of the additionalInfo property.
+     * Ruft den Wert der additionalInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -104,7 +104,7 @@ public class IdentityLinkType {
     }
 
     /**
-     * Sets the value of the additionalInfo property.
+     * Legt den Wert der additionalInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/ObjectFactory.java b/src/main/java/at/gv/util/xsd/szr/ObjectFactory.java
index c6ef806..82d6335 100644
--- a/src/main/java/at/gv/util/xsd/szr/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/szr/ObjectFactory.java
@@ -37,51 +37,51 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link BasiszahlZuBPK }
+     * Create an instance of {@link GetBPKKombiResponseType }
      * 
      */
-    public BasiszahlZuBPK createBasiszahlZuBPK() {
-        return new BasiszahlZuBPK();
+    public GetBPKKombiResponseType createGetBPKKombiResponseType() {
+        return new GetBPKKombiResponseType();
     }
 
     /**
-     * Create an instance of {@link GetStammzahl }
+     * Create an instance of {@link GetStammzahlResponse }
      * 
      */
-    public GetStammzahl createGetStammzahl() {
-        return new GetStammzahl();
+    public GetStammzahlResponse createGetStammzahlResponse() {
+        return new GetStammzahlResponse();
     }
 
     /**
-     * Create an instance of {@link ZMRAnwendungsIntegrationReturnType }
+     * Create an instance of {@link ValidateIdentityLinkResponse }
      * 
      */
-    public ZMRAnwendungsIntegrationReturnType createZMRAnwendungsIntegrationReturnType() {
-        return new ZMRAnwendungsIntegrationReturnType();
+    public ValidateIdentityLinkResponse createValidateIdentityLinkResponse() {
+        return new ValidateIdentityLinkResponse();
     }
 
     /**
-     * Create an instance of {@link TransformBPKResponse }
+     * Create an instance of {@link GetBPKKombi }
      * 
      */
-    public TransformBPKResponse createTransformBPKResponse() {
-        return new TransformBPKResponse();
+    public GetBPKKombi createGetBPKKombi() {
+        return new GetBPKKombi();
     }
 
     /**
-     * Create an instance of {@link IdentityLinkType }
+     * Create an instance of {@link GetBPKKombiRequestType }
      * 
      */
-    public IdentityLinkType createIdentityLinkType() {
-        return new IdentityLinkType();
+    public GetBPKKombiRequestType createGetBPKKombiRequestType() {
+        return new GetBPKKombiRequestType();
     }
 
     /**
-     * Create an instance of {@link GetBPKKombiResponseType.ResultRecord }
+     * Create an instance of {@link GetIdentityLink }
      * 
      */
-    public GetBPKKombiResponseType.ResultRecord createGetBPKKombiResponseTypeResultRecord() {
-        return new GetBPKKombiResponseType.ResultRecord();
+    public GetIdentityLink createGetIdentityLink() {
+        return new GetIdentityLink();
     }
 
     /**
@@ -93,83 +93,83 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link FremdBPKRequestType }
+     * Create an instance of {@link ValidateIdentityLink }
      * 
      */
-    public FremdBPKRequestType createFremdBPKRequestType() {
-        return new FremdBPKRequestType();
+    public ValidateIdentityLink createValidateIdentityLink() {
+        return new ValidateIdentityLink();
     }
 
     /**
-     * Create an instance of {@link BPKzuBasiszahlResponse }
+     * Create an instance of {@link IdentityLinkType }
      * 
      */
-    public BPKzuBasiszahlResponse createBPKzuBasiszahlResponse() {
-        return new BPKzuBasiszahlResponse();
+    public IdentityLinkType createIdentityLinkType() {
+        return new IdentityLinkType();
     }
 
     /**
-     * Create an instance of {@link GetBPK }
+     * Create an instance of {@link BasiszahlZuBPKResponse }
      * 
      */
-    public GetBPK createGetBPK() {
-        return new GetBPK();
+    public BasiszahlZuBPKResponse createBasiszahlZuBPKResponse() {
+        return new BasiszahlZuBPKResponse();
     }
 
     /**
-     * Create an instance of {@link GetIdentityLinkResponse }
+     * Create an instance of {@link BasiszahlZuBPKReturnType }
      * 
      */
-    public GetIdentityLinkResponse createGetIdentityLinkResponse() {
-        return new GetIdentityLinkResponse();
+    public BasiszahlZuBPKReturnType createBasiszahlZuBPKReturnType() {
+        return new BasiszahlZuBPKReturnType();
     }
 
     /**
-     * Create an instance of {@link TransformBPK }
+     * Create an instance of {@link BasiszahlZuBPK }
      * 
      */
-    public TransformBPK createTransformBPK() {
-        return new TransformBPK();
+    public BasiszahlZuBPK createBasiszahlZuBPK() {
+        return new BasiszahlZuBPK();
     }
 
     /**
-     * Create an instance of {@link GetBPKKombiResponse }
+     * Create an instance of {@link FremdBPKRequestType }
      * 
      */
-    public GetBPKKombiResponse createGetBPKKombiResponse() {
-        return new GetBPKKombiResponse();
+    public FremdBPKRequestType createFremdBPKRequestType() {
+        return new FremdBPKRequestType();
     }
 
     /**
-     * Create an instance of {@link GetBPKKombiRequestType }
+     * Create an instance of {@link BPKzuBasiszahl }
      * 
      */
-    public GetBPKKombiRequestType createGetBPKKombiRequestType() {
-        return new GetBPKKombiRequestType();
+    public BPKzuBasiszahl createBPKzuBasiszahl() {
+        return new BPKzuBasiszahl();
     }
 
     /**
-     * Create an instance of {@link GetVersionResponse }
+     * Create an instance of {@link ZMRAnwendungsIntegration }
      * 
      */
-    public GetVersionResponse createGetVersionResponse() {
-        return new GetVersionResponse();
+    public ZMRAnwendungsIntegration createZMRAnwendungsIntegration() {
+        return new ZMRAnwendungsIntegration();
     }
 
     /**
-     * Create an instance of {@link TravelDocumentType }
+     * Create an instance of {@link GetBPKKombiResponse }
      * 
      */
-    public TravelDocumentType createTravelDocumentType() {
-        return new TravelDocumentType();
+    public GetBPKKombiResponse createGetBPKKombiResponse() {
+        return new GetBPKKombiResponse();
     }
 
     /**
-     * Create an instance of {@link BasiszahlZuBPKResponse }
+     * Create an instance of {@link SZRException }
      * 
      */
-    public BasiszahlZuBPKResponse createBasiszahlZuBPKResponse() {
-        return new BasiszahlZuBPKResponse();
+    public SZRException createSZRException() {
+        return new SZRException();
     }
 
     /**
@@ -181,27 +181,27 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ZMRAnwendungsIntegration }
+     * Create an instance of {@link ZMRAnwendungsIntegrationReturnType }
      * 
      */
-    public ZMRAnwendungsIntegration createZMRAnwendungsIntegration() {
-        return new ZMRAnwendungsIntegration();
+    public ZMRAnwendungsIntegrationReturnType createZMRAnwendungsIntegrationReturnType() {
+        return new ZMRAnwendungsIntegrationReturnType();
     }
 
     /**
-     * Create an instance of {@link GetBPKKombi }
+     * Create an instance of {@link TransformBPK }
      * 
      */
-    public GetBPKKombi createGetBPKKombi() {
-        return new GetBPKKombi();
+    public TransformBPK createTransformBPK() {
+        return new TransformBPK();
     }
 
     /**
-     * Create an instance of {@link ValidateIdentityLinkResponse }
+     * Create an instance of {@link TransformBPKResponse }
      * 
      */
-    public ValidateIdentityLinkResponse createValidateIdentityLinkResponse() {
-        return new ValidateIdentityLinkResponse();
+    public TransformBPKResponse createTransformBPKResponse() {
+        return new TransformBPKResponse();
     }
 
     /**
@@ -213,51 +213,51 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link GetIdentityLink }
+     * Create an instance of {@link GetStammzahl }
      * 
      */
-    public GetIdentityLink createGetIdentityLink() {
-        return new GetIdentityLink();
+    public GetStammzahl createGetStammzahl() {
+        return new GetStammzahl();
     }
 
     /**
-     * Create an instance of {@link GetBPKResponse }
+     * Create an instance of {@link BPKzuBasiszahlResponse }
      * 
      */
-    public GetBPKResponse createGetBPKResponse() {
-        return new GetBPKResponse();
+    public BPKzuBasiszahlResponse createBPKzuBasiszahlResponse() {
+        return new BPKzuBasiszahlResponse();
     }
 
     /**
-     * Create an instance of {@link BPKzuBasiszahl }
+     * Create an instance of {@link GetBPKResponse }
      * 
      */
-    public BPKzuBasiszahl createBPKzuBasiszahl() {
-        return new BPKzuBasiszahl();
+    public GetBPKResponse createGetBPKResponse() {
+        return new GetBPKResponse();
     }
 
     /**
-     * Create an instance of {@link BasiszahlZuBPKReturnType }
+     * Create an instance of {@link GetBPK }
      * 
      */
-    public BasiszahlZuBPKReturnType createBasiszahlZuBPKReturnType() {
-        return new BasiszahlZuBPKReturnType();
+    public GetBPK createGetBPK() {
+        return new GetBPK();
     }
 
     /**
-     * Create an instance of {@link GetStammzahlResponse }
+     * Create an instance of {@link GetVersionResponse }
      * 
      */
-    public GetStammzahlResponse createGetStammzahlResponse() {
-        return new GetStammzahlResponse();
+    public GetVersionResponse createGetVersionResponse() {
+        return new GetVersionResponse();
     }
 
     /**
-     * Create an instance of {@link SZRException }
+     * Create an instance of {@link GetIdentityLinkResponse }
      * 
      */
-    public SZRException createSZRException() {
-        return new SZRException();
+    public GetIdentityLinkResponse createGetIdentityLinkResponse() {
+        return new GetIdentityLinkResponse();
     }
 
     /**
@@ -269,19 +269,19 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link ValidateIdentityLink }
+     * Create an instance of {@link TravelDocumentType }
      * 
      */
-    public ValidateIdentityLink createValidateIdentityLink() {
-        return new ValidateIdentityLink();
+    public TravelDocumentType createTravelDocumentType() {
+        return new TravelDocumentType();
     }
 
     /**
-     * Create an instance of {@link GetBPKKombiResponseType }
+     * Create an instance of {@link GetBPKKombiResponseType.ResultRecord }
      * 
      */
-    public GetBPKKombiResponseType createGetBPKKombiResponseType() {
-        return new GetBPKKombiResponseType();
+    public GetBPKKombiResponseType.ResultRecord createGetBPKKombiResponseTypeResultRecord() {
+        return new GetBPKKombiResponseType.ResultRecord();
     }
 
     /**
diff --git a/src/main/java/at/gv/util/xsd/szr/PersonInfoType.java b/src/main/java/at/gv/util/xsd/szr/PersonInfoType.java
index 84b7248..44d30c8 100644
--- a/src/main/java/at/gv/util/xsd/szr/PersonInfoType.java
+++ b/src/main/java/at/gv/util/xsd/szr/PersonInfoType.java
@@ -12,9 +12,9 @@ import at.gv.util.xsd.szr.persondata.PostalAddressType;
 
 
 /**
- * <p>Java class for PersonInfoType complex type.
+ * <p>Java-Klasse für PersonInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PersonInfoType">
@@ -50,13 +50,13 @@ public class PersonInfoType {
     protected PostalAddressType regularDomicile;
     @XmlElement(name = "AddressCodes")
     protected AddressCodesType addressCodes;
-    @XmlElementRef(name = "TravelDocument", namespace = "urn:SZRServices", type = JAXBElement.class)
+    @XmlElementRef(name = "TravelDocument", namespace = "urn:SZRServices", type = JAXBElement.class, required = false)
     protected JAXBElement<TravelDocumentType> travelDocument;
-    @XmlElementRef(name = "DateOfBirthWildcard", namespace = "urn:SZRServices", type = JAXBElement.class)
+    @XmlElementRef(name = "DateOfBirthWildcard", namespace = "urn:SZRServices", type = JAXBElement.class, required = false)
     protected JAXBElement<Boolean> dateOfBirthWildcard;
 
     /**
-     * Gets the value of the person property.
+     * Ruft den Wert der person-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -68,7 +68,7 @@ public class PersonInfoType {
     }
 
     /**
-     * Sets the value of the person property.
+     * Legt den Wert der person-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -80,7 +80,7 @@ public class PersonInfoType {
     }
 
     /**
-     * Gets the value of the regularDomicile property.
+     * Ruft den Wert der regularDomicile-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -92,7 +92,7 @@ public class PersonInfoType {
     }
 
     /**
-     * Sets the value of the regularDomicile property.
+     * Legt den Wert der regularDomicile-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -104,7 +104,7 @@ public class PersonInfoType {
     }
 
     /**
-     * Gets the value of the addressCodes property.
+     * Ruft den Wert der addressCodes-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -116,7 +116,7 @@ public class PersonInfoType {
     }
 
     /**
-     * Sets the value of the addressCodes property.
+     * Legt den Wert der addressCodes-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -128,7 +128,7 @@ public class PersonInfoType {
     }
 
     /**
-     * Gets the value of the travelDocument property.
+     * Ruft den Wert der travelDocument-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -140,7 +140,7 @@ public class PersonInfoType {
     }
 
     /**
-     * Sets the value of the travelDocument property.
+     * Legt den Wert der travelDocument-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -148,11 +148,11 @@ public class PersonInfoType {
      *     
      */
     public void setTravelDocument(JAXBElement<TravelDocumentType> value) {
-        this.travelDocument = ((JAXBElement<TravelDocumentType> ) value);
+        this.travelDocument = value;
     }
 
     /**
-     * Gets the value of the dateOfBirthWildcard property.
+     * Ruft den Wert der dateOfBirthWildcard-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -164,7 +164,7 @@ public class PersonInfoType {
     }
 
     /**
-     * Sets the value of the dateOfBirthWildcard property.
+     * Legt den Wert der dateOfBirthWildcard-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -172,7 +172,7 @@ public class PersonInfoType {
      *     
      */
     public void setDateOfBirthWildcard(JAXBElement<Boolean> value) {
-        this.dateOfBirthWildcard = ((JAXBElement<Boolean> ) value);
+        this.dateOfBirthWildcard = value;
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/szr/SZRException.java b/src/main/java/at/gv/util/xsd/szr/SZRException.java
index 6498ce6..4c03d06 100644
--- a/src/main/java/at/gv/util/xsd/szr/SZRException.java
+++ b/src/main/java/at/gv/util/xsd/szr/SZRException.java
@@ -7,9 +7,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SZRException complex type.
+ * <p>Java-Klasse für SZRException complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SZRException">
diff --git a/src/main/java/at/gv/util/xsd/szr/TransformBPK.java b/src/main/java/at/gv/util/xsd/szr/TransformBPK.java
index c8c9179..852b51c 100644
--- a/src/main/java/at/gv/util/xsd/szr/TransformBPK.java
+++ b/src/main/java/at/gv/util/xsd/szr/TransformBPK.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -56,7 +56,7 @@ public class TransformBPK {
     protected List<FremdBPKRequestType> target;
 
     /**
-     * Gets the value of the personInfo property.
+     * Ruft den Wert der personInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -68,7 +68,7 @@ public class TransformBPK {
     }
 
     /**
-     * Sets the value of the personInfo property.
+     * Legt den Wert der personInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -80,7 +80,7 @@ public class TransformBPK {
     }
 
     /**
-     * Gets the value of the inputBPK property.
+     * Ruft den Wert der inputBPK-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -92,7 +92,7 @@ public class TransformBPK {
     }
 
     /**
-     * Sets the value of the inputBPK property.
+     * Legt den Wert der inputBPK-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -104,7 +104,7 @@ public class TransformBPK {
     }
 
     /**
-     * Gets the value of the inputBereichsKennung property.
+     * Ruft den Wert der inputBereichsKennung-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -116,7 +116,7 @@ public class TransformBPK {
     }
 
     /**
-     * Sets the value of the inputBereichsKennung property.
+     * Legt den Wert der inputBereichsKennung-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -128,7 +128,7 @@ public class TransformBPK {
     }
 
     /**
-     * Gets the value of the begruendung property.
+     * Ruft den Wert der begruendung-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -140,7 +140,7 @@ public class TransformBPK {
     }
 
     /**
-     * Sets the value of the begruendung property.
+     * Legt den Wert der begruendung-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/TransformBPKResponse.java b/src/main/java/at/gv/util/xsd/szr/TransformBPKResponse.java
index 73471e6..306da51 100644
--- a/src/main/java/at/gv/util/xsd/szr/TransformBPKResponse.java
+++ b/src/main/java/at/gv/util/xsd/szr/TransformBPKResponse.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
diff --git a/src/main/java/at/gv/util/xsd/szr/TravelDocumentType.java b/src/main/java/at/gv/util/xsd/szr/TravelDocumentType.java
index 6df406b..3091944 100644
--- a/src/main/java/at/gv/util/xsd/szr/TravelDocumentType.java
+++ b/src/main/java/at/gv/util/xsd/szr/TravelDocumentType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for TravelDocumentType complex type.
+ * <p>Java-Klasse für TravelDocumentType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="TravelDocumentType">
@@ -52,7 +52,7 @@ public class TravelDocumentType {
     protected String issuingCountry;
 
     /**
-     * Gets the value of the documentNumber property.
+     * Ruft den Wert der documentNumber-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -64,7 +64,7 @@ public class TravelDocumentType {
     }
 
     /**
-     * Sets the value of the documentNumber property.
+     * Legt den Wert der documentNumber-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -76,7 +76,7 @@ public class TravelDocumentType {
     }
 
     /**
-     * Gets the value of the documentType property.
+     * Ruft den Wert der documentType-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -88,7 +88,7 @@ public class TravelDocumentType {
     }
 
     /**
-     * Sets the value of the documentType property.
+     * Legt den Wert der documentType-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -100,7 +100,7 @@ public class TravelDocumentType {
     }
 
     /**
-     * Gets the value of the issueDate property.
+     * Ruft den Wert der issueDate-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -112,7 +112,7 @@ public class TravelDocumentType {
     }
 
     /**
-     * Sets the value of the issueDate property.
+     * Legt den Wert der issueDate-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -124,7 +124,7 @@ public class TravelDocumentType {
     }
 
     /**
-     * Gets the value of the issuingAuthority property.
+     * Ruft den Wert der issuingAuthority-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -136,7 +136,7 @@ public class TravelDocumentType {
     }
 
     /**
-     * Sets the value of the issuingAuthority property.
+     * Legt den Wert der issuingAuthority-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -148,7 +148,7 @@ public class TravelDocumentType {
     }
 
     /**
-     * Gets the value of the issuingCountry property.
+     * Ruft den Wert der issuingCountry-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -160,7 +160,7 @@ public class TravelDocumentType {
     }
 
     /**
-     * Sets the value of the issuingCountry property.
+     * Legt den Wert der issuingCountry-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/ValidateIdentityLink.java b/src/main/java/at/gv/util/xsd/szr/ValidateIdentityLink.java
index 79392df..19a45e0 100644
--- a/src/main/java/at/gv/util/xsd/szr/ValidateIdentityLink.java
+++ b/src/main/java/at/gv/util/xsd/szr/ValidateIdentityLink.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -42,7 +42,7 @@ public class ValidateIdentityLink {
     protected String bereichsKennung;
 
     /**
-     * Gets the value of the identityLink property.
+     * Ruft den Wert der identityLink-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class ValidateIdentityLink {
     }
 
     /**
-     * Sets the value of the identityLink property.
+     * Legt den Wert der identityLink-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -66,7 +66,7 @@ public class ValidateIdentityLink {
     }
 
     /**
-     * Gets the value of the bereichsKennung property.
+     * Ruft den Wert der bereichsKennung-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -78,7 +78,7 @@ public class ValidateIdentityLink {
     }
 
     /**
-     * Sets the value of the bereichsKennung property.
+     * Legt den Wert der bereichsKennung-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/ValidateIdentityLinkResponse.java b/src/main/java/at/gv/util/xsd/szr/ValidateIdentityLinkResponse.java
index a353aae..4858270 100644
--- a/src/main/java/at/gv/util/xsd/szr/ValidateIdentityLinkResponse.java
+++ b/src/main/java/at/gv/util/xsd/szr/ValidateIdentityLinkResponse.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -38,7 +38,7 @@ public class ValidateIdentityLinkResponse {
     protected String validateIdentityLinkReturn;
 
     /**
-     * Gets the value of the validateIdentityLinkReturn property.
+     * Ruft den Wert der validateIdentityLinkReturn-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -50,7 +50,7 @@ public class ValidateIdentityLinkResponse {
     }
 
     /**
-     * Sets the value of the validateIdentityLinkReturn property.
+     * Legt den Wert der validateIdentityLinkReturn-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegration.java b/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegration.java
index 96e86c8..bc2962c 100644
--- a/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegration.java
+++ b/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegration.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -48,7 +48,7 @@ public class ZMRAnwendungsIntegration {
     protected List<String> zmRfremdbPK;
 
     /**
-     * Gets the value of the bereich property.
+     * Ruft den Wert der bereich-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -60,7 +60,7 @@ public class ZMRAnwendungsIntegration {
     }
 
     /**
-     * Sets the value of the bereich property.
+     * Legt den Wert der bereich-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegrationResponse.java b/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegrationResponse.java
index 903832b..1882cc6 100644
--- a/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegrationResponse.java
+++ b/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegrationResponse.java
@@ -11,9 +11,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
diff --git a/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegrationReturnType.java b/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegrationReturnType.java
index cc2a1be..2010a85 100644
--- a/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegrationReturnType.java
+++ b/src/main/java/at/gv/util/xsd/szr/ZMRAnwendungsIntegrationReturnType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ZMRAnwendungsIntegrationReturnType complex type.
+ * <p>Java-Klasse für ZMRAnwendungsIntegrationReturnType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ZMRAnwendungsIntegrationReturnType">
@@ -42,7 +42,7 @@ public class ZMRAnwendungsIntegrationReturnType {
     protected List<FremdBPKType> fremdBPKs;
 
     /**
-     * Gets the value of the bpk property.
+     * Ruft den Wert der bpk-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class ZMRAnwendungsIntegrationReturnType {
     }
 
     /**
-     * Sets the value of the bpk property.
+     * Legt den Wert der bpk-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/ecdsa/DomainParamsType.java b/src/main/java/at/gv/util/xsd/szr/ecdsa/DomainParamsType.java
index e3d6d69..12d756c 100644
--- a/src/main/java/at/gv/util/xsd/szr/ecdsa/DomainParamsType.java
+++ b/src/main/java/at/gv/util/xsd/szr/ecdsa/DomainParamsType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DomainParamsType complex type.
+ * <p>Java-Klasse für DomainParamsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="DomainParamsType">
@@ -36,7 +36,7 @@ public class DomainParamsType {
     protected NamedCurveType namedCurve;
 
     /**
-     * Gets the value of the namedCurve property.
+     * Ruft den Wert der namedCurve-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -48,7 +48,7 @@ public class DomainParamsType {
     }
 
     /**
-     * Sets the value of the namedCurve property.
+     * Legt den Wert der namedCurve-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/ecdsa/ECDSAKeyValueType.java b/src/main/java/at/gv/util/xsd/szr/ecdsa/ECDSAKeyValueType.java
index 25e1c3e..47e8afd 100644
--- a/src/main/java/at/gv/util/xsd/szr/ecdsa/ECDSAKeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/szr/ecdsa/ECDSAKeyValueType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ECDSAKeyValueType complex type.
+ * <p>Java-Klasse für ECDSAKeyValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ECDSAKeyValueType">
@@ -40,7 +40,7 @@ public class ECDSAKeyValueType {
     protected ECPointType publicKey;
 
     /**
-     * Gets the value of the domainParameters property.
+     * Ruft den Wert der domainParameters-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class ECDSAKeyValueType {
     }
 
     /**
-     * Sets the value of the domainParameters property.
+     * Legt den Wert der domainParameters-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -64,7 +64,7 @@ public class ECDSAKeyValueType {
     }
 
     /**
-     * Gets the value of the publicKey property.
+     * Ruft den Wert der publicKey-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class ECDSAKeyValueType {
     }
 
     /**
-     * Sets the value of the publicKey property.
+     * Legt den Wert der publicKey-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/ecdsa/ECPointType.java b/src/main/java/at/gv/util/xsd/szr/ecdsa/ECPointType.java
index 895fd6c..fc96885 100644
--- a/src/main/java/at/gv/util/xsd/szr/ecdsa/ECPointType.java
+++ b/src/main/java/at/gv/util/xsd/szr/ecdsa/ECPointType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for ECPointType complex type.
+ * <p>Java-Klasse für ECPointType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ECPointType">
@@ -40,7 +40,7 @@ public class ECPointType {
     protected PrimeFieldElemType y;
 
     /**
-     * Gets the value of the x property.
+     * Ruft den Wert der x-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class ECPointType {
     }
 
     /**
-     * Sets the value of the x property.
+     * Legt den Wert der x-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -64,7 +64,7 @@ public class ECPointType {
     }
 
     /**
-     * Gets the value of the y property.
+     * Ruft den Wert der y-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class ECPointType {
     }
 
     /**
-     * Sets the value of the y property.
+     * Legt den Wert der y-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/ecdsa/NamedCurveType.java b/src/main/java/at/gv/util/xsd/szr/ecdsa/NamedCurveType.java
index e612756..3ae485b 100644
--- a/src/main/java/at/gv/util/xsd/szr/ecdsa/NamedCurveType.java
+++ b/src/main/java/at/gv/util/xsd/szr/ecdsa/NamedCurveType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for NamedCurveType complex type.
+ * <p>Java-Klasse für NamedCurveType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="NamedCurveType">
@@ -32,7 +32,7 @@ public class NamedCurveType {
     protected String urn;
 
     /**
-     * Gets the value of the urn property.
+     * Ruft den Wert der urn-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -44,7 +44,7 @@ public class NamedCurveType {
     }
 
     /**
-     * Sets the value of the urn property.
+     * Legt den Wert der urn-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/ecdsa/ObjectFactory.java b/src/main/java/at/gv/util/xsd/szr/ecdsa/ObjectFactory.java
index 70cca4f..9243d14 100644
--- a/src/main/java/at/gv/util/xsd/szr/ecdsa/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/szr/ecdsa/ObjectFactory.java
@@ -42,35 +42,35 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link DomainParamsType }
+     * Create an instance of {@link ECPointType }
      * 
      */
-    public DomainParamsType createDomainParamsType() {
-        return new DomainParamsType();
+    public ECPointType createECPointType() {
+        return new ECPointType();
     }
 
     /**
-     * Create an instance of {@link NamedCurveType }
+     * Create an instance of {@link PrimeFieldElemType }
      * 
      */
-    public NamedCurveType createNamedCurveType() {
-        return new NamedCurveType();
+    public PrimeFieldElemType createPrimeFieldElemType() {
+        return new PrimeFieldElemType();
     }
 
     /**
-     * Create an instance of {@link ECPointType }
+     * Create an instance of {@link DomainParamsType }
      * 
      */
-    public ECPointType createECPointType() {
-        return new ECPointType();
+    public DomainParamsType createDomainParamsType() {
+        return new DomainParamsType();
     }
 
     /**
-     * Create an instance of {@link PrimeFieldElemType }
+     * Create an instance of {@link NamedCurveType }
      * 
      */
-    public PrimeFieldElemType createPrimeFieldElemType() {
-        return new PrimeFieldElemType();
+    public NamedCurveType createNamedCurveType() {
+        return new NamedCurveType();
     }
 
     /**
diff --git a/src/main/java/at/gv/util/xsd/szr/ecdsa/PrimeFieldElemType.java b/src/main/java/at/gv/util/xsd/szr/ecdsa/PrimeFieldElemType.java
index 030dd66..c4b68f4 100644
--- a/src/main/java/at/gv/util/xsd/szr/ecdsa/PrimeFieldElemType.java
+++ b/src/main/java/at/gv/util/xsd/szr/ecdsa/PrimeFieldElemType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for PrimeFieldElemType complex type.
+ * <p>Java-Klasse für PrimeFieldElemType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PrimeFieldElemType">
@@ -32,7 +32,7 @@ public class PrimeFieldElemType {
     protected String value;
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -44,7 +44,7 @@ public class PrimeFieldElemType {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/persondata/AlternativeNameType.java b/src/main/java/at/gv/util/xsd/szr/persondata/AlternativeNameType.java
index 34b3bdf..bf7c3c6 100644
--- a/src/main/java/at/gv/util/xsd/szr/persondata/AlternativeNameType.java
+++ b/src/main/java/at/gv/util/xsd/szr/persondata/AlternativeNameType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for AlternativeNameType complex type.
+ * <p>Java-Klasse für AlternativeNameType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="AlternativeNameType">
@@ -42,7 +42,7 @@ public class AlternativeNameType {
     protected String type;
 
     /**
-     * Gets the value of the familyName property.
+     * Ruft den Wert der familyName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class AlternativeNameType {
     }
 
     /**
-     * Sets the value of the familyName property.
+     * Legt den Wert der familyName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -66,7 +66,7 @@ public class AlternativeNameType {
     }
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -82,7 +82,7 @@ public class AlternativeNameType {
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/persondata/DeliveryAddressType.java b/src/main/java/at/gv/util/xsd/szr/persondata/DeliveryAddressType.java
index 02ce4d9..89759e9 100644
--- a/src/main/java/at/gv/util/xsd/szr/persondata/DeliveryAddressType.java
+++ b/src/main/java/at/gv/util/xsd/szr/persondata/DeliveryAddressType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DeliveryAddressType complex type.
+ * <p>Java-Klasse für DeliveryAddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="DeliveryAddressType">
@@ -52,7 +52,7 @@ public class DeliveryAddressType {
     protected String doorNumber;
 
     /**
-     * Gets the value of the addressLine property.
+     * Ruft den Wert der addressLine-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -64,7 +64,7 @@ public class DeliveryAddressType {
     }
 
     /**
-     * Sets the value of the addressLine property.
+     * Legt den Wert der addressLine-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -76,7 +76,7 @@ public class DeliveryAddressType {
     }
 
     /**
-     * Gets the value of the streetName property.
+     * Ruft den Wert der streetName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -88,7 +88,7 @@ public class DeliveryAddressType {
     }
 
     /**
-     * Sets the value of the streetName property.
+     * Legt den Wert der streetName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -100,7 +100,7 @@ public class DeliveryAddressType {
     }
 
     /**
-     * Gets the value of the buildingNumber property.
+     * Ruft den Wert der buildingNumber-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -112,7 +112,7 @@ public class DeliveryAddressType {
     }
 
     /**
-     * Sets the value of the buildingNumber property.
+     * Legt den Wert der buildingNumber-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -124,7 +124,7 @@ public class DeliveryAddressType {
     }
 
     /**
-     * Gets the value of the unit property.
+     * Ruft den Wert der unit-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -136,7 +136,7 @@ public class DeliveryAddressType {
     }
 
     /**
-     * Sets the value of the unit property.
+     * Legt den Wert der unit-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -148,7 +148,7 @@ public class DeliveryAddressType {
     }
 
     /**
-     * Gets the value of the doorNumber property.
+     * Ruft den Wert der doorNumber-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -160,7 +160,7 @@ public class DeliveryAddressType {
     }
 
     /**
-     * Sets the value of the doorNumber property.
+     * Legt den Wert der doorNumber-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/persondata/IdentificationType.java b/src/main/java/at/gv/util/xsd/szr/persondata/IdentificationType.java
index 861528e..7318306 100644
--- a/src/main/java/at/gv/util/xsd/szr/persondata/IdentificationType.java
+++ b/src/main/java/at/gv/util/xsd/szr/persondata/IdentificationType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for IdentificationType complex type.
+ * <p>Java-Klasse für IdentificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="IdentificationType">
@@ -40,7 +40,7 @@ public class IdentificationType {
     protected String type;
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class IdentificationType {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -64,7 +64,7 @@ public class IdentificationType {
     }
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class IdentificationType {
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/persondata/ObjectFactory.java b/src/main/java/at/gv/util/xsd/szr/persondata/ObjectFactory.java
index 94788d8..40d8384 100644
--- a/src/main/java/at/gv/util/xsd/szr/persondata/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/szr/persondata/ObjectFactory.java
@@ -30,19 +30,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link IdentificationType }
-     * 
-     */
-    public IdentificationType createIdentificationType() {
-        return new IdentificationType();
-    }
-
-    /**
-     * Create an instance of {@link PostalAddressType }
+     * Create an instance of {@link PhysicalPersonType }
      * 
      */
-    public PostalAddressType createPostalAddressType() {
-        return new PostalAddressType();
+    public PhysicalPersonType createPhysicalPersonType() {
+        return new PhysicalPersonType();
     }
 
     /**
@@ -54,19 +46,19 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link PersonNameType }
+     * Create an instance of {@link PostalAddressType }
      * 
      */
-    public PersonNameType createPersonNameType() {
-        return new PersonNameType();
+    public PostalAddressType createPostalAddressType() {
+        return new PostalAddressType();
     }
 
     /**
-     * Create an instance of {@link PhysicalPersonType }
+     * Create an instance of {@link IdentificationType }
      * 
      */
-    public PhysicalPersonType createPhysicalPersonType() {
-        return new PhysicalPersonType();
+    public IdentificationType createIdentificationType() {
+        return new IdentificationType();
     }
 
     /**
@@ -77,4 +69,12 @@ public class ObjectFactory {
         return new DeliveryAddressType();
     }
 
+    /**
+     * Create an instance of {@link PersonNameType }
+     * 
+     */
+    public PersonNameType createPersonNameType() {
+        return new PersonNameType();
+    }
+
 }
diff --git a/src/main/java/at/gv/util/xsd/szr/persondata/PersonNameType.java b/src/main/java/at/gv/util/xsd/szr/persondata/PersonNameType.java
index 0914b6b..28ec874 100644
--- a/src/main/java/at/gv/util/xsd/szr/persondata/PersonNameType.java
+++ b/src/main/java/at/gv/util/xsd/szr/persondata/PersonNameType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for PersonNameType complex type.
+ * <p>Java-Klasse für PersonNameType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PersonNameType">
@@ -48,7 +48,7 @@ public class PersonNameType {
     protected String suffixedDegree;
 
     /**
-     * Gets the value of the prefixedDegree property.
+     * Ruft den Wert der prefixedDegree-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -60,7 +60,7 @@ public class PersonNameType {
     }
 
     /**
-     * Sets the value of the prefixedDegree property.
+     * Legt den Wert der prefixedDegree-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -72,7 +72,7 @@ public class PersonNameType {
     }
 
     /**
-     * Gets the value of the givenName property.
+     * Ruft den Wert der givenName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -84,7 +84,7 @@ public class PersonNameType {
     }
 
     /**
-     * Sets the value of the givenName property.
+     * Legt den Wert der givenName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -96,7 +96,7 @@ public class PersonNameType {
     }
 
     /**
-     * Gets the value of the familyName property.
+     * Ruft den Wert der familyName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -108,7 +108,7 @@ public class PersonNameType {
     }
 
     /**
-     * Sets the value of the familyName property.
+     * Legt den Wert der familyName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -120,7 +120,7 @@ public class PersonNameType {
     }
 
     /**
-     * Gets the value of the suffixedDegree property.
+     * Ruft den Wert der suffixedDegree-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -132,7 +132,7 @@ public class PersonNameType {
     }
 
     /**
-     * Sets the value of the suffixedDegree property.
+     * Legt den Wert der suffixedDegree-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/persondata/PhysicalPersonType.java b/src/main/java/at/gv/util/xsd/szr/persondata/PhysicalPersonType.java
index 123c50e..7e235f8 100644
--- a/src/main/java/at/gv/util/xsd/szr/persondata/PhysicalPersonType.java
+++ b/src/main/java/at/gv/util/xsd/szr/persondata/PhysicalPersonType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for PhysicalPersonType complex type.
+ * <p>Java-Klasse für PhysicalPersonType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PhysicalPersonType">
@@ -64,7 +64,7 @@ public class PhysicalPersonType {
     protected String nationality;
 
     /**
-     * Gets the value of the identification property.
+     * Ruft den Wert der identification-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Sets the value of the identification property.
+     * Legt den Wert der identification-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -88,7 +88,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Gets the value of the name property.
+     * Ruft den Wert der name-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -100,7 +100,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Sets the value of the name property.
+     * Legt den Wert der name-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -112,7 +112,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Gets the value of the alternativeName property.
+     * Ruft den Wert der alternativeName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -124,7 +124,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Sets the value of the alternativeName property.
+     * Legt den Wert der alternativeName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -136,7 +136,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Gets the value of the sex property.
+     * Ruft den Wert der sex-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -148,7 +148,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Sets the value of the sex property.
+     * Legt den Wert der sex-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -160,7 +160,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Gets the value of the dateOfBirth property.
+     * Ruft den Wert der dateOfBirth-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -172,7 +172,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Sets the value of the dateOfBirth property.
+     * Legt den Wert der dateOfBirth-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -184,7 +184,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Gets the value of the placeOfBirth property.
+     * Ruft den Wert der placeOfBirth-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -196,7 +196,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Sets the value of the placeOfBirth property.
+     * Legt den Wert der placeOfBirth-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -208,7 +208,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Gets the value of the countryOfBirth property.
+     * Ruft den Wert der countryOfBirth-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -220,7 +220,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Sets the value of the countryOfBirth property.
+     * Legt den Wert der countryOfBirth-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -232,7 +232,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Gets the value of the nationality property.
+     * Ruft den Wert der nationality-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -244,7 +244,7 @@ public class PhysicalPersonType {
     }
 
     /**
-     * Sets the value of the nationality property.
+     * Legt den Wert der nationality-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/persondata/PostalAddressType.java b/src/main/java/at/gv/util/xsd/szr/persondata/PostalAddressType.java
index eb10a12..3fbc0c2 100644
--- a/src/main/java/at/gv/util/xsd/szr/persondata/PostalAddressType.java
+++ b/src/main/java/at/gv/util/xsd/szr/persondata/PostalAddressType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for PostalAddressType complex type.
+ * <p>Java-Klasse für PostalAddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PostalAddressType">
@@ -52,7 +52,7 @@ public class PostalAddressType {
     protected DeliveryAddressType deliveryAddress;
 
     /**
-     * Gets the value of the postalCode property.
+     * Ruft den Wert der postalCode-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -64,7 +64,7 @@ public class PostalAddressType {
     }
 
     /**
-     * Sets the value of the postalCode property.
+     * Legt den Wert der postalCode-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -76,7 +76,7 @@ public class PostalAddressType {
     }
 
     /**
-     * Gets the value of the municipality property.
+     * Ruft den Wert der municipality-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -88,7 +88,7 @@ public class PostalAddressType {
     }
 
     /**
-     * Sets the value of the municipality property.
+     * Legt den Wert der municipality-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -100,7 +100,7 @@ public class PostalAddressType {
     }
 
     /**
-     * Gets the value of the locality property.
+     * Ruft den Wert der locality-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -112,7 +112,7 @@ public class PostalAddressType {
     }
 
     /**
-     * Sets the value of the locality property.
+     * Legt den Wert der locality-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -124,7 +124,7 @@ public class PostalAddressType {
     }
 
     /**
-     * Gets the value of the stateCode3 property.
+     * Ruft den Wert der stateCode3-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -136,7 +136,7 @@ public class PostalAddressType {
     }
 
     /**
-     * Sets the value of the stateCode3 property.
+     * Legt den Wert der stateCode3-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -148,7 +148,7 @@ public class PostalAddressType {
     }
 
     /**
-     * Gets the value of the deliveryAddress property.
+     * Ruft den Wert der deliveryAddress-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -160,7 +160,7 @@ public class PostalAddressType {
     }
 
     /**
-     * Sets the value of the deliveryAddress property.
+     * Legt den Wert der deliveryAddress-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/Param.java b/src/main/java/at/gv/util/xsd/szr/pvp/Param.java
index 7a33c83..5d56d55 100644
--- a/src/main/java/at/gv/util/xsd/szr/pvp/Param.java
+++ b/src/main/java/at/gv/util/xsd/szr/pvp/Param.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -42,7 +42,7 @@ public class Param {
     protected String value;
 
     /**
-     * Gets the value of the key property.
+     * Ruft den Wert der key-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -54,7 +54,7 @@ public class Param {
     }
 
     /**
-     * Sets the value of the key property.
+     * Legt den Wert der key-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -66,7 +66,7 @@ public class Param {
     }
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -78,7 +78,7 @@ public class Param {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/PvpPrincipalType.java b/src/main/java/at/gv/util/xsd/szr/pvp/PvpPrincipalType.java
index eeadb45..b5f10d6 100644
--- a/src/main/java/at/gv/util/xsd/szr/pvp/PvpPrincipalType.java
+++ b/src/main/java/at/gv/util/xsd/szr/pvp/PvpPrincipalType.java
@@ -14,9 +14,9 @@ import javax.xml.namespace.QName;
 
 
 /**
- * <p>Java class for pvpPrincipalType complex type.
+ * <p>Java-Klasse für pvpPrincipalType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="pvpPrincipalType">
@@ -63,7 +63,7 @@ public class PvpPrincipalType {
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
-     * Gets the value of the userId property.
+     * Ruft den Wert der userId-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -75,7 +75,7 @@ public class PvpPrincipalType {
     }
 
     /**
-     * Sets the value of the userId property.
+     * Legt den Wert der userId-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -87,7 +87,7 @@ public class PvpPrincipalType {
     }
 
     /**
-     * Gets the value of the cn property.
+     * Ruft den Wert der cn-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -99,7 +99,7 @@ public class PvpPrincipalType {
     }
 
     /**
-     * Sets the value of the cn property.
+     * Legt den Wert der cn-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -111,7 +111,7 @@ public class PvpPrincipalType {
     }
 
     /**
-     * Gets the value of the gvOuId property.
+     * Ruft den Wert der gvOuId-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -123,7 +123,7 @@ public class PvpPrincipalType {
     }
 
     /**
-     * Sets the value of the gvOuId property.
+     * Legt den Wert der gvOuId-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -135,7 +135,7 @@ public class PvpPrincipalType {
     }
 
     /**
-     * Gets the value of the ou property.
+     * Ruft den Wert der ou-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -147,7 +147,7 @@ public class PvpPrincipalType {
     }
 
     /**
-     * Sets the value of the ou property.
+     * Legt den Wert der ou-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -159,7 +159,7 @@ public class PvpPrincipalType {
     }
 
     /**
-     * Gets the value of the gvSecClass property.
+     * Ruft den Wert der gvSecClass-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -171,7 +171,7 @@ public class PvpPrincipalType {
     }
 
     /**
-     * Sets the value of the gvSecClass property.
+     * Legt den Wert der gvSecClass-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java b/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java
index 3e3910a..297bccc 100644
--- a/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java
+++ b/src/main/java/at/gv/util/xsd/szr/pvp/PvpTokenType.java
@@ -18,9 +18,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for pvpTokenType complex type.
+ * <p>Java-Klasse für pvpTokenType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="pvpTokenType">
@@ -140,7 +140,7 @@ public class PvpTokenType {
     private Map<QName, String> otherAttributes = new HashMap<QName, String>();
 
     /**
-     * Gets the value of the authenticate property.
+     * Ruft den Wert der authenticate-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -152,7 +152,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Sets the value of the authenticate property.
+     * Legt den Wert der authenticate-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -164,7 +164,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Gets the value of the authorize property.
+     * Ruft den Wert der authorize-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -176,7 +176,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Sets the value of the authorize property.
+     * Legt den Wert der authorize-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -188,7 +188,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Gets the value of the accounting property.
+     * Ruft den Wert der accounting-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -200,7 +200,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Sets the value of the accounting property.
+     * Legt den Wert der accounting-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -212,7 +212,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Gets the value of the pvpChainedToken property.
+     * Ruft den Wert der pvpChainedToken-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -224,7 +224,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Sets the value of the pvpChainedToken property.
+     * Legt den Wert der pvpChainedToken-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -236,7 +236,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Gets the value of the pvpExtension property.
+     * Ruft den Wert der pvpExtension-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -248,7 +248,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Sets the value of the pvpExtension property.
+     * Legt den Wert der pvpExtension-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -260,7 +260,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Gets the value of the version property.
+     * Ruft den Wert der version-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -272,7 +272,7 @@ public class PvpTokenType {
     }
 
     /**
-     * Sets the value of the version property.
+     * Legt den Wert der version-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -303,9 +303,9 @@ public class PvpTokenType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -355,7 +355,7 @@ public class PvpTokenType {
         protected List<PvpTokenType.Accounting.GvChargeCode> gvChargeCode;
 
         /**
-         * Gets the value of the invoiceRecptId property.
+         * Ruft den Wert der invoiceRecptId-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -367,7 +367,7 @@ public class PvpTokenType {
         }
 
         /**
-         * Sets the value of the invoiceRecptId property.
+         * Legt den Wert der invoiceRecptId-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -438,9 +438,9 @@ public class PvpTokenType {
 
 
         /**
-         * <p>Java class for anonymous complex type.
+         * <p>Java-Klasse für anonymous complex type.
          * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
+         * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
          * 
          * <pre>
          * &lt;complexType>
@@ -466,7 +466,7 @@ public class PvpTokenType {
             protected Boolean _default;
 
             /**
-             * Gets the value of the value property.
+             * Ruft den Wert der value-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -478,7 +478,7 @@ public class PvpTokenType {
             }
 
             /**
-             * Sets the value of the value property.
+             * Legt den Wert der value-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -490,7 +490,7 @@ public class PvpTokenType {
             }
 
             /**
-             * Gets the value of the default property.
+             * Ruft den Wert der default-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -506,7 +506,7 @@ public class PvpTokenType {
             }
 
             /**
-             * Sets the value of the default property.
+             * Legt den Wert der default-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -521,9 +521,9 @@ public class PvpTokenType {
 
 
         /**
-         * <p>Java class for anonymous complex type.
+         * <p>Java-Klasse für anonymous complex type.
          * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
+         * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
          * 
          * <pre>
          * &lt;complexType>
@@ -549,7 +549,7 @@ public class PvpTokenType {
             protected Boolean _default;
 
             /**
-             * Gets the value of the value property.
+             * Ruft den Wert der value-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -561,7 +561,7 @@ public class PvpTokenType {
             }
 
             /**
-             * Sets the value of the value property.
+             * Legt den Wert der value-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -573,7 +573,7 @@ public class PvpTokenType {
             }
 
             /**
-             * Gets the value of the default property.
+             * Ruft den Wert der default-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -589,7 +589,7 @@ public class PvpTokenType {
             }
 
             /**
-             * Sets the value of the default property.
+             * Legt den Wert der default-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -606,9 +606,9 @@ public class PvpTokenType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -657,7 +657,7 @@ public class PvpTokenType {
         protected PvpPrincipalType systemPrincipal;
 
         /**
-         * Gets the value of the participantId property.
+         * Ruft den Wert der participantId-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -669,7 +669,7 @@ public class PvpTokenType {
         }
 
         /**
-         * Sets the value of the participantId property.
+         * Legt den Wert der participantId-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -681,7 +681,7 @@ public class PvpTokenType {
         }
 
         /**
-         * Gets the value of the gvOuDomain property.
+         * Ruft den Wert der gvOuDomain-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -693,7 +693,7 @@ public class PvpTokenType {
         }
 
         /**
-         * Sets the value of the gvOuDomain property.
+         * Legt den Wert der gvOuDomain-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -705,7 +705,7 @@ public class PvpTokenType {
         }
 
         /**
-         * Gets the value of the userPrincipal property.
+         * Ruft den Wert der userPrincipal-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -717,7 +717,7 @@ public class PvpTokenType {
         }
 
         /**
-         * Sets the value of the userPrincipal property.
+         * Legt den Wert der userPrincipal-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -729,7 +729,7 @@ public class PvpTokenType {
         }
 
         /**
-         * Gets the value of the systemPrincipal property.
+         * Ruft den Wert der systemPrincipal-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -741,7 +741,7 @@ public class PvpTokenType {
         }
 
         /**
-         * Sets the value of the systemPrincipal property.
+         * Legt den Wert der systemPrincipal-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -754,9 +754,9 @@ public class PvpTokenType {
 
 
         /**
-         * <p>Java class for anonymous complex type.
+         * <p>Java-Klasse für anonymous complex type.
          * 
-         * <p>The following schema fragment specifies the expected content contained within this class.
+         * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
          * 
          * <pre>
          * &lt;complexType>
@@ -788,7 +788,7 @@ public class PvpTokenType {
             protected String gvFunction;
 
             /**
-             * Gets the value of the gvGid property.
+             * Ruft den Wert der gvGid-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -800,7 +800,7 @@ public class PvpTokenType {
             }
 
             /**
-             * Sets the value of the gvGid property.
+             * Legt den Wert der gvGid-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -812,7 +812,7 @@ public class PvpTokenType {
             }
 
             /**
-             * Gets the value of the gvFunction property.
+             * Ruft den Wert der gvFunction-Eigenschaft ab.
              * 
              * @return
              *     possible object is
@@ -824,7 +824,7 @@ public class PvpTokenType {
             }
 
             /**
-             * Sets the value of the gvFunction property.
+             * Legt den Wert der gvFunction-Eigenschaft fest.
              * 
              * @param value
              *     allowed object is
@@ -841,9 +841,9 @@ public class PvpTokenType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -901,7 +901,7 @@ public class PvpTokenType {
         }
 
         /**
-         * Gets the value of the dummy property.
+         * Ruft den Wert der dummy-Eigenschaft ab.
          * 
          * @return
          *     possible object is
@@ -913,7 +913,7 @@ public class PvpTokenType {
         }
 
         /**
-         * Sets the value of the dummy property.
+         * Legt den Wert der dummy-Eigenschaft fest.
          * 
          * @param value
          *     allowed object is
@@ -928,9 +928,9 @@ public class PvpTokenType {
 
 
     /**
-     * <p>Java class for anonymous complex type.
+     * <p>Java-Klasse für anonymous complex type.
      * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
+     * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
      * 
      * <pre>
      * &lt;complexType>
@@ -973,8 +973,8 @@ public class PvpTokenType {
          * 
          * <p>
          * Objects of the following type(s) are allowed in the list
-         * {@link Object }
          * {@link Element }
+         * {@link Object }
          * 
          * 
          */
diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/Role.java b/src/main/java/at/gv/util/xsd/szr/pvp/Role.java
index 624347b..efdfcac 100644
--- a/src/main/java/at/gv/util/xsd/szr/pvp/Role.java
+++ b/src/main/java/at/gv/util/xsd/szr/pvp/Role.java
@@ -12,9 +12,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -76,7 +76,7 @@ public class Role {
     }
 
     /**
-     * Gets the value of the dummy property.
+     * Ruft den Wert der dummy-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -88,7 +88,7 @@ public class Role {
     }
 
     /**
-     * Sets the value of the dummy property.
+     * Legt den Wert der dummy-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -100,7 +100,7 @@ public class Role {
     }
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -112,7 +112,7 @@ public class Role {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/pvp/sec/Security.java b/src/main/java/at/gv/util/xsd/szr/pvp/sec/Security.java
index 7f70ee2..42a3d37 100644
--- a/src/main/java/at/gv/util/xsd/szr/pvp/sec/Security.java
+++ b/src/main/java/at/gv/util/xsd/szr/pvp/sec/Security.java
@@ -10,9 +10,9 @@ import at.gv.util.xsd.szr.pvp.PvpTokenType;
 
 
 /**
- * <p>Java class for anonymous complex type.
+ * <p>Java-Klasse für anonymous complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType>
@@ -39,7 +39,7 @@ public class Security {
     protected PvpTokenType pvpToken;
 
     /**
-     * Gets the value of the pvpToken property.
+     * Ruft den Wert der pvpToken-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -51,7 +51,7 @@ public class Security {
     }
 
     /**
-     * Sets the value of the pvpToken property.
+     * Legt den Wert der pvpToken-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/xmldsig/DSAKeyValueType.java b/src/main/java/at/gv/util/xsd/szr/xmldsig/DSAKeyValueType.java
index c544a9c..698e515 100644
--- a/src/main/java/at/gv/util/xsd/szr/xmldsig/DSAKeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/szr/xmldsig/DSAKeyValueType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DSAKeyValueType complex type.
+ * <p>Java-Klasse für DSAKeyValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="DSAKeyValueType">
@@ -60,7 +60,7 @@ public class DSAKeyValueType {
     protected String seed;
 
     /**
-     * Gets the value of the p property.
+     * Ruft den Wert der p-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -72,7 +72,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the p property.
+     * Legt den Wert der p-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -84,7 +84,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the q property.
+     * Ruft den Wert der q-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -96,7 +96,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the q property.
+     * Legt den Wert der q-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -108,7 +108,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the j property.
+     * Ruft den Wert der j-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -120,7 +120,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the j property.
+     * Legt den Wert der j-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -132,7 +132,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the g property.
+     * Ruft den Wert der g-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -144,7 +144,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the g property.
+     * Legt den Wert der g-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -156,7 +156,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the y property.
+     * Ruft den Wert der y-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -168,7 +168,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the y property.
+     * Legt den Wert der y-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -180,7 +180,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the pgenCounter property.
+     * Ruft den Wert der pgenCounter-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -192,7 +192,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the pgenCounter property.
+     * Legt den Wert der pgenCounter-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -204,7 +204,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the seed property.
+     * Ruft den Wert der seed-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -216,7 +216,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the seed property.
+     * Legt den Wert der seed-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/xmldsig/KeyValueType.java b/src/main/java/at/gv/util/xsd/szr/xmldsig/KeyValueType.java
index 840b549..36e6c42 100644
--- a/src/main/java/at/gv/util/xsd/szr/xmldsig/KeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/szr/xmldsig/KeyValueType.java
@@ -9,9 +9,9 @@ import at.gv.util.xsd.szr.ecdsa.ECDSAKeyValueType;
 
 
 /**
- * <p>Java class for KeyValueType complex type.
+ * <p>Java-Klasse für KeyValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="KeyValueType">
@@ -45,7 +45,7 @@ public class KeyValueType {
     protected ECDSAKeyValueType ecdsaKeyValue;
 
     /**
-     * Gets the value of the dsaKeyValue property.
+     * Ruft den Wert der dsaKeyValue-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -57,7 +57,7 @@ public class KeyValueType {
     }
 
     /**
-     * Sets the value of the dsaKeyValue property.
+     * Legt den Wert der dsaKeyValue-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -69,7 +69,7 @@ public class KeyValueType {
     }
 
     /**
-     * Gets the value of the rsaKeyValue property.
+     * Ruft den Wert der rsaKeyValue-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -81,7 +81,7 @@ public class KeyValueType {
     }
 
     /**
-     * Sets the value of the rsaKeyValue property.
+     * Legt den Wert der rsaKeyValue-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -93,7 +93,7 @@ public class KeyValueType {
     }
 
     /**
-     * Gets the value of the ecdsaKeyValue property.
+     * Ruft den Wert der ecdsaKeyValue-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -105,7 +105,7 @@ public class KeyValueType {
     }
 
     /**
-     * Sets the value of the ecdsaKeyValue property.
+     * Legt den Wert der ecdsaKeyValue-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/szr/xmldsig/ObjectFactory.java b/src/main/java/at/gv/util/xsd/szr/xmldsig/ObjectFactory.java
index 5267115..eaf3663 100644
--- a/src/main/java/at/gv/util/xsd/szr/xmldsig/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/szr/xmldsig/ObjectFactory.java
@@ -30,11 +30,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link RSAKeyValueType }
+     * Create an instance of {@link KeyValueType }
      * 
      */
-    public RSAKeyValueType createRSAKeyValueType() {
-        return new RSAKeyValueType();
+    public KeyValueType createKeyValueType() {
+        return new KeyValueType();
     }
 
     /**
@@ -46,11 +46,11 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link KeyValueType }
+     * Create an instance of {@link RSAKeyValueType }
      * 
      */
-    public KeyValueType createKeyValueType() {
-        return new KeyValueType();
+    public RSAKeyValueType createRSAKeyValueType() {
+        return new RSAKeyValueType();
     }
 
 }
diff --git a/src/main/java/at/gv/util/xsd/szr/xmldsig/RSAKeyValueType.java b/src/main/java/at/gv/util/xsd/szr/xmldsig/RSAKeyValueType.java
index 9deeb6b..6eb4d0e 100644
--- a/src/main/java/at/gv/util/xsd/szr/xmldsig/RSAKeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/szr/xmldsig/RSAKeyValueType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for RSAKeyValueType complex type.
+ * <p>Java-Klasse für RSAKeyValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="RSAKeyValueType">
@@ -40,7 +40,7 @@ public class RSAKeyValueType {
     protected String exponent;
 
     /**
-     * Gets the value of the modulus property.
+     * Ruft den Wert der modulus-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class RSAKeyValueType {
     }
 
     /**
-     * Sets the value of the modulus property.
+     * Legt den Wert der modulus-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -64,7 +64,7 @@ public class RSAKeyValueType {
     }
 
     /**
-     * Gets the value of the exponent property.
+     * Ruft den Wert der exponent-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class RSAKeyValueType {
     }
 
     /**
-     * Sets the value of the exponent property.
+     * Legt den Wert der exponent-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/CanonicalizationMethodType.java b/src/main/java/at/gv/util/xsd/xmldsig/CanonicalizationMethodType.java
index 98f97fb..fdf03b4 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/CanonicalizationMethodType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/CanonicalizationMethodType.java
@@ -13,9 +13,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for CanonicalizationMethodType complex type.
+ * <p>Java-Klasse für CanonicalizationMethodType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="CanonicalizationMethodType">
@@ -76,7 +76,7 @@ public class CanonicalizationMethodType {
     }
 
     /**
-     * Gets the value of the algorithm property.
+     * Ruft den Wert der algorithm-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -88,7 +88,7 @@ public class CanonicalizationMethodType {
     }
 
     /**
-     * Sets the value of the algorithm property.
+     * Legt den Wert der algorithm-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/DSAKeyValueType.java b/src/main/java/at/gv/util/xsd/xmldsig/DSAKeyValueType.java
index a57f030..238152e 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/DSAKeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/DSAKeyValueType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for DSAKeyValueType complex type.
+ * <p>Java-Klasse für DSAKeyValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="DSAKeyValueType">
@@ -64,7 +64,7 @@ public class DSAKeyValueType {
     protected String pgenCounter;
 
     /**
-     * Gets the value of the p property.
+     * Ruft den Wert der p-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the p property.
+     * Legt den Wert der p-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -88,7 +88,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the q property.
+     * Ruft den Wert der q-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -100,7 +100,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the q property.
+     * Legt den Wert der q-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -112,7 +112,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the j property.
+     * Ruft den Wert der j-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -124,7 +124,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the j property.
+     * Legt den Wert der j-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -136,7 +136,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the g property.
+     * Ruft den Wert der g-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -148,7 +148,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the g property.
+     * Legt den Wert der g-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -160,7 +160,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the y property.
+     * Ruft den Wert der y-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -172,7 +172,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the y property.
+     * Legt den Wert der y-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -184,7 +184,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the seed property.
+     * Ruft den Wert der seed-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -196,7 +196,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the seed property.
+     * Legt den Wert der seed-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -208,7 +208,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Gets the value of the pgenCounter property.
+     * Ruft den Wert der pgenCounter-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -220,7 +220,7 @@ public class DSAKeyValueType {
     }
 
     /**
-     * Sets the value of the pgenCounter property.
+     * Legt den Wert der pgenCounter-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 3eb9514..45a7454 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/DigestMethodType.java
@@ -14,9 +14,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for DigestMethodType complex type.
+ * <p>Java-Klasse für DigestMethodType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="DigestMethodType">
@@ -64,9 +64,9 @@ public class DigestMethodType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Object }
      * {@link String }
      * {@link Element }
-     * {@link Object }
      * 
      * 
      */
@@ -78,7 +78,7 @@ public class DigestMethodType {
     }
 
     /**
-     * Gets the value of the algorithm property.
+     * Ruft den Wert der algorithm-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -90,7 +90,7 @@ public class DigestMethodType {
     }
 
     /**
-     * Sets the value of the algorithm property.
+     * Legt den Wert der algorithm-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 6e6603d..a74ebb1 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/KeyInfoType.java
@@ -20,9 +20,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for KeyInfoType complex type.
+ * <p>Java-Klasse für KeyInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="KeyInfoType">
@@ -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 = "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 = "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 = "KeyName", 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, required = false),
+        @XmlElementRef(name = "RetrievalMethod", 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 = "MgmtData", 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 = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -88,14 +88,14 @@ public class KeyInfoType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
      * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
      * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
+     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
      * {@link String }
      * {@link Element }
-     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
      * {@link Object }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
@@ -109,7 +109,7 @@ public class KeyInfoType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -121,7 +121,7 @@ public class KeyInfoType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 922ac74..e37e59b 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/KeyValueType.java
@@ -15,9 +15,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for KeyValueType complex type.
+ * <p>Java-Klasse für KeyValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="KeyValueType">
@@ -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 = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlMixed
     @XmlAnyElement(lax = true)
@@ -68,10 +68,10 @@ 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 Object }
+     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/ManifestType.java b/src/main/java/at/gv/util/xsd/xmldsig/ManifestType.java
index 98a7b9a..14c81a4 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/ManifestType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/ManifestType.java
@@ -15,9 +15,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for ManifestType complex type.
+ * <p>Java-Klasse für ManifestType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ManifestType">
@@ -78,7 +78,7 @@ public class ManifestType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -90,7 +90,7 @@ public class ManifestType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 3a6a69d..d9c2aa5 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/ObjectFactory.java
@@ -27,38 +27,38 @@ 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 _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");
     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 _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");
+    private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
 
     /**
      * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: at.gv.util.xsd.xmldsig
@@ -262,15 +262,6 @@ 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 >}}
      * 
      */
@@ -280,15 +271,6 @@ 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 >}}
      * 
      */
@@ -343,6 +325,69 @@ 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 >}}
      * 
      */
@@ -379,24 +424,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 SignatureValueType }{@code >}}
      * 
      */
@@ -415,57 +442,57 @@ public class ObjectFactory {
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue")
+    public JAXBElement<String> createDigestValue(String value) {
+        return new JAXBElement<String>(_DigestValue_QNAME, String.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue")
-    public JAXBElement<String> createDigestValue(String value) {
-        return new JAXBElement<String>(_DigestValue_QNAME, String.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
+    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
+        return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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);
+    @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 = "KeyName")
-    public JAXBElement<String> createKeyName(String value) {
-        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, 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);
     }
 
     /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}}
+     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
      * 
      */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
-    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
-        return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
+    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
+    public JAXBElement<String> createPGPDataTypePGPKeyID(String value) {
+        return new JAXBElement<String>(_PGPDataTypePGPKeyID_QNAME, String.class, PGPDataType.class, value);
     }
 
     /**
-     * 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 = "PGPKeyPacket", scope = PGPDataType.class)
+    public JAXBElement<String> createPGPDataTypePGPKeyPacket(String value) {
+        return new JAXBElement<String>(_PGPDataTypePGPKeyPacket_QNAME, String.class, PGPDataType.class, value);
     }
 
     /**
@@ -514,39 +541,12 @@ public class ObjectFactory {
     }
 
     /**
-     * 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);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@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);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
-    public JAXBElement<String> createPGPDataTypePGPKeyID(String value) {
-        return new JAXBElement<String>(_PGPDataTypePGPKeyID_QNAME, String.class, PGPDataType.class, value);
-    }
-
-    /**
-     * 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 = "PGPKeyPacket", scope = PGPDataType.class)
-    public JAXBElement<String> createPGPDataTypePGPKeyPacket(String value) {
-        return new JAXBElement<String>(_PGPDataTypePGPKeyPacket_QNAME, String.class, PGPDataType.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);
     }
 
 }
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 613edf9..7bb550c 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/ObjectType.java
@@ -17,9 +17,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for ObjectType complex type.
+ * <p>Java-Klasse für ObjectType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ObjectType">
@@ -76,9 +76,9 @@ public class ObjectType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Object }
      * {@link String }
      * {@link Element }
-     * {@link Object }
      * 
      * 
      */
@@ -90,7 +90,7 @@ public class ObjectType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -102,7 +102,7 @@ public class ObjectType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -114,7 +114,7 @@ public class ObjectType {
     }
 
     /**
-     * Gets the value of the mimeType property.
+     * Ruft den Wert der mimeType-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -126,7 +126,7 @@ public class ObjectType {
     }
 
     /**
-     * Sets the value of the mimeType property.
+     * Legt den Wert der mimeType-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -138,7 +138,7 @@ public class ObjectType {
     }
 
     /**
-     * Gets the value of the encoding property.
+     * Ruft den Wert der encoding-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -150,7 +150,7 @@ public class ObjectType {
     }
 
     /**
-     * Sets the value of the encoding property.
+     * Legt den Wert der encoding-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 b07ad11..edd3bc2 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/PGPDataType.java
@@ -14,9 +14,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for PGPDataType complex type.
+ * <p>Java-Klasse für PGPDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="PGPDataType">
@@ -47,23 +47,23 @@ 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 = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> content;
 
     /**
-     * Gets the rest of the content model. 
+     * Ruft das restliche Contentmodell ab. 
      * 
      * <p>
-     * You are getting this "catch-all" property because of the following reason: 
-     * The field name "PGPKeyPacket" is used by two different parts of a schema. See: 
-     * line 184 of file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/W3C-XMLDSig.xsd
-     * line 180 of file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/W3C-XMLDSig.xsd
+     * Sie rufen diese "catch-all"-Eigenschaft aus folgendem Grund ab: 
+     * Der Feldname "PGPKeyPacket" wird von zwei verschiedenen Teilen eines Schemas verwendet. Siehe: 
+     * Zeile 184 von file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/W3C-XMLDSig.xsd
+     * Zeile 180 von file:/D:/Projekte/svn/online-vollmachten/egovutils/src/main/resources/wsdl/W3C-XMLDSig.xsd
      * <p>
-     * To get rid of this property, apply a property customization to one 
-     * of both of the following declarations to change their names: 
+     * Um diese Eigenschaft zu entfernen, wenden Sie eine Eigenschaftenanpassung für eine
+     * der beiden folgenden Deklarationen an, um deren Namen zu ändern: 
      * Gets the value of the content property.
      * 
      * <p>
@@ -81,10 +81,10 @@ public class PGPDataType {
      * 
      * <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 Element }
      * {@link Object }
+     * {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
      * 
      */
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/RSAKeyValueType.java b/src/main/java/at/gv/util/xsd/xmldsig/RSAKeyValueType.java
index a03ee7b..4faa9db 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/RSAKeyValueType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/RSAKeyValueType.java
@@ -8,9 +8,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for RSAKeyValueType complex type.
+ * <p>Java-Klasse für RSAKeyValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="RSAKeyValueType">
@@ -40,7 +40,7 @@ public class RSAKeyValueType {
     protected String exponent;
 
     /**
-     * Gets the value of the modulus property.
+     * Ruft den Wert der modulus-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -52,7 +52,7 @@ public class RSAKeyValueType {
     }
 
     /**
-     * Sets the value of the modulus property.
+     * Legt den Wert der modulus-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -64,7 +64,7 @@ public class RSAKeyValueType {
     }
 
     /**
-     * Gets the value of the exponent property.
+     * Ruft den Wert der exponent-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -76,7 +76,7 @@ public class RSAKeyValueType {
     }
 
     /**
-     * Sets the value of the exponent property.
+     * Legt den Wert der exponent-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/ReferenceType.java b/src/main/java/at/gv/util/xsd/xmldsig/ReferenceType.java
index faacd02..d6b038d 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/ReferenceType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/ReferenceType.java
@@ -13,9 +13,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for ReferenceType complex type.
+ * <p>Java-Klasse für ReferenceType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="ReferenceType">
@@ -63,7 +63,7 @@ public class ReferenceType {
     protected String type;
 
     /**
-     * Gets the value of the transforms property.
+     * Ruft den Wert der transforms-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -75,7 +75,7 @@ public class ReferenceType {
     }
 
     /**
-     * Sets the value of the transforms property.
+     * Legt den Wert der transforms-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -87,7 +87,7 @@ public class ReferenceType {
     }
 
     /**
-     * Gets the value of the digestMethod property.
+     * Ruft den Wert der digestMethod-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -99,7 +99,7 @@ public class ReferenceType {
     }
 
     /**
-     * Sets the value of the digestMethod property.
+     * Legt den Wert der digestMethod-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -111,7 +111,7 @@ public class ReferenceType {
     }
 
     /**
-     * Gets the value of the digestValue property.
+     * Ruft den Wert der digestValue-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -123,7 +123,7 @@ public class ReferenceType {
     }
 
     /**
-     * Sets the value of the digestValue property.
+     * Legt den Wert der digestValue-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -135,7 +135,7 @@ public class ReferenceType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -147,7 +147,7 @@ public class ReferenceType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -159,7 +159,7 @@ public class ReferenceType {
     }
 
     /**
-     * Gets the value of the uri property.
+     * Ruft den Wert der uri-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -171,7 +171,7 @@ public class ReferenceType {
     }
 
     /**
-     * Sets the value of the uri property.
+     * Legt den Wert der uri-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -183,7 +183,7 @@ public class ReferenceType {
     }
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -195,7 +195,7 @@ public class ReferenceType {
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/RetrievalMethodType.java b/src/main/java/at/gv/util/xsd/xmldsig/RetrievalMethodType.java
index 8de9a57..9d7ccc3 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/RetrievalMethodType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/RetrievalMethodType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for RetrievalMethodType complex type.
+ * <p>Java-Klasse für RetrievalMethodType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="RetrievalMethodType">
@@ -46,7 +46,7 @@ public class RetrievalMethodType {
     protected String type;
 
     /**
-     * Gets the value of the transforms property.
+     * Ruft den Wert der transforms-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -58,7 +58,7 @@ public class RetrievalMethodType {
     }
 
     /**
-     * Sets the value of the transforms property.
+     * Legt den Wert der transforms-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -70,7 +70,7 @@ public class RetrievalMethodType {
     }
 
     /**
-     * Gets the value of the uri property.
+     * Ruft den Wert der uri-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -82,7 +82,7 @@ public class RetrievalMethodType {
     }
 
     /**
-     * Sets the value of the uri property.
+     * Legt den Wert der uri-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -94,7 +94,7 @@ public class RetrievalMethodType {
     }
 
     /**
-     * Gets the value of the type property.
+     * Ruft den Wert der type-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -106,7 +106,7 @@ public class RetrievalMethodType {
     }
 
     /**
-     * Sets the value of the type property.
+     * Legt den Wert der type-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 e6a187e..fa1ab30 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SPKIDataType.java
@@ -13,9 +13,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for SPKIDataType complex type.
+ * <p>Java-Klasse für SPKIDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SPKIDataType">
@@ -60,9 +60,9 @@ public class SPKIDataType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Object }
      * {@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..ad1cf70 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SignatureMethodType.java
@@ -16,9 +16,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for SignatureMethodType complex type.
+ * <p>Java-Klasse für SignatureMethodType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SignatureMethodType">
@@ -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;
@@ -68,9 +68,9 @@ public class SignatureMethodType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Object }
      * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+     * {@link Object }
+     * {@link String }
      * 
      * 
      */
@@ -82,7 +82,7 @@ public class SignatureMethodType {
     }
 
     /**
-     * Gets the value of the algorithm property.
+     * Ruft den Wert der algorithm-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -94,7 +94,7 @@ public class SignatureMethodType {
     }
 
     /**
-     * Sets the value of the algorithm property.
+     * Legt den Wert der algorithm-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertiesType.java b/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertiesType.java
index d70a3df..a1cea54 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertiesType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertiesType.java
@@ -15,9 +15,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for SignaturePropertiesType complex type.
+ * <p>Java-Klasse für SignaturePropertiesType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SignaturePropertiesType">
@@ -78,7 +78,7 @@ public class SignaturePropertiesType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -90,7 +90,7 @@ public class SignaturePropertiesType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 deea9c9..e32707e 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SignaturePropertyType.java
@@ -17,9 +17,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for SignaturePropertyType complex type.
+ * <p>Java-Klasse für SignaturePropertyType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SignaturePropertyType">
@@ -73,9 +73,9 @@ public class SignaturePropertyType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Object }
      * {@link String }
      * {@link Element }
-     * {@link Object }
      * 
      * 
      */
@@ -87,7 +87,7 @@ public class SignaturePropertyType {
     }
 
     /**
-     * Gets the value of the target property.
+     * Ruft den Wert der target-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -99,7 +99,7 @@ public class SignaturePropertyType {
     }
 
     /**
-     * Sets the value of the target property.
+     * Legt den Wert der target-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -111,7 +111,7 @@ public class SignaturePropertyType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -123,7 +123,7 @@ public class SignaturePropertyType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SignatureType.java b/src/main/java/at/gv/util/xsd/xmldsig/SignatureType.java
index 49db579..b1fcc1f 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SignatureType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SignatureType.java
@@ -15,9 +15,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for SignatureType complex type.
+ * <p>Java-Klasse für SignatureType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SignatureType">
@@ -61,7 +61,7 @@ public class SignatureType {
     protected String id;
 
     /**
-     * Gets the value of the signedInfo property.
+     * Ruft den Wert der signedInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -73,7 +73,7 @@ public class SignatureType {
     }
 
     /**
-     * Sets the value of the signedInfo property.
+     * Legt den Wert der signedInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -85,7 +85,7 @@ public class SignatureType {
     }
 
     /**
-     * Gets the value of the signatureValue property.
+     * Ruft den Wert der signatureValue-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -97,7 +97,7 @@ public class SignatureType {
     }
 
     /**
-     * Sets the value of the signatureValue property.
+     * Legt den Wert der signatureValue-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -109,7 +109,7 @@ public class SignatureType {
     }
 
     /**
-     * Gets the value of the keyInfo property.
+     * Ruft den Wert der keyInfo-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -121,7 +121,7 @@ public class SignatureType {
     }
 
     /**
-     * Sets the value of the keyInfo property.
+     * Legt den Wert der keyInfo-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -162,7 +162,7 @@ public class SignatureType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -174,7 +174,7 @@ public class SignatureType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SignatureValueType.java b/src/main/java/at/gv/util/xsd/xmldsig/SignatureValueType.java
index 10c6120..68d6a44 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SignatureValueType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SignatureValueType.java
@@ -13,9 +13,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for SignatureValueType complex type.
+ * <p>Java-Klasse für SignatureValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SignatureValueType">
@@ -44,7 +44,7 @@ public class SignatureValueType {
     protected String id;
 
     /**
-     * Gets the value of the value property.
+     * Ruft den Wert der value-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -56,7 +56,7 @@ public class SignatureValueType {
     }
 
     /**
-     * Sets the value of the value property.
+     * Legt den Wert der value-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -68,7 +68,7 @@ public class SignatureValueType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -80,7 +80,7 @@ public class SignatureValueType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/SignedInfoType.java b/src/main/java/at/gv/util/xsd/xmldsig/SignedInfoType.java
index 140ed1b..bc17734 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/SignedInfoType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/SignedInfoType.java
@@ -15,9 +15,9 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
 
 /**
- * <p>Java class for SignedInfoType complex type.
+ * <p>Java-Klasse für SignedInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="SignedInfoType">
@@ -57,7 +57,7 @@ public class SignedInfoType {
     protected String id;
 
     /**
-     * Gets the value of the canonicalizationMethod property.
+     * Ruft den Wert der canonicalizationMethod-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -69,7 +69,7 @@ public class SignedInfoType {
     }
 
     /**
-     * Sets the value of the canonicalizationMethod property.
+     * Legt den Wert der canonicalizationMethod-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -81,7 +81,7 @@ public class SignedInfoType {
     }
 
     /**
-     * Gets the value of the signatureMethod property.
+     * Ruft den Wert der signatureMethod-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -93,7 +93,7 @@ public class SignedInfoType {
     }
 
     /**
-     * Sets the value of the signatureMethod property.
+     * Legt den Wert der signatureMethod-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -134,7 +134,7 @@ public class SignedInfoType {
     }
 
     /**
-     * Gets the value of the id property.
+     * Ruft den Wert der id-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -146,7 +146,7 @@ public class SignedInfoType {
     }
 
     /**
-     * Sets the value of the id property.
+     * Legt den Wert der id-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
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 7499065..a825b16 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/TransformType.java
@@ -16,9 +16,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for TransformType complex type.
+ * <p>Java-Klasse für TransformType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="TransformType">
@@ -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;
@@ -68,10 +68,10 @@ public class TransformType {
      * 
      * <p>
      * Objects of the following type(s) are allowed in the list
+     * {@link Object }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link String }
      * {@link Element }
-     * {@link Object }
      * 
      * 
      */
@@ -83,7 +83,7 @@ public class TransformType {
     }
 
     /**
-     * Gets the value of the algorithm property.
+     * Ruft den Wert der algorithm-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -95,7 +95,7 @@ public class TransformType {
     }
 
     /**
-     * Sets the value of the algorithm property.
+     * Legt den Wert der algorithm-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/TransformsType.java b/src/main/java/at/gv/util/xsd/xmldsig/TransformsType.java
index 9b95a61..f987e51 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/TransformsType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/TransformsType.java
@@ -10,9 +10,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for TransformsType complex type.
+ * <p>Java-Klasse für TransformsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="TransformsType">
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 3adef12..4e36973 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/X509DataType.java
@@ -14,9 +14,9 @@ import org.w3c.dom.Element;
 
 
 /**
- * <p>Java class for X509DataType complex type.
+ * <p>Java-Klasse für X509DataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="X509DataType">
@@ -46,11 +46,11 @@ import org.w3c.dom.Element;
 public class X509DataType {
 
     @XmlElementRefs({
-        @XmlElementRef(name = "X509SubjectName", 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 = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class),
-        @XmlElementRef(name = "X509CRL", 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 = "X509IssuerSerial", 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 = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+        @XmlElementRef(name = "X509SubjectName", 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)
     })
     @XmlAnyElement(lax = true)
     protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
@@ -74,10 +74,10 @@ public class X509DataType {
      * <p>
      * Objects of the following type(s) are allowed in the list
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Element }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Object }
+     * {@link Element }
      * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+     * {@link Object }
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * {@link JAXBElement }{@code <}{@link String }{@code >}
      * 
diff --git a/src/main/java/at/gv/util/xsd/xmldsig/X509IssuerSerialType.java b/src/main/java/at/gv/util/xsd/xmldsig/X509IssuerSerialType.java
index b3ef622..12ef687 100644
--- a/src/main/java/at/gv/util/xsd/xmldsig/X509IssuerSerialType.java
+++ b/src/main/java/at/gv/util/xsd/xmldsig/X509IssuerSerialType.java
@@ -9,9 +9,9 @@ import javax.xml.bind.annotation.XmlType;
 
 
 /**
- * <p>Java class for X509IssuerSerialType complex type.
+ * <p>Java-Klasse für X509IssuerSerialType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>Das folgende Schemafragment gibt den erwarteten Content an, der in dieser Klasse enthalten ist.
  * 
  * <pre>
  * &lt;complexType name="X509IssuerSerialType">
@@ -41,7 +41,7 @@ public class X509IssuerSerialType {
     protected BigInteger x509SerialNumber;
 
     /**
-     * Gets the value of the x509IssuerName property.
+     * Ruft den Wert der x509IssuerName-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -53,7 +53,7 @@ public class X509IssuerSerialType {
     }
 
     /**
-     * Sets the value of the x509IssuerName property.
+     * Legt den Wert der x509IssuerName-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
@@ -65,7 +65,7 @@ public class X509IssuerSerialType {
     }
 
     /**
-     * Gets the value of the x509SerialNumber property.
+     * Ruft den Wert der x509SerialNumber-Eigenschaft ab.
      * 
      * @return
      *     possible object is
@@ -77,7 +77,7 @@ public class X509IssuerSerialType {
     }
 
     /**
-     * Sets the value of the x509SerialNumber property.
+     * Legt den Wert der x509SerialNumber-Eigenschaft fest.
      * 
      * @param value
      *     allowed object is
diff --git a/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl b/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl
index fe227ae..3c40e41 100644
--- a/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl
+++ b/src/main/resources/wsdl/MOA-SPSS-1.3.wsdl
@@ -2,116 +2,113 @@
 <!-- 
   Web Service Description for MOA SP/SS 1.4
 -->
-<definitions name="MOA"
-             targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl"
-             xmlns="http://schemas.xmlsoap.org/wsdl/"
-             xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl"
-             xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-             xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#"
-             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  
-  <xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl">
-    	<xsd:import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" schemaLocation="MOA-SPSS-1.3.xsd"/>
-    </xsd:schema>
-  <message name="CreateXMLSignatureInput">
-    <part name="body" element="moa:CreateXMLSignatureRequest"/>
-  </message>
-  <message name="CreateXMLSignatureOutput">
-    <part name="body" element="moa:CreateXMLSignatureResponse"/>
-  </message>
-  <message name="VerifyCMSSignatureInput">
-    <part name="body" element="moa:VerifyCMSSignatureRequest"/>
-  </message>
-  <message name="VerifyCMSSignatureOutput">
-    <part name="body" element="moa:VerifyCMSSignatureResponse"/>
-  </message>
-  <message name="VerifyXMLSignatureInput">
-    <part name="body" element="moa:VerifyXMLSignatureRequest"/>
-  </message>
-  <message name="VerifyXMLSignatureOutput">
-    <part name="body" element="moa:VerifyXMLSignatureResponse"/>
-  </message>
-  <message name="MOAFault">
-    <part name="body" element="moa:ErrorResponse"/>
-  </message>
-  <portType name="SignatureCreationPortType">
-    <operation name="createXMLSignature">
-      <input message="tns:CreateXMLSignatureInput"/>
-      <output message="tns:CreateXMLSignatureOutput"/>
-      <fault name="MOAFault" message="tns:MOAFault"/>
-    </operation>
-  </portType>
-  <portType name="SignatureVerificationPortType">
-    <operation name="verifyCMSSignature">
-      <input message="tns:VerifyCMSSignatureInput"/>
-      <output message="tns:VerifyCMSSignatureOutput"/>
-      <fault name="MOAFault" message="tns:MOAFault"/>
-    </operation>
-    <operation name="verifyXMLSignature">
-      <input message="tns:VerifyXMLSignatureInput"/>
-      <output message="tns:VerifyXMLSignatureOutput"/>
-      <fault name="MOAFault" message="tns:MOAFault"/>
-    </operation>
-  </portType>
-  <binding name="SignatureCreationBinding" type="tns:SignatureCreationPortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="createXMLSignature">
-      <soap:operation soapAction="urn:CreateXMLSignatureAction"/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="MOAFault">
-        <soap:fault use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <binding name="SignatureVerificationBinding" type="tns:SignatureVerificationPortType">
-    <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <operation name="verifyCMSSignature">
-      <soap:operation soapAction="urn:VerifyCMSSignatureAction"/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="MOAFault">
-        <soap:fault use="literal"/>
-      </fault>
-    </operation>
-    <operation name="verifyXMLSignature">
-      <soap:operation soapAction="urn:VerifyXMLSignatureAction"/>
-      <input>
-        <soap:body use="literal"/>
-      </input>
-      <output>
-        <soap:body use="literal"/>
-      </output>
-      <fault name="MOAFault">
-        <soap:fault use="literal"/>
-      </fault>
-    </operation>
-  </binding>
-  <service name="SignatureCreationService">
-    <port name="SignatureCreationPort" binding="tns:SignatureCreationBinding">
-      <!--
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:tns="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:moa="http://reference.e-government.gv.at/namespace/moa/20020822#" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" name="MOA" targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl">
+	<types>
+		<xsd:schema>
+			<xsd:import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" schemaLocation="MOA-SPSS-1.3.xsd"/>
+		</xsd:schema>
+	</types>
+	<message name="CreateXMLSignatureInput">
+		<part name="body" element="moa:CreateXMLSignatureRequest"/>
+	</message>
+	<message name="CreateXMLSignatureOutput">
+		<part name="body" element="moa:CreateXMLSignatureResponse"/>
+	</message>
+	<message name="VerifyCMSSignatureInput">
+		<part name="body" element="moa:VerifyCMSSignatureRequest"/>
+	</message>
+	<message name="VerifyCMSSignatureOutput">
+		<part name="body" element="moa:VerifyCMSSignatureResponse"/>
+	</message>
+	<message name="VerifyXMLSignatureInput">
+		<part name="body" element="moa:VerifyXMLSignatureRequest"/>
+	</message>
+	<message name="VerifyXMLSignatureOutput">
+		<part name="body" element="moa:VerifyXMLSignatureResponse"/>
+	</message>
+	<message name="MOAFault">
+		<part name="body" element="moa:ErrorResponse"/>
+	</message>
+	<portType name="SignatureCreationPortType">
+		<operation name="createXMLSignature">
+			<input message="tns:CreateXMLSignatureInput"/>
+			<output message="tns:CreateXMLSignatureOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<portType name="SignatureVerificationPortType">
+		<operation name="verifyCMSSignature">
+			<input message="tns:VerifyCMSSignatureInput"/>
+			<output message="tns:VerifyCMSSignatureOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+		<operation name="verifyXMLSignature">
+			<input message="tns:VerifyXMLSignatureInput"/>
+			<output message="tns:VerifyXMLSignatureOutput"/>
+			<fault name="MOAFault" message="tns:MOAFault"/>
+		</operation>
+	</portType>
+	<binding name="SignatureCreationBinding" type="tns:SignatureCreationPortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="createXMLSignature">
+			<soap:operation soapAction="urn:CreateXMLSignatureAction"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="" use="literal"/>
+			</fault>
+		</operation>
+	</binding>
+	<binding name="SignatureVerificationBinding" type="tns:SignatureVerificationPortType">
+		<soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+		<operation name="verifyCMSSignature">
+			<soap:operation soapAction="urn:VerifyCMSSignatureAction"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="" use="literal"/>
+			</fault>
+		</operation>
+		<operation name="verifyXMLSignature">
+			<soap:operation soapAction="urn:VerifyXMLSignatureAction"/>
+			<input>
+				<soap:body use="literal"/>
+			</input>
+			<output>
+				<soap:body use="literal"/>
+			</output>
+			<fault name="MOAFault">
+				<soap:fault name="" use="literal"/>
+			</fault>
+		</operation>
+	</binding>
+	<service name="SignatureCreationService">
+		<port name="SignatureCreationPort" binding="tns:SignatureCreationBinding">
+			<soap:address location="http://localhost/moa-spss/services/SignatureCreation"/>
+			<!--
         Please note that the location URL must be adapted to the actual service URL.
       
       -->
-      <soap:address location="http://localhost/moa-spss/services/SignatureCreation"/>
-    </port>
-  </service>
-  <service name="SignatureVerificationService">
-    <port name="SignatureVerificationPort" binding="tns:SignatureVerificationBinding">
-      <!--
+		</port>
+	</service>
+	<service name="SignatureVerificationService">
+		<port name="SignatureVerificationPort" binding="tns:SignatureVerificationBinding">
+			<soap:address location="http://localhost/moa-spss/services/SignatureVerification"/>
+			<!--
         Please note that the location URL must be adapted to the actual service URL.
       
       -->
-      <soap:address location="http://localhost/moa-spss/services/SignatureVerification"/>
-    </port>
-  </service>
+		</port>
+	</service>
+	<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/moa/20020822#moa.wsdl">
+		<xsd:import namespace="http://reference.e-government.gv.at/namespace/moa/20020822#" schemaLocation="MOA-SPSS-1.3.xsd"/>
+	</xsd:schema>
 </definitions>
diff --git a/src/main/resources/wsdl/custom-bindings/szr-schemas.xml b/src/main/resources/wsdl/custom-bindings/szr-schemas.xml
index f65d13b..67afa83 100644
--- a/src/main/resources/wsdl/custom-bindings/szr-schemas.xml
+++ b/src/main/resources/wsdl/custom-bindings/szr-schemas.xml
@@ -3,6 +3,22 @@
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
 	xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc">
 
+  <bindings schemaLocation="../szr/szr_v2.0.xsd">
+		<bindings node="/xsd:schema">
+			<schemaBindings>
+				<package name="at.gv.util.xsd.szr" />
+			</schemaBindings>
+		</bindings>
+	</bindings>
+
+  <!--bindings schemaLocation="../szr/szr_v2.0.xsd">
+		<bindings node="/xs:schema/xs:element[@name="GetBPK"]">
+			<schemaBindings>
+				<package name="at.gv.util.xsd.haha" />
+			</schemaBindings>
+		</bindings>
+	</bindings-->
+  
 	<bindings schemaLocation="../szr/szr_ecdsa.xsd">
 		<bindings node="/xsd:schema">
 			<schemaBindings>
@@ -35,15 +51,7 @@
 		</bindings>
 	</bindings>
 
-	<bindings schemaLocation="../szr/szr_v2.0.xsd">
-		<bindings node="/xsd:schema">
-			<schemaBindings>
-				<package name="at.gv.util.xsd.szr" />
-			</schemaBindings>
-		</bindings>
-	</bindings>
-
-	<bindings schemaLocation="../szr/szr_xmldsig.xsd">
+  <bindings schemaLocation="../szr/szr_xmldsig.xsd">
 		<bindings node="/xsd:schema">
 			<schemaBindings>
 				<package name="at.gv.util.xsd.szr.xmldsig" />
diff --git a/src/main/resources/wsdl/custom-bindings/szr-wsdl.xml b/src/main/resources/wsdl/custom-bindings/szr-wsdl.xml
index 8f3c358..02cc04e 100644
--- a/src/main/resources/wsdl/custom-bindings/szr-wsdl.xml
+++ b/src/main/resources/wsdl/custom-bindings/szr-wsdl.xml
@@ -4,5 +4,7 @@
                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
                xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
 
-  <package name="at.gv.util.wsdl.szr"/>  
+  <enableWrapperStyle>false</enableWrapperStyle>
+  <package name="at.gv.util.wsdl.szr"/> 
+     
 </bindings>
\ No newline at end of file
diff --git a/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl b/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl
index 2a249f3..f037b44 100644
--- a/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl
+++ b/src/main/resources/wsdl/mis/usp/mis-usp-1.0.2.wsdl
@@ -1,16 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/"
-			 xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-             xmlns:tns="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl"
-             xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-             xmlns:usp="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd"
-             name="usp"
-             targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl">
-
-	<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl">
-    	<xsd:import namespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd" schemaLocation="mis-usp-1.0.2.xsd"/>
-    </xsd:schema>
-    
+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:usp="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd" name="usp" targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl">
+	<types>
+		<xsd:schema>
+			<xsd:import namespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd" schemaLocation="mis-usp-1.0.2.xsd"/>
+		</xsd:schema>
+	</types>
 	<message name="GetMandatesRequest">
 		<part name="GetMandatesRequest" element="usp:GetMandatesRequest"/>
 	</message>
@@ -38,6 +32,9 @@
 	<service name="GetMandatesService">
 		<port name="GetMandatesPort" binding="tns:GetMandatesBinding">
 			<soap:address location="http://localhost:8080/usp/GetMandatesService"/>
-		</port>		
+		</port>
 	</service>
+	<xsd:schema targetNamespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/wsdl">
+		<xsd:import namespace="http://reference.e-government.gv.at/namespace/mandates/mis/usp/1.0.2/xsd" schemaLocation="mis-usp-1.0.2.xsd"/>
+	</xsd:schema>
 </definitions>
diff --git a/src/main/resources/wsdl/szr/SZR_v2.0.wsdl b/src/main/resources/wsdl/szr/SZR_v2.0.wsdl
index 4819cdc..3da49dd 100644
--- a/src/main/resources/wsdl/szr/SZR_v2.0.wsdl
+++ b/src/main/resources/wsdl/szr/SZR_v2.0.wsdl
@@ -1,269 +1,267 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:szr="urn:SZRServices"

-	xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#"

-	xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema"

-	xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#"

-	xmlns:pvp="http://egov.gv.at/pvp1.xsd" xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/04/secext" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"

-	targetNamespace="urn:SZRServices">

-	

-	<import namespace="urn:SZRServices" location="szr_v2.0.xsd"/>

-	

+<definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:szr="urn:SZRServices" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#" xmlns:pvp="http://egov.gv.at/pvp1.xsd" xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/04/secext" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" targetNamespace="urn:SZRServices">

+		<types>

+			<xs:schema>

+				<xs:import namespace="urn:SZRServices" schemaLocation="szr_v2.0.xsd"/>

+			</xs:schema>

+		</types>

 	<message name="Header">

-		<part name="SecurityHeader" element="wsse:Security" />

+		<part name="SecurityHeader" element="wsse:Security"/>

 	</message>

 	<message name="GetIdentityLinkRequest">

-		<part name="parameters" element="szr:GetIdentityLink" />

+		<part name="parameters" element="szr:GetIdentityLink"/>

 	</message>

 	<message name="GetIdentityLinkResponse">

-		<part name="parameters" element="szr:GetIdentityLinkResponse" />

+		<part name="parameters" element="szr:GetIdentityLinkResponse"/>

 	</message>

 	<message name="GetBPKRequest">

-		<part name="parameters" element="szr:GetBPK" />

+		<part name="parameters" element="szr:GetBPK"/>

 	</message>

 	<message name="GetBPKResponse">

-		<part name="parameters" element="szr:GetBPKResponse" />

+		<part name="parameters" element="szr:GetBPKResponse"/>

 	</message>

 	<message name="GetBPKKombiRequest">

-		<part name="parameters" element="szr:GetBPKKombi" />

+		<part name="parameters" element="szr:GetBPKKombi"/>

 	</message>

 	<message name="GetBPKKombiResponse">

-		<part name="parameters" element="szr:GetBPKKombiResponse" />

+		<part name="parameters" element="szr:GetBPKKombiResponse"/>

 	</message>

 	<message name="BPKzuBasiszahlRequest">

-		<part name="parameters" element="szr:BPKzuBasiszahl" />

+		<part name="parameters" element="szr:BPKzuBasiszahl"/>

 	</message>

 	<message name="BPKzuBasiszahlResponse">

-		<part name="parameters" element="szr:BPKzuBasiszahlResponse" />

+		<part name="parameters" element="szr:BPKzuBasiszahlResponse"/>

 	</message>

 	<message name="BasiszahlZuBPKRequest">

-		<part name="parameters" element="szr:BasiszahlZuBPK" />

+		<part name="parameters" element="szr:BasiszahlZuBPK"/>

 	</message>

 	<message name="BasiszahlZuBPKResponse">

-		<part name="parameters" element="szr:BasiszahlZuBPKResponse" />

+		<part name="parameters" element="szr:BasiszahlZuBPKResponse"/>

 	</message>

 	<message name="ValidateIdentityLinkRequest">

-		<part name="parameters" element="szr:ValidateIdentityLink" />

+		<part name="parameters" element="szr:ValidateIdentityLink"/>

 	</message>

 	<message name="ValidateIdentityLinkResponse">

-		<part name="parameters" element="szr:ValidateIdentityLinkResponse" />

+		<part name="parameters" element="szr:ValidateIdentityLinkResponse"/>

 	</message>

 	<message name="TransformBPKRequest">

-		<part name="parameters" element="szr:TransformBPK" />

+		<part name="parameters" element="szr:TransformBPK"/>

 	</message>

 	<message name="TransformBPKResponse">

-		<part name="parameters" element="szr:TransformBPKResponse" />

+		<part name="parameters" element="szr:TransformBPKResponse"/>

 	</message>

 	<message name="ZMRAnwendungsIntegrationRequest">

-		<part name="parameters" element="szr:ZMRAnwendungsIntegration" />

+		<part name="parameters" element="szr:ZMRAnwendungsIntegration"/>

 	</message>

 	<message name="ZMRAnwendungsIntegrationResponse">

-		<part name="parameters" element="szr:ZMRAnwendungsIntegrationResponse" />

+		<part name="parameters" element="szr:ZMRAnwendungsIntegrationResponse"/>

 	</message>

 	<message name="GetStammzahlRequest">

-		<part name="parameters" element="szr:GetStammzahl" />

+		<part name="parameters" element="szr:GetStammzahl"/>

 	</message>

 	<message name="GetStammzahlResponse">

-		<part name="parameters" element="szr:GetStammzahlResponse" />

+		<part name="parameters" element="szr:GetStammzahlResponse"/>

 	</message>

 	<message name="GetVersionRequest">

-		<part name="parameters" element="szr:GetVersion" />

+		<part name="parameters" element="szr:GetVersion"/>

 	</message>

 	<message name="GetVersionResponse">

-		<part name="parameters" element="szr:GetVersionResponse" />

+		<part name="parameters" element="szr:GetVersionResponse"/>

 	</message>

 	<message name="SZRException">

-		<part name="fault" element="szr:SZRException" />

+		<part name="fault" element="szr:SZRException"/>

 	</message>

 	<portType name="SZR">

 		<operation name="GetIdentityLink">

-			<input name="GetIdentityLinkRequest" message="szr:GetIdentityLinkRequest" />

-			<output name="GetIdentityLinkResponse" message="szr:GetIdentityLinkResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="GetIdentityLinkRequest" message="szr:GetIdentityLinkRequest"/>

+			<output name="GetIdentityLinkResponse" message="szr:GetIdentityLinkResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="GetBPK">

-			<input name="GetBPKRequest" message="szr:GetBPKRequest" />

-			<output name="GetBPKResponse" message="szr:GetBPKResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="GetBPKRequest" message="szr:GetBPKRequest"/>

+			<output name="GetBPKResponse" message="szr:GetBPKResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="GetBPKKombi">

-			<input name="GetBPKKombiRequest" message="szr:GetBPKKombiRequest" />

-			<output name="GetBPKKombiResponse" message="szr:GetBPKKombiResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="GetBPKKombiRequest" message="szr:GetBPKKombiRequest"/>

+			<output name="GetBPKKombiResponse" message="szr:GetBPKKombiResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="ValidateIdentityLink">

-			<input name="ValidateIdentityLinkRequest" message="szr:ValidateIdentityLinkRequest" />

-			<output name="ValidateIdentityLinkResponse" message="szr:ValidateIdentityLinkResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="ValidateIdentityLinkRequest" message="szr:ValidateIdentityLinkRequest"/>

+			<output name="ValidateIdentityLinkResponse" message="szr:ValidateIdentityLinkResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="TransformBPK">

-			<input name="TransformBPKRequest" message="szr:TransformBPKRequest" />

-			<output name="TransformBPKResponse" message="szr:TransformBPKResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="TransformBPKRequest" message="szr:TransformBPKRequest"/>

+			<output name="TransformBPKResponse" message="szr:TransformBPKResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="BPKzuBasiszahl">

-			<input name="BPKzuBasiszahlRequest" message="szr:BPKzuBasiszahlRequest" />

-			<output name="BPKzuBasiszahlResponse" message="szr:BPKzuBasiszahlResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="BPKzuBasiszahlRequest" message="szr:BPKzuBasiszahlRequest"/>

+			<output name="BPKzuBasiszahlResponse" message="szr:BPKzuBasiszahlResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="BasiszahlZuBPK">

-			<input name="BasiszahlZuBPKRequest" message="szr:BasiszahlZuBPKRequest" />

-			<output name="BasiszahlZuBPKResponse" message="szr:BasiszahlZuBPKResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="BasiszahlZuBPKRequest" message="szr:BasiszahlZuBPKRequest"/>

+			<output name="BasiszahlZuBPKResponse" message="szr:BasiszahlZuBPKResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="ZMRAnwendungsIntegration">

-			<input name="ZMRAnwendungsIntegrationRequest" message="szr:ZMRAnwendungsIntegrationRequest" />

-			<output name="ZMRAnwendungsIntegrationResponse" message="szr:ZMRAnwendungsIntegrationResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="ZMRAnwendungsIntegrationRequest" message="szr:ZMRAnwendungsIntegrationRequest"/>

+			<output name="ZMRAnwendungsIntegrationResponse" message="szr:ZMRAnwendungsIntegrationResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="GetStammzahl">

-			<input name="GetStammzahlRequest" message="szr:GetStammzahlRequest" />

-			<output name="GetStammzahlResponse" message="szr:GetStammzahlResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="GetStammzahlRequest" message="szr:GetStammzahlRequest"/>

+			<output name="GetStammzahlResponse" message="szr:GetStammzahlResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 		<operation name="GetVersion">

-			<input name="GetVersionRequest" message="szr:GetVersionRequest" />

-			<output name="GetVersionResponse" message="szr:GetVersionResponse" />

-			<fault name="SZRException" message="szr:SZRException" />

+			<input name="GetVersionRequest" message="szr:GetVersionRequest"/>

+			<output name="GetVersionResponse" message="szr:GetVersionResponse"/>

+			<fault name="SZRException" message="szr:SZRException"/>

 		</operation>

 	</portType>

 	<binding name="SZRSoapBinding" type="szr:SZR">

-		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />

+		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>

 		<operation name="GetIdentityLink">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="GetIdentityLinkRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="GetIdentityLinkResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="GetBPK">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="GetBPKRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="GetBPKResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="GetBPKKombi">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="GetBPKKombiRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="GetBPKKombiResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="ValidateIdentityLink">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="ValidateIdentityLinkRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="ValidateIdentityLinkResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="TransformBPK">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="TransformBPKRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="TransformBPKResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="BPKzuBasiszahl">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="BPKzuBasiszahlRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="BPKzuBasiszahlResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="BasiszahlZuBPK">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="BasiszahlZuBPKRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal"></wsdlsoap:body>

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="BasiszahlZuBPKResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="ZMRAnwendungsIntegration">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="ZMRAnwendungsIntegrationRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="ZMRAnwendungsIntegrationResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="GetStammzahl">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="GetStammzahlRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="GetStammzahlResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 		<operation name="GetVersion">

-			<wsdlsoap:operation soapAction="" />

+			<wsdlsoap:operation soapAction=""/>

 			<input name="GetVersionRequest">

-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal"/>

+				<wsdlsoap:body use="literal"/>

 			</input>

 			<output name="GetVersionResponse">

-				<wsdlsoap:body use="literal" />

+				<wsdlsoap:body use="literal"/>

 			</output>

 			<fault name="SZRException">

-				<wsdlsoap:fault use="literal" name="SZRException" />

+				<wsdlsoap:fault name="SZRException" use="literal"/>

 			</fault>

 		</operation>

 	</binding>

-	<service name="SZRService">
		<port name="SZRTestumgebung" binding="szr:SZRSoapBinding">

-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services-T/services/SZR" />

+	<service name="SZRService">

+		<port name="SZRTestumgebung" binding="szr:SZRSoapBinding">

+			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services-T/services/SZR"/>

 		</port>

 		<port name="SZRProduktionsumgebung" binding="szr:SZRSoapBinding">

-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services/services/SZR" />

+			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services/services/SZR"/>

 		</port>

 	</service>

 </definitions>

diff --git a/src/main/resources/wsdl/szr/szr_v2.0.xsd b/src/main/resources/wsdl/szr/szr_v2.0.xsd
index f4b3907..db88c6f 100644
--- a/src/main/resources/wsdl/szr/szr_v2.0.xsd
+++ b/src/main/resources/wsdl/szr/szr_v2.0.xsd
@@ -1,91 +1,81 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema elementFormDefault="qualified" targetNamespace="urn:SZRServices" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:szr="urn:SZRServices"
-			xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-	<xs:import
-		namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="szr_persondata.xsd"/>
-	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="szr_xmldsig.xsd" />
-	<xs:element name="SZRException" type="szr:SZRException" />
-	<xs:complexType name="SZRException" />
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:szr="urn:SZRServices" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" targetNamespace="urn:SZRServices" elementFormDefault="qualified">
+	<xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" schemaLocation="szr_persondata.xsd"/>
+	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="szr_xmldsig.xsd"/>
+	<xs:element name="SZRException" type="szr:SZRException"/>
+	<xs:complexType name="SZRException"/>
 	<xs:complexType name="PersonInfoType">
 		<xs:sequence>
-			<xs:element name="Person" type="pd:PhysicalPersonType" />
-			<xs:element name="RegularDomicile" minOccurs="0"
-				type="pd:PostalAddressType" />
-			<xs:element name="AddressCodes" minOccurs="0"
-				type="szr:AddressCodesType" />
-			<xs:element name="TravelDocument" nillable="true"
-				minOccurs="0" type="szr:TravelDocumentType" />
-			<xs:element name="DateOfBirthWildcard" nillable="true"
-				minOccurs="0" type="xs:boolean" />
+			<xs:element name="Person" type="pd:PhysicalPersonType"/>
+			<xs:element name="RegularDomicile" type="pd:PostalAddressType" minOccurs="0"/>
+			<xs:element name="AddressCodes" type="szr:AddressCodesType" minOccurs="0"/>
+			<xs:element name="TravelDocument" type="szr:TravelDocumentType" nillable="true" minOccurs="0"/>
+			<xs:element name="DateOfBirthWildcard" type="xs:boolean" nillable="true" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="TravelDocumentType">
 		<xs:sequence>
-			<xs:element name="DocumentNumber" minOccurs="0" type="xs:string" />
-			<xs:element name="DocumentType" minOccurs="0" type="xs:string" />
-			<xs:element name="IssueDate" minOccurs="0" type="xs:string" />
-			<xs:element name="IssuingAuthority" minOccurs="0" type="xs:string" />
-			<xs:element name="IssuingCountry" minOccurs="0" type="xs:string" />
+			<xs:element name="DocumentNumber" type="xs:string" minOccurs="0"/>
+			<xs:element name="DocumentType" type="xs:string" minOccurs="0"/>
+			<xs:element name="IssueDate" type="xs:string" minOccurs="0"/>
+			<xs:element name="IssuingAuthority" type="xs:string" minOccurs="0"/>
+			<xs:element name="IssuingCountry" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="AddressCodesType">
 		<xs:sequence>
-			<xs:element name="GKZ" minOccurs="0" type="xs:string" />
-			<xs:element name="OKZ" minOccurs="0" type="xs:string" />
-			<xs:element name="SKZ" minOccurs="0" type="xs:string" />
-			<xs:element name="ADRCD" minOccurs="0" type="xs:string" />
-			<xs:element name="SUBCD" minOccurs="0" type="xs:string" />
-			<xs:element name="OBJNR" minOccurs="0" type="xs:string" />
-			<xs:element name="NTZLNR" minOccurs="0" type="xs:string" />
+			<xs:element name="GKZ" type="xs:string" minOccurs="0"/>
+			<xs:element name="OKZ" type="xs:string" minOccurs="0"/>
+			<xs:element name="SKZ" type="xs:string" minOccurs="0"/>
+			<xs:element name="ADRCD" type="xs:string" minOccurs="0"/>
+			<xs:element name="SUBCD" type="xs:string" minOccurs="0"/>
+			<xs:element name="OBJNR" type="xs:string" minOccurs="0"/>
+			<xs:element name="NTZLNR" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="TransformBPK">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-				<xs:element name="InputBPK" type="xs:string" />
-				<xs:element name="InputBereichsKennung" type="xs:string" />
-				<xs:element name="Begruendung" type="xs:string" />
-				<xs:element maxOccurs="unbounded" name="Target"
-					type="szr:FremdBPKRequestType" />
+				<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
+				<xs:element name="InputBPK" type="xs:string"/>
+				<xs:element name="InputBereichsKennung" type="xs:string"/>
+				<xs:element name="Begruendung" type="xs:string"/>
+				<xs:element name="Target" type="szr:FremdBPKRequestType" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="TransformBPKResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element maxOccurs="unbounded" name="TransformBPKReturn"
-					type="szr:FremdBPKType" />
+				<xs:element name="TransformBPKReturn" type="szr:FremdBPKType" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="IdentityLinkType">
 		<xs:sequence>
-			<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-			<xs:element name="Assertion" type="xs:anyType" />
-			<xs:element name="AdditionalInfo" minOccurs="0" type="xs:string" />
+			<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
+			<xs:element name="Assertion" type="xs:anyType"/>
+			<xs:element name="AdditionalInfo" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="GetBPKKombiRequestType">
 		<xs:sequence>
-			<xs:element name="PersonInfo" type="szr:PersonInfoType" />
+			<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
 			<xs:element name="InsertERnP" minOccurs="0">
 				<xs:simpleType>
 					<xs:restriction base="xs:string">
-						<xs:enumeration value="NoInsert" />
-						<xs:enumeration value="InsertOnNoMatch" />
-						<xs:enumeration value="ForceInsert" />
+						<xs:enumeration value="NoInsert"/>
+						<xs:enumeration value="InsertOnNoMatch"/>
+						<xs:enumeration value="ForceInsert"/>
 					</xs:restriction>
 				</xs:simpleType>
 			</xs:element>
-			<xs:element name="Suchwizard" type="xs:boolean" minOccurs="0" />
-			<xs:element name="VKZ" type="xs:string" />
-			<xs:element name="BehoerdenKennzeichen" minOccurs="0"
-				type="xs:string" />
-			<xs:element name="BereichsKennung" type="xs:string" />
-			<xs:element name="Target" minOccurs="0" maxOccurs="unbounded"
-				type="szr:FremdBPKRequestType" />
-			<xs:element name="Sessionid" type="xs:string" minOccurs="0" />
+			<xs:element name="Suchwizard" type="xs:boolean" minOccurs="0"/>
+			<xs:element name="VKZ" type="xs:string"/>
+			<xs:element name="BehoerdenKennzeichen" type="xs:string" minOccurs="0"/>
+			<xs:element name="BereichsKennung" type="xs:string"/>
+			<xs:element name="Target" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
+			<xs:element name="Sessionid" type="xs:string" minOccurs="0"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="GetBPKKombiResponseType">
@@ -93,190 +83,175 @@
 			<xs:element name="ResultRecord" maxOccurs="unbounded">
 				<xs:complexType>
 					<xs:sequence>
-						<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element name="Register" type="xs:string" />
-						<xs:element name="bPK" type="xs:string" />
-						<xs:element name="FremdBPK" minOccurs="0" maxOccurs="unbounded"
-							type="szr:FremdBPKType" />
+						<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
+						<xs:element name="Register" type="xs:string"/>
+						<xs:element name="bPK" type="xs:string"/>
+						<xs:element name="FremdBPK" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
 					</xs:sequence>
 				</xs:complexType>
 			</xs:element>
-			<xs:element name="InsertERnPResult" type="xs:boolean" />
-			<xs:element name="FoundWithSuchwizard" type="xs:boolean" />
-			<xs:element name="Sessionid" type="xs:string" />
+			<xs:element name="InsertERnPResult" type="xs:boolean"/>
+			<xs:element name="FoundWithSuchwizard" type="xs:boolean"/>
+			<xs:element name="Sessionid" type="xs:string"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="GetIdentityLink">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-				<xs:element name="KeyValue" type="dsig:KeyValueType"
-					maxOccurs="unbounded" />
-				<xs:element name="InsertERnP" type="xs:boolean"
-					minOccurs="0" />
+				<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
+				<xs:element name="KeyValue" type="dsig:KeyValueType" maxOccurs="unbounded"/>
+				<xs:element name="InsertERnP" type="xs:boolean" minOccurs="0"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetIdentityLinkResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="GetIdentityLinkReturn" type="szr:IdentityLinkType" />
+				<xs:element name="GetIdentityLinkReturn" type="szr:IdentityLinkType"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetBPK">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-				<xs:element name="BereichsKennung" type="xs:string" />
-				<xs:element name="VKZ" type="xs:string" />
-				<xs:element name="Target" type="szr:FremdBPKRequestType"
-					minOccurs="0" maxOccurs="unbounded" />
-				<xs:element name="ListMultiplePersons" type="xs:boolean"
-					minOccurs="0" />
+				<xs:element name="PersonInfo" type="szr:PersonInfoType" minOccurs="1" maxOccurs="1"/>
+				<xs:element name="BereichsKennung" type="xs:string"/>
+				<xs:element name="VKZ" type="xs:string"/>
+				<xs:element name="Target" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element name="ListMultiplePersons" type="xs:boolean" minOccurs="0"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetBPKResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="GetBPKReturn" type="xs:string"
-					minOccurs="0" />
-				<xs:element name="FremdBPK" type="szr:FremdBPKType"
-					minOccurs="0" maxOccurs="unbounded" />
-				<xs:element name="PersonInfo" type="szr:PersonInfoType"
-					minOccurs="0" maxOccurs="5" />
+				<xs:element name="GetBPKReturn" type="xs:string" minOccurs="0"/>
+				<xs:element name="FremdBPK" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element name="PersonInfo" type="szr:PersonInfoType" minOccurs="0" maxOccurs="5"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetBPKKombi">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="GetBPKKombiRequest" type="szr:GetBPKKombiRequestType" />
+				<xs:element name="GetBPKKombiRequest" type="szr:GetBPKKombiRequestType"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetBPKKombiResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="GetBPKKombiResponse" type="szr:GetBPKKombiResponseType" />
+				<xs:element name="GetBPKKombiResponse" type="szr:GetBPKKombiResponseType"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="ValidateIdentityLink">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="IdentityLink" type="szr:IdentityLinkType" />
-				<xs:element name="BereichsKennung" type="xs:string" />
+				<xs:element name="IdentityLink" type="szr:IdentityLinkType"/>
+				<xs:element name="BereichsKennung" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="ValidateIdentityLinkResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="ValidateIdentityLinkReturn" type="xs:string" />
+				<xs:element name="ValidateIdentityLinkReturn" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="BPKzuBasiszahl">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="Bereich" type="xs:string" />
-				<xs:element name="BPK" type="xs:string" />
-				<xs:element name="BasisZahl" maxOccurs="unbounded" type="xs:string" />
+				<xs:element name="Bereich" type="xs:string"/>
+				<xs:element name="BPK" type="xs:string"/>
+				<xs:element name="BasisZahl" type="xs:string" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="BPKzuBasiszahlResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="BPKzuBasiszahlReturn" type="xs:string" />
+				<xs:element name="BPKzuBasiszahlReturn" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="FremdBPKRequestType">
 		<xs:sequence>
-			<xs:element name="BereichsKennung" type="xs:string" />
-			<xs:element name="VKZ" type="xs:string" />
+			<xs:element name="BereichsKennung" type="xs:string"/>
+			<xs:element name="VKZ" type="xs:string"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:complexType name="FremdBPKType">
 		<xs:sequence>
-			<xs:element name="BereichsKennung" type="xs:string" />
-			<xs:element name="FremdBPK" type="xs:string" />
+			<xs:element name="BereichsKennung" type="xs:string"/>
+			<xs:element name="FremdBPK" type="xs:string"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="BasiszahlZuBPK">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="BasisZahl" type="xs:string" maxOccurs="unbounded" />
-				<xs:element name="Bereich" type="xs:string" />
-				<xs:element minOccurs="0" maxOccurs="unbounded" name="FremdBPKTargets"
-					type="szr:FremdBPKRequestType" />
+				<xs:element name="BasisZahl" type="xs:string" maxOccurs="unbounded"/>
+				<xs:element name="Bereich" type="xs:string"/>
+				<xs:element name="FremdBPKTargets" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="BasiszahlZuBPKReturnType">
 		<xs:sequence>
-			<xs:element name="BPK" type="xs:string" />
-			<xs:element minOccurs="0" maxOccurs="unbounded" name="FremdBPKs"
-				type="szr:FremdBPKType" />
+			<xs:element name="BPK" type="xs:string"/>
+			<xs:element name="FremdBPKs" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="BasiszahlZuBPKResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="BasiszahlZuBPKReturn" type="szr:BasiszahlZuBPKReturnType"
-					maxOccurs="unbounded" />
+				<xs:element name="BasiszahlZuBPKReturn" type="szr:BasiszahlZuBPKReturnType" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="ZMRAnwendungsIntegration">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="Bereich" type="xs:string" />
-				<xs:element minOccurs="0" maxOccurs="unbounded" name="FremdBPKTargets"
-					type="szr:FremdBPKRequestType" />
-				<xs:element name="ZMRfremdbPK" maxOccurs="unbounded"
-					type="xs:string" />
+				<xs:element name="Bereich" type="xs:string"/>
+				<xs:element name="FremdBPKTargets" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
+				<xs:element name="ZMRfremdbPK" type="xs:string" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:complexType name="ZMRAnwendungsIntegrationReturnType">
 		<xs:sequence>
-			<xs:element name="BPK" type="xs:string" />
-			<xs:element minOccurs="0" maxOccurs="unbounded" name="FremdBPKs"
-				type="szr:FremdBPKType" />
+			<xs:element name="BPK" type="xs:string"/>
+			<xs:element name="FremdBPKs" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
 		</xs:sequence>
 	</xs:complexType>
 	<xs:element name="ZMRAnwendungsIntegrationResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="ZMRAnwendungsIntegrationReturn" type="szr:ZMRAnwendungsIntegrationReturnType"
-					maxOccurs="unbounded" />
+				<xs:element name="ZMRAnwendungsIntegrationReturn" type="szr:ZMRAnwendungsIntegrationReturnType" maxOccurs="unbounded"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetStammzahl">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType" />
+				<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
 	<xs:element name="GetStammzahlResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="Stammzahl" type="xs:string" />
+				<xs:element name="Stammzahl" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
-	<xs:element name="GetVersion" />
+	<xs:element name="GetVersion"/>
 	<xs:element name="GetVersionResponse">
 		<xs:complexType>
 			<xs:sequence>
-				<xs:element name="Version" type="xs:string" />
+				<xs:element name="Version" type="xs:string"/>
 			</xs:sequence>
 		</xs:complexType>
 	</xs:element>
-</xs:schema>
\ No newline at end of file
+</xs:schema>