From 7bf7c3c03fd3a1efeaf3f8e3dd75922e2f5f9921 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 8 Mar 2022 19:06:10 +0100
Subject: refactor(core): move all project libs into sub-project 'modules'

---
 ...iz.components.spring.api.SpringResourceProvider |   1 -
 .../resources/eIDAS.Authentication.process.xml     |  29 -
 .../main/resources/eIDAS/additional-attributes.xml |  42 -
 .../src/main/resources/eIDAS/eidas-attributes.xml  | 379 ---------
 .../src/main/resources/eidas_v2_auth.beans.xml     | 100 ---
 .../resources/xmldata/fakeIdL_IdL_template.xml     | 122 ---
 .../src/main/resources/szr_client/SZR-1.1.WSDL     | 939 ---------------------
 .../src/main/resources/szr_client/SZR-1.WSDL       | 901 --------------------
 .../src/main/resources/szr_client/SZR_v4.0.wsdl    | 441 ----------
 .../src/main/resources/szr_client/pvp1.xsd         | 133 ---
 .../src/main/resources/szr_client/pvp19.xsd        | 133 ---
 .../src/main/resources/szr_client/szr.xsd          | 388 ---------
 .../src/main/resources/szr_client/szr_ecdsa.xsd    |  30 -
 .../main/resources/szr_client/szr_persondata.xsd   |  54 --
 .../src/main/resources/szr_client/szr_pvp_sec.xsd  |  10 -
 .../main/resources/szr_client/szr_v4.0-schemas.xml |  54 --
 .../main/resources/szr_client/szr_v4.0-wsdl.xml    |  10 -
 .../src/main/resources/szr_client/szr_v4.0.xsd     | 443 ----------
 .../src/main/resources/szr_client/szr_xmldsig.xsd  |  31 -
 .../resources/templates/eidas_node_forward.html    |  36 -
 20 files changed, 4276 deletions(-)
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS/additional-attributes.xml
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS/eidas-attributes.xml
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/resources/xmldata/fakeIdL_IdL_template.xml
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR-1.1.WSDL
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR-1.WSDL
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR_v4.0.wsdl
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/pvp1.xsd
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/pvp19.xsd
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr.xsd
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_ecdsa.xsd
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_persondata.xsd
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_pvp_sec.xsd
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0-schemas.xml
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0-wsdl.xml
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0.xsd
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_xmldsig.xsd
 delete mode 100644 eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html

(limited to 'eidas_modules/authmodule-eIDAS-v2/src/main/resources')

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
deleted file mode 100644
index a8d2991d..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/META-INF/services/at.gv.egiz.components.spring.api.SpringResourceProvider
+++ /dev/null
@@ -1 +0,0 @@
-at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasAuthenticationSpringResourceProvider
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
deleted file mode 100644
index 55bb1ace..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS.Authentication.process.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<pd:ProcessDefinition id="eIDASAuthentication_v2"
-  xmlns:pd="http://reference.e-government.gv.at/namespace/moa/process/definition/v1">
-
-
-  <pd:Task id="createAuthnRequest" class="ConnecteIDASNodeTask" />
-  <pd:Task id="receiveAuthnResponse"
-    class="ReceiveResponseFromeIDASNodeTask" async="true" />
-  <pd:Task id="finalizeAuthentication"
-    class="FinalizeAuthenticationTask" />
-  <pd:Task id="generateIdentityLink"
-    class="CreateIdentityLinkTask" />
-
-  <pd:StartEvent id="start" />
-  
-  <pd:Transition  from="start" 
-                  to="createAuthnRequest" />
-  <pd:Transition  from="createAuthnRequest"
-                  to="receiveAuthnResponse" />
-  <pd:Transition  from="receiveAuthnResponse"
-                  to="generateIdentityLink" />
-  <pd:Transition  from="generateIdentityLink"
-                  to="finalizeAuthentication" />
-  <pd:Transition  from="finalizeAuthentication" 
-                  to="end" />
-  
-  <pd:EndEvent id="end" />
-
-</pd:ProcessDefinition>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS/additional-attributes.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS/additional-attributes.xml
deleted file mode 100644
index a72ac1e8..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS/additional-attributes.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2017 by European Commission
-  ~
-  ~ Licensed under the EUPL, Version 1.2 or - as soon they will be
-  ~ approved by the European Commission - subsequent versions of the
-  ~ EUPL (the "Licence");
-  ~ You may not use this work except in compliance with the Licence.
-  ~ You may obtain a copy of the Licence at:
-  ~ https://joinup.ec.europa.eu/page/eupl-text-11-12
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the Licence is distributed on an "AS IS" basis,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-  ~ implied.
-  ~ See the Licence for the specific language governing permissions and
-  ~ limitations under the Licence.
-  -->
-
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-    <comment>Dynamic attributes</comment>
-
-    <entry key="1.NameUri">http://eidas.europa.eu/attributes/naturalperson/AdditionalAttribute</entry>
-    <entry key="1.FriendlyName">AdditionalAttribute</entry>
-    <entry key="1.PersonType">NaturalPerson</entry>
-    <entry key="1.Required">false</entry>
-    <entry key="1.XmlType.NamespaceUri">http://www.w3.org/2001/XMLSchema</entry>
-    <entry key="1.XmlType.LocalPart">string</entry>
-    <entry key="1.XmlType.NamespacePrefix">xs</entry>
-    <entry key="1.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="2.NameUri">http://eidas.europa.eu/attributes/legalperson/LegalAdditionalAttribute</entry>
-    <entry key="2.FriendlyName">LegalAdditionalAttribute</entry>
-    <entry key="2.PersonType">LegalPerson</entry>
-    <entry key="2.Required">false</entry>
-    <entry key="2.XmlType.NamespaceUri">http://www.w3.org/2001/XMLSchema</entry>
-    <entry key="2.XmlType.LocalPart">string</entry>
-    <entry key="2.XmlType.NamespacePrefix">xs</entry>
-    <entry key="2.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-</properties>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS/eidas-attributes.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS/eidas-attributes.xml
deleted file mode 100644
index c9288d59..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eIDAS/eidas-attributes.xml
+++ /dev/null
@@ -1,379 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2017 by European Commission
-  ~
-  ~ Licensed under the EUPL, Version 1.2 or - as soon they will be
-  ~ approved by the European Commission - subsequent versions of the
-  ~ EUPL (the "Licence");
-  ~ You may not use this work except in compliance with the Licence.
-  ~ You may obtain a copy of the Licence at:
-  ~ https://joinup.ec.europa.eu/page/eupl-text-11-12
-  ~
-  ~ Unless required by applicable law or agreed to in writing, software
-  ~ distributed under the Licence is distributed on an "AS IS" basis,
-  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-  ~ implied.
-  ~ See the Licence for the specific language governing permissions and
-  ~ limitations under the Licence.
-  -->
-
-<!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
-<properties>
-    <comment>eIDAS attributes</comment>
-
-    <entry key="1.NameUri">http://eidas.europa.eu/attributes/naturalperson/PersonIdentifier</entry>
-    <entry key="1.FriendlyName">PersonIdentifier</entry>
-    <entry key="1.PersonType">NaturalPerson</entry>
-    <entry key="1.Required">true</entry>
-    <entry key="1.UniqueIdentifier">true</entry>
-    <entry key="1.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson</entry>
-    <entry key="1.XmlType.LocalPart">PersonIdentifierType</entry>
-    <entry key="1.XmlType.NamespacePrefix">eidas-natural</entry>
-    <entry key="1.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="2.NameUri">http://eidas.europa.eu/attributes/naturalperson/CurrentFamilyName</entry>
-    <entry key="2.FriendlyName">FamilyName</entry>
-    <entry key="2.PersonType">NaturalPerson</entry>
-    <entry key="2.Required">true</entry>
-    <entry key="2.TransliterationMandatory">true</entry>
-    <entry key="2.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson</entry>
-    <entry key="2.XmlType.LocalPart">CurrentFamilyNameType</entry>
-    <entry key="2.XmlType.NamespacePrefix">eidas-natural</entry>
-    <entry key="2.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="3.NameUri">http://eidas.europa.eu/attributes/naturalperson/CurrentGivenName</entry>
-    <entry key="3.FriendlyName">FirstName</entry>
-    <entry key="3.PersonType">NaturalPerson</entry>
-    <entry key="3.Required">true</entry>
-    <entry key="3.TransliterationMandatory">true</entry>
-    <entry key="3.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson</entry>
-    <entry key="3.XmlType.LocalPart">CurrentGivenNameType</entry>
-    <entry key="3.XmlType.NamespacePrefix">eidas-natural</entry>
-    <entry key="3.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="4.NameUri">http://eidas.europa.eu/attributes/naturalperson/DateOfBirth</entry>
-    <entry key="4.FriendlyName">DateOfBirth</entry>
-    <entry key="4.PersonType">NaturalPerson</entry>
-    <entry key="4.Required">true</entry>
-    <entry key="4.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson</entry>
-    <entry key="4.XmlType.LocalPart">DateOfBirthType</entry>
-    <entry key="4.XmlType.NamespacePrefix">eidas-natural</entry>
-    <entry key="4.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.DateTimeAttributeValueMarshaller</entry>
-
-    <entry key="5.NameUri">http://eidas.europa.eu/attributes/naturalperson/BirthName</entry>
-    <entry key="5.FriendlyName">BirthName</entry>
-    <entry key="5.PersonType">NaturalPerson</entry>
-    <entry key="5.Required">false</entry>
-    <entry key="5.TransliterationMandatory">true</entry>
-    <entry key="5.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson</entry>
-    <entry key="5.XmlType.LocalPart">BirthNameType</entry>
-    <entry key="5.XmlType.NamespacePrefix">eidas-natural</entry>
-    <entry key="5.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="6.NameUri">http://eidas.europa.eu/attributes/naturalperson/PlaceOfBirth</entry>
-    <entry key="6.FriendlyName">PlaceOfBirth</entry>
-    <entry key="6.PersonType">NaturalPerson</entry>
-    <entry key="6.Required">false</entry>
-    <entry key="6.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson</entry>
-    <entry key="6.XmlType.LocalPart">PlaceOfBirthType</entry>
-    <entry key="6.XmlType.NamespacePrefix">eidas-natural</entry>
-    <entry key="6.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="7.NameUri">http://eidas.europa.eu/attributes/naturalperson/CurrentAddress</entry>
-    <entry key="7.FriendlyName">CurrentAddress</entry>
-    <entry key="7.PersonType">NaturalPerson</entry>
-    <entry key="7.Required">false</entry>
-    <entry key="7.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson</entry>
-    <entry key="7.XmlType.LocalPart">CurrentAddressType</entry>
-    <entry key="7.XmlType.NamespacePrefix">eidas-natural</entry>
-    <entry key="7.AttributeValueMarshaller">eu.eidas.auth.commons.protocol.eidas.impl.CurrentAddressAttributeValueMarshaller</entry>
-
-    <entry key="8.NameUri">http://eidas.europa.eu/attributes/naturalperson/Gender</entry>
-    <entry key="8.FriendlyName">Gender</entry>
-    <entry key="8.PersonType">NaturalPerson</entry>
-    <entry key="8.Required">false</entry>
-    <entry key="8.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson</entry>
-    <entry key="8.XmlType.LocalPart">GenderType</entry>
-    <entry key="8.XmlType.NamespacePrefix">eidas-natural</entry>
-    <entry key="8.AttributeValueMarshaller">eu.eidas.auth.commons.protocol.eidas.impl.GenderAttributeValueMarshaller</entry>
-
-    <entry key="9.NameUri">http://eidas.europa.eu/attributes/legalperson/LegalPersonIdentifier</entry>
-    <entry key="9.FriendlyName">LegalPersonIdentifier</entry>
-    <entry key="9.PersonType">LegalPerson</entry>
-    <entry key="9.Required">true</entry>
-    <entry key="9.UniqueIdentifier">true</entry>
-    <entry key="9.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson</entry>
-    <entry key="9.XmlType.LocalPart">LegalPersonIdentifierType</entry>
-    <entry key="9.XmlType.NamespacePrefix">eidas-legal</entry>
-    <entry key="9.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="10.NameUri">http://eidas.europa.eu/attributes/legalperson/LegalName</entry>
-    <entry key="10.FriendlyName">LegalName</entry>
-    <entry key="10.PersonType">LegalPerson</entry>
-    <entry key="10.Required">true</entry>
-    <entry key="10.TransliterationMandatory">true</entry>
-    <entry key="10.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson</entry>
-    <entry key="10.XmlType.LocalPart">LegalNameType</entry>
-    <entry key="10.XmlType.NamespacePrefix">eidas-legal</entry>
-    <entry key="10.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="11.NameUri">http://eidas.europa.eu/attributes/legalperson/LegalPersonAddress</entry>
-    <entry key="11.FriendlyName">LegalAddress</entry>
-    <entry key="11.PersonType">LegalPerson</entry>
-    <entry key="11.Required">false</entry>
-    <entry key="11.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson</entry>
-    <entry key="11.XmlType.LocalPart">LegalPersonAddressType</entry>
-    <entry key="11.XmlType.NamespacePrefix">eidas-legal</entry>
-    <entry key="11.AttributeValueMarshaller">eu.eidas.auth.commons.protocol.eidas.impl.LegalAddressAttributeValueMarshaller</entry>
-
-    <entry key="12.NameUri">http://eidas.europa.eu/attributes/legalperson/VATRegistrationNumber</entry>
-    <entry key="12.FriendlyName">VATRegistration</entry>
-    <entry key="12.PersonType">LegalPerson</entry>
-    <entry key="12.Required">false</entry>
-    <entry key="12.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson</entry>
-    <entry key="12.XmlType.LocalPart">VATRegistrationNumberType</entry>
-    <entry key="12.XmlType.NamespacePrefix">eidas-legal</entry>
-    <entry key="12.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="13.NameUri">http://eidas.europa.eu/attributes/legalperson/TaxReference</entry>
-    <entry key="13.FriendlyName">TaxReference</entry>
-    <entry key="13.PersonType">LegalPerson</entry>
-    <entry key="13.Required">false</entry>
-    <entry key="13.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson</entry>
-    <entry key="13.XmlType.LocalPart">TaxReferenceType</entry>
-    <entry key="13.XmlType.NamespacePrefix">eidas-legal</entry>
-    <entry key="13.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="14.NameUri">http://eidas.europa.eu/attributes/legalperson/D-2012-17-EUIdentifier</entry>
-    <entry key="14.FriendlyName">D-2012-17-EUIdentifier</entry>
-    <entry key="14.PersonType">LegalPerson</entry>
-    <entry key="14.Required">false</entry>
-    <entry key="14.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson</entry>
-    <entry key="14.XmlType.LocalPart">D-2012-17-EUIdentifierType</entry>
-    <entry key="14.XmlType.NamespacePrefix">eidas-legal</entry>
-    <entry key="14.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="15.NameUri">http://eidas.europa.eu/attributes/legalperson/LEI</entry>
-    <entry key="15.FriendlyName">LEI</entry>
-    <entry key="15.PersonType">LegalPerson</entry>
-    <entry key="15.Required">false</entry>
-    <entry key="15.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson</entry>
-    <entry key="15.XmlType.LocalPart">LEIType</entry>
-    <entry key="15.XmlType.NamespacePrefix">eidas-legal</entry>
-    <entry key="15.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="16.NameUri">http://eidas.europa.eu/attributes/legalperson/EORI</entry>
-    <entry key="16.FriendlyName">EORI</entry>
-    <entry key="16.PersonType">LegalPerson</entry>
-    <entry key="16.Required">false</entry>
-    <entry key="16.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson</entry>
-    <entry key="16.XmlType.LocalPart">EORIType</entry>
-    <entry key="16.XmlType.NamespacePrefix">eidas-legal</entry>
-    <entry key="16.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="17.NameUri">http://eidas.europa.eu/attributes/legalperson/SEED</entry>
-    <entry key="17.FriendlyName">SEED</entry>
-    <entry key="17.PersonType">LegalPerson</entry>
-    <entry key="17.Required">false</entry>
-    <entry key="17.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson</entry>
-    <entry key="17.XmlType.LocalPart">SEEDType</entry>
-    <entry key="17.XmlType.NamespacePrefix">eidas-legal</entry>
-    <entry key="17.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="18.NameUri">http://eidas.europa.eu/attributes/legalperson/SIC</entry>
-    <entry key="18.FriendlyName">SIC</entry>
-    <entry key="18.PersonType">LegalPerson</entry>
-    <entry key="18.Required">false</entry>
-    <entry key="18.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson</entry>
-    <entry key="18.XmlType.LocalPart">SICType</entry>
-    <entry key="18.XmlType.NamespacePrefix">eidas-legal</entry>
-    <entry key="18.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="19.NameUri">http://eidas.europa.eu/attributes/naturalperson/representative/PersonIdentifier</entry>
-    <entry key="19.FriendlyName">RepresentativePersonIdentifier</entry>
-    <entry key="19.PersonType">RepresentativeNaturalPerson</entry>
-    <entry key="19.Required">false</entry>
-    <entry key="19.UniqueIdentifier">true</entry>
-    <entry key="19.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson/representative</entry>
-    <entry key="19.XmlType.LocalPart">PersonIdentifierType</entry>
-    <entry key="19.XmlType.NamespacePrefix">eidas-natural</entry>
-    <entry key="19.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="20.NameUri">http://eidas.europa.eu/attributes/naturalperson/representative/CurrentFamilyName</entry>
-    <entry key="20.FriendlyName">RepresentativeFamilyName</entry>
-    <entry key="20.PersonType">RepresentativeNaturalPerson</entry>
-    <entry key="20.Required">false</entry>
-    <entry key="20.TransliterationMandatory">true</entry>
-    <entry key="20.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson/representative</entry>
-    <entry key="20.XmlType.LocalPart">CurrentFamilyNameType</entry>
-    <entry key="20.XmlType.NamespacePrefix">eidas-reprentative-natural</entry>
-    <entry key="20.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="21.NameUri">http://eidas.europa.eu/attributes/naturalperson/representative/CurrentGivenName</entry>
-    <entry key="21.FriendlyName">RepresentativeFirstName</entry>
-    <entry key="21.PersonType">RepresentativeNaturalPerson</entry>
-    <entry key="21.Required">false</entry>
-    <entry key="21.TransliterationMandatory">true</entry>
-    <entry key="21.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson/representative</entry>
-    <entry key="21.XmlType.LocalPart">CurrentGivenNameType</entry>
-    <entry key="21.XmlType.NamespacePrefix">eidas-reprentative-natural</entry>
-    <entry key="21.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="22.NameUri">http://eidas.europa.eu/attributes/naturalperson/representative/DateOfBirth</entry>
-    <entry key="22.FriendlyName">RepresentativeDateOfBirth</entry>
-    <entry key="22.PersonType">RepresentativeNaturalPerson</entry>
-    <entry key="22.Required">false</entry>
-    <entry key="22.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson/representative</entry>
-    <entry key="22.XmlType.LocalPart">DateOfBirthType</entry>
-    <entry key="22.XmlType.NamespacePrefix">eidas-reprentative-natural</entry>
-    <entry key="22.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.DateTimeAttributeValueMarshaller</entry>
-
-    <entry key="23.NameUri">http://eidas.europa.eu/attributes/naturalperson/representative/BirthName</entry>
-    <entry key="23.FriendlyName">RepresentativeBirthName</entry>
-    <entry key="23.PersonType">RepresentativeNaturalPerson</entry>
-    <entry key="23.Required">false</entry>
-    <entry key="23.TransliterationMandatory">true</entry>
-    <entry key="23.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson/representative</entry>
-    <entry key="23.XmlType.LocalPart">BirthNameType</entry>
-    <entry key="23.XmlType.NamespacePrefix">eidas-reprentative-natural</entry>
-    <entry key="23.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="24.NameUri">http://eidas.europa.eu/attributes/naturalperson/representative/PlaceOfBirth</entry>
-    <entry key="24.FriendlyName">RepresentativePlaceOfBirth</entry>
-    <entry key="24.PersonType">RepresentativeNaturalPerson</entry>
-    <entry key="24.Required">false</entry>
-    <entry key="24.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson/representative</entry>
-    <entry key="24.XmlType.LocalPart">PlaceOfBirthType</entry>
-    <entry key="24.XmlType.NamespacePrefix">eidas-reprentative-natural</entry>
-    <entry key="24.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="25.NameUri">http://eidas.europa.eu/attributes/naturalperson/representative/CurrentAddress</entry>
-    <entry key="25.FriendlyName">RepresentativeCurrentAddress</entry>
-    <entry key="25.PersonType">RepresentativeNaturalPerson</entry>
-    <entry key="25.Required">false</entry>
-    <entry key="25.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson/representative</entry>
-    <entry key="25.XmlType.LocalPart">CurrentAddressType</entry>
-    <entry key="25.XmlType.NamespacePrefix">eidas-reprentative-natural</entry>
-    <entry key="25.AttributeValueMarshaller">eu.eidas.auth.commons.protocol.eidas.impl.RepvCurrentAddressAttributeValueMarshaller</entry>
-
-    <entry key="26.NameUri">http://eidas.europa.eu/attributes/naturalperson/representative/Gender</entry>
-    <entry key="26.FriendlyName">RepresentativeGender</entry>
-    <entry key="26.PersonType">RepresentativeNaturalPerson</entry>
-    <entry key="26.Required">false</entry>
-    <entry key="26.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/naturalperson/representative</entry>
-    <entry key="26.XmlType.LocalPart">GenderType</entry>
-    <entry key="26.XmlType.NamespacePrefix">eidas-reprentative-natural</entry>
-    <entry key="26.AttributeValueMarshaller">eu.eidas.auth.commons.protocol.eidas.impl.GenderAttributeValueMarshaller</entry>
-
-    <entry key="27.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/LegalPersonIdentifier</entry>
-    <entry key="27.FriendlyName">RepresentativeLegalPersonIdentifier</entry>
-    <entry key="27.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="27.Required">false</entry>
-    <entry key="27.UniqueIdentifier">true</entry>
-    <entry key="27.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="27.XmlType.LocalPart">LegalPersonIdentifierType</entry>
-    <entry key="27.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="27.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="28.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/LegalName</entry>
-    <entry key="28.FriendlyName">RepresentativeLegalName</entry>
-    <entry key="28.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="28.Required">false</entry>
-    <entry key="28.TransliterationMandatory">true</entry>
-    <entry key="28.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="28.XmlType.LocalPart">LegalNameType</entry>
-    <entry key="28.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="28.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="29.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/LegalPersonAddress</entry>
-    <entry key="29.FriendlyName">RepresentativeLegalAddress</entry>
-    <entry key="29.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="29.Required">false</entry>
-    <entry key="29.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="29.XmlType.LocalPart">LegalPersonAddressType</entry>
-    <entry key="29.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="29.AttributeValueMarshaller">eu.eidas.auth.commons.protocol.eidas.impl.RepvLegalAddressAttributeValueMarshaller</entry>
-
-    <entry key="30.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/VATRegistrationNumber</entry>
-    <entry key="30.FriendlyName">RepresentativeVATRegistration</entry>
-    <entry key="30.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="30.Required">false</entry>
-    <entry key="30.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="30.XmlType.LocalPart">VATRegistrationNumberType</entry>
-    <entry key="30.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="30.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="31.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/TaxReference</entry>
-    <entry key="31.FriendlyName">RepresentativeTaxReference</entry>
-    <entry key="31.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="31.Required">false</entry>
-    <entry key="31.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="31.XmlType.LocalPart">TaxReferenceType</entry>
-    <entry key="31.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="31.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="32.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/D-2012-17-EUIdentifier</entry>
-    <entry key="32.FriendlyName">RepresentativeD-2012-17-EUIdentifier</entry>
-    <entry key="32.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="32.Required">false</entry>
-    <entry key="32.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="32.XmlType.LocalPart">D-2012-17-EUIdentifierType</entry>
-    <entry key="32.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="32.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="33.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/LEI</entry>
-    <entry key="33.FriendlyName">RepresentativeLEI</entry>
-    <entry key="33.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="33.Required">false</entry>
-    <entry key="33.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="33.XmlType.LocalPart">LEIType</entry>
-    <entry key="33.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="33.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="34.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/EORI</entry>
-    <entry key="34.FriendlyName">RepresentativeEORI</entry>
-    <entry key="34.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="34.Required">false</entry>
-    <entry key="34.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="34.XmlType.LocalPart">EORIType</entry>
-    <entry key="34.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="34.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="35.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/SEED</entry>
-    <entry key="35.FriendlyName">RepresentativeSEED</entry>
-    <entry key="35.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="35.Required">false</entry>
-    <entry key="35.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="35.XmlType.LocalPart">SEEDType</entry>
-    <entry key="35.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="35.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="36.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/SIC</entry>
-    <entry key="36.FriendlyName">RepresentativeSIC</entry>
-    <entry key="36.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="36.Required">false</entry>
-    <entry key="36.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="36.XmlType.LocalPart">SICType</entry>
-    <entry key="36.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="36.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-    <entry key="39.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/LegalPersonAddress</entry>
-    <entry key="39.FriendlyName">RepresentativeLegalAddress</entry>
-    <entry key="39.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="39.Required">false</entry>
-    <entry key="39.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="39.XmlType.LocalPart">LegalPersonAddressType</entry>
-    <entry key="39.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="39.AttributeValueMarshaller">eu.eidas.auth.commons.protocol.eidas.impl.RepvLegalAddressAttributeValueMarshaller</entry>
-
-    <entry key="40.NameUri">http://eidas.europa.eu/attributes/legalperson/representative/VATRegistrationNumber</entry>
-    <entry key="40.FriendlyName">RepresentativeVATRegistration</entry>
-    <entry key="40.PersonType">RepresentativeLegalPerson</entry>
-    <entry key="40.Required">false</entry>
-    <entry key="40.XmlType.NamespaceUri">http://eidas.europa.eu/attributes/legalperson/representative</entry>
-    <entry key="40.XmlType.LocalPart">VATRegistrationNumberType</entry>
-    <entry key="40.XmlType.NamespacePrefix">eidas-reprentative-legal</entry>
-    <entry key="40.AttributeValueMarshaller">eu.eidas.auth.commons.attribute.impl.LiteralStringAttributeValueMarshaller</entry>
-
-
-</properties>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
deleted file mode 100644
index f37516f8..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xmlns:tx="http://www.springframework.org/schema/tx"
-  xmlns:aop="http://www.springframework.org/schema/aop"
-  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-
-  <context:annotation-config />
-
-  <import
-    resource="classpath:specificCommunicationDefinitionApplicationContext.xml" />
-
-  <bean id="SZRClientForeIDAS"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.szr.SzrClient" />
-
-  <bean id="specificConnectorAttributesFile"
-    class="java.lang.String">
-    <constructor-arg value="eidas-attributes.xml" />
-  </bean>
-
-  <bean id="specificAdditionalAttributesFile"
-    class="java.lang.String">
-    <constructor-arg value="additional-attributes.xml" />
-  </bean>
-
-  <bean id="specificConnectorAttributesFileWithPath"
-    class="java.lang.String">
-    <constructor-arg
-      value="#{specificConnectorConfigRepository}#{specificConnectorAttributesFile}" />
-  </bean>
-
-  <bean id="specificConnectorAdditionalAttributesFileWithPath"
-    class="java.lang.String">
-    <constructor-arg
-      value="#{specificConnectorConfigRepository}#{specificAdditionalAttributesFile}" />
-  </bean>
-
-  <bean id="eIDASAuthModule"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasAuthenticationModulImpl">
-    <property name="priority" value="2" />
-  </bean>
-
-  <bean id="eIDASSignalServlet"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasSignalServlet" />
-
-  <bean id="attributeRegistry"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry">
-    <property name="eidasAttributesFile"
-      ref="specificConnectorAttributesFileWithPath" />
-    <property name="additionalAttributesFile"
-      ref="specificConnectorAdditionalAttributesFileWithPath" />
-  </bean>
-
-  <!-- <bean id="eIDASDataStore" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.eIDASDataStore" 
-    /> -->
-
-  <bean id="authBlockSigningService"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.AuthBlockSigningService" />
-
-  <bean id="EIDPostProcessingService"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.CcSpecificEidProcessingService" />
-
-  <bean id="DE-Processor"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.DeEidProcessor">
-    <property name="priority" value="1" />
-  </bean>
-
-  <bean id="LU-Processor"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.LuEidProcessor">
-    <property name="priority" value="1" />
-  </bean>
-
-  <bean id="NL-Processor"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.NlEidProcessor">
-    <property name="priority" value="1" />
-  </bean>
-
-  <bean id="Default-Processor"
-        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.GenericEidProcessor">
-    <property name="priority" value="0" />
-  </bean>
-
-  <!-- Authentication Process Tasks -->
-  <bean id="ConnecteIDASNodeTask"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateAuthnRequestTask"
-    scope="prototype" />
-
-  <bean id="ReceiveResponseFromeIDASNodeTask"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAuthnResponseTask"
-    scope="prototype" />
-
-  <bean id="CreateIdentityLinkTask"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateIdentityLinkTask"
-    scope="prototype" />
-
-</beans>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/resources/xmldata/fakeIdL_IdL_template.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/resources/xmldata/fakeIdL_IdL_template.xml
deleted file mode 100644
index 91b8e5e4..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/resources/xmldata/fakeIdL_IdL_template.xml
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<saml:Assertion
-  xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion"
-  xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#"
-  xmlns:pr="http://reference.e-government.gv.at/namespace/persondata/20020228#"
-  xmlns:si="http://www.w3.org/2001/XMLSchema-instance"
-  AssertionID="szr.bmi.gv.at-AssertionID13456264458587874"
-  IssueInstant="2012-08-22T11:07:25+01:00"
-  Issuer="http://portal.bmi.gv.at/ref/szr/issuer" MajorVersion="1"
-  MinorVersion="0" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-  <saml:AttributeStatement>
-    <saml:Subject>
-      <saml:SubjectConfirmation>
-        <saml:ConfirmationMethod>urn:oasis:names:tc:SAML:1.0:cm:sender-vouches
-        </saml:ConfirmationMethod>
-        <saml:SubjectConfirmationData>
-          <pr:Person si:type="pr:PhysicalPersonType">
-            <pr:Identification>
-              <pr:Value>wJO/bvDJjUysG0yARn7I6w==</pr:Value>
-              <pr:Type>urn:publicid:gv.at:baseid</pr:Type>
-            </pr:Identification>
-            <pr:Name>
-              <pr:GivenName>XXXRúùd</pr:GivenName>
-              <pr:FamilyName primary="undefined">XXXVàn Nisteĺrooy
-              </pr:FamilyName>
-            </pr:Name>
-            <pr:DateOfBirth>1969-02-13</pr:DateOfBirth>
-          </pr:Person>
-        </saml:SubjectConfirmationData>
-      </saml:SubjectConfirmation>
-    </saml:Subject>
-    <saml:Attribute AttributeName="CitizenPublicKey"
-      AttributeNamespace="urn:publicid:gv.at:namespaces:identitylink:1.2">
-      <saml:AttributeValue>
-        <ecdsa:ECDSAKeyValue>
-          <ecdsa:DomainParameters>
-            <ecdsa:NamedCurve
-              URN="urn:oid:1.2.840.10045.3.1.7" />
-          </ecdsa:DomainParameters>
-          <ecdsa:PublicKey>
-            <ecdsa:X
-              Value="22280299907126338788314199678167217078072953115254374209747379168424021905237"
-              si:type="ecdsa:PrimeFieldElemType" />
-            <ecdsa:Y
-              Value="40387096985250872237992703378062984723606079359080588656963239072881568409170"
-              si:type="ecdsa:PrimeFieldElemType" />
-          </ecdsa:PublicKey>
-        </ecdsa:ECDSAKeyValue>
-      </saml:AttributeValue>
-    </saml:Attribute>
-    <saml:Attribute AttributeName="CitizenPublicKey"
-      AttributeNamespace="urn:publicid:gv.at:namespaces:identitylink:1.2">
-      <saml:AttributeValue>
-        <dsig:RSAKeyValue>
-          <dsig:Modulus>4Y4FL09VhczsfYQgFPuycP8quJNZBAAu1R1rFXNodI2711B6BTMjAGQn6xuFWfd3/nyFav/MLTr/
-            t2VazvANS4TRFxJAcWyIx7xbxCdzZr6gJ+FCmq4g5JPrQvt50v3JX+wKSYft1gHBOWlDn90Ia4Gm
-            P8MVuze21T+VVKM6ZklmS6d5PT1er/uYQFydGErmJ17xlSQG6Fi5xuftopBDyJxG1tL1KIebpLFg
-            gaM2EyuB1HxH8/+Mfqa4UgeqIH65
-          </dsig:Modulus>
-          <dsig:Exponent>AQAB</dsig:Exponent>
-        </dsig:RSAKeyValue>
-      </saml:AttributeValue>
-    </saml:Attribute>
-  </saml:AttributeStatement>
-  <dsig:Signature>
-    <dsig:SignedInfo>
-      <dsig:CanonicalizationMethod
-        Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-      <dsig:SignatureMethod
-        Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-      <dsig:Reference URI="">
-        <dsig:Transforms>
-          <dsig:Transform
-            Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116">
-            <dsig:XPath>not(ancestor-or-self::pr:Identification)
-            </dsig:XPath>
-          </dsig:Transform>
-          <dsig:Transform
-            Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
-        </dsig:Transforms>
-        <dsig:DigestMethod
-          Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>KEQEPY2O3Z3IRaISSSoRZVPzsHE=
-        </dsig:DigestValue>
-      </dsig:Reference>
-      <dsig:Reference
-        Type="http://www.w3.org/2000/09/xmldsig#Manifest"
-        URI="#manifest">
-        <dsig:DigestMethod
-          Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-        <dsig:DigestValue>gzGhjH1kdmPcPbgen0xojNIoJLk=
-        </dsig:DigestValue>
-      </dsig:Reference>
-    </dsig:SignedInfo>
-    <dsig:SignatureValue>
-      06wqWHgplwpu3N5HMhzb6QC5NkXMO1z4N4oc1L6eDqwZlvFJ9X1XGW//QqviKO9oog3il7IzdfJwnjygR4trgGCIqx+JYCDHJCrG9l8zlxlSW0ZqfsygGXthutcQ1aeUpfO6jYuhnWOUywa8BgzukRtWT+AOJBQZPRYTb8IBmey+uAwlhFLni94eMOd81l+efCvkWi3jRajwsG8ZOaNxSZT3aEV5vj+32Aqtx2MPEVzQWtIA7GqZi+EzcdSdHQvHhg7UB+8kqbU70ENAJbEMTANFZYvLOJ0Om9KfDtPf/+R2TvTc360fNo9RnPl04pHPhCIjcGZhFZorBpUhXFwd2Q==
-    </dsig:SignatureValue>
-    <dsig:KeyInfo>
-      <dsig:X509Data>
-        <dsig:X509Certificate>MIIF3TCCBMWgAwIBAgIDByniMA0GCSqGSIb3DQEBBQUAMIGfMQswCQYDVQQGEwJBVDFIMEYGA1UECgw/QS1UcnVzdCBHZXMuIGYuIFNpY2hlcmhlaXRzc3lzdGVtZSBpbSBlbGVrdHIuIERhdGVudmVya2VociBHbWJIMSIwIAYDVQQLDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAyMSIwIAYDVQQDDBlhLXNpZ24tY29ycG9yYXRlLWxpZ2h0LTAyMB4XDTEwMDcyODExMzY0M1oXDTE1MDcyODExMzY0M1owgbYxCzAJBgNVBAYTAkFUMR4wHAYDVQQKDBVEYXRlbnNjaHV0emtvbW1pc3Npb24xIjAgBgNVBAsMGVN0YW1temFobHJlZ2lzdGVyYmVob2VyZGUxLjAsBgNVBAMMJVNpZ25hdHVyc2VydmljZSBEYXRlbnNjaHV0emtvbW1pc3Npb24xFTATBgNVBAUTDDMyNTkyODMyMzk5ODEcMBoGCSqGSIb3DQEJARYNZHNrQGRzay5ndi5hdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAN+dBSEBGj2jUXIK1Mp3lVxc/Za+pJMiyKrX3G1ZxgX/ikx7D9scsPYMt473LlAWl9cmCbHbJK+PV2XNNdURLMUCIX+4vUNs2MHeDTQtX8BXjJFpwJYSoaRJQ39FVS/1r5sWcra9Hhdm7w5Gtx/2ukyDX0kdkxawkhP4EQEzi/SI+Fugn+WqgQ1nAdlbxb/dcBw5w1h9b3lmuwUf4z3ooQWUD2DgA/kKd1KejNR43mLUsmvSzevPxT9zs78pOR1OacB7IszTVJPXeOEaaNZHnnB/UeO3g8LEV/3OkXcUgcMkbIIiaBHlll71Pq0COj9kqjXoe7OrRjLY5i3KwOpa6TMCAwEAAaOCAgcwggIDMBMGA1UdIwQMMAqACEkcWDpP6A0DMH8GCCsGAQUFBwEBBHMwcTAnBggrBgEFBQcwAYYbaHR0cDovL29jc3AuYS10cnVzdC5hdC9vY3NwMEYGCCsGAQUFBzAChjpodHRwOi8vd3d3LmEtdHJ1c3QuYXQvY2VydHMvYS1zaWduLWNvcnBvcmF0ZS1saWdodC0wMmEuY3J0MFQGA1UdIARNMEswSQYGKigAEQESMD8wPQYIKwYBBQUHAgEWMWh0dHA6Ly93d3cuYS10cnVzdC5hdC9kb2NzL2NwL2Etc2lnbi1BbXRzc2lnbmF0dXIwgZ4GA1UdHwSBljCBkzCBkKCBjaCBioaBh2xkYXA6Ly9sZGFwLmEtdHJ1c3QuYXQvb3U9YS1zaWduLWNvcnBvcmF0ZS1saWdodC0wMixvPUEtVHJ1c3QsYz1BVD9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0P2Jhc2U/b2JqZWN0Y2xhc3M9ZWlkQ2VydGlmaWNhdGlvbkF1dGhvcml0eTARBgNVHQ4ECgQITAgOnhr0tbowDgYDVR0PAQH/BAQDAgSwMCAGA1UdEQQZMBeBFW1hcmN1cy5oaWxkQGRzay5ndi5hdDAJBgNVHRMEAjAAMA4GByooAAoBBwEEAwEB/zAUBgcqKAAKAQEBBAkMB0JTQi1EU0swDQYJKoZIhvcNAQEFBQADggEBAHTklnvPCH/bJSOlIPbLUEkSGuFHsektSZ8Vr22x/Yv7EzsxoQrJIiz2mQ2gQqFuExdWYxvsowjiSbiis9iUf1c0zscvDS3mIZxGs4M89XHsjHnIyb+Fuwnamw65QrFvM1tNB1ZMjxJ3x+YmHLHdtT3BEBcr3/NCRHd2S0HoBspNz9HVgJaZY1llR7poKBvnAc4g1i+QTvyVb00PtKxR9Lw/9ABInX/1pzpxqrPy7Ib2OP8z6dd3WHmIsCiSHUaj0Dxwwln6fYJjhxZ141SnbovlCLYtrsZLXoi9ljIqX4xO0PwMI2RfNc9cXxTRrRS6rEOvX7PpvgXiDXhp592Yyp4=
-        </dsig:X509Certificate>
-      </dsig:X509Data>
-    </dsig:KeyInfo>
-    <dsig:Object>
-      <dsig:Manifest Id="manifest">
-        <dsig:Reference URI="">
-          <dsig:Transforms>
-            <dsig:Transform
-              Algorithm="http://www.w3.org/TR/1999/REC-xpath-19991116">
-              <dsig:XPath>not(ancestor-or-self::dsig:Signature)
-              </dsig:XPath>
-            </dsig:Transform>
-          </dsig:Transforms>
-          <dsig:DigestMethod
-            Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-          <dsig:DigestValue>8e7RjLnA4Mgltq5ruIJzheKGxu0=
-          </dsig:DigestValue>
-        </dsig:Reference>
-      </dsig:Manifest>
-    </dsig:Object>
-  </dsig:Signature>
-</saml:Assertion>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR-1.1.WSDL b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR-1.1.WSDL
deleted file mode 100644
index 3c34458d..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR-1.1.WSDL
+++ /dev/null
@@ -1,939 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions targetNamespace="urn:SZRServices" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:pvp="http://egov.gv.at/pvp1.xsd" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:szr="urn:SZRServices" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/04/secext" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<types>
-		<xs:schema elementFormDefault="qualified" targetNamespace="http://reference.e-government.gv.at/namespace/persondata/20020228#">
-			<xs:complexType name="PhysicalPersonType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="Identification" type="pd:IdentificationType" />
-					<xs:element minOccurs="1" name="Name" type="pd:PersonNameType" />
-					<xs:element minOccurs="0" name="AlternativeName" type="pd:AlternativeNameType" />
-					<xs:element minOccurs="0" name="Sex" type="xs:string" />
-					<xs:element minOccurs="0" name="DateOfBirth" type="xs:string" />
-					<xs:element minOccurs="0" name="PlaceOfBirth" type="xs:string" />
-					<xs:element minOccurs="0" name="CountryOfBirth" type="xs:string" />
-					<xs:element minOccurs="0" name="Nationality" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="IdentificationType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="Value" type="xs:string" />
-					<xs:element minOccurs="0" name="Type" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="PersonNameType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="PrefixedDegree" type="xs:string" />
-					<xs:element name="GivenName" type="xs:string" nillable="true" />
-					<xs:element name="FamilyName" type="xs:string" nillable="true" />
-					<xs:element minOccurs="0" name="SuffixedDegree" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="AlternativeNameType">
-				<xs:sequence>
-					<xs:element name="FamilyName" type="xs:string" nillable="true" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="PostalAddressType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="PostalCode" type="xs:string" />
-					<xs:element minOccurs="0" name="Municipality" type="xs:string" />
-					<xs:element minOccurs="0" name="Locality" type="xs:string" />
-					<xs:element minOccurs="0" name="StateCode3" type="xs:string" />
-					<xs:element minOccurs="0" name="DeliveryAddress" type="pd:DeliveryAddressType" />
-					<xs:element minOccurs="0" name="HistoricRecord" type="xs:boolean" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="DeliveryAddressType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="AddressLine" type="xs:string" />
-					<xs:element minOccurs="0" name="StreetName" type="xs:string" />
-					<xs:element minOccurs="0" name="BuildingNumber" type="xs:string" />
-					<xs:element minOccurs="0" name="Unit" type="xs:string" />
-					<xs:element minOccurs="0" name="DoorNumber" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:schema>
-		<xs:schema elementFormDefault="qualified" targetNamespace="http://www.w3.org/2001/04/xmldsig-more#">
-			<xs:element name="ECDSAKeyValue" type="ecdsa:ECDSAKeyValueType" nillable="true" />
-			<xs:complexType name="ECDSAKeyValueType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="DomainParameters" type="ecdsa:DomainParamsType" />
-					<xs:element name="PublicKey" type="ecdsa:ECPointType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="DomainParamsType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="NamedCurve" type="ecdsa:NamedCurveType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="NamedCurveType">
-				<xs:attribute name="URN" type="xs:string" use="required" />
-			</xs:complexType>
-			<xs:complexType name="ECPointType">
-				<xs:sequence minOccurs="0">
-					<xs:element name="X" type="ecdsa:PrimeFieldElemType" />
-					<xs:element name="Y" type="ecdsa:PrimeFieldElemType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="PrimeFieldElemType">
-				<xs:attribute name="Value" type="xs:string" use="required" />
-			</xs:complexType>
-		</xs:schema>
-		<xs:schema elementFormDefault="qualified" targetNamespace="http://www.w3.org/2000/09/xmldsig#" xmlns="http://www.w3.org/2001/XMLSchema">
-			<xs:import namespace="http://www.w3.org/2001/04/xmldsig-more#" />
-			<xs:complexType name="KeyValueType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="DSAKeyValue" type="dsig:DSAKeyValueType" />
-					<xs:element minOccurs="0" name="RSAKeyValue" type="dsig:RSAKeyValueType" />
-					<xs:element minOccurs="0" ref="ecdsa:ECDSAKeyValue" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="DSAKeyValueType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="P" type="xs:string" />
-					<xs:element minOccurs="0" name="Q" type="xs:string" />
-					<xs:element minOccurs="0" name="J" type="xs:string" />
-					<xs:element minOccurs="0" name="G" type="xs:string" />
-					<xs:element minOccurs="0" name="Y" type="xs:string" />
-					<!-- https://www.w3.org/TR/xmldsig-core/ defines PgenCounter THEN Seed, SZR.wsdl used Seed BEFORE PgenCounter. To keep it backwards compatible but allow the usual order, both ways are allowed. -->
-					<xs:choice maxOccurs="unbounded">
-						<xs:element minOccurs="0" name="PgenCounter" type="xs:string" />
-						<xs:element minOccurs="0" name="Seed" type="xs:string" />
-					</xs:choice>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="RSAKeyValueType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="Modulus" type="xs:string" />
-					<xs:element minOccurs="0" name="Exponent" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:schema>
-		<xs:schema elementFormDefault="qualified" targetNamespace="urn:SZRServices">
-			<xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" />
-			<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" />
-			<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 minOccurs="0" name="RegularDomicile" type="pd:PostalAddressType" />
-					<xs:element minOccurs="0" name="AddressCodes" type="szr:AddressCodesType" />
-					<xs:element minOccurs="0" name="TravelDocument" type="szr:TravelDocumentType" />
-					<xs:element minOccurs="0" name="DateOfBirthWildcard" type="xs:boolean" />
-					<xs:element minOccurs="0" name="AuskunftssperreGesetzt" type="xs:boolean" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="TravelDocumentType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="DocumentNumber" type="xs:string" />
-					<xs:element minOccurs="0" name="DocumentType" type="xs:string" />
-					<xs:element minOccurs="0" name="IssueDate" type="xs:string" />
-					<xs:element minOccurs="0" name="IssuingAuthority" type="xs:string" />
-					<xs:element minOccurs="0" name="IssuingCountry" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="AddressCodesType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="GKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="OKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="SKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="ADRCD" type="xs:string" />
-					<xs:element minOccurs="0" name="SUBCD" type="xs:string" />
-					<xs:element minOccurs="0" name="OBJNR" type="xs:string" />
-					<xs:element minOccurs="0" name="NTZLNR" type="xs:string" />
-				</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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="TransformBPKResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="TransformBPKReturn" type="szr:FremdBPKType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVKZPermission">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VKZ" type="xs:string" />
-						<xs:element name="BereichsKennung" type="xs:string" />
-						<xs:element minOccurs="0" name="ParticipantId" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVKZPermissionResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetVKZPermissionReturn" type="szr:GetVKZPermissionResponseType" />
-					</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 minOccurs="0" name="AdditionalInfo" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="ResultRecord">
-				<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 maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKKombiRequestType">
-				<xs:sequence>
-					<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-					<xs:element minOccurs="0" name="InsertERnP">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="NoInsert" />
-								<xs:enumeration value="InsertOnNoMatch" />
-								<xs:enumeration value="ForceInsert" />
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element minOccurs="0" name="Suchwizard" type="xs:boolean" />
-					<xs:element name="VKZ" type="xs:string" nillable="true" />
-					<xs:element minOccurs="0" name="BehoerdenKennzeichen" type="xs:string" />
-					<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-					<xs:element minOccurs="0" name="Sessionid" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKKombiResponseType">
-				<xs:complexContent>
-					<xs:extension base="szr:GetBPKZPVResponseType">
-						<xs:sequence>
-							<xs:element name="FoundWithSuchwizard" type="xs:boolean" />
-							<xs:element name="Sessionid" type="xs:string" />
-						</xs:sequence>
-					</xs:extension>
-				</xs:complexContent>
-			</xs:complexType>
-			<xs:complexType name="GetBPKZPVRequestType">
-				<xs:sequence>
-					<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-					<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" default="false" />
-					<xs:element minOccurs="1" name="VKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="BehoerdenKennzeichen" type="xs:string" />
-					<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKZPVResponseType">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" name="ResultRecord" type="szr:ResultRecord" />
-					<xs:element name="InsertERnPResult" type="xs:boolean" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKFromStammzahlEncryptedRequestType">
-				<xs:sequence>
-					<xs:element minOccurs="1" name="StammzahlEncrypted" type="xs:string" />
-					<xs:element minOccurs="0" name="PersonInfo" type="szr:PersonInfoType" />
-					<xs:element minOccurs="1" name="VKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKFromStammzahlEncryptedResponseType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="bPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="GetIdentityLink">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element minOccurs="0" maxOccurs="unbounded" name="KeyValue" type="dsig:KeyValueType" />
-						<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetIdentityLinkResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetIdentityLinkReturn" type="szr:IdentityLinkType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetIdentityLinkEidas">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetIdentityLinkEidasResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<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 minOccurs="0" name="BereichsKennung" type="xs:string" />
-						<xs:element minOccurs="0" name="VKZ" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-						<xs:element minOccurs="0" name="ListMultiplePersons" type="xs:boolean" />
-						<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="GetBPKReturn" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-						<xs:element maxOccurs="5" minOccurs="0" name="PersonInfo" type="szr:PersonInfoType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKs">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-						<xs:element name="VKZ" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="ResultRecord" type="szr:GetBPKsResponseType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="GetBPKsResponseType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="BPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-					<xs:element minOccurs="0" name="Fault">
-						<xs:complexType>
-							<xs:attribute name="Code" type="xs:string" />
-							<xs:attribute name="String" type="xs:string" />
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="GetBPKKombi">
-				<xs:complexType>
-					<xs:sequence>
-						<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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKZPV">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKZPVRequest" type="szr:GetBPKZPVRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKZPVResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKZPVResponse" type="szr:GetBPKZPVResponseType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKFromStammzahlEncrypted">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKFromStammzahlEncryptedRequest" type="szr:GetBPKFromStammzahlEncryptedRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKFromStammzahlEncryptedResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKFromStammzahlEncryptedResponse" type="szr:GetBPKFromStammzahlEncryptedResponseType" />
-					</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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ValidateIdentityLinkResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<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 maxOccurs="unbounded" name="BasisZahl" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="BPKzuBasiszahlResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<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:sequence>
-			</xs:complexType>
-			<xs:complexType name="FremdBPKType">
-				<xs:sequence>
-					<xs:element name="BereichsKennung" type="xs:string" />
-					<xs:element name="FremdBPK" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetVKZPermissionResponseType">
-				<xs:sequence>
-					<xs:element name="isAllowed" type="xs:boolean" />
-					<xs:element minOccurs="0" name="behSchluessel" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="BasiszahlZuBPK">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="VKZ" type="xs:string" />
-						<xs:element maxOccurs="unbounded" name="BasisZahl" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="Bereich" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKTargets" type="szr:FremdBPKRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="BasiszahlZuBPKReturnType">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="BPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKs" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="BasiszahlZuBPKResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="BasiszahlZuBPKReturn" type="szr:BasiszahlZuBPKReturnType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ZMRAnwendungsIntegration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Bereich" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKTargets" type="szr:FremdBPKRequestType" />
-						<xs:element maxOccurs="unbounded" name="ZMRfremdbPK" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="ZMRAnwendungsIntegrationReturnType">
-				<xs:sequence>
-					<xs:element name="BPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKs" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="ZMRAnwendungsIntegrationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="ZMRAnwendungsIntegrationReturn" type="szr:ZMRAnwendungsIntegrationReturnType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStammzahl">
-				<xs:complexType>
-					<xs:sequence>
-						<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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStammzahlEncrypted">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStammzahlEncryptedResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Stammzahl" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVersion" nillable="true" />
-			<xs:element name="GetVersionResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Version" type="xs:string" />
-						<xs:element name="Revision" type="xs:string" />
-						<xs:element name="Time" type="xs:string" />
-						<xs:element name="IdentityLinkNotAfter" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:schema>
-		<xs:schema targetNamespace="http://egov.gv.at/pvp1.xsd">
-			<xs:include schemaLocation="pvp1.xsd" />
-		</xs:schema>
-		<xs:schema elementFormDefault="qualified" targetNamespace="http://schemas.xmlsoap.org/ws/2002/04/secext">
-			<xs:element name="Security">
-				<xs:complexType>
-					<xs:sequence>
-						<!-- add the pvpToken here. You can also uncomment the following line if you support XSD 1.1 -->
-						<!-- <xs:element ref="pvp:pvpToken" /> -->
-						<xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-					</xs:sequence>
-					<xs:anyAttribute processContents="lax" />
-				</xs:complexType>
-			</xs:element>
-		</xs:schema>
-	</types>
-	<message name="Header">
-		<part name="SecurityHeader" element="wsse:Security" />
-	</message>
-	<message name="GetIdentityLinkRequest">
-		<part element="szr:GetIdentityLink" name="parameters" />
-	</message>
-	<message name="GetIdentityLinkResponse">
-		<part element="szr:GetIdentityLinkResponse" name="parameters" />
-	</message>
-	<message name="GetIdentityLinkEidasRequest">
-		<part element="szr:GetIdentityLinkEidas" name="parameters" />
-	</message>
-	<message name="GetIdentityLinkEidasResponse">
-		<part element="szr:GetIdentityLinkEidasResponse" name="parameters" />
-	</message>
-	<message name="GetBPKRequest">
-		<part element="szr:GetBPK" name="parameters" />
-	</message>
-	<message name="GetBPKResponse">
-		<part element="szr:GetBPKResponse" name="parameters" />
-	</message>
-	<message name="GetBPKsRequest">
-		<part element="szr:GetBPKs" name="parameters" />
-	</message>
-	<message name="GetBPKsResponse">
-		<part element="szr:GetBPKsResponse" name="parameters" />
-	</message>
-	<message name="GetBPKKombiRequest">
-		<part element="szr:GetBPKKombi" name="parameters" />
-	</message>
-	<message name="GetBPKKombiResponse">
-		<part element="szr:GetBPKKombiResponse" name="parameters" />
-	</message>
-	<message name="GetBPKZPVRequest">
-		<part element="szr:GetBPKZPV" name="parameters" />
-	</message>
-	<message name="GetBPKZPVResponse">
-		<part element="szr:GetBPKZPVResponse" name="parameters" />
-	</message>
-	<message name="GetBPKFromStammzahlEncryptedRequest">
-		<part element="szr:GetBPKFromStammzahlEncrypted" name="parameters" />
-	</message>
-	<message name="GetBPKFromStammzahlEncryptedResponse">
-		<part element="szr:GetBPKFromStammzahlEncryptedResponse" name="parameters" />
-	</message>
-	<message name="BPKzuBasiszahlRequest">
-		<part element="szr:BPKzuBasiszahl" name="parameters" />
-	</message>
-	<message name="BPKzuBasiszahlResponse">
-		<part element="szr:BPKzuBasiszahlResponse" name="parameters" />
-	</message>
-	<message name="BasiszahlZuBPKRequest">
-		<part element="szr:BasiszahlZuBPK" name="parameters" />
-	</message>
-	<message name="BasiszahlZuBPKResponse">
-		<part element="szr:BasiszahlZuBPKResponse" name="parameters" />
-	</message>
-	<message name="ValidateIdentityLinkRequest">
-		<part element="szr:ValidateIdentityLink" name="parameters" />
-	</message>
-	<message name="ValidateIdentityLinkResponse">
-		<part element="szr:ValidateIdentityLinkResponse" name="parameters" />
-	</message>
-	<message name="TransformBPKRequest">
-		<part element="szr:TransformBPK" name="parameters" />
-	</message>
-	<message name="TransformBPKResponse">
-		<part element="szr:TransformBPKResponse" name="parameters" />
-	</message>
-	<message name="GetVKZPermissionRequest">
-		<part element="szr:GetVKZPermission" name="parameters" />
-	</message>
-	<message name="GetVKZPermissionResponse">
-		<part element="szr:GetVKZPermissionResponse" name="parameters" />
-	</message>
-	<message name="ZMRAnwendungsIntegrationRequest">
-		<part element="szr:ZMRAnwendungsIntegration" name="parameters" />
-	</message>
-	<message name="ZMRAnwendungsIntegrationResponse">
-		<part element="szr:ZMRAnwendungsIntegrationResponse" name="parameters" />
-	</message>
-	<message name="GetStammzahlRequest">
-		<part element="szr:GetStammzahl" name="parameters" />
-	</message>
-	<message name="GetStammzahlResponse">
-		<part element="szr:GetStammzahlResponse" name="parameters" />
-	</message>
-	<message name="GetStammzahlEncryptedRequest">
-		<part element="szr:GetStammzahlEncrypted" name="parameters" />
-	</message>
-	<message name="GetStammzahlEncryptedResponse">
-		<part element="szr:GetStammzahlEncryptedResponse" name="parameters" />
-	</message>
-	<message name="GetVersionRequest">
-		<part element="szr:GetVersion" name="parameters" />
-	</message>
-	<message name="GetVersionResponse">
-		<part element="szr:GetVersionResponse" name="parameters" />
-	</message>
-	<message name="SZRException">
-		<part element="szr:SZRException" name="fault" />
-	</message>
-	<portType name="SZR">
-		<operation name="GetIdentityLink">
-			<input message="szr:GetIdentityLinkRequest" name="GetIdentityLinkRequest" />
-			<output message="szr:GetIdentityLinkResponse" name="GetIdentityLinkResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetIdentityLinkEidas">
-			<input message="szr:GetIdentityLinkEidasRequest" name="GetIdentityLinkEidasRequest" />
-			<output message="szr:GetIdentityLinkEidasResponse" name="GetIdentityLinkEidasResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPK">
-			<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
-				<jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
-			</jaxws:bindings>
-			<input message="szr:GetBPKRequest" name="GetBPKRequest" />
-			<output message="szr:GetBPKResponse" name="GetBPKResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKs">
-			<input message="szr:GetBPKsRequest" name="GetBPKsRequest" />
-			<output message="szr:GetBPKsResponse" name="GetBPKsResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKKombi">
-			<input message="szr:GetBPKKombiRequest" name="GetBPKKombiRequest" />
-			<output message="szr:GetBPKKombiResponse" name="GetBPKKombiResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKZPV">
-			<input message="szr:GetBPKZPVRequest" name="GetBPKZPVRequest" />
-			<output message="szr:GetBPKZPVResponse" name="GetBPKZPVResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKFromStammzahlEncrypted">
-			<input message="szr:GetBPKFromStammzahlEncryptedRequest" name="GetBPKFromStammzahlEncryptedRequest" />
-			<output message="szr:GetBPKFromStammzahlEncryptedResponse" name="GetBPKFromStammzahlEncryptedResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="ValidateIdentityLink">
-			<input message="szr:ValidateIdentityLinkRequest" name="ValidateIdentityLinkRequest" />
-			<output message="szr:ValidateIdentityLinkResponse" name="ValidateIdentityLinkResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="TransformBPK">
-			<input message="szr:TransformBPKRequest" name="TransformBPKRequest" />
-			<output message="szr:TransformBPKResponse" name="TransformBPKResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetVKZPermission">
-			<input message="szr:GetVKZPermissionRequest" name="GetVKZPermissionRequest" />
-			<output message="szr:GetVKZPermissionResponse" name="GetVKZPermissionResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="BPKzuBasiszahl">
-			<input message="szr:BPKzuBasiszahlRequest" name="BPKzuBasiszahlRequest" />
-			<output message="szr:BPKzuBasiszahlResponse" name="BPKzuBasiszahlResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="BasiszahlZuBPK">
-			<input message="szr:BasiszahlZuBPKRequest" name="BasiszahlZuBPKRequest" />
-			<output message="szr:BasiszahlZuBPKResponse" name="BasiszahlZuBPKResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="ZMRAnwendungsIntegration">
-			<input message="szr:ZMRAnwendungsIntegrationRequest" name="ZMRAnwendungsIntegrationRequest" />
-			<output message="szr:ZMRAnwendungsIntegrationResponse" name="ZMRAnwendungsIntegrationResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetStammzahl">
-			<input message="szr:GetStammzahlRequest" name="GetStammzahlRequest" />
-			<output message="szr:GetStammzahlResponse" name="GetStammzahlResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetStammzahlEncrypted">
-			<input message="szr:GetStammzahlEncryptedRequest" name="GetStammzahlEncryptedRequest" />
-			<output message="szr:GetStammzahlEncryptedResponse" name="GetStammzahlEncryptedResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetVersion">
-			<input message="szr:GetVersionRequest" name="GetVersionRequest" />
-			<output message="szr:GetVersionResponse" name="GetVersionResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-	</portType>
-	<binding name="SZRSoapBinding" type="szr:SZR">
-		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-		<operation name="GetIdentityLink">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetIdentityLinkRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetIdentityLinkResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetIdentityLinkEidas">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetIdentityLinkEidasRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetIdentityLinkEidasResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPK">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKs">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKsRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKsResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKKombi">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKKombiRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKKombiResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKZPV">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKZPVRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKZPVResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKFromStammzahlEncrypted">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKFromStammzahlEncryptedRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKFromStammzahlEncryptedResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetVKZPermission">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetVKZPermissionRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetVKZPermissionResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="ValidateIdentityLink">
-			<wsdlsoap:operation soapAction="" />
-			<input name="ValidateIdentityLinkRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="ValidateIdentityLinkResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="TransformBPK">
-			<wsdlsoap:operation soapAction="" />
-			<input name="TransformBPKRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="TransformBPKResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="BPKzuBasiszahl">
-			<wsdlsoap:operation soapAction="" />
-			<input name="BPKzuBasiszahlRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="BPKzuBasiszahlResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="BasiszahlZuBPK">
-			<wsdlsoap:operation soapAction="" />
-			<input name="BasiszahlZuBPKRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="BasiszahlZuBPKResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="ZMRAnwendungsIntegration">
-			<wsdlsoap:operation soapAction="" />
-			<input name="ZMRAnwendungsIntegrationRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="ZMRAnwendungsIntegrationResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetStammzahl">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetStammzahlRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetStammzahlResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetStammzahlEncrypted">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetStammzahlEncryptedRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetStammzahlEncryptedResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetVersion">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetVersionRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetVersionResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-	</binding>
-	<service name="SZRService">
-		<port binding="szr:SZRSoapBinding" name="SZRBusinesspartnerTestumgebung">
-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/at.gv.bmi.szrsrv-b/services/SZR" />
-		</port>
-		<port binding="szr:SZRSoapBinding" name="SZRTestumgebung">
-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services-T/services/SZR" />
-		</port>
-		<port binding="szr:SZRSoapBinding" name="SZRProduktionsumgebung">
-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services/services/SZR" />
-		</port>
-	</service>
-</definitions>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR-1.WSDL b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR-1.WSDL
deleted file mode 100644
index 4ad2645a..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR-1.WSDL
+++ /dev/null
@@ -1,901 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions targetNamespace="urn:SZRServices" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:pvp="http://egov.gv.at/pvp1.xsd" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:szr="urn:SZRServices" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/04/secext" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-	<types>
-		<xs:schema elementFormDefault="qualified" targetNamespace="http://reference.e-government.gv.at/namespace/persondata/20020228#">
-			<xs:complexType name="PhysicalPersonType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="Identification" type="pd:IdentificationType" />
-					<xs:element minOccurs="1" name="Name" type="pd:PersonNameType" />
-					<xs:element minOccurs="0" name="AlternativeName" type="pd:AlternativeNameType" />
-					<xs:element minOccurs="0" name="Sex" type="xs:string" />
-					<xs:element minOccurs="0" name="DateOfBirth" type="xs:string" />
-					<xs:element minOccurs="0" name="PlaceOfBirth" type="xs:string" />
-					<xs:element minOccurs="0" name="CountryOfBirth" type="xs:string" />
-					<xs:element minOccurs="0" name="Nationality" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="IdentificationType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="Value" type="xs:string" />
-					<xs:element minOccurs="0" name="Type" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="PersonNameType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="PrefixedDegree" type="xs:string" />
-					<xs:element name="GivenName" type="xs:string" nillable="true" />
-					<xs:element name="FamilyName" type="xs:string" nillable="true" />
-					<xs:element minOccurs="0" name="SuffixedDegree" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="AlternativeNameType">
-				<xs:sequence>
-					<xs:element name="FamilyName" type="xs:string" nillable="true" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="PostalAddressType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="PostalCode" type="xs:string" />
-					<xs:element minOccurs="0" name="Municipality" type="xs:string" />
-					<xs:element minOccurs="0" name="Locality" type="xs:string" />
-					<xs:element minOccurs="0" name="StateCode3" type="xs:string" />
-					<xs:element minOccurs="0" name="DeliveryAddress" type="pd:DeliveryAddressType" />
-					<xs:element minOccurs="0" name="HistoricRecord" type="xs:boolean" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="DeliveryAddressType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="AddressLine" type="xs:string" />
-					<xs:element minOccurs="0" name="StreetName" type="xs:string" />
-					<xs:element minOccurs="0" name="BuildingNumber" type="xs:string" />
-					<xs:element minOccurs="0" name="Unit" type="xs:string" />
-					<xs:element minOccurs="0" name="DoorNumber" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:schema>
-		<xs:schema elementFormDefault="qualified" targetNamespace="http://www.w3.org/2001/04/xmldsig-more#">
-			<xs:element name="ECDSAKeyValue" type="ecdsa:ECDSAKeyValueType" nillable="true" />
-			<xs:complexType name="ECDSAKeyValueType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="DomainParameters" type="ecdsa:DomainParamsType" />
-					<xs:element name="PublicKey" type="ecdsa:ECPointType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="DomainParamsType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="NamedCurve" type="ecdsa:NamedCurveType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="NamedCurveType">
-				<xs:attribute name="URN" type="xs:string" use="required" />
-			</xs:complexType>
-			<xs:complexType name="ECPointType">
-				<xs:sequence minOccurs="0">
-					<xs:element name="X" type="ecdsa:PrimeFieldElemType" />
-					<xs:element name="Y" type="ecdsa:PrimeFieldElemType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="PrimeFieldElemType">
-				<xs:attribute name="Value" type="xs:string" use="required" />
-			</xs:complexType>
-		</xs:schema>
-		<xs:schema elementFormDefault="qualified" targetNamespace="http://www.w3.org/2000/09/xmldsig#" xmlns="http://www.w3.org/2001/XMLSchema">
-			<xs:import namespace="http://www.w3.org/2001/04/xmldsig-more#" />
-			<xs:complexType name="KeyValueType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="DSAKeyValue" type="dsig:DSAKeyValueType" />
-					<xs:element minOccurs="0" name="RSAKeyValue" type="dsig:RSAKeyValueType" />
-					<xs:element minOccurs="0" ref="ecdsa:ECDSAKeyValue" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="DSAKeyValueType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="P" type="xs:string" />
-					<xs:element minOccurs="0" name="Q" type="xs:string" />
-					<xs:element minOccurs="0" name="J" type="xs:string" />
-					<xs:element minOccurs="0" name="G" type="xs:string" />
-					<xs:element minOccurs="0" name="Y" type="xs:string" />
-					<!-- https://www.w3.org/TR/xmldsig-core/ defines PgenCounter THEN Seed, SZR.wsdl used Seed BEFORE PgenCounter. To keep it backwards compatible but allow the usual order, both ways are allowed. -->
-					<xs:choice maxOccurs="unbounded">
-						<xs:element minOccurs="0" name="PgenCounter" type="xs:string" />
-						<xs:element minOccurs="0" name="Seed" type="xs:string" />
-					</xs:choice>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="RSAKeyValueType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="Modulus" type="xs:string" />
-					<xs:element minOccurs="0" name="Exponent" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-		</xs:schema>
-		<xs:schema elementFormDefault="qualified" targetNamespace="urn:SZRServices">
-			<xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" />
-			<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" />
-			<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 minOccurs="0" name="RegularDomicile" type="pd:PostalAddressType" />
-					<xs:element minOccurs="0" name="AddressCodes" type="szr:AddressCodesType" />
-					<xs:element minOccurs="0" name="TravelDocument" type="szr:TravelDocumentType" />
-					<xs:element minOccurs="0" name="DateOfBirthWildcard" type="xs:boolean" />
-					<xs:element minOccurs="0" name="AuskunftssperreGesetzt" type="xs:boolean" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="TravelDocumentType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="DocumentNumber" type="xs:string" />
-					<xs:element minOccurs="0" name="DocumentType" type="xs:string" />
-					<xs:element minOccurs="0" name="IssueDate" type="xs:string" />
-					<xs:element minOccurs="0" name="IssuingAuthority" type="xs:string" />
-					<xs:element minOccurs="0" name="IssuingCountry" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="AddressCodesType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="GKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="OKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="SKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="ADRCD" type="xs:string" />
-					<xs:element minOccurs="0" name="SUBCD" type="xs:string" />
-					<xs:element minOccurs="0" name="OBJNR" type="xs:string" />
-					<xs:element minOccurs="0" name="NTZLNR" type="xs:string" />
-				</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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="TransformBPKResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="TransformBPKReturn" type="szr:FremdBPKType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVKZPermission">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VKZ" type="xs:string" />
-						<xs:element name="BereichsKennung" type="xs:string" />
-						<xs:element minOccurs="0" name="ParticipantId" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVKZPermissionResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetVKZPermissionReturn" type="szr:GetVKZPermissionResponseType" />
-					</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 minOccurs="0" name="AdditionalInfo" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="ResultRecord">
-				<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 maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKKombiRequestType">
-				<xs:sequence>
-					<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-					<xs:element minOccurs="0" name="InsertERnP">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="NoInsert" />
-								<xs:enumeration value="InsertOnNoMatch" />
-								<xs:enumeration value="ForceInsert" />
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element minOccurs="0" name="Suchwizard" type="xs:boolean" />
-					<xs:element name="VKZ" type="xs:string" nillable="true" />
-					<xs:element minOccurs="0" name="BehoerdenKennzeichen" type="xs:string" />
-					<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-					<xs:element minOccurs="0" name="Sessionid" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKKombiResponseType">
-				<xs:complexContent>
-					<xs:extension base="szr:GetBPKZPVResponseType">
-						<xs:sequence>
-							<xs:element name="FoundWithSuchwizard" type="xs:boolean" />
-							<xs:element name="Sessionid" type="xs:string" />
-						</xs:sequence>
-					</xs:extension>
-				</xs:complexContent>
-			</xs:complexType>
-			<xs:complexType name="GetBPKZPVRequestType">
-				<xs:sequence>
-					<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-					<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" default="false" />
-					<xs:element minOccurs="1" name="VKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="BehoerdenKennzeichen" type="xs:string" />
-					<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKZPVResponseType">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" name="ResultRecord" type="szr:ResultRecord" />
-					<xs:element name="InsertERnPResult" type="xs:boolean" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKFromStammzahlEncryptedRequestType">
-				<xs:sequence>
-					<xs:element minOccurs="1" name="StammzahlEncrypted" type="xs:string" />
-					<xs:element minOccurs="0" name="PersonInfo" type="szr:PersonInfoType" />
-					<xs:element minOccurs="1" name="VKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKFromStammzahlEncryptedResponseType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="bPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="GetIdentityLink">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element maxOccurs="unbounded" name="KeyValue" type="dsig:KeyValueType" />
-						<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetIdentityLinkResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<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 minOccurs="0" name="BereichsKennung" type="xs:string" />
-						<xs:element minOccurs="0" name="VKZ" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-						<xs:element minOccurs="0" name="ListMultiplePersons" type="xs:boolean" />
-						<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="GetBPKReturn" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-						<xs:element maxOccurs="5" minOccurs="0" name="PersonInfo" type="szr:PersonInfoType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKs">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-						<xs:element name="VKZ" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="ResultRecord" type="szr:GetBPKsResponseType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="GetBPKsResponseType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="BPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-					<xs:element minOccurs="0" name="Fault">
-						<xs:complexType>
-							<xs:attribute name="Code" type="xs:string" />
-							<xs:attribute name="String" type="xs:string" />
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="GetBPKKombi">
-				<xs:complexType>
-					<xs:sequence>
-						<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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKZPV">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKZPVRequest" type="szr:GetBPKZPVRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKZPVResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKZPVResponse" type="szr:GetBPKZPVResponseType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKFromStammzahlEncrypted">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKFromStammzahlEncryptedRequest" type="szr:GetBPKFromStammzahlEncryptedRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKFromStammzahlEncryptedResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKFromStammzahlEncryptedResponse" type="szr:GetBPKFromStammzahlEncryptedResponseType" />
-					</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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ValidateIdentityLinkResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<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 maxOccurs="unbounded" name="BasisZahl" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="BPKzuBasiszahlResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<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:sequence>
-			</xs:complexType>
-			<xs:complexType name="FremdBPKType">
-				<xs:sequence>
-					<xs:element name="BereichsKennung" type="xs:string" />
-					<xs:element name="FremdBPK" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetVKZPermissionResponseType">
-				<xs:sequence>
-					<xs:element name="isAllowed" type="xs:boolean" />
-					<xs:element minOccurs="0" name="behSchluessel" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="BasiszahlZuBPK">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="VKZ" type="xs:string" />
-						<xs:element maxOccurs="unbounded" name="BasisZahl" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="Bereich" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKTargets" type="szr:FremdBPKRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="BasiszahlZuBPKReturnType">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="BPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKs" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="BasiszahlZuBPKResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="BasiszahlZuBPKReturn" type="szr:BasiszahlZuBPKReturnType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ZMRAnwendungsIntegration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Bereich" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKTargets" type="szr:FremdBPKRequestType" />
-						<xs:element maxOccurs="unbounded" name="ZMRfremdbPK" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="ZMRAnwendungsIntegrationReturnType">
-				<xs:sequence>
-					<xs:element name="BPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKs" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="ZMRAnwendungsIntegrationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="ZMRAnwendungsIntegrationReturn" type="szr:ZMRAnwendungsIntegrationReturnType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStammzahl">
-				<xs:complexType>
-					<xs:sequence>
-						<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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStammzahlEncrypted">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStammzahlEncryptedResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Stammzahl" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVersion" />
-			<xs:element name="GetVersionResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Version" type="xs:string" />
-						<xs:element name="Revision" type="xs:string" />
-						<xs:element name="Time" type="xs:string" />
-						<xs:element name="IdentityLinkNotAfter" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:schema>
-		<xs:schema targetNamespace="http://egov.gv.at/pvp1.xsd">
-			<xs:include schemaLocation="pvp1.xsd" />
-		</xs:schema>
-		<xs:schema elementFormDefault="qualified" targetNamespace="http://schemas.xmlsoap.org/ws/2002/04/secext">
-			<xs:element name="Security">
-				<xs:complexType>
-					<xs:sequence>
-						<!-- add the pvpToken here. You can also uncomment the following line if you support XSD 1.1 -->
-						<!-- <xs:element ref="pvp:pvpToken" /> -->
-						<xs:any processContents="lax" minOccurs="0" maxOccurs="unbounded" />
-					</xs:sequence>
-					<xs:anyAttribute processContents="lax" />
-				</xs:complexType>
-			</xs:element>
-		</xs:schema>
-	</types>
-	<message name="Header">
-		<part name="SecurityHeader" element="wsse:Security" />
-	</message>
-	<message name="GetIdentityLinkRequest">
-		<part element="szr:GetIdentityLink" name="parameters" />
-	</message>
-	<message name="GetIdentityLinkResponse">
-		<part element="szr:GetIdentityLinkResponse" name="parameters" />
-	</message>
-	<message name="GetBPKRequest">
-		<part element="szr:GetBPK" name="parameters" />
-	</message>
-	<message name="GetBPKResponse">
-		<part element="szr:GetBPKResponse" name="parameters" />
-	</message>
-	<message name="GetBPKsRequest">
-		<part element="szr:GetBPKs" name="parameters" />
-	</message>
-	<message name="GetBPKsResponse">
-		<part element="szr:GetBPKsResponse" name="parameters" />
-	</message>
-	<message name="GetBPKKombiRequest">
-		<part element="szr:GetBPKKombi" name="parameters" />
-	</message>
-	<message name="GetBPKKombiResponse">
-		<part element="szr:GetBPKKombiResponse" name="parameters" />
-	</message>
-	<message name="GetBPKZPVRequest">
-		<part element="szr:GetBPKZPV" name="parameters" />
-	</message>
-	<message name="GetBPKZPVResponse">
-		<part element="szr:GetBPKZPVResponse" name="parameters" />
-	</message>
-	<message name="GetBPKFromStammzahlEncryptedRequest">
-		<part element="szr:GetBPKFromStammzahlEncrypted" name="parameters" />
-	</message>
-	<message name="GetBPKFromStammzahlEncryptedResponse">
-		<part element="szr:GetBPKFromStammzahlEncryptedResponse" name="parameters" />
-	</message>
-	<message name="BPKzuBasiszahlRequest">
-		<part element="szr:BPKzuBasiszahl" name="parameters" />
-	</message>
-	<message name="BPKzuBasiszahlResponse">
-		<part element="szr:BPKzuBasiszahlResponse" name="parameters" />
-	</message>
-	<message name="BasiszahlZuBPKRequest">
-		<part element="szr:BasiszahlZuBPK" name="parameters" />
-	</message>
-	<message name="BasiszahlZuBPKResponse">
-		<part element="szr:BasiszahlZuBPKResponse" name="parameters" />
-	</message>
-	<message name="ValidateIdentityLinkRequest">
-		<part element="szr:ValidateIdentityLink" name="parameters" />
-	</message>
-	<message name="ValidateIdentityLinkResponse">
-		<part element="szr:ValidateIdentityLinkResponse" name="parameters" />
-	</message>
-	<message name="TransformBPKRequest">
-		<part element="szr:TransformBPK" name="parameters" />
-	</message>
-	<message name="TransformBPKResponse">
-		<part element="szr:TransformBPKResponse" name="parameters" />
-	</message>
-	<message name="GetVKZPermissionRequest">
-		<part element="szr:GetVKZPermission" name="parameters" />
-	</message>
-	<message name="GetVKZPermissionResponse">
-		<part element="szr:GetVKZPermissionResponse" name="parameters" />
-	</message>
-	<message name="ZMRAnwendungsIntegrationRequest">
-		<part element="szr:ZMRAnwendungsIntegration" name="parameters" />
-	</message>
-	<message name="ZMRAnwendungsIntegrationResponse">
-		<part element="szr:ZMRAnwendungsIntegrationResponse" name="parameters" />
-	</message>
-	<message name="GetStammzahlRequest">
-		<part element="szr:GetStammzahl" name="parameters" />
-	</message>
-	<message name="GetStammzahlResponse">
-		<part element="szr:GetStammzahlResponse" name="parameters" />
-	</message>
-	<message name="GetStammzahlEncryptedRequest">
-		<part element="szr:GetStammzahlEncrypted" name="parameters" />
-	</message>
-	<message name="GetStammzahlEncryptedResponse">
-		<part element="szr:GetStammzahlEncryptedResponse" name="parameters" />
-	</message>
-	<message name="GetVersionRequest">
-		<part element="szr:GetVersion" name="parameters" />
-	</message>
-	<message name="GetVersionResponse">
-		<part element="szr:GetVersionResponse" name="parameters" />
-	</message>
-	<message name="SZRException">
-		<part element="szr:SZRException" name="fault" />
-	</message>
-	<portType name="SZR">
-		<operation name="GetIdentityLink">
-			<input message="szr:GetIdentityLinkRequest" name="GetIdentityLinkRequest" />
-			<output message="szr:GetIdentityLinkResponse" name="GetIdentityLinkResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPK">
-			<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
-				<jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
-			</jaxws:bindings>
-			<input message="szr:GetBPKRequest" name="GetBPKRequest" />
-			<output message="szr:GetBPKResponse" name="GetBPKResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKs">
-			<input message="szr:GetBPKsRequest" name="GetBPKsRequest" />
-			<output message="szr:GetBPKsResponse" name="GetBPKsResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKKombi">
-			<input message="szr:GetBPKKombiRequest" name="GetBPKKombiRequest" />
-			<output message="szr:GetBPKKombiResponse" name="GetBPKKombiResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKZPV">
-			<input message="szr:GetBPKZPVRequest" name="GetBPKZPVRequest" />
-			<output message="szr:GetBPKZPVResponse" name="GetBPKZPVResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKFromStammzahlEncrypted">
-			<input message="szr:GetBPKFromStammzahlEncryptedRequest" name="GetBPKFromStammzahlEncryptedRequest" />
-			<output message="szr:GetBPKFromStammzahlEncryptedResponse" name="GetBPKFromStammzahlEncryptedResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="ValidateIdentityLink">
-			<input message="szr:ValidateIdentityLinkRequest" name="ValidateIdentityLinkRequest" />
-			<output message="szr:ValidateIdentityLinkResponse" name="ValidateIdentityLinkResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="TransformBPK">
-			<input message="szr:TransformBPKRequest" name="TransformBPKRequest" />
-			<output message="szr:TransformBPKResponse" name="TransformBPKResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetVKZPermission">
-			<input message="szr:GetVKZPermissionRequest" name="GetVKZPermissionRequest" />
-			<output message="szr:GetVKZPermissionResponse" name="GetVKZPermissionResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="BPKzuBasiszahl">
-			<input message="szr:BPKzuBasiszahlRequest" name="BPKzuBasiszahlRequest" />
-			<output message="szr:BPKzuBasiszahlResponse" name="BPKzuBasiszahlResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="BasiszahlZuBPK">
-			<input message="szr:BasiszahlZuBPKRequest" name="BasiszahlZuBPKRequest" />
-			<output message="szr:BasiszahlZuBPKResponse" name="BasiszahlZuBPKResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="ZMRAnwendungsIntegration">
-			<input message="szr:ZMRAnwendungsIntegrationRequest" name="ZMRAnwendungsIntegrationRequest" />
-			<output message="szr:ZMRAnwendungsIntegrationResponse" name="ZMRAnwendungsIntegrationResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetStammzahl">
-			<input message="szr:GetStammzahlRequest" name="GetStammzahlRequest" />
-			<output message="szr:GetStammzahlResponse" name="GetStammzahlResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetStammzahlEncrypted">
-			<input message="szr:GetStammzahlEncryptedRequest" name="GetStammzahlEncryptedRequest" />
-			<output message="szr:GetStammzahlEncryptedResponse" name="GetStammzahlEncryptedResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetVersion">
-			<input message="szr:GetVersionRequest" name="GetVersionRequest" />
-			<output message="szr:GetVersionResponse" name="GetVersionResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-	</portType>
-	<binding name="SZRSoapBinding" type="szr:SZR">
-		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-		<operation name="GetIdentityLink">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetIdentityLinkRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetIdentityLinkResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPK">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKs">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKsRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKsResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKKombi">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKKombiRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKKombiResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKZPV">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKZPVRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKZPVResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKFromStammzahlEncrypted">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKFromStammzahlEncryptedRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKFromStammzahlEncryptedResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetVKZPermission">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetVKZPermissionRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetVKZPermissionResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="ValidateIdentityLink">
-			<wsdlsoap:operation soapAction="" />
-			<input name="ValidateIdentityLinkRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="ValidateIdentityLinkResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="TransformBPK">
-			<wsdlsoap:operation soapAction="" />
-			<input name="TransformBPKRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="TransformBPKResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="BPKzuBasiszahl">
-			<wsdlsoap:operation soapAction="" />
-			<input name="BPKzuBasiszahlRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="BPKzuBasiszahlResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="BasiszahlZuBPK">
-			<wsdlsoap:operation soapAction="" />
-			<input name="BasiszahlZuBPKRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="BasiszahlZuBPKResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="ZMRAnwendungsIntegration">
-			<wsdlsoap:operation soapAction="" />
-			<input name="ZMRAnwendungsIntegrationRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="ZMRAnwendungsIntegrationResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetStammzahl">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetStammzahlRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetStammzahlResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetStammzahlEncrypted">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetStammzahlEncryptedRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetStammzahlEncryptedResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetVersion">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetVersionRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetVersionResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-	</binding>
-	<service name="SZRService">
-		<port binding="szr:SZRSoapBinding" name="SZRBusinesspartnerTestumgebung">
-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/at.gv.bmi.szrsrv-b/services/SZR" />
-		</port>
-		<port binding="szr:SZRSoapBinding" name="SZRTestumgebung">
-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services-T/services/SZR" />
-		</port>
-		<port binding="szr:SZRSoapBinding" name="SZRProduktionsumgebung">
-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services/services/SZR" />
-		</port>
-	</service>
-</definitions>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR_v4.0.wsdl b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR_v4.0.wsdl
deleted file mode 100644
index e7f296bd..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/SZR_v4.0.wsdl
+++ /dev/null
@@ -1,441 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<definitions targetNamespace="urn:SZRServices" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:pvp="http://egov.gv.at/pvp1.xsd" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:szr="urn:SZRServices" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsse="http://schemas.xmlsoap.org/ws/2002/04/secext" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <types>
-			<xs:schema>
-				<xs:import namespace="urn:SZRServices" schemaLocation="szr_v4.0.xsd"/>
-			</xs:schema>
-		</types>
-	<message name="Header">
-		<part name="SecurityHeader" element="wsse:Security" />
-	</message>
-	<message name="GetIdentityLinkRequest">
-		<part element="szr:GetIdentityLink" name="parameters" />
-	</message>
-	<message name="GetIdentityLinkResponse">
-		<part element="szr:GetIdentityLinkResponse" name="parameters" />
-	</message>
-	<message name="GetIdentityLinkEidasRequest">
-		<part element="szr:GetIdentityLinkEidas" name="parameters" />
-	</message>
-	<message name="GetIdentityLinkEidasResponse">
-		<part element="szr:GetIdentityLinkEidasResponse" name="parameters" />
-	</message>
-	<message name="GetBPKRequest">
-		<part element="szr:GetBPK" name="parameters" />
-	</message>
-	<message name="GetBPKResponse">
-		<part element="szr:GetBPKResponse" name="parameters" />
-	</message>
-	<message name="GetBPKsRequest">
-		<part element="szr:GetBPKs" name="parameters" />
-	</message>
-	<message name="GetBPKsResponse">
-		<part element="szr:GetBPKsResponse" name="parameters" />
-	</message>
-	<message name="GetBPKKombiRequest">
-		<part element="szr:GetBPKKombi" name="parameters" />
-	</message>
-	<message name="GetBPKKombiResponse">
-		<part element="szr:GetBPKKombiResponse" name="parameters" />
-	</message>
-	<message name="GetBPKZPVRequest">
-		<part element="szr:GetBPKZPV" name="parameters" />
-	</message>
-	<message name="GetBPKZPVResponse">
-		<part element="szr:GetBPKZPVResponse" name="parameters" />
-	</message>
-	<message name="GetBPKFromStammzahlEncryptedRequest">
-		<part element="szr:GetBPKFromStammzahlEncrypted" name="parameters" />
-	</message>
-	<message name="GetBPKFromStammzahlEncryptedResponse">
-		<part element="szr:GetBPKFromStammzahlEncryptedResponse" name="parameters" />
-	</message>
-	<message name="SignContentRequest">
-		<part element="szr:SignContent" name="parameters" />
-	</message>
-	<message name="SignContentResponse">
-		<part element="szr:SignContentResponse" name="parameters" />
-	</message>
-	<message name="BPKzuBasiszahlRequest">
-		<part element="szr:BPKzuBasiszahl" name="parameters" />
-	</message>
-	<message name="BPKzuBasiszahlResponse">
-		<part element="szr:BPKzuBasiszahlResponse" name="parameters" />
-	</message>
-	<message name="BasiszahlZuBPKRequest">
-		<part element="szr:BasiszahlZuBPK" name="parameters" />
-	</message>
-	<message name="BasiszahlZuBPKResponse">
-		<part element="szr:BasiszahlZuBPKResponse" name="parameters" />
-	</message>
-	<message name="ValidateIdentityLinkRequest">
-		<part element="szr:ValidateIdentityLink" name="parameters" />
-	</message>
-	<message name="ValidateIdentityLinkResponse">
-		<part element="szr:ValidateIdentityLinkResponse" name="parameters" />
-	</message>
-	<message name="TransformBPKRequest">
-		<part element="szr:TransformBPK" name="parameters" />
-	</message>
-	<message name="TransformBPKResponse">
-		<part element="szr:TransformBPKResponse" name="parameters" />
-	</message>
-	<message name="GetVKZPermissionRequest">
-		<part element="szr:GetVKZPermission" name="parameters" />
-	</message>
-	<message name="GetVKZPermissionResponse">
-		<part element="szr:GetVKZPermissionResponse" name="parameters" />
-	</message>
-	<message name="ZMRAnwendungsIntegrationRequest">
-		<part element="szr:ZMRAnwendungsIntegration" name="parameters" />
-	</message>
-	<message name="ZMRAnwendungsIntegrationResponse">
-		<part element="szr:ZMRAnwendungsIntegrationResponse" name="parameters" />
-	</message>
-	<message name="GetStammzahlRequest">
-		<part element="szr:GetStammzahl" name="parameters" />
-	</message>
-	<message name="GetStammzahlResponse">
-		<part element="szr:GetStammzahlResponse" name="parameters" />
-	</message>
-	<message name="GetStammzahlEncryptedRequest">
-		<part element="szr:GetStammzahlEncrypted" name="parameters" />
-	</message>
-	<message name="GetStammzahlEncryptedResponse">
-		<part element="szr:GetStammzahlEncryptedResponse" name="parameters" />
-	</message>
-	<message name="GetVersionRequest">
-		<part element="szr:GetVersion" name="parameters" />
-	</message>
-	<message name="GetVersionResponse">
-		<part element="szr:GetVersionResponse" name="parameters" />
-	</message>
-	<message name="SZRException">
-		<part element="szr:SZRException" name="fault" />
-	</message>
-	<portType name="SZR">
-		<operation name="GetIdentityLink">
-			<input message="szr:GetIdentityLinkRequest" name="GetIdentityLinkRequest" />
-			<output message="szr:GetIdentityLinkResponse" name="GetIdentityLinkResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetIdentityLinkEidas">
-			<input message="szr:GetIdentityLinkEidasRequest" name="GetIdentityLinkEidasRequest" />
-			<output message="szr:GetIdentityLinkEidasResponse" name="GetIdentityLinkEidasResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPK">
-			<jaxws:bindings xmlns:jaxws="http://java.sun.com/xml/ns/jaxws">
-				<jaxws:enableWrapperStyle>false</jaxws:enableWrapperStyle>
-			</jaxws:bindings>
-			<input message="szr:GetBPKRequest" name="GetBPKRequest" />
-			<output message="szr:GetBPKResponse" name="GetBPKResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKs">
-			<input message="szr:GetBPKsRequest" name="GetBPKsRequest" />
-			<output message="szr:GetBPKsResponse" name="GetBPKsResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKKombi">
-			<input message="szr:GetBPKKombiRequest" name="GetBPKKombiRequest" />
-			<output message="szr:GetBPKKombiResponse" name="GetBPKKombiResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKZPV">
-			<input message="szr:GetBPKZPVRequest" name="GetBPKZPVRequest" />
-			<output message="szr:GetBPKZPVResponse" name="GetBPKZPVResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetBPKFromStammzahlEncrypted">
-			<input message="szr:GetBPKFromStammzahlEncryptedRequest" name="GetBPKFromStammzahlEncryptedRequest" />
-			<output message="szr:GetBPKFromStammzahlEncryptedResponse" name="GetBPKFromStammzahlEncryptedResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="SignContent">
-			<input message="szr:SignContentRequest" name="SignContentRequest" />
-			<output message="szr:SignContentResponse" name="SignContentResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="ValidateIdentityLink">
-			<input message="szr:ValidateIdentityLinkRequest" name="ValidateIdentityLinkRequest" />
-			<output message="szr:ValidateIdentityLinkResponse" name="ValidateIdentityLinkResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="TransformBPK">
-			<input message="szr:TransformBPKRequest" name="TransformBPKRequest" />
-			<output message="szr:TransformBPKResponse" name="TransformBPKResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetVKZPermission">
-			<input message="szr:GetVKZPermissionRequest" name="GetVKZPermissionRequest" />
-			<output message="szr:GetVKZPermissionResponse" name="GetVKZPermissionResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="BPKzuBasiszahl">
-			<input message="szr:BPKzuBasiszahlRequest" name="BPKzuBasiszahlRequest" />
-			<output message="szr:BPKzuBasiszahlResponse" name="BPKzuBasiszahlResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="BasiszahlZuBPK">
-			<input message="szr:BasiszahlZuBPKRequest" name="BasiszahlZuBPKRequest" />
-			<output message="szr:BasiszahlZuBPKResponse" name="BasiszahlZuBPKResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="ZMRAnwendungsIntegration">
-			<input message="szr:ZMRAnwendungsIntegrationRequest" name="ZMRAnwendungsIntegrationRequest" />
-			<output message="szr:ZMRAnwendungsIntegrationResponse" name="ZMRAnwendungsIntegrationResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetStammzahl">
-			<input message="szr:GetStammzahlRequest" name="GetStammzahlRequest" />
-			<output message="szr:GetStammzahlResponse" name="GetStammzahlResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetStammzahlEncrypted">
-			<input message="szr:GetStammzahlEncryptedRequest" name="GetStammzahlEncryptedRequest" />
-			<output message="szr:GetStammzahlEncryptedResponse" name="GetStammzahlEncryptedResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-		<operation name="GetVersion">
-			<input message="szr:GetVersionRequest" name="GetVersionRequest" />
-			<output message="szr:GetVersionResponse" name="GetVersionResponse" />
-			<fault message="szr:SZRException" name="SZRException" />
-		</operation>
-	</portType>
-	<binding name="SZRSoapBinding" type="szr:SZR">
-		<wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" />
-		<operation name="GetIdentityLink">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetIdentityLinkRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetIdentityLinkResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetIdentityLinkEidas">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetIdentityLinkEidasRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetIdentityLinkEidasResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPK">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKs">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKsRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKsResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKKombi">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKKombiRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKKombiResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKZPV">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKZPVRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKZPVResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetBPKFromStammzahlEncrypted">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetBPKFromStammzahlEncryptedRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetBPKFromStammzahlEncryptedResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="SignContent">
-			<wsdlsoap:operation soapAction="" />
-			<input name="SignContentRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="SignContentResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetVKZPermission">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetVKZPermissionRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetVKZPermissionResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="ValidateIdentityLink">
-			<wsdlsoap:operation soapAction="" />
-			<input name="ValidateIdentityLinkRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="ValidateIdentityLinkResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="TransformBPK">
-			<wsdlsoap:operation soapAction="" />
-			<input name="TransformBPKRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="TransformBPKResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="BPKzuBasiszahl">
-			<wsdlsoap:operation soapAction="" />
-			<input name="BPKzuBasiszahlRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="BPKzuBasiszahlResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="BasiszahlZuBPK">
-			<wsdlsoap:operation soapAction="" />
-			<input name="BasiszahlZuBPKRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="BasiszahlZuBPKResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="ZMRAnwendungsIntegration">
-			<wsdlsoap:operation soapAction="" />
-			<input name="ZMRAnwendungsIntegrationRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="ZMRAnwendungsIntegrationResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetStammzahl">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetStammzahlRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetStammzahlResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetStammzahlEncrypted">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetStammzahlEncryptedRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetStammzahlEncryptedResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-		<operation name="GetVersion">
-			<wsdlsoap:operation soapAction="" />
-			<input name="GetVersionRequest">
-				<wsdlsoap:header message="szr:Header" part="SecurityHeader" use="literal" />
-				<wsdlsoap:body use="literal" />
-			</input>
-			<output name="GetVersionResponse">
-				<wsdlsoap:body use="literal" />
-			</output>
-			<fault name="SZRException">
-				<wsdlsoap:fault name="SZRException" use="literal" />
-			</fault>
-		</operation>
-	</binding>
-	<service name="SZRService">
-		<port binding="szr:SZRSoapBinding" name="SZRBusinesspartnerTestumgebung">
-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/at.gv.bmi.szrsrv-b/services/SZR" />
-		</port>
-		<port binding="szr:SZRSoapBinding" name="SZRTestumgebung">
-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services-T/services/SZR" />
-		</port>
-		<port binding="szr:SZRSoapBinding" name="SZRProduktionsumgebung">
-			<wsdlsoap:address location="https://pvawp.bmi.gv.at/bmi.gv.at/soap/SZ2Services/services/SZR" />
-		</port>
-	</service>
-</definitions>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/pvp1.xsd b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/pvp1.xsd
deleted file mode 100644
index 09c0b1e3..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/pvp1.xsd
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 2 U (http://www.xmlspy.com) by BM (Bundeskanzleramt) -->
-<!-- PVP Schema 1.8.10 -->
-<!-- pvpToken wird über das Element <Security> aus der Spezifikation WS-Security in den SOAP-Header eingebunden -->
-<!--erstellt: rainer.hoerbe@bmi.gv.at 2004-04-30 -->
-<!--geändert: rainer.hoerbe@beko.at 2007-04-04: Extensions Points definiert -->
-<xs:schema targetNamespace="http://egov.gv.at/pvp1.xsd" xmlns="http://egov.gv.at/pvp1.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="pvpToken">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="pvpTokenType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="pvpTokenType">
-		<xs:sequence>
-			<xs:element name="authenticate">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="participantId" type="xs:string" />
-						<xs:element name="gvOuDomain" type="xs:string" minOccurs="0" maxOccurs="1" />
-						<xs:choice>
-							<xs:element name="userPrincipal">
-								<xs:complexType>
-									<xs:complexContent>
-										<xs:extension base="pvpPrincipalType">
-											<xs:sequence>
-												<xs:element name="gvGid" type="xs:string" />
-												<xs:element name="mail" type="xs:string" minOccurs="0" maxOccurs="1" />
-												<xs:element name="tel" type="xs:string" minOccurs="0" maxOccurs="1" />
-												<xs:element name="bpk" type="xs:string" minOccurs="0" maxOccurs="1" />
-												<xs:element name="gvFunction" type="xs:string" minOccurs="0" maxOccurs="1" />
-											</xs:sequence>
-										</xs:extension>
-									</xs:complexContent>
-								</xs:complexType>
-							</xs:element>
-							<xs:element name="systemPrincipal" type="pvpPrincipalType" />
-						</xs:choice>
-						<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>additional authentication properties</xs:documentation>
-							</xs:annotation>
-						</xs:any>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="authorize" minOccurs="0" maxOccurs="1">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:sequence minOccurs="0">
-							<xs:element name="gvOuId" type="xs:string" />
-							<xs:element name="ou" type="xs:string" />
-						</xs:sequence>
-						<xs:element name="role" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded" />
-								</xs:sequence>
-								<xs:attribute name="value" type="xs:string" use="required" />
-							</xs:complexType>
-						</xs:element>
-						<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>additional authorization properties</xs:documentation>
-							</xs:annotation>
-						</xs:any>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="accounting" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any processContents="skip" minOccurs="0" maxOccurs="unbounded" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="pvpChainedToken" type="pvpTokenType" minOccurs="0" />
-			<xs:element name="pvpExtension" block="extension" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="version" type="gvVersionType" use="required" />
-		<xs:anyAttribute namespace="##any" processContents="lax" />
-	</xs:complexType>
-	<xs:complexType name="pvpPrincipalType">
-		<xs:sequence>
-			<xs:element name="userId" type="xs:string" />
-			<xs:element name="cn" type="xs:string" />
-			<xs:element name="gvOuId" type="xs:string" />
-			<xs:element name="ou" type="xs:string" />
-			<xs:element name="gvOuOKZ" type="xs:string" minOccurs="0" /> <!-- steht auch in der pvp doku, fehlt aber im normalen pvp1.xsd -->
-			<xs:element name="gvSecClass" type="gvSecClassType" minOccurs="0" />
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>additional principal attributes</xs:documentation>
-				</xs:annotation>
-			</xs:any>
-		</xs:sequence>
-		<xs:anyAttribute namespace="##any" processContents="lax" />
-	</xs:complexType>
-	<xs:simpleType name="gvSecClassType">
-		<xs:restriction base="xs:integer">
-			<xs:enumeration value="0" />
-			<xs:enumeration value="1" />
-			<xs:enumeration value="2" />
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="gvVersionType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="1.0" />
-			<xs:enumeration value="1.1" />
-			<xs:enumeration value="1.2" />
-			<xs:enumeration value="1.8" />
-			<xs:enumeration value="1.9" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="logLevelType">
-		<xs:restriction base="xs:integer">
-			<xs:enumeration value="0" />
-			<xs:enumeration value="1" />
-			<xs:enumeration value="2" />
-			<xs:enumeration value="3" />
-			<xs:enumeration value="4" />
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-</xs:schema>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/pvp19.xsd b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/pvp19.xsd
deleted file mode 100644
index 596a2b99..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/pvp19.xsd
+++ /dev/null
@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSPY v2004 rel. 2 U (http://www.xmlspy.com) by BM (Bundeskanzleramt) -->
-<!-- PVP Schema 1.8.10 -->
-<!-- pvpToken wird über das Element <Security> aus der Spezifikation WS-Security in den SOAP-Header eingebunden -->
-<!--erstellt: rainer.hoerbe@bmi.gv.at 2004-04-30 -->
-<!--geändert: rainer.hoerbe@beko.at 2007-04-04: Extensions Points definiert -->
-<xs:schema targetNamespace="http://egov.gv.at/pvp1.xsd" xmlns="http://egov.gv.at/pvp1.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-	<xs:element name="pvpToken">
-		<xs:complexType>
-			<xs:complexContent>
-				<xs:extension base="pvpTokenType" />
-			</xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="pvpTokenType">
-		<xs:sequence>
-			<xs:element name="authenticate">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="participantId" type="xs:string" />
-						<xs:element name="gvOuDomain" type="xs:string" minOccurs="0" maxOccurs="1" />
-						<xs:choice>
-							<xs:element name="userPrincipal">
-								<xs:complexType>
-									<xs:complexContent>
-										<xs:extension base="pvpPrincipalType">
-											<xs:sequence>
-												<xs:element name="gvGid" type="xs:string" />
-												<xs:element name="mail" type="xs:string" minOccurs="0" maxOccurs="1" />
-												<xs:element name="tel" type="xs:string" minOccurs="0" maxOccurs="1" />
-												<xs:element name="bpk" type="xs:string" minOccurs="0" maxOccurs="1" />
-												<xs:element name="gvFunction" type="xs:string" minOccurs="0" maxOccurs="1" />
-											</xs:sequence>
-										</xs:extension>
-									</xs:complexContent>
-								</xs:complexType>
-							</xs:element>
-							<xs:element name="systemPrincipal" type="pvpPrincipalType" />
-						</xs:choice>
-						<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>additional authentication properties</xs:documentation>
-							</xs:annotation>
-						</xs:any>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="authorize" minOccurs="0" maxOccurs="1">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:sequence minOccurs="0">
-							<xs:element name="gvOuId" type="xs:string" />
-							<xs:element name="ou" type="xs:string" />
-						</xs:sequence>
-						<xs:element name="role" maxOccurs="unbounded">
-							<xs:complexType>
-								<xs:sequence>
-									<xs:any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded" />
-								</xs:sequence>
-								<xs:attribute name="value" type="xs:string" use="required" />
-							</xs:complexType>
-						</xs:element>
-						<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-							<xs:annotation>
-								<xs:documentation>additional authorization properties</xs:documentation>
-							</xs:annotation>
-						</xs:any>
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="accounting" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any processContents="skip" minOccurs="0" maxOccurs="unbounded" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="pvpChainedToken" type="pvpTokenType" minOccurs="0" />
-			<xs:element name="pvpExtension" block="extension" minOccurs="0">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:any namespace="##any" processContents="skip" minOccurs="0" maxOccurs="unbounded" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="version" type="gvVersionType" use="required" />
-		<xs:anyAttribute namespace="##any" processContents="lax" />
-	</xs:complexType>
-	<xs:complexType name="pvpPrincipalType">
-		<xs:sequence>
-			<xs:element name="userId" type="xs:string" />
-			<xs:element name="cn" type="xs:string" />
-			<xs:element name="gvOuId" type="xs:string" />
-			<xs:element name="ou" type="xs:string" />
-			<xs:element name="gvOuOKZ" type="xs:string" minOccurs="0" />
-			<xs:element name="gvSecClass" type="gvSecClassType" minOccurs="0" />
-			<xs:any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded">
-				<xs:annotation>
-					<xs:documentation>additional principal attributes</xs:documentation>
-				</xs:annotation>
-			</xs:any>
-		</xs:sequence>
-		<xs:anyAttribute namespace="##any" processContents="lax" />
-	</xs:complexType>
-	<xs:simpleType name="gvSecClassType">
-		<xs:restriction base="xs:integer">
-			<xs:enumeration value="0" />
-			<xs:enumeration value="1" />
-			<xs:enumeration value="2" />
-			<xs:enumeration value="3" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="gvVersionType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="1.0" />
-			<xs:enumeration value="1.1" />
-			<xs:enumeration value="1.2" />
-			<xs:enumeration value="1.8" />
-			<xs:enumeration value="1.9" />
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="logLevelType">
-		<xs:restriction base="xs:integer">
-			<xs:enumeration value="0" />
-			<xs:enumeration value="1" />
-			<xs:enumeration value="2" />
-			<xs:enumeration value="3" />
-			<xs:enumeration value="4" />
-			<xs:enumeration value="5" />
-		</xs:restriction>
-	</xs:simpleType>
-</xs:schema>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr.xsd b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr.xsd
deleted file mode 100644
index 85acfb65..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr.xsd
+++ /dev/null
@@ -1,388 +0,0 @@
-<xs:schema elementFormDefault="qualified" targetNamespace="urn:SZRServices" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:szr="urn:SZRServices" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-			<xs:import namespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" />
-			<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" />
-			<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 minOccurs="0" name="RegularDomicile" type="pd:PostalAddressType" />
-					<xs:element minOccurs="0" name="AddressCodes" type="szr:AddressCodesType" />
-					<xs:element minOccurs="0" name="TravelDocument" type="szr:TravelDocumentType" />
-					<xs:element minOccurs="0" name="DateOfBirthWildcard" type="xs:boolean" />
-					<xs:element minOccurs="0" name="AuskunftssperreGesetzt" type="xs:boolean" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="TravelDocumentType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="DocumentNumber" type="xs:string" />
-					<xs:element minOccurs="0" name="DocumentType" type="xs:string" />
-					<xs:element minOccurs="0" name="IssueDate" type="xs:string" />
-					<xs:element minOccurs="0" name="IssuingAuthority" type="xs:string" />
-					<xs:element minOccurs="0" name="IssuingCountry" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="AddressCodesType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="GKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="OKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="SKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="ADRCD" type="xs:string" />
-					<xs:element minOccurs="0" name="SUBCD" type="xs:string" />
-					<xs:element minOccurs="0" name="OBJNR" type="xs:string" />
-					<xs:element minOccurs="0" name="NTZLNR" type="xs:string" />
-				</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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="TransformBPKResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="TransformBPKReturn" type="szr:FremdBPKType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVKZPermission">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="VKZ" type="xs:string" />
-						<xs:element name="BereichsKennung" type="xs:string" />
-						<xs:element minOccurs="0" name="ParticipantId" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVKZPermissionResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetVKZPermissionReturn" type="szr:GetVKZPermissionResponseType" />
-					</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 minOccurs="0" name="AdditionalInfo" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="ResultRecord">
-				<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 maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKKombiRequestType">
-				<xs:sequence>
-					<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-					<xs:element minOccurs="0" name="InsertERnP">
-						<xs:simpleType>
-							<xs:restriction base="xs:string">
-								<xs:enumeration value="NoInsert" />
-								<xs:enumeration value="InsertOnNoMatch" />
-								<xs:enumeration value="ForceInsert" />
-							</xs:restriction>
-						</xs:simpleType>
-					</xs:element>
-					<xs:element minOccurs="0" name="Suchwizard" type="xs:boolean" />
-					<xs:element name="VKZ" type="xs:string" nillable="true" />
-					<xs:element minOccurs="0" name="BehoerdenKennzeichen" type="xs:string" />
-					<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-					<xs:element minOccurs="0" name="Sessionid" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKKombiResponseType">
-				<xs:complexContent>
-					<xs:extension base="szr:GetBPKZPVResponseType">
-						<xs:sequence>
-							<xs:element name="FoundWithSuchwizard" type="xs:boolean" />
-							<xs:element name="Sessionid" type="xs:string" />
-						</xs:sequence>
-					</xs:extension>
-				</xs:complexContent>
-			</xs:complexType>
-			<xs:complexType name="GetBPKZPVRequestType">
-				<xs:sequence>
-					<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-					<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" default="false" />
-					<xs:element minOccurs="1" name="VKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="BehoerdenKennzeichen" type="xs:string" />
-					<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKZPVResponseType">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" name="ResultRecord" type="szr:ResultRecord" />
-					<xs:element name="InsertERnPResult" type="xs:boolean" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKFromStammzahlEncryptedRequestType">
-				<xs:sequence>
-					<xs:element minOccurs="1" name="StammzahlEncrypted" type="xs:string" />
-					<xs:element minOccurs="0" name="PersonInfo" type="szr:PersonInfoType" />
-					<xs:element minOccurs="1" name="VKZ" type="xs:string" />
-					<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetBPKFromStammzahlEncryptedResponseType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="bPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="GetIdentityLink">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element maxOccurs="unbounded" name="KeyValue" type="dsig:KeyValueType" />
-						<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetIdentityLinkResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<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 minOccurs="0" name="BereichsKennung" type="xs:string" />
-						<xs:element minOccurs="0" name="VKZ" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-						<xs:element minOccurs="0" name="ListMultiplePersons" type="xs:boolean" />
-						<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="GetBPKReturn" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-						<xs:element maxOccurs="5" minOccurs="0" name="PersonInfo" type="szr:PersonInfoType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKs">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element minOccurs="0" name="BereichsKennung" type="xs:string" />
-						<xs:element name="VKZ" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="Target" type="szr:FremdBPKRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKsResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="ResultRecord" type="szr:GetBPKsResponseType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="GetBPKsResponseType">
-				<xs:sequence>
-					<xs:element minOccurs="0" name="BPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPK" type="szr:FremdBPKType" />
-					<xs:element minOccurs="0" name="Fault">
-						<xs:complexType>
-							<xs:attribute name="Code" type="xs:string" />
-							<xs:attribute name="String" type="xs:string" />
-						</xs:complexType>
-					</xs:element>
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="GetBPKKombi">
-				<xs:complexType>
-					<xs:sequence>
-						<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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKZPV">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKZPVRequest" type="szr:GetBPKZPVRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKZPVResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKZPVResponse" type="szr:GetBPKZPVResponseType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKFromStammzahlEncrypted">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKFromStammzahlEncryptedRequest" type="szr:GetBPKFromStammzahlEncryptedRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetBPKFromStammzahlEncryptedResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="GetBPKFromStammzahlEncryptedResponse" type="szr:GetBPKFromStammzahlEncryptedResponseType" />
-					</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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ValidateIdentityLinkResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<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 maxOccurs="unbounded" name="BasisZahl" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="BPKzuBasiszahlResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<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:sequence>
-			</xs:complexType>
-			<xs:complexType name="FremdBPKType">
-				<xs:sequence>
-					<xs:element name="BereichsKennung" type="xs:string" />
-					<xs:element name="FremdBPK" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:complexType name="GetVKZPermissionResponseType">
-				<xs:sequence>
-					<xs:element name="isAllowed" type="xs:boolean" />
-					<xs:element minOccurs="0" name="behSchluessel" type="xs:string" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="BasiszahlZuBPK">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element minOccurs="0" name="VKZ" type="xs:string" />
-						<xs:element maxOccurs="unbounded" name="BasisZahl" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="Bereich" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKTargets" type="szr:FremdBPKRequestType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="BasiszahlZuBPKReturnType">
-				<xs:sequence>
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="BPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKs" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="BasiszahlZuBPKResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="BasiszahlZuBPKReturn" type="szr:BasiszahlZuBPKReturnType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ZMRAnwendungsIntegration">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Bereich" type="xs:string" />
-						<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKTargets" type="szr:FremdBPKRequestType" />
-						<xs:element maxOccurs="unbounded" name="ZMRfremdbPK" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:complexType name="ZMRAnwendungsIntegrationReturnType">
-				<xs:sequence>
-					<xs:element name="BPK" type="xs:string" />
-					<xs:element maxOccurs="unbounded" minOccurs="0" name="FremdBPKs" type="szr:FremdBPKType" />
-				</xs:sequence>
-			</xs:complexType>
-			<xs:element name="ZMRAnwendungsIntegrationResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element maxOccurs="unbounded" name="ZMRAnwendungsIntegrationReturn" type="szr:ZMRAnwendungsIntegrationReturnType" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStammzahl">
-				<xs:complexType>
-					<xs:sequence>
-						<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:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStammzahlEncrypted">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="PersonInfo" type="szr:PersonInfoType" />
-						<xs:element minOccurs="0" name="InsertERnP" type="xs:boolean" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetStammzahlEncryptedResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Stammzahl" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="GetVersion" />
-			<xs:element name="GetVersionResponse">
-				<xs:complexType>
-					<xs:sequence>
-						<xs:element name="Version" type="xs:string" />
-						<xs:element name="Revision" type="xs:string" />
-						<xs:element name="Time" type="xs:string" />
-						<xs:element name="IdentityLinkNotAfter" type="xs:string" />
-					</xs:sequence>
-				</xs:complexType>
-			</xs:element>
-</xs:schema>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_ecdsa.xsd b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_ecdsa.xsd
deleted file mode 100644
index 87ee80be..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_ecdsa.xsd
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema"
-           targetNamespace="http://www.w3.org/2001/04/xmldsig-more#" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#">
-    <xs:element name="ECDSAKeyValue" type="ecdsa:ECDSAKeyValueType" />
-    <xs:complexType name="ECDSAKeyValueType">
-        <xs:sequence>
-            <xs:element name="DomainParameters" type="ecdsa:DomainParamsType"
-                        minOccurs="0" />
-            <xs:element name="PublicKey" type="ecdsa:ECPointType" />
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DomainParamsType">
-        <xs:sequence>
-            <xs:element name="NamedCurve" minOccurs="0"
-                        type="ecdsa:NamedCurveType" />
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="NamedCurveType">
-        <xs:attribute name="URN" type="xs:string" use="required" />
-    </xs:complexType>
-    <xs:complexType name="ECPointType">
-        <xs:sequence minOccurs="0">
-            <xs:element name="X" type="ecdsa:PrimeFieldElemType" />
-            <xs:element name="Y" type="ecdsa:PrimeFieldElemType" />
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="PrimeFieldElemType">
-        <xs:attribute name="Value" type="xs:string" use="required" />
-    </xs:complexType>
-</xs:schema>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_persondata.xsd b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_persondata.xsd
deleted file mode 100644
index 3c9ac932..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_persondata.xsd
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema elementFormDefault="qualified" xmlns:pd="http://reference.e-government.gv.at/namespace/persondata/20020228#"
-	targetNamespace="http://reference.e-government.gv.at/namespace/persondata/20020228#" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-  <xs:complexType name="PhysicalPersonType">
-    <xs:sequence>
-      <xs:element minOccurs="0" name="Identification" type="pd:IdentificationType" />
-      <xs:element minOccurs="1" name="Name" type="pd:PersonNameType" />
-      <xs:element minOccurs="0" name="AlternativeName" type="pd:AlternativeNameType" />
-      <xs:element minOccurs="0" name="Sex" type="xs:string" />
-      <xs:element minOccurs="0" name="DateOfBirth" type="xs:string" />
-      <xs:element minOccurs="0" name="PlaceOfBirth" type="xs:string" />
-      <xs:element minOccurs="0" name="CountryOfBirth" type="xs:string" />
-      <xs:element minOccurs="0" name="Nationality" type="xs:string" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="IdentificationType">
-    <xs:sequence>
-      <xs:element minOccurs="0" name="Value" type="xs:string" />
-      <xs:element minOccurs="0" name="Type" type="xs:string" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="PersonNameType">
-    <xs:sequence>
-      <xs:element minOccurs="0" name="PrefixedDegree" type="xs:string" />
-      <xs:element name="GivenName" type="xs:string" nillable="true" />
-      <xs:element name="FamilyName" type="xs:string" nillable="true" />
-      <xs:element minOccurs="0" name="SuffixedDegree" type="xs:string" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="AlternativeNameType">
-    <xs:sequence>
-      <xs:element name="FamilyName" type="xs:string" nillable="true" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="PostalAddressType">
-    <xs:sequence>
-      <xs:element minOccurs="0" name="PostalCode" type="xs:string" />
-      <xs:element minOccurs="0" name="Municipality" type="xs:string" />
-      <xs:element minOccurs="0" name="Locality" type="xs:string" />
-      <xs:element minOccurs="0" name="StateCode3" type="xs:string" />
-      <xs:element minOccurs="0" name="DeliveryAddress" type="pd:DeliveryAddressType" />
-      <xs:element minOccurs="0" name="HistoricRecord" type="xs:boolean" />
-    </xs:sequence>
-  </xs:complexType>
-  <xs:complexType name="DeliveryAddressType">
-    <xs:sequence>
-      <xs:element minOccurs="0" name="AddressLine" type="xs:string" />
-      <xs:element minOccurs="0" name="StreetName" type="xs:string" />
-      <xs:element minOccurs="0" name="BuildingNumber" type="xs:string" />
-      <xs:element minOccurs="0" name="Unit" type="xs:string" />
-      <xs:element minOccurs="0" name="DoorNumber" type="xs:string" />
-    </xs:sequence>
-  </xs:complexType>
-</xs:schema>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_pvp_sec.xsd b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_pvp_sec.xsd
deleted file mode 100644
index 5001c1b8..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_pvp_sec.xsd
+++ /dev/null
@@ -1,10 +0,0 @@
-<xs:schema xmlns:pvp="http://egov.gv.at/pvp1.xsd" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://schemas.xmlsoap.org/ws/2002/04/secext" elementFormDefault="qualified">
-	<xs:import namespace="http://egov.gv.at/pvp1.xsd" schemaLocation="pvp19.xsd"/>
-	<xs:element name="Security">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="pvp:pvpToken"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element> 
-</xs:schema>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0-schemas.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0-schemas.xml
deleted file mode 100644
index d40efa45..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0-schemas.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bindings version="2.0" xmlns="http://java.sun.com/xml/ns/jaxb"
-	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_v4/szr_v4.0.xsd">
-		<bindings node="/xsd:schema">
-			<schemaBindings>
-				<package name="at.gv.util.xsd.szr_v4" />
-			</schemaBindings>
-		</bindings>
-	</bindings>
-  
-	<bindings schemaLocation="../szr/szr_ecdsa.xsd">
-		<bindings node="/xsd:schema">
-			<schemaBindings>
-				<package name="at.gv.util.xsd.szr.ecdsa" />
-			</schemaBindings>
-		</bindings>
-	</bindings>
-
-	<bindings schemaLocation="../szr_v4/szr_persondata.xsd">
-		<bindings node="/xsd:schema">
-			<schemaBindings>
-				<package name="at.gv.util.xsd.szr.persondata" />
-			</schemaBindings>
-		</bindings>
-	</bindings>
-
-	<bindings schemaLocation="../szr_v4/szr_pvp_sec.xsd">
-		<bindings node="/xsd:schema">
-			<schemaBindings>
-				<package name="at.gv.util.xsd.szr.pvp19.sec" />
-			</schemaBindings>
-		</bindings>
-	</bindings>
-
-	<bindings schemaLocation="../szr_v4/pvp19.xsd">
-		<bindings node="/xsd:schema">
-			<schemaBindings>
-				<package name="at.gv.util.xsd.szr.pvp19" />
-			</schemaBindings>
-		</bindings>
-	</bindings>
-
-  <bindings schemaLocation="../szr/szr_xmldsig.xsd">
-		<bindings node="/xsd:schema">
-			<schemaBindings>
-				<package name="at.gv.util.xsd.szr.xmldsig" />
-			</schemaBindings>
-		</bindings>
-	</bindings>
-
-</bindings>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0-wsdl.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0-wsdl.xml
deleted file mode 100644
index f95c35f0..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0-wsdl.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bindings xmlns="http://java.sun.com/xml/ns/jaxws"
-               xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
-               xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-               xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-  <enableWrapperStyle>false</enableWrapperStyle>
-  <package name="at.gv.util.wsdl.szr_v4"/> 
-     
-</bindings>
\ No newline at end of file
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0.xsd b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0.xsd
deleted file mode 100644
index 2d25f2dc..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_v4.0.xsd
+++ /dev/null
@@ -1,443 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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" type="pd:PostalAddressType" minOccurs="0"/>
-			<xs:element name="AddressCodes" type="szr:AddressCodesType" minOccurs="0"/>
-			<xs:element name="TravelDocument" type="szr:TravelDocumentType" minOccurs="0"/>
-			<xs:element name="DateOfBirthWildcard" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="AuskunftssperreGesetzt" type="xs:boolean" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="TravelDocumentType">
-		<xs:sequence>
-			<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" 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 name="Target" type="szr:FremdBPKRequestType" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="TransformBPKResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="TransformBPKReturn" type="szr:FremdBPKType" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetVKZPermission">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="VKZ" type="xs:string"/>
-				<xs:element name="BereichsKennung" type="xs:string"/>
-				<xs:element name="ParticipantId" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetVKZPermissionResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="GetVKZPermissionReturn" type="szr:GetVKZPermissionResponseType"/>
-			</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" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="ResultRecord">
-		<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" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="GetBPKKombiRequestType">
-		<xs:sequence>
-			<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:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="Suchwizard" type="xs:boolean" minOccurs="0"/>
-			<xs:element name="VKZ" type="xs:string" nillable="true"/>
-			<xs:element name="BehoerdenKennzeichen" type="xs:string" minOccurs="0"/>
-			<xs:element name="BereichsKennung" type="xs:string" minOccurs="0"/>
-			<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">
-		<xs:complexContent>
-			<xs:extension base="szr:GetBPKZPVResponseType">
-				<xs:sequence>
-					<xs:element name="FoundWithSuchwizard" type="xs:boolean"/>
-					<xs:element name="Sessionid" type="xs:string"/>
-				</xs:sequence>
-			</xs:extension>
-		</xs:complexContent>
-	</xs:complexType>
-	<xs:complexType name="GetBPKZPVRequestType">
-		<xs:sequence>
-			<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
-			<xs:element name="InsertERnP" type="xs:boolean" default="false" minOccurs="0"/>
-			<xs:element name="VKZ" type="xs:string" minOccurs="1"/>
-			<xs:element name="BehoerdenKennzeichen" type="xs:string" minOccurs="0"/>
-			<xs:element name="BereichsKennung" type="xs:string" minOccurs="0"/>
-			<xs:element name="Target" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="GetBPKZPVResponseType">
-		<xs:sequence>
-			<xs:element name="ResultRecord" type="szr:ResultRecord" maxOccurs="unbounded"/>
-			<xs:element name="InsertERnPResult" type="xs:boolean"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="GetBPKFromStammzahlEncryptedRequestType">
-		<xs:sequence>
-			<xs:element name="StammzahlEncrypted" type="xs:string" minOccurs="1"/>
-			<xs:element name="PersonInfo" type="szr:PersonInfoType" minOccurs="0"/>
-			<xs:element name="VKZ" type="xs:string" minOccurs="1"/>
-			<xs:element name="BereichsKennung" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Target" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-		<xs:attribute name="key"/>
-	</xs:complexType>
-	<xs:complexType name="GetBPKFromStammzahlEncryptedResponseType">
-		<xs:sequence>
-			<xs:element name="bPK" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="FremdBPK" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Fault" type="szr:Fault" minOccurs="0"/>
-		</xs:sequence>
-		<xs:attribute name="key"/>
-	</xs:complexType>
-	<xs:complexType name="Fault">
-		<xs:attribute name="Code" type="xs:string"/>
-		<xs:attribute name="String" type="xs:string"/>
-	</xs:complexType>
-	<xs:complexType name="SignContentResponseType">
-		<xs:sequence>
-			<xs:element name="JwsAlg" type="xs:string" minOccurs="0"/>
-			<xs:element name="Out" type="szr:SignContentEntry" minOccurs="0" maxOccurs="unbounded"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="SignContentEntry">
-		<xs:simpleContent>
-			<xs:extension base="xs:string">
-				<xs:attribute name="key"/>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-	<xs:element name="GetIdentityLink">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
-				<xs:element name="KeyValue" type="dsig:KeyValueType" minOccurs="0" 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:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetIdentityLinkEidas">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetIdentityLinkEidasResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<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" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="VKZ" type="xs:string" minOccurs="0"/>
-				<xs:element name="Target" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="ListMultiplePersons" type="xs:boolean" minOccurs="0"/>
-				<xs:element name="InsertERnP" 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" maxOccurs="unbounded"/>
-				<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="GetBPKs">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType" maxOccurs="unbounded"/>
-				<xs:element name="BereichsKennung" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="VKZ" type="xs:string"/>
-				<xs:element name="Target" type="szr:FremdBPKRequestType" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetBPKsResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="ResultRecord" type="szr:GetBPKsResponseType" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="GetBPKsResponseType">
-		<xs:sequence>
-			<xs:element name="BPK" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="FremdBPK" type="szr:FremdBPKType" minOccurs="0" maxOccurs="unbounded"/>
-			<xs:element name="Fault" minOccurs="0">
-				<xs:complexType>
-					<xs:attribute name="Code" type="xs:string"/>
-					<xs:attribute name="String" type="xs:string"/>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="GetBPKKombi">
-		<xs:complexType>
-			<xs:sequence>
-				<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:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetBPKZPV">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="GetBPKZPVRequest" type="szr:GetBPKZPVRequestType"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetBPKZPVResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="GetBPKZPVResponse" type="szr:GetBPKZPVResponseType"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetBPKFromStammzahlEncrypted">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="In" type="szr:GetBPKFromStammzahlEncryptedRequestType" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetBPKFromStammzahlEncryptedResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Out" type="szr:GetBPKFromStammzahlEncryptedResponseType" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="SignContent">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="AppendCert" type="xs:boolean" default="false" minOccurs="0"/>
-				<xs:element name="JWSHeaderParam" type="szr:JwsHeaderParam" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="In" type="szr:SignContentEntry" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:complexType name="JwsHeaderParam">
-		<xs:attribute name="key" type="xs:string" use="required"/>
-		<xs:attribute name="value" type="xs:string" use="required"/>
-	</xs:complexType>
-	<xs:element name="SignContentResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="SignContentResponse" type="szr:SignContentResponseType"/>
-			</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:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="ValidateIdentityLinkResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<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" 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: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:sequence>
-	</xs:complexType>
-	<xs:complexType name="FremdBPKType">
-		<xs:sequence>
-			<xs:element name="BereichsKennung" type="xs:string"/>
-			<xs:element name="FremdBPK" type="xs:string"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:complexType name="GetVKZPermissionResponseType">
-		<xs:sequence>
-			<xs:element name="isAllowed" type="xs:boolean"/>
-			<xs:element name="behSchluessel" type="xs:string" minOccurs="0"/>
-		</xs:sequence>
-	</xs:complexType>
-	<xs:element name="BasiszahlZuBPK">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="VKZ" type="xs:string" minOccurs="0"/>
-				<xs:element name="BasisZahl" type="xs:string" maxOccurs="unbounded"/>
-				<xs:element name="Bereich" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-				<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" minOccurs="0" maxOccurs="unbounded"/>
-			<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:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="ZMRAnwendungsIntegration">
-		<xs:complexType>
-			<xs:sequence>
-				<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 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:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetStammzahl">
-		<xs:complexType>
-			<xs:sequence>
-				<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:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetStammzahlEncrypted">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="PersonInfo" type="szr:PersonInfoType"/>
-				<xs:element name="InsertERnP" type="xs:boolean" minOccurs="0"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetStammzahlEncryptedResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Stammzahl" type="xs:string"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="GetVersion" nillable="true"/>
-	<xs:element name="GetVersionResponse">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="Version" type="xs:string"/>
-				<xs:element name="Revision" type="xs:string"/>
-				<xs:element name="Time" type="xs:string"/>
-				<xs:element name="IdentityLinkNotAfter" type="xs:string"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_xmldsig.xsd b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_xmldsig.xsd
deleted file mode 100644
index 96b50b40..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/szr_client/szr_xmldsig.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ecdsa="http://www.w3.org/2001/04/xmldsig-more#"
-           targetNamespace="http://www.w3.org/2000/09/xmldsig#" xmlns="http://www.w3.org/2001/XMLSchema" xmlns:dsig="http://www.w3.org/2000/09/xmldsig#">
-    <xs:import namespace="http://www.w3.org/2001/04/xmldsig-more#" schemaLocation="szr_ecdsa.xsd"/>
-    <xs:complexType name="KeyValueType">
-        <xs:sequence>
-            <xs:element name="DSAKeyValue" minOccurs="0"
-                        type="dsig:DSAKeyValueType" />
-            <xs:element name="RSAKeyValue" minOccurs="0"
-                        type="dsig:RSAKeyValueType" />
-            <xs:element ref="ecdsa:ECDSAKeyValue" />
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="DSAKeyValueType">
-        <xs:sequence>
-            <xs:element name="P" minOccurs="0" type="xs:string" />
-            <xs:element name="Q" minOccurs="0" type="xs:string" />
-            <xs:element name="J" minOccurs="0" type="xs:string" />
-            <xs:element name="G" minOccurs="0" type="xs:string" />
-            <xs:element name="Y" minOccurs="0" type="xs:string" />
-            <xs:element name="PgenCounter" minOccurs="0" type="xs:string" />
-            <xs:element name="Seed" minOccurs="0" type="xs:string" />
-        </xs:sequence>
-    </xs:complexType>
-    <xs:complexType name="RSAKeyValueType">
-        <xs:sequence>
-            <xs:element name="Modulus" minOccurs="0" type="xs:string" />
-            <xs:element name="Exponent" minOccurs="0" type="xs:string" />
-        </xs:sequence>
-    </xs:complexType>
-</xs:schema>
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html
deleted file mode 100644
index 186937d7..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/resources/templates/eidas_node_forward.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<!DOCTYPE html>
-<html xmlns:th="http://www.thymeleaf.org"
-      xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-      layout:decorator="fragments/base"
-      th:with="lang=${#locale.language}" th:lang="${lang}">
-<head>
-  <script src="$contextPath/autocommit.js"
-          th:attr="src=@{/autocommit.js}"></script>
-</head>
-<body>
-	<noscript>
-		<p>
-			<strong>Note:</strong> Since your browser does not support
-			JavaScript, you must press the Continue button once to proceed.
-		</p>
-	</noscript>
-
-	<div id="alert">Your login is being processed. Thank you for
-		waiting.</div>
-
-	<form 	action="${endPoint}" method="post" target="_parent"
-			th:attr="action=@{${endPoint}}">
-		<div>
-			<input type="hidden" name="${tokenName}" value="${tokenValue}"
-			 	   th:attr="value=${tokenValue},name=${tokenName}" />
-		</div>
-		<noscript>
-			<div>
-				<p>Your browser does not support JavaScript. Click the button to continuing the process .</p>
-				<input type="submit" value="Continue" />
-			</div>
-		</noscript>
-	</form>
-
-</body>
-</html>
\ No newline at end of file
-- 
cgit v1.2.3