refactoring to new EGIZ code requirements

52 files changed, 4135 insertions, 3847 deletions

diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
new file mode 100644
index 00000000..b0eb8fc1
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
@@ -0,0 +1,167 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2;
+
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
+
+public class Constants {
+
+  public static final String DATA_REQUESTERID = "req_requesterId";
+  public static final String DATA_PROVIDERNAME = "req_providerName";
+  public static final String DATA_REQUESTED_LOA_LIST = "req_requestedLoA";
+  public static final String DATA_REQUESTED_LOA_COMPERISON = "req_requestedLoAComperision";
+  public static final String DATA_FULL_EIDAS_RESPONSE = "resp_fulleIDASResponse";
+
+  // templates for post-binding forwarding
+  public static final String TEMPLATE_POST_FORWARD_NAME = "eidas_node_forward.html";
+  public static final String TEMPLATE_POST_FORWARD_ENDPOINT = "endPoint";
+  public static final String TEMPLATE_POST_FORWARD_TOKEN_NAME = "tokenName";
+  public static final String TEMPLATE_POST_FORWARD_TOKEN_VALUE = "tokenValue";
+
+  // configuration properties
+  public static final String CONIG_PROPS_EIDAS_PREFIX = "auth.eIDAS";
+  public static final String CONIG_PROPS_EIDAS_NODE = CONIG_PROPS_EIDAS_PREFIX + ".node_v2";
+  public static final String CONIG_PROPS_EIDAS_NODE_COUNTRYCODE = CONIG_PROPS_EIDAS_NODE + ".countrycode";
+  public static final String CONIG_PROPS_EIDAS_NODE_PUBLICSECTOR_TARGETS = CONIG_PROPS_EIDAS_NODE
+      + ".publicSectorTargets";
+  public static final String CONIG_PROPS_EIDAS_NODE_ENTITYID = CONIG_PROPS_EIDAS_NODE + ".entityId";
+  public static final String CONIG_PROPS_EIDAS_NODE_FORWARD_URL = CONIG_PROPS_EIDAS_NODE
+      + ".forward.endpoint";
+  public static final String CONIG_PROPS_EIDAS_NODE_FORWARD_METHOD = CONIG_PROPS_EIDAS_NODE
+      + ".forward.method";
+  public static final String CONIG_PROPS_EIDAS_NODE_ATTRIBUTES_REQUESTED_DEFAULT_ONLYNATURAL =
+      CONIG_PROPS_EIDAS_NODE + ".attributes.requested.onlynatural.";
+  public static final String CONIG_PROPS_EIDAS_NODE_ATTRIBUTES_REQUESTED_CC_SPECIFIC_ONLYNATURAL =
+      CONIG_PROPS_EIDAS_NODE + ".attributes.requested.{0}.onlynatural.";
+  public static final String CONIG_PROPS_EIDAS_NODE_ATTRIBUTES_REQUESTED_REPRESENTATION =
+      CONIG_PROPS_EIDAS_NODE + ".attributes.requested.representation.";
+  public static final String CONIG_PROPS_EIDAS_NODE_WORKAROUND_ADD_ALWAYS_PROVIDERNAME =
+      CONIG_PROPS_EIDAS_NODE + ".workarounds.addAlwaysProviderName";
+  public static final String CONIG_PROPS_EIDAS_NODE_WORKAROUND_USEREQUESTIDASTRANSACTIONIDENTIFIER =
+      CONIG_PROPS_EIDAS_NODE + ".workarounds.useRequestIdAsTransactionIdentifier";
+  public static final String CONIG_PROPS_EIDAS_NODE_WORKAROUND_USE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP =
+      CONIG_PROPS_EIDAS_NODE + ".workarounds.useStaticProviderNameForPublicSPs";
+  public static final String CONIG_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP = CONIG_PROPS_EIDAS_NODE
+      + ".staticProviderNameForPublicSPs";
+  public static final String DEFAULT_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP = "ERnB";
+
+  public static final String FORWARD_METHOD_POST = "POST";
+  public static final String FORWARD_METHOD_GET = "GET";
+
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT = CONIG_PROPS_EIDAS_PREFIX + ".szrclient";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_USETESTSERVICE = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".useTestService";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_TRACEMESSAGES = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".debug.logfullmessages";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_USEDUMMY = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".debug.useDummySolution";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_TIMEOUT_CONNECTION = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".timeout.connection";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_TIMEOUT_RESPONSE = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".timeout.response";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_ENDPOINT_PROD = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".endpoint.prod";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_ENDPOINT_TEST = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".endpoint.test";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_SSL_KEYSTORE_PATH = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".ssl.keyStore.path";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_SSL_KEYSTORE_PASSWORD = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".ssl.keyStore.password";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_SSL_TRUSTSTORE_PATH = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".ssl.trustStore.path";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_SSL_TRUSTSTORE_PASSWORD = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".ssl.trustStore.password";
+
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_EDOCUMENTTYPE = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".params.documenttype";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_VKZ = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".params.vkz";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_ISSUING_DATE = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".params.issuingdate";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_ISSUING_AUTHORITY =
+      CONIG_PROPS_EIDAS_SZRCLIENT + ".params.issuingauthority";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_KEYS_USEDUMMY = CONIG_PROPS_EIDAS_SZRCLIENT
+      + ".params.usedummykeys";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_USESRZFORBPKGENERATION =
+      CONIG_PROPS_EIDAS_SZRCLIENT + ".params.useSZRForbPKCalculation";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETPLACEOFBIRTHIFAVAILABLE =
+      CONIG_PROPS_EIDAS_SZRCLIENT + ".params.setPlaceOfBirthIfAvailable";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETBIRTHNAMEIFAVAILABLE =
+      CONIG_PROPS_EIDAS_SZRCLIENT + ".params.setBirthNameIfAvailable";
+
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_REVISIONLOGDATASTORE_ACTIVE =
+      CONIG_PROPS_EIDAS_SZRCLIENT + ".revisionlog.eidmapping.active";
+
+  @Deprecated
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_SQLLITEDATASTORE_URL =
+      CONIG_PROPS_EIDAS_SZRCLIENT + ".workarounds.datastore.sqlite.url";
+  @Deprecated
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_SQLLITEDATASTORE_ACTIVE =
+      CONIG_PROPS_EIDAS_SZRCLIENT + ".workarounds.datastore.sqlite.active";
+
+  // http endpoint descriptions
+  public static final String eIDAS_HTTP_ENDPOINT_SP_POST = "/eidas/light/sp/post";
+  public static final String eIDAS_HTTP_ENDPOINT_SP_REDIRECT = "/eidas/light/sp/redirect";
+  public static final String eIDAS_HTTP_ENDPOINT_IDP_COLLEAGUEREQUEST = "/eidas/light/ColleagueRequest";
+  public static final String eIDAS_HTTP_ENDPOINT_METADATA = "/eidas/light/metadata";
+
+  // eIDAS request parameters
+  public static final String eIDAS_REQ_NAMEID_FORMAT = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent";
+
+  // eIDAS attribute names
+  public static final String eIDAS_ATTR_PERSONALIDENTIFIER = "PersonIdentifier";
+  public static final String eIDAS_ATTR_DATEOFBIRTH = "DateOfBirth";
+  public static final String eIDAS_ATTR_CURRENTGIVENNAME = "FirstName";
+  public static final String eIDAS_ATTR_CURRENTFAMILYNAME = "FamilyName";
+  public static final String eIDAS_ATTR_PLACEOFBIRTH = "PlaceOfBirth";
+  public static final String eIDAS_ATTR_BIRTHNAME = "BirthName";
+  public static final String eIDAS_ATTR_CURRENTADDRESS = "CurrentAddress";
+
+  public static final String eIDAS_ATTR_LEGALPERSONIDENTIFIER = "LegalPersonIdentifier";
+  public static final String eIDAS_ATTR_LEGALNAME = "LegalName";
+
+  public static final String POLICY_DEFAULT_ALLOWED_TARGETS =
+      EaafConstants.URN_PREFIX_CDID.replaceAll("\\.", "\\\\.").replaceAll("\\+", "\\\\+") + ".*";
+
+  // SAML2 Constants
+  public static final String SUCCESS_URI = "urn:oasis:names:tc:SAML:2.0:status:Success";
+
+  public static final String HTTP_CLIENT_DEFAULT_TIMEOUT_CONNECTION = "30"; // seconds
+  public static final String HTTP_CLIENT_DEFAULT_TIMEOUT_RESPONSE = "60"; // seconds
+
+  public static final String SZR_SCHEMA_LOCATIONS =
+      "urn:SZRServices" + " " + "/szr_client/szr.xsd";
+
+  // Default values for SZR communication
+  public static final String SZR_CONSTANTS_DEFAULT_DOCUMENT_TYPE = "ELEKTR_DOKUMENT";
+
+  // TODO remove!!!
+  public static final String SZR_CONSTANTS_DEFAULT_ISSUING_DATE = "2014-01-01";
+  public static final String SZR_CONSTANTS_DEFAULT_ISSUING_AUTHORITY = "ms-specific eIDAS-Node for AT";
+  public static final String SZR_CONSTANTS_DEFAULT_PUBKEY_EXPONENT = "AQAB";
+  public static final String SZR_CONSTANTS_DEFAULT_PUBKEY_MODULUS =
+      "AJZyj/+sdCMDRq9RkvbFcgSTVn/OfS8EUE81ddwP8MNuJ1kd1SWBUJPaQX2JLJHrL54mkOhrkhH2M/zcuOTu8nW9TOEg"
+      + "XGjrRB/0HpiYKpV+VDJViyyc/GacNLxN4Anw4pima6gHYaJIw9hQkL/nuO2hyh8PGJd7rxeFXJmbLy+X";
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasAuthenticationModulImpl.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasAuthenticationModulImpl.java
new file mode 100644
index 00000000..41c74217
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasAuthenticationModulImpl.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2;
+
+import org.apache.commons.lang3.StringUtils;
+
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
+import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule;
+import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
+
+/**
+ * eIDAS authentication-process selector.
+ * 
+ * @author tlenz
+ *
+ */
+public class EidasAuthenticationModulImpl implements AuthModule {
+
+  private int priority = 1;
+
+  @Override
+  public int getPriority() {
+    return priority;
+  }
+
+  /**
+   * Sets the priority of this module. Default value is {@code 0}.
+   * 
+   * @param priority The priority.
+   */
+  public void setPriority(int priority) {
+    this.priority = priority;
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see at.gv.egovernment.moa.id.auth.modules.AuthModule#selectProcess(at.gv.
+   * egovernment.moa.id.process.api.ExecutionContext)
+   */
+  @Override
+  public String selectProcess(ExecutionContext context, IRequest pendingReq) {
+    if (StringUtils.isNotBlank((String) context.get(MsEidasNodeConstants.REQ_PARAM_SELECTED_COUNTRY)) 
+        || StringUtils.isNotBlank((String) context.get(MsEidasNodeConstants.REQ_PARAM_SELECTED_COUNTRY))) {
+      return "eIDASAuthentication_v2";
+    } else {
+      return null;
+    }
+
+  }
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see at.gv.egovernment.moa.id.auth.modules.AuthModule#getProcessDefinitions()
+   */
+  @Override
+  public String[] getProcessDefinitions() {
+    return new String[] { "classpath:eIDAS.Authentication.process.xml" };
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASAuthenticationSpringResourceProvider.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasAuthenticationSpringResourceProvider.java
index b5321cc9..535e4f97 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASAuthenticationSpringResourceProvider.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasAuthenticationSpringResourceProvider.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,34 +19,34 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2;
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2;
 
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
 import at.gv.egiz.components.spring.api.SpringResourceProvider;
 
-public class eIDASAuthenticationSpringResourceProvider implements SpringResourceProvider {
-
-	@Override
-	public String getName() {
-		return "Auth. module for eIDAS Ref. Impl. v2.x";
-	}
-
-	@Override
-	public String[] getPackagesToScan() {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	@Override
-	public Resource[] getResourcesToLoad() {
-		ClassPathResource eIDASAuthConfig = new ClassPathResource("/eidas_v2_auth.beans.xml", eIDASAuthenticationSpringResourceProvider.class);					
-		
-		return new Resource[] {eIDASAuthConfig};
-	}
+public class EidasAuthenticationSpringResourceProvider implements SpringResourceProvider {
+
+  @Override
+  public String getName() {
+    return "Auth. module for eIDAS Ref. Impl. v2.x";
+  }
+
+  @Override
+  public String[] getPackagesToScan() {
+    // TODO Auto-generated method stub
+    return null;
+  }
+
+  @Override
+  public Resource[] getResourcesToLoad() {
+    final ClassPathResource eidasAuthConfig = new ClassPathResource("/eidas_v2_auth.beans.xml",
+        EidasAuthenticationSpringResourceProvider.class);
+
+    return new Resource[] { eidasAuthConfig };
+  }
 
 }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasSignalServlet.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasSignalServlet.java
new file mode 100644
index 00000000..e9302f6d
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasSignalServlet.java
@@ -0,0 +1,161 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+
+import com.google.common.collect.ImmutableSortedSet;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractProcessEngineSignalController;
+import eu.eidas.auth.commons.EidasParameterKeys;
+import eu.eidas.auth.commons.light.ILightResponse;
+import eu.eidas.specificcommunication.SpecificCommunicationDefinitionBeanNames;
+import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
+import eu.eidas.specificcommunication.protocol.impl.SpecificConnectorCommunicationServiceImpl;
+
+/**
+ * Controler implementation for eIDAS Node communication.
+ * 
+ * @author tlenz
+ *
+ */
+@Controller
+public class EidasSignalServlet extends AbstractProcessEngineSignalController {
+
+  private static final Logger log = LoggerFactory.getLogger(EidasSignalServlet.class);
+  @Autowired
+  private ApplicationContext context;
+  @Autowired
+  private EidasAttributeRegistry attrRegistry;
+
+  /**
+   * eIDAS Node communication end-point implementation.
+   * 
+   */
+  public EidasSignalServlet() {
+    super();
+    log.debug("Registering servlet {} with mappings '{}' and '{}'.", 
+        getClass().getName(), Constants.eIDAS_HTTP_ENDPOINT_SP_POST, 
+        Constants.eIDAS_HTTP_ENDPOINT_SP_REDIRECT);
+
+  }
+
+  @RequestMapping(value = { 
+      Constants.eIDAS_HTTP_ENDPOINT_SP_POST,
+      Constants.eIDAS_HTTP_ENDPOINT_SP_REDIRECT
+      },
+      method = { RequestMethod.POST, RequestMethod.GET })
+  public void restoreEidasAuthProcess(HttpServletRequest req, HttpServletResponse resp) throws IOException,
+      EaafException {
+    signalProcessManagement(req, resp);
+  }
+
+  /**
+   * Protocol specific implementation to get the pending-requestID from http
+   * request object.
+   *
+   * @param request The http Servlet-Request object
+   * @return The Pending-request id
+   *
+   */
+  @Override
+  public String getPendingRequestId(HttpServletRequest request) {
+    // String sessionId = super.getPendingRequestId(request);
+
+    try {
+      // get token from Request
+      final String tokenBase64 = request.getParameter(EidasParameterKeys.TOKEN.toString());
+      if (StringUtils.isEmpty(tokenBase64)) {
+        log.warn("NO eIDAS message token found.");
+        throw new EidasSAuthenticationException("eidas.04", null);
+
+      }
+      log.trace("Receive eIDAS-node token: " + tokenBase64 + " Starting transaction-restore process ... ");
+
+      final SpecificConnectorCommunicationServiceImpl specificConnectorCommunicationService =
+          (SpecificConnectorCommunicationServiceImpl) context.getBean(
+              SpecificCommunicationDefinitionBeanNames.SPECIFIC_CONNECTOR_COMMUNICATION_SERVICE.toString());
+      final ILightResponse eidasResponse = specificConnectorCommunicationService.getAndRemoveResponse(
+          tokenBase64,
+          ImmutableSortedSet.copyOf(attrRegistry.getCoreAttributeRegistry().getAttributes()));
+
+      String pendingReqId = null;
+      if (StringUtils.isEmpty(eidasResponse.getRelayState())) {
+        log.debug("eIDAS Node returns no RelayState. ");
+
+        if (authConfig.getBasicConfigurationBoolean(
+            Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_USEREQUESTIDASTRANSACTIONIDENTIFIER,
+            false)) {
+          log.trace("Use lightRequestId to recover session ... ");
+          pendingReqId = transactionStorage.get(eidasResponse.getInResponseToId(), String.class);
+          if (StringUtils.isNotEmpty(pendingReqId)) {
+            log.debug("Restoring session with lightRequestId ... ");
+            transactionStorage.remove(eidasResponse.getInResponseToId());
+
+          }
+        }
+
+      } else {
+        log.debug("Find transaction identifier in SAML2 'RelayState': " + eidasResponse.getRelayState());
+        pendingReqId = eidasResponse.getRelayState();
+
+      }
+
+      if (StringUtils.isNotEmpty(pendingReqId)) {
+        request.setAttribute(Constants.DATA_FULL_EIDAS_RESPONSE, eidasResponse);
+        return pendingReqId;
+
+      }
+
+      log.info("NO transaction identifier found! Stopping process ....");
+      log.trace("FullResponse: " + eidasResponse.toString());
+
+    } catch (final SpecificCommunicationException e) {
+      log.warn("Can NOT load eIDAS Response from cache.", e);
+      log.debug("eIDAS response token was: " + request.getParameter(EidasParameterKeys.TOKEN.toString()));
+
+    } catch (final Exception e) {
+      log.warn("Unable to retrieve moa session id.", e);
+
+    }
+
+    return null;
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/EidasPersonalIdStoreDao.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/EidasPersonalIdStoreDao.java
new file mode 100644
index 00000000..c7acdb15
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/EidasPersonalIdStoreDao.java
@@ -0,0 +1,158 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.dao;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+
+import at.gv.egiz.eaaf.core.impl.data.Pair;
+
+@Deprecated
+public class EidasPersonalIdStoreDao {
+  public static final String NAME = "foreigneIDMap";
+
+  // Enum with all cols of this table
+  public enum Cols {
+    timestamp, transactionId, eidasId, eidasSourceCountry, eidasDestinationCountry, ernbId
+  }
+
+  public enum T {
+    ID("INTEGER"),
+    BIGINT("VARCHAR(265)"),
+    URI("VARCHAR(256)"),
+    DATE("Long"),
+    TEXT("TEXT"),
+    Long("BIGINT"),
+    Int("INTEGER"),
+    BLOB("BLOB"),
+    CC("CHAR(2)"),
+    BOOL("INTEGER");
+
+    private final String type;
+
+    T(String el) {
+      type = el;
+    }
+
+    @Override
+    public String toString() {
+      return type;
+    }
+  }
+
+  // define Cols of the table
+  public static final List<Pair<String, T>> TABLE_COLS;
+  
+  static {
+    final List<Pair<String, T>> cols = new ArrayList<>();
+    cols.add(Pair.newInstance(Cols.timestamp.name(), T.DATE));
+    cols.add(Pair.newInstance(Cols.transactionId.name(), T.TEXT));
+    cols.add(Pair.newInstance(Cols.eidasId.name(), T.TEXT));
+    cols.add(Pair.newInstance(Cols.eidasSourceCountry.name(), T.CC));
+    cols.add(Pair.newInstance(Cols.eidasDestinationCountry.name(), T.CC));
+    cols.add(Pair.newInstance(Cols.ernbId.name(), T.TEXT));
+
+    TABLE_COLS = Collections.unmodifiableList(cols);
+
+  }
+
+  public static final String CREATE = "CREATE TABLE " + NAME
+      + " (" + "id" + " " + T.ID.toString()
+      + " PRIMARY KEY AUTOINCREMENT, " + buildCreateTableQuery(TABLE_COLS) + ")";
+
+  public static final String INSERT = "INSERT INTO " + NAME
+      + "(" + buildInsertQueryKeys(TABLE_COLS) + ")"
+      + " VALUES (" + buildInsertQueryValues(TABLE_COLS) + ");";
+
+  public static final String SELECT_BY_ERNB_ID = "SELECT * FROM " + NAME
+      + " WHERE " + Cols.ernbId.name() + "=?;";
+
+  public static final String SELECT_BY_EIDAS_RAW_ID = "SELECT * FROM " + NAME
+      + " WHERE " + Cols.eidasId.name() + "=?"
+      + " and " + Cols.eidasSourceCountry.name() + "=?" + ";";
+
+  /**
+   * Build a part of a SQL query, which contains the cols of a table that should
+   * be created.
+   * 
+   * @param cols List of DB col definitions {@link Pair}
+   * @return Part of a SQL query, which contains cols that should be created
+   */
+  private static String buildCreateTableQuery(List<Pair<String, T>> cols) {    
+    StringBuffer buf = new StringBuffer();
+    for (final Pair<String, T> el : cols) {
+      buf.append(el.getFirst());
+      buf.append(" ");
+      buf.append(el.getSecond());
+      buf.append(",");
+      
+    }
+    String sql = buf.toString();
+    return sql.substring(0, sql.length() - 1);
+    
+  }
+
+  /**
+   * Build a part of a SQL query, which contains the cols keys of a table for
+   * insert operation.
+   * 
+   * @param cols List of DB col definitions {@link Pair}
+   * @return Part of a SQL query, which contains cols that should be created
+   */
+  protected static String buildInsertQueryKeys(List<Pair<String, T>> cols) {
+    
+    StringBuffer buf = new StringBuffer();
+    for (final Pair<String, T> el : cols) {
+      buf.append(el.getFirst());
+      buf.append(",");
+
+    }
+    String sql = buf.toString();
+    return sql.substring(0, sql.length() - 1);
+  }
+
+  /**
+   * Build a part of a SQL query, which contains the cols values of a table for
+   * insert operation.
+   * 
+   * @param cols List of DB col definitions {@link Pair}
+   * @return Part of a SQL query, which contains cols that should be created
+   */
+  protected static String buildInsertQueryValues(List<Pair<String, T>> cols) {
+    
+    StringBuffer buf = new StringBuffer();
+    Iterator<Pair<String, T>> it = cols.iterator();
+    while (it.hasNext()) {
+      buf.append("?,");
+      it.next();
+      
+    }
+
+    String sql = buf.toString();
+    return sql.substring(0, sql.length() - 1);
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/ErnbEidData.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/ErnbEidData.java
new file mode 100644
index 00000000..6c7eeb6b
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/dao/ErnbEidData.java
@@ -0,0 +1,115 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.dao;
+
+import java.text.SimpleDateFormat;
+
+import org.joda.time.DateTime;
+
+import at.gv.e_government.reference.namespace.persondata._20020228.PostalAddressType;
+
+public class ErnbEidData {
+
+  private String citizenCountryCode = null;
+
+  // MDS
+  private String pseudonym = null;
+  private String givenName = null;
+  private String familyName = null;
+  private DateTime dateOfBirth = null;
+
+  // additional attributes
+  private String placeOfBirth = null;
+  private String birthName = null;
+  private PostalAddressType address = null;
+
+  public String getCitizenCountryCode() {
+    return citizenCountryCode;
+  }
+
+  public void setCitizenCountryCode(String citizenCountryCode) {
+    this.citizenCountryCode = citizenCountryCode;
+  }
+
+  public String getPseudonym() {
+    return pseudonym;
+  }
+
+  public void setPseudonym(String pseudonym) {
+    this.pseudonym = pseudonym;
+  }
+
+  public String getGivenName() {
+    return givenName;
+  }
+
+  public void setGivenName(String givenName) {
+    this.givenName = givenName;
+  }
+
+  public String getFamilyName() {
+    return familyName;
+  }
+
+  public void setFamilyName(String familyName) {
+    this.familyName = familyName;
+  }
+
+  public DateTime getDateOfBirth() {
+    return dateOfBirth;
+  }
+
+  public void setDateOfBirth(DateTime dateOfBirth) {
+    this.dateOfBirth = dateOfBirth;
+  }
+
+  public String getPlaceOfBirth() {
+    return placeOfBirth;
+  }
+
+  public void setPlaceOfBirth(String placeOfBirth) {
+    this.placeOfBirth = placeOfBirth;
+  }
+
+  public String getBirthName() {
+    return birthName;
+  }
+
+  public void setBirthName(String birthName) {
+    this.birthName = birthName;
+  }
+
+  public PostalAddressType getAddress() {
+    return address;
+  }
+
+  public void setAddress(PostalAddressType address) {
+    this.address = address;
+  }
+
+  public String getFormatedDateOfBirth() {
+    return new SimpleDateFormat("yyyy-MM-dd").format(dateOfBirth.toDate());
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/SQLiteServiceException.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/EidPostProcessingException.java
index 181dc5e2..f4c0be67 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/SQLiteServiceException.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/EidPostProcessingException.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,21 +19,22 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception;
+*/
 
-public class SQLiteServiceException extends eIDASAuthenticationException {
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.exception;
 
-	private static final long serialVersionUID = 2278259367925102676L;
+public class EidPostProcessingException extends EidasSAuthenticationException {
 
-	public SQLiteServiceException(String internalMsgId, Object[] params, Throwable e) {
-		super(internalMsgId, params, e);
-		
-	}
+  private static final long serialVersionUID = 6780652273831172456L;
 
-	public SQLiteServiceException(String internalMsgId, Object[] params) {
-		super(internalMsgId, params);
-		
-	}
+  public EidPostProcessingException(String internalMsgId, Object[] params) {
+    super(internalMsgId, params);
+
+  }
+
+  public EidPostProcessingException(String internalMsgId, Object[] params, Throwable e) {
+    super(internalMsgId, params, e);
+
+  }
 
 }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDASValidationException.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/EidasAttributeException.java
index d41f5aad..49736d58 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDASValidationException.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/EidasAttributeException.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,18 +19,16 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception;
+*/
 
-public class eIDASValidationException extends eIDASAuthenticationException {
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.exception;
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+public class EidasAttributeException extends EidasSAuthenticationException {
+  private static final long serialVersionUID = 1L;
 
-	public eIDASValidationException(String internalMsgId, Object[] params) {
-		super(internalMsgId, params);
-	}
+  public EidasAttributeException(String attrbuteName) {
+    super("eidas.00", new Object[] { attrbuteName });
+
+  }
 
 }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDASAuthenticationException.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/EidasSAuthenticationException.java
index e468fd72..8ff218e3 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDASAuthenticationException.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/EidasSAuthenticationException.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,24 +19,23 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception;
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.exception;
 
 import at.gv.egiz.eaaf.core.exceptions.EaafAuthenticationException;
 
-public class eIDASAuthenticationException extends EaafAuthenticationException{
+public class EidasSAuthenticationException extends EaafAuthenticationException {
+
+
+  private static final long serialVersionUID = 1L;
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+  public EidasSAuthenticationException(String internalMsgId, Object[] params) {
+    super(internalMsgId, params);
+  }
 
-	public eIDASAuthenticationException(String internalMsgId, Object[] params) {
-		super(internalMsgId, params);
-	}
-	
-	public eIDASAuthenticationException(String internalMsgId, Object[] params, Throwable e) {
-		super(internalMsgId, params, e);
-	}
+  public EidasSAuthenticationException(String internalMsgId, Object[] params, Throwable e) {
+    super(internalMsgId, params, e);
+  }
 
 }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/SZRCommunicationException.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/EidasValidationException.java
index ea9fa6ce..2988dd6f 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/SZRCommunicationException.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/EidasValidationException.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,19 +19,16 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception;
+*/
 
-public class SZRCommunicationException extends eIDASAuthenticationException {
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.exception;
 
-	private static final long serialVersionUID = 1L;
+public class EidasValidationException extends EidasSAuthenticationException {
 
-	public SZRCommunicationException(String internalMsgId, Object[] params) {
-		super(internalMsgId, params);
-	}
+  private static final long serialVersionUID = 1L;
 
-	public SZRCommunicationException(String internalMsgId, Object[] params, Throwable e) {
-		super(internalMsgId, params, e);
-	}
+  public EidasValidationException(String internalMsgId, Object[] params) {
+    super(internalMsgId, params);
+  }
 
 }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDASAttributeException.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/SqliteServiceException.java
index ec307b7d..d48abec9 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDASAttributeException.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/SqliteServiceException.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,19 +19,22 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception;
+*/
 
-public class eIDASAttributeException extends eIDASAuthenticationException {
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.exception;
 
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
+public class SqliteServiceException extends EidasSAuthenticationException {
 
-	public eIDASAttributeException(String attrbuteName) {
-		super("eidas.00", new Object[] {attrbuteName});
+  private static final long serialVersionUID = 2278259367925102676L;
 
-	}
+  public SqliteServiceException(String internalMsgId, Object[] params, Throwable e) {
+    super(internalMsgId, params, e);
+
+  }
+
+  public SqliteServiceException(String internalMsgId, Object[] params) {
+    super(internalMsgId, params);
+
+  }
 
 }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDPostProcessingException.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/SzrCommunicationException.java
index 05e12dbd..c736cadb 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/exception/eIDPostProcessingException.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/exception/SzrCommunicationException.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,21 +19,20 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception;
+*/
 
-public class eIDPostProcessingException extends eIDASAuthenticationException {
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.exception;
 
-	private static final long serialVersionUID = 6780652273831172456L;
+public class SzrCommunicationException extends EidasSAuthenticationException {
 
-	public eIDPostProcessingException(String internalMsgId, Object[] params) {
-		super(internalMsgId, params);
-		
-	}
-	
-	public eIDPostProcessingException(String internalMsgId, Object[] params, Throwable e) {
-		super(internalMsgId, params, e);
-		
-	}
+  private static final long serialVersionUID = 1L;
+
+  public SzrCommunicationException(String internalMsgId, Object[] params) {
+    super(internalMsgId, params);
+  }
+
+  public SzrCommunicationException(String internalMsgId, Object[] params, Throwable e) {
+    super(internalMsgId, params, e);
+  }
 
 }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
new file mode 100644
index 00000000..2b0e0d2f
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
@@ -0,0 +1,357 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.handler;
+
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import com.google.common.collect.ImmutableSortedSet;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.ErnbEidData;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidPostProcessingException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasAttributeException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils;
+import at.gv.e_government.reference.namespace.persondata._20020228.PostalAddressType;
+import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
+import at.gv.egiz.eaaf.core.impl.data.Trible;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import eu.eidas.auth.commons.attribute.AttributeDefinition;
+import eu.eidas.auth.commons.attribute.ImmutableAttributeMap;
+import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
+import eu.eidas.auth.commons.protocol.eidas.SpType;
+import eu.eidas.auth.commons.protocol.eidas.impl.PostalAddress;
+
+public abstract class AbstractEidProcessor implements INationalEidProcessor {
+  private static final Logger log = LoggerFactory.getLogger(AbstractEidProcessor.class);
+
+  @Autowired
+  protected EidasAttributeRegistry attrRegistry;
+  @Autowired
+  protected IConfigurationWithSP basicConfig;
+
+  @Override
+  public final void preProcess(IRequest pendingReq, Builder authnRequestBuilder) {
+
+    buildProviderNameAttribute(pendingReq, authnRequestBuilder);
+    buildRequestedAttributes(authnRequestBuilder);
+
+  }
+
+  @Override
+  public final ErnbEidData postProcess(Map<String, Object> eidasAttrMap) throws EidPostProcessingException,
+      EidasAttributeException {
+    final ErnbEidData result = new ErnbEidData();
+
+    final Object eIdentifierObj = eidasAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+    final Trible<String, String, String> eIdentifier =
+        EidasResponseUtils.parseEidasPersonalIdentifier((String) eIdentifierObj);
+    result.setCitizenCountryCode(eIdentifier.getFirst());
+
+    // MDS attributes
+    result.setPseudonym(processPseudonym(eidasAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER)));
+    result.setFamilyName(processFamilyName(eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTFAMILYNAME)));
+    result.setGivenName(processGivenName(eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTGIVENNAME)));
+    result.setDateOfBirth(processDateOfBirth(eidasAttrMap.get(Constants.eIDAS_ATTR_DATEOFBIRTH)));
+
+    // additional attributes
+    result.setPlaceOfBirth(processPlaceOfBirth(eidasAttrMap.get(Constants.eIDAS_ATTR_PLACEOFBIRTH)));
+    result.setBirthName(processBirthName(eidasAttrMap.get(Constants.eIDAS_ATTR_BIRTHNAME)));
+    result.setAddress(processAddress(eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTADDRESS)));
+
+    return result;
+
+  }
+
+  
+  /**
+   * Get a Map of country-specific requested attributes.
+   * 
+   * @return
+   */
+  @NonNull
+  protected abstract Map<String, Boolean> getCountrySpecificRequestedAttributes();
+
+  /**
+   * Post-Process the eIDAS CurrentAddress attribute.
+   * 
+   * @param currentAddressObj eIDAS current address information
+   * @return current address or null if no attribute is available
+   * @throws EidPostProcessingException if post-processing fails
+   * @throws EidasAttributeException    if eIDAS attribute is of a wrong type
+   */
+  protected PostalAddressType processAddress(Object currentAddressObj) throws EidPostProcessingException,
+      EidasAttributeException {
+
+    if (currentAddressObj != null) {
+      if (currentAddressObj instanceof PostalAddress) {
+        final PostalAddressType result = new PostalAddressType();
+        result.setPostalCode(((PostalAddress) currentAddressObj).getPostCode());
+        result.setMunicipality(((PostalAddress) currentAddressObj).getPostName());
+
+        // TODO: add more mappings
+        
+        return result;
+
+      } else {
+        log.warn("eIDAS attr: " + Constants.eIDAS_ATTR_CURRENTADDRESS + " is of WRONG type");
+        throw new EidasAttributeException(Constants.eIDAS_ATTR_CURRENTADDRESS);
+
+      }
+
+    } else {
+      log.debug("NO '" + Constants.eIDAS_ATTR_CURRENTADDRESS + "' attribute. Post-Processing skipped ... ");
+    }
+
+    return null;
+
+  }
+
+  /**
+   * Post-Process the eIDAS BirthName attribute.
+   * 
+   * @param birthNameObj eIDAS birthname information
+   * @return birthName or null if no attribute is available
+   * @throws EidPostProcessingException if post-processing fails
+   * @throws EidasAttributeException    if eIDAS attribute is of a wrong type
+   */
+  protected String processBirthName(Object birthNameObj) throws EidPostProcessingException,
+      EidasAttributeException {
+    if (birthNameObj != null) {
+      if (birthNameObj instanceof String) {
+        return (String) birthNameObj;
+
+      } else {
+        log.warn("eIDAS attr: " + Constants.eIDAS_ATTR_BIRTHNAME + " is of WRONG type");
+        throw new EidasAttributeException(Constants.eIDAS_ATTR_BIRTHNAME);
+
+      }
+
+    } else {
+      log.debug("NO '" + Constants.eIDAS_ATTR_BIRTHNAME + "' attribute. Post-Processing skipped ... ");
+    }
+
+    return null;
+
+  }
+
+  /**
+   * Post-Process the eIDAS PlaceOfBirth attribute.
+   * 
+   * @param placeOfBirthObj eIDAS Place-of-Birth information
+   * @return place of Birth or null if no attribute is available
+   * @throws EidPostProcessingException if post-processing fails
+   * @throws EidasAttributeException    if eIDAS attribute is of a wrong type
+   */
+  protected String processPlaceOfBirth(Object placeOfBirthObj) throws EidPostProcessingException,
+      EidasAttributeException {
+    if (placeOfBirthObj != null) {
+      if (placeOfBirthObj instanceof String) {
+        return (String) placeOfBirthObj;
+
+      } else {
+        log.warn("eIDAS attr: " + Constants.eIDAS_ATTR_PLACEOFBIRTH + " is of WRONG type");
+        throw new EidasAttributeException(Constants.eIDAS_ATTR_PLACEOFBIRTH);
+
+      }
+
+    } else {
+      log.debug("NO '" + Constants.eIDAS_ATTR_PLACEOFBIRTH + "' attribute. Post-Processing skipped ... ");
+    }
+
+    return null;
+
+  }
+
+  /**
+   * Post-Process the eIDAS DateOfBirth attribute.
+   * 
+   * @param dateOfBirthObj eIDAS date-of-birth attribute information
+   * @return formated user's date-of-birth
+   * @throws EidasAttributeException    if NO attribute is available
+   * @throws EidPostProcessingException if post-processing fails
+   */
+  protected DateTime processDateOfBirth(Object dateOfBirthObj) throws EidPostProcessingException,
+      EidasAttributeException {
+    if (dateOfBirthObj == null || !(dateOfBirthObj instanceof DateTime)) {
+      throw new EidasAttributeException(Constants.eIDAS_ATTR_DATEOFBIRTH);
+    }
+
+    return (DateTime) dateOfBirthObj;
+
+  }
+
+  /**
+   * Post-Process the eIDAS GivenName attribute.
+   * 
+   * @param givenNameObj eIDAS givenName attribute information
+   * @return formated user's givenname
+   * @throws EidasAttributeException    if NO attribute is available
+   * @throws EidPostProcessingException if post-processing fails
+   */
+  protected String processGivenName(Object givenNameObj) throws EidPostProcessingException,
+      EidasAttributeException {
+    if (givenNameObj == null || !(givenNameObj instanceof String)) {
+      throw new EidasAttributeException(Constants.eIDAS_ATTR_CURRENTGIVENNAME);
+    }
+
+    return (String) givenNameObj;
+
+  }
+
+  /**
+   * Post-Process the eIDAS FamilyName attribute.
+   * 
+   * @param familyNameObj eIDAS familyName attribute information
+   * @return formated user's familyname
+   * @throws EidasAttributeException    if NO attribute is available
+   * @throws EidPostProcessingException if post-processing fails
+   */
+  protected String processFamilyName(Object familyNameObj) throws EidPostProcessingException,
+      EidasAttributeException {
+    if (familyNameObj == null || !(familyNameObj instanceof String)) {
+      throw new EidasAttributeException(Constants.eIDAS_ATTR_CURRENTFAMILYNAME);
+    }
+
+    return (String) familyNameObj;
+
+  }
+
+  /**
+   * Post-Process the eIDAS pseudonym to ERnB unique identifier.
+   * 
+   * @param personalIdObj eIDAS PersonalIdentifierAttribute
+   * @return Unique personal identifier without country-code information
+   * @throws EidasAttributeException    if NO attribute is available
+   * @throws EidPostProcessingException if post-processing fails
+   */
+  protected String processPseudonym(Object personalIdObj) throws EidPostProcessingException,
+      EidasAttributeException {
+    if (personalIdObj == null || !(personalIdObj instanceof String)) {
+      throw new EidasAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+    }
+
+    final Trible<String, String, String> eIdentifier =
+        EidasResponseUtils.parseEidasPersonalIdentifier((String) personalIdObj);
+
+    return eIdentifier.getThird();
+
+  }
+
+  private void buildRequestedAttributes(Builder authnRequestBuilder) {
+    // build and add requested attribute set
+    final Map<String, Boolean> ccSpecificReqAttr = getCountrySpecificRequestedAttributes();
+    log.debug("Get #{} country-specific requested attributes", ccSpecificReqAttr.size());
+
+    final Map<String, Boolean> mdsReqAttr = attrRegistry.getDefaultAttributeSetFromConfiguration();
+    log.trace("Get #{} default requested attributes", mdsReqAttr.size());
+
+    // put it together
+    ccSpecificReqAttr.putAll(mdsReqAttr);
+
+    // convert it to eIDAS attributes
+    final ImmutableAttributeMap reqAttrMap = translateToEidasAttributes(ccSpecificReqAttr);
+    authnRequestBuilder.requestedAttributes(reqAttrMap);
+
+  }
+
+  private ImmutableAttributeMap translateToEidasAttributes(final Map<String, Boolean> requiredAttributes) {
+    final ImmutableAttributeMap.Builder builder = ImmutableAttributeMap.builder();
+    for (final Map.Entry<String, Boolean> attribute : requiredAttributes.entrySet()) {
+      final String name = attribute.getKey();
+      final ImmutableSortedSet<AttributeDefinition<?>> byFriendlyName = attrRegistry
+          .getCoreAttributeRegistry().getByFriendlyName(name);
+      if (!byFriendlyName.isEmpty()) {
+        final AttributeDefinition<?> attributeDefinition = byFriendlyName.first();
+        builder.put(AttributeDefinition.builder(attributeDefinition).required(attribute.getValue()).build());
+
+      } else {
+        log.warn("Can NOT request UNKNOWN attribute: " + attribute.getKey() + " Ignore it!");
+      }
+
+    }
+
+    return builder.build();
+
+  }
+
+  private void buildProviderNameAttribute(IRequest pendingReq, Builder authnRequestBuilder) {
+    final ISpConfiguration spConfig = pendingReq.getServiceProviderConfiguration();
+
+    // set correct SPType for requested target sector
+    final String publicSectorTargetSelector = basicConfig.getBasicConfiguration(
+        Constants.CONIG_PROPS_EIDAS_NODE_PUBLICSECTOR_TARGETS,
+        Constants.POLICY_DEFAULT_ALLOWED_TARGETS);
+    final Pattern p = Pattern.compile(publicSectorTargetSelector);
+    final Matcher m = p.matcher(spConfig.getAreaSpecificTargetIdentifier());
+    if (m.matches()) {
+      log.debug("Map " + spConfig.getAreaSpecificTargetIdentifier() + " to 'PublicSector'");
+      authnRequestBuilder.spType(SpType.PUBLIC.getValue());
+
+      if (basicConfig.getBasicConfigurationBoolean(
+          Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_USE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP,
+          false)) {
+        authnRequestBuilder.providerName(basicConfig.getBasicConfiguration(
+            Constants.CONIG_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP,
+            Constants.DEFAULT_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP));
+
+      } else {
+        // TODO: only for eIDAS ref. node 2.0 and 2.1 because it need 'Providername' for
+        // any SPType
+        final String providerName = pendingReq.getRawData(Constants.DATA_PROVIDERNAME, String.class);
+        if (StringUtils.isNotEmpty(providerName)
+            && basicConfig.getBasicConfigurationBoolean(
+                Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_ADD_ALWAYS_PROVIDERNAME,
+                false)) {
+          authnRequestBuilder.providerName(providerName);
+
+        }
+      }
+
+    } else {
+      log.debug("Map " + spConfig.getAreaSpecificTargetIdentifier() + " to 'PrivateSector'");
+      authnRequestBuilder.spType(SpType.PRIVATE.getValue());
+
+      // TODO: switch to RequesterId in further version
+      // set provider name for private sector applications
+      final String providerName = pendingReq.getRawData(Constants.DATA_PROVIDERNAME, String.class);
+      if (StringUtils.isNotEmpty(providerName)) {
+        authnRequestBuilder.providerName(providerName);
+      }
+
+    }
+
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeEidProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeEidProcessor.java
new file mode 100644
index 00000000..8d8cc6b0
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeEidProcessor.java
@@ -0,0 +1,112 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.handler;
+
+import java.io.UnsupportedEncodingException;
+import java.util.Base64;
+import java.util.Map;
+
+import org.apache.commons.codec.DecoderException;
+import org.apache.commons.codec.binary.Hex;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidPostProcessingException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasAttributeException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils;
+import at.gv.egiz.eaaf.core.impl.data.Trible;
+
+public class DeEidProcessor extends AbstractEidProcessor {
+  private static final Logger log = LoggerFactory.getLogger(DeEidProcessor.class);
+  private static final String canHandleCC = "DE";
+
+  private int priority = 1;
+
+  @Override
+  public int getPriority() {
+    return priority;
+  }
+
+  @Override
+  public boolean canHandle(String countryCode) {
+    return countryCode != null && countryCode.equalsIgnoreCase(canHandleCC);
+
+  }
+
+  public void setPriority(int priority) {
+    this.priority = priority;
+  }
+
+  @Override
+  public String getName() {
+    return "DE-PostProcessor";
+
+  }
+
+  @Override
+  protected String processPseudonym(Object uniqeIdentifierObj) throws EidPostProcessingException,
+      EidasAttributeException {
+    if (uniqeIdentifierObj == null || !(uniqeIdentifierObj instanceof String)) {
+      throw new EidasAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+    }
+
+    final Trible<String, String, String> eIdentifier =
+        EidasResponseUtils.parseEidasPersonalIdentifier((String) uniqeIdentifierObj);
+
+    log.trace(getName() + " starts processing of attribute: " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+    final String result = convertDeIdentifier(eIdentifier.getThird());
+    log.debug(getName() + " finished processing of attribute: " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+
+    return result;
+
+  }
+
+  private String convertDeIdentifier(String hexEncodedDeIdentifier) throws EidPostProcessingException {
+    if (hexEncodedDeIdentifier.length() != 64) {
+      throw new EidPostProcessingException("ernb.03", new Object[] {
+          "Input has wrong length, expected 64 chars" });
+    }
+
+    byte[] data;
+    try {
+      data = Hex.decodeHex(hexEncodedDeIdentifier);
+      final byte[] encoded = Base64.getEncoder().encode(data);
+      return new String(encoded, "UTF-8");
+
+    } catch (final DecoderException | UnsupportedEncodingException e) {
+      throw new EidPostProcessingException("ernb.03", null, e);
+
+    }
+
+    
+  }
+
+  @Override
+  protected Map<String, Boolean> getCountrySpecificRequestedAttributes() {
+    return attrRegistry.getAttributeSetFromConfiguration(canHandleCC);
+
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/GenericEidProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/GenericEidProcessor.java
new file mode 100644
index 00000000..69949435
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/GenericEidProcessor.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.handler;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class GenericEidProcessor extends AbstractEidProcessor {
+
+  private int priority = 0;
+
+  @Override
+  public int getPriority() {
+    return priority;
+
+  }
+
+  @Override
+  public boolean canHandle(String countryCode) {
+    return true;
+
+  }
+
+  public void setPriority(int priority) {
+    this.priority = priority;
+  }
+
+  @Override
+  public String getName() {
+    return "Default-PostProcessor";
+
+  }
+
+  @Override
+  protected Map<String, Boolean> getCountrySpecificRequestedAttributes() {
+    return new HashMap<>();
+
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/INationalEidProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/INationalEidProcessor.java
new file mode 100644
index 00000000..577efbcd
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/INationalEidProcessor.java
@@ -0,0 +1,81 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.handler;
+
+import java.util.Map;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.ErnbEidData;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasAttributeException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidPostProcessingException;
+import at.gv.egiz.eaaf.core.api.IRequest;
+import eu.eidas.auth.commons.light.ILightRequest;
+import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
+
+public interface INationalEidProcessor {
+
+  /**
+   * Get a friendlyName of this post-processor implementation.
+   * 
+   * @return
+   */
+  String getName();
+
+  /**
+   * Get the priority of this eID Post-Processor <br>
+   * If more than one Post-Processor implementations can handle the eID data, the
+   * post-processor with the highest priority are selected. The Default-Processor
+   * has priority '0'
+   * 
+   * @return Priority of this handler
+   */
+  int getPriority();
+
+  /**
+   * Check if this postProcessor is sensitive for a specific country.
+   * 
+   * @param countryCode of the eID data that should be processed
+   * @return true if this implementation can handle the country, otherwise false
+   * 
+   */
+  boolean canHandle(String countryCode);
+
+  /**
+   * Post-Process eIDAS eID data into national format.
+   * 
+   * @param eidasAttrMap Map of eIDAS attributes in format friendlyName and
+   *                     attribute
+   * @throws EidPostProcessingException In case of a post-processing error
+   * @throws EidasAttributeException In case of an invalid eIDAS attribute
+   */
+  ErnbEidData postProcess(Map<String, Object> eidasAttrMap) throws EidPostProcessingException,
+      EidasAttributeException;
+
+  /**
+   * Pre-Process eIDAS Request to national requirements.
+   * 
+   * @param pendingReq          current pending request
+   * @param authnRequestBuilder eIDAS {@link ILightRequest} builder
+   */
+  void preProcess(IRequest pendingReq, Builder authnRequestBuilder);
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/CcSpecificEidProcessingService.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/CcSpecificEidProcessingService.java
new file mode 100644
index 00000000..09bb09d6
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/CcSpecificEidProcessingService.java
@@ -0,0 +1,135 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.service;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import javax.annotation.PostConstruct;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.ErnbEidData;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasAttributeException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidPostProcessingException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.INationalEidProcessor;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils;
+import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.core.impl.data.Trible;
+import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
+
+@Service
+public class CcSpecificEidProcessingService implements ICcSpecificEidProcessingService {
+  private static final Logger log = LoggerFactory.getLogger(CcSpecificEidProcessingService.class);
+
+  @Autowired
+  private ApplicationContext context;
+
+  private final List<INationalEidProcessor> handlers = new ArrayList<>();
+
+  @PostConstruct
+  private void initialize() {
+    log.debug("Initialize eID PostProcessing-Service ... ");
+    final Map<String, INationalEidProcessor> postProcessors = context.getBeansOfType(
+        INationalEidProcessor.class);
+    final Iterator<Entry<String, INationalEidProcessor>> iterator = postProcessors.entrySet().iterator();
+    while (iterator.hasNext()) {
+      final Entry<String, INationalEidProcessor> el = iterator.next();
+      log.debug("Find eID-PostProcessor with name: " + el.getKey());
+      handlers.add(el.getValue());
+
+    }
+
+    log.trace("Sorting eID-PostProcessors on priority ... ");
+    Collections.sort(handlers, (thisAuthModule, otherAuthModule) -> {
+      final int thisOrder = thisAuthModule.getPriority();
+      final int otherOrder = otherAuthModule.getPriority();
+      return thisOrder < otherOrder ? 1 : thisOrder == otherOrder ? 0 : -1;
+    });
+
+    log.info("# " + handlers.size() + " eID PostProcessing services are registrated");
+
+  }
+
+  @Override
+  public void preProcess(String selectedCitizenCountry, IRequest pendingReq, Builder authnRequestBuilder)
+      throws EidPostProcessingException {
+    if (StringUtils.isEmpty(selectedCitizenCountry)) {
+      log.info("No CountryCode for eID Pre-Processor. Default Pre-Processor will be used");
+    }
+
+    for (final INationalEidProcessor el : handlers) {
+      if (el.canHandle(selectedCitizenCountry)) {
+        log.debug("Pre-Process eIDAS request for " + selectedCitizenCountry + " by using:  " + el.getName());
+        el.preProcess(pendingReq, authnRequestBuilder);
+        return;
+
+      }
+    }
+
+    log.error("NO eID PostProcessor FOUND. Looks like a depentency problem!");
+    throw new EidPostProcessingException("internal.00", null);
+
+  }
+
+  @Override
+  public ErnbEidData postProcess(Map<String, Object> eidasAttrMap) throws EidPostProcessingException,
+      EidasAttributeException {
+    // extract citizen country from eIDAS unique identifier
+    final Object eIdentifierObj = eidasAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+    if (eIdentifierObj == null || !(eIdentifierObj instanceof String)) {
+      throw new EidasAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+    }
+
+    final Trible<String, String, String> eIdentifier =
+        EidasResponseUtils.parseEidasPersonalIdentifier((String) eIdentifierObj);
+    final String citizenCountry = eIdentifier.getFirst();
+
+    if (StringUtils.isEmpty(citizenCountry)) {
+      log.info("No CountryCode for eID PostProcessor. Default-PostProcessor will be used");
+    }
+
+    for (final INationalEidProcessor el : handlers) {
+      if (el.canHandle(citizenCountry)) {
+        log.debug("Post-Process eIDAS eID from " + citizenCountry + " by using:  " + el.getName());
+        return el.postProcess(eidasAttrMap);
+
+      }
+    }
+
+    log.error("NO eID PostProcessor FOUND. Looks like a depentency problem!");
+    throw new EidPostProcessingException("internal.00", null);
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/EidasAttributeRegistry.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/EidasAttributeRegistry.java
new file mode 100644
index 00000000..98c4c2de
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/EidasAttributeRegistry.java
@@ -0,0 +1,180 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.service;
+
+import java.io.File;
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
+import edu.umd.cs.findbugs.annotations.NonNull;
+import eu.eidas.auth.commons.attribute.AttributeRegistries;
+import eu.eidas.auth.commons.attribute.AttributeRegistry;
+
+@Service("attributeRegistry")
+public class EidasAttributeRegistry {
+  private static final Logger log = LoggerFactory.getLogger(EidasAttributeRegistry.class);
+  @Autowired
+  private IConfigurationWithSP basicConfig;
+
+  private AttributeRegistry coreAttributeRegistry;
+
+  private String eidasAttributesFile;
+  private String additionalAttributesFile;
+
+  @PostConstruct
+  private void initialize() throws RuntimeException {
+    try {
+      if (eidasAttributesFile.isEmpty()) {
+        log.error("Basic eIDAS addribute definition NOT defined");
+        throw new EaafConfigurationException("config.30",
+            new Object[] { "eidas-attributes.xml" });
+
+      }
+
+      boolean additionalAttrAvailabe = false;
+      if (!additionalAttributesFile.isEmpty()) {
+        final File file = new File(additionalAttributesFile);
+        if (file.exists()) {
+          additionalAttrAvailabe = true;
+        }
+
+      }
+
+      if (!additionalAttrAvailabe) {
+        log.info("Start eIDAS ref. impl. Core without additional eIDAS attribute definitions ... ");
+        coreAttributeRegistry = AttributeRegistries.fromFiles(eidasAttributesFile, null);
+
+      } else {
+        // load attribute definitions
+        log.info("Start eIDAS ref. impl. Core with additional eIDAS attribute definitions ... ");
+        coreAttributeRegistry = AttributeRegistries.fromFiles(eidasAttributesFile, null,
+            additionalAttributesFile);
+
+      }
+
+    } catch (final Throwable e) {
+      log.error("Can NOT initialize eIDAS attribute definition.", e);
+      throw new RuntimeException("Can NOT initialize eIDAS attribute definition.", e);
+
+    }
+  }
+
+  public AttributeRegistry getCoreAttributeRegistry() {
+    return coreAttributeRegistry;
+  }
+
+  /**
+   * Get Map of attributes that are requested by default.
+   * 
+   * @return Map of AttributeIdentifier, isRequired flag
+   */
+  @NonNull
+  public Map<String, Boolean> getDefaultAttributeSetFromConfiguration() {
+    /*
+     * TODO: select set for representation if mandates should be used. It's an open
+     * task in respect to requested eIDAS attributes and isRequired flag, because
+     * there can be a decision problem in case of natural or legal person
+     * representation! From an Austrian use-case point of view, an Austrian service
+     * provider can support mandates for natural and legal persons at the same time.
+     * However, we CAN NOT request attributes for natural AND legal persons on the
+     * same time, because it's not possible to represent both simultaneously.
+     */
+    final Map<String, String> configAttributes =
+        basicConfig.getBasicConfigurationWithPrefix(
+            Constants.CONIG_PROPS_EIDAS_NODE_ATTRIBUTES_REQUESTED_DEFAULT_ONLYNATURAL);
+    return processAttributeInfosFromConfig(configAttributes);
+
+  }
+
+  /**
+   * Get a Map of attributes that are additionally requested for a specific country.
+   * 
+   * @param countryCode Country Code
+   * @return Map of AttributeIdentifier, isRequired flag
+   */
+  @NonNull
+  public Map<String, Boolean> getAttributeSetFromConfiguration(String countryCode) {
+
+    /*
+     * TODO: select set for representation if mandates should be used. It's an open
+     * task in respect to requested eIDAS attributes and isRequired flag, because
+     * there can be a decision problem in case of natural or legal person
+     * representation! From an Austrian use-case point of view, an Austrian service
+     * provider can support mandates for natural and legal persons at the same time.
+     * However, we CAN NOT request attributes for natural AND legal persons on the
+     * same time, because it's not possible to represent both simultaneously.
+     */
+    final Map<String, String> configAttributes =
+        basicConfig.getBasicConfigurationWithPrefix(
+            MessageFormat.format(
+                Constants.CONIG_PROPS_EIDAS_NODE_ATTRIBUTES_REQUESTED_CC_SPECIFIC_ONLYNATURAL,
+                countryCode.toLowerCase()));
+    return processAttributeInfosFromConfig(configAttributes);
+
+  }
+
+  private Map<String, Boolean> processAttributeInfosFromConfig(Map<String, String> configAttributes) {
+
+    final Map<String, Boolean> result = new HashMap<>();
+    for (final String el : configAttributes.values()) {
+      if (StringUtils.isNotEmpty(el.trim())) {
+        final List<String> attrDef = KeyValueUtils.getListOfCsvValues(el.trim());
+        boolean isRequired = false;
+        if (attrDef.size() == 2) {
+          isRequired = Boolean.parseBoolean(attrDef.get(1));
+        }
+
+        result.put(attrDef.get(0), isRequired);
+
+      }
+    }
+
+    log.trace("Load #" + result.size() + " requested attributes from configuration");
+    return result;
+
+  }
+
+  public void setEidasAttributesFile(String eidasAttributesFile) {
+    this.eidasAttributesFile = eidasAttributesFile;
+  }
+
+  public void setAdditionalAttributesFile(String additionalAttributesFile) {
+    this.additionalAttributesFile = additionalAttributesFile;
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/EidasDataStore.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/EidasDataStore.java
new file mode 100644
index 00000000..549aa65c
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/EidasDataStore.java
@@ -0,0 +1,363 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH AT-specific eIDAS Connector has been developed
+ * in a cooperation between EGIZ, A-SIT Plus GmbH, A-SIT, and Graz University of
+ * Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License. You may
+ * obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations under
+ * the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses. The "NOTICE" text file
+ * is part of the distribution. Any derivative works that you distribute must
+ * include a readable copy of the "NOTICE" text file.
+ */
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.service;
+
+//import java.io.File;
+//import java.io.IOException;
+//import java.sql.Connection;
+//import java.sql.DriverManager;
+//import java.sql.PreparedStatement;
+//import java.sql.ResultSet;
+//import java.sql.SQLException;
+//import java.sql.Statement;
+//import java.time.Instant;
+//import java.util.Properties;
+//
+//import javax.annotation.PostConstruct;
+//
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Component;
+//import org.sqlite.SQLiteConfig;
+//import org.sqlite.SQLiteConfig.LockingMode;
+//import org.sqlite.SQLiteConfig.SynchronousMode;
+//import org.sqlite.SQLiteErrorCode;
+//
+//import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+//import at.asitplus.eidas.specific.modules.auth.eidas.v2.DAO.eIDASPersonalIdStoreDAO;
+//import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.SQLiteServiceException;
+//import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+//import at.gv.egiz.eaaf.core.impl.data.Pair;
+//import at.gv.egiz.eaaf.core.impl.data.Trible;
+//
+//@Component
+//@Deprecated
+//public class EidasDataStore {
+//
+//  private static final String SQLITE_JDBC_DRIVER_CLASS = "org.sqlite.JDBC";
+//  private static final String SQLITE_CONNECTION_PARAM = "jdbc:sqlite:%s";
+//  private static final boolean sleep = true;
+//  private static final int howLongToSleepOnBusyLock_ = 100;
+//
+//  private static final Logger log = LoggerFactory.getLogger(EidasDataStore.class);
+//
+//  @Autowired
+//  private IConfiguration basicConfig;
+//
+//  private String connectionUrl;
+//  private Connection conn = null;
+//
+//  @PostConstruct
+//  private void initialize() throws SQLiteServiceException {
+//    try {
+//      final String sqlLiteDbUrl = basicConfig.getBasicConfiguration(
+//          Constants.CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_SQLLITEDATASTORE_URL,
+//          basicConfig.getConfigurationRootDirectory().toString() + "/sqlite/database.db"
+//
+//      );
+//
+//      log.info("Use SQLite database with URL: " + sqlLiteDbUrl);
+//
+//      // check if SQLite lib is in Classpath
+//      Class.forName(SQLITE_JDBC_DRIVER_CLASS);
+//
+//      // open DB connection
+//      boolean isNewFileCreated = false;
+//
+//      // open file or create file if not already exists
+//      final File dbFile = new File(sqlLiteDbUrl);
+//      if (!dbFile.exists()) {
+//        log.info("SQLite database does not exist. Creating new database file ... ");
+//        dbFile.createNewFile();
+//        isNewFileCreated = true;
+//
+//      }
+//
+//      // open database connection
+//      connectionUrl = String.format(SQLITE_CONNECTION_PARAM, dbFile.getPath());
+//
+//      // create DB scheme if new DB file was created
+//      if (isNewFileCreated) {
+//        executeUpdate(startConnection().createStatement(), eIDASPersonalIdStoreDAO.CREATE);
+//        log.debug("SQLite db scheme created");
+//
+//      }
+//
+//    } catch (final ClassNotFoundException e) {
+//      log.warn("Can NOT initialize SQLite database for temporarly identity mapping. ", e);
+//      throw new SQLiteServiceException("internal.05", new Object[] { e.getMessage() }, e);
+//
+//    } catch (SQLException | IOException e) {
+//      log.warn("Can NOT initialize SQLite database for temporarly identity mapping. ", e);
+//      throw new SQLiteServiceException("internal.05", new Object[] { e.getMessage() }, e);
+//
+//    }
+//
+//  }
+//
+//  /**
+//   * Store a mapping entry with eIDAS personal identifier (source country /
+//   * destination country / personal identifier) and the identifier that is used
+//   * for ERnB communication.
+//   *
+//   * @param transactionId Id of this authentication transaction
+//   * @param eidasId       eIDAS personal identifier without country prefixes
+//   * @param ernbId        personal identifier that is used to request the ERnB
+//   * @throws SQLiteServiceException In case of a database error
+//   */
+//  public void storeNationalId(String transactionId, Trible<String, String, String> eidasId, String ernbId)
+//      throws SQLiteServiceException {
+//    try {
+//      final PreparedStatement preStatment = startConnection().prepareStatement(
+//          eIDASPersonalIdStoreDAO.INSERT,
+//          Statement.RETURN_GENERATED_KEYS);
+//
+//      for (int i = 1; i <= eIDASPersonalIdStoreDAO.TABLE_COLS.size(); i++) {
+//        final Pair<String, eIDASPersonalIdStoreDAO.T> col = eIDASPersonalIdStoreDAO.TABLE_COLS.get(i - 1);
+//        if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.timestamp.name())) {
+//          preStatment.setDate(i, new java.sql.Date(Instant.now().toEpochMilli()));
+//        } else if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.transactionId.name())) {
+//          preStatment.setString(i, transactionId);
+//        } else if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.eidasId.name())) {
+//          preStatment.setString(i, eidasId.getThird());
+//        } else if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.eidasSourceCountry.name())) {
+//          preStatment.setString(i, eidasId.getFirst());
+//        } else if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.eidasDestinationCountry.name())) {
+//          preStatment.setString(i, eidasId.getSecond());
+//        } else if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.ernbId.name())) {
+//          preStatment.setString(i, ernbId);
+//        } else {
+//          log.warn("SQLite table:" + eIDASPersonalIdStoreDAO.NAME + " contains no col with name:" + col
+//              .getFirst());
+//        }
+//
+//      }
+//
+//      // execute SQL query
+//      final int sqlResult = preStatment.executeUpdate();
+//
+//      if (sqlResult != 1) {
+//        log.warn("SQLite query execution FAILED!");
+//        throw new SQLiteServiceException("internal.06", new Object[] { "Queryresult is '-1'" });
+//
+//      }
+//
+//    } catch (SQLiteServiceException | SQLException e) {
+//      log.warn("SQLite query execution FAILED!", e);
+//      throw new SQLiteServiceException("internal.05", new Object[] { e.getMessage() }, e);
+//
+//    }
+//
+//  }
+//
+//  /**
+//   * Get the ERnB related national identifier from mapping database.
+//   * 
+//   * @param eidasId eIDAS related identifier
+//   * @return Mapped ERnB identifier
+//   * @throws SQLiteServiceException In case of a database error
+//   */
+//  public String getErnbNationalId(Trible<String, String, String> eidasId) throws SQLiteServiceException {
+//    try {
+//      final PreparedStatement preStatment = startConnection().prepareStatement(
+//          eIDASPersonalIdStoreDAO.SELECT_BY_EIDAS_RAW_ID,
+//          Statement.RETURN_GENERATED_KEYS);
+//
+//      preStatment.setString(1, eidasId.getThird());
+//      preStatment.setString(2, eidasId.getFirst());
+//
+//      final ResultSet rs = preStatment.executeQuery();
+//
+//      if (!rs.next()) {
+//        return null;
+//      } else {
+//        return rs.getString(eIDASPersonalIdStoreDAO.COLS.ernbId.name());
+//      }
+//
+//    } catch (SQLiteServiceException | SQLException e) {
+//      log.warn("SQLite query execution FAILED!", e);
+//      throw new SQLiteServiceException("internal.05", new Object[] { e.getMessage() }, e);
+//
+//    }
+//
+//  }
+//
+//  /**
+//   * Get the eIDAS identifier from an ERnB identifier.
+//   * 
+//   * @param ernbId ERnB specific identifier
+//   * @return eIDAS unqiue identifier
+//   * @throws SQLiteServiceException In case of a database error
+//   */
+//  public String getEidasRawNationalId(String ernbId) throws SQLiteServiceException {
+//    try {
+//      final PreparedStatement preStatment = startConnection().prepareStatement(
+//          eIDASPersonalIdStoreDAO.SELECT_BY_ERNB_ID,
+//          Statement.RETURN_GENERATED_KEYS);
+//
+//      preStatment.setString(1, ernbId);
+//
+//      final ResultSet rs = preStatment.executeQuery();
+//
+//      if (!rs.next()) {
+//        return null;
+//      } else {
+//        return rs.getString(eIDASPersonalIdStoreDAO.COLS.eidasId.name());
+//      }
+//
+//    } catch (SQLiteServiceException | SQLException e) {
+//      log.warn("SQLite query execution FAILED!", e);
+//      throw new SQLiteServiceException("internal.05", new Object[] { e.getMessage() }, e);
+//
+//    }
+//
+//  }
+//
+//  private Connection startConnection() throws SQLiteServiceException {
+//    int i = howLongToSleepOnBusyLock_;
+//
+//    while (true) {
+//      try {
+//        if (conn == null) {
+//          log.info("Initializing SQLite database with URL: " + connectionUrl + " ... ");
+//          conn = DriverManager.getConnection(connectionUrl, getConnectionProperties());
+//
+//        } else {
+//          if (!conn.isValid(10)) {
+//            log.info("SQLite connection is not valid any more --> restarting connection ...");
+//            conn.close();
+//            conn = DriverManager.getConnection(connectionUrl, getConnectionProperties());
+//          }
+//        }
+//
+//        log.info("SQLite database connected");
+//        return conn;
+//
+//      } catch (final SQLException e) {
+//        final String msg = e.getLocalizedMessage();
+//        if (isBusyLocked(e)) {
+//          log.warn(msg, e);
+//          try {
+//            if (sleep) {
+//              Thread.sleep(i++);
+//            }
+//
+//          } catch (final InterruptedException e1) {
+//            throw new SQLiteServiceException("internal.05", new Object[] { e1.getMessage() }, e1);
+//
+//          }
+//          continue;
+//
+//        }
+//        throw new SQLiteServiceException("internal.05", new Object[] { e.getMessage() }, e);
+//
+//      }
+//    }
+//  }
+//
+//  /*
+//   * SQLite query code
+//   */
+//
+//  protected Properties getConnectionProperties() {
+//    final SQLiteConfig config = new SQLiteConfig();
+//    config.enforceForeignKeys(true);
+//    config.setCacheSize(8000);
+//    config.setLockingMode(LockingMode.NORMAL);
+//    config.setSharedCache(false);
+//    config.setReadUncommited(true);
+//    config.setSynchronous(SynchronousMode.NORMAL);
+//    return config.toProperties();
+//
+//  }
+//
+//  private int executeUpdate(Statement statement, String sql) throws SQLiteServiceException {
+//    final int i = 10;
+//
+//    int rc = -1;
+//    while (true) {
+//      try {
+//        rc = statement.executeUpdate(sql);
+//        break;
+//
+//      } catch (final SQLException e) {
+//        try {
+//          if (executeUpdateError(e, i)) {
+//            continue;
+//          } else {
+//            throw new SQLiteServiceException("internal.06",
+//                new Object[] { e.getMessage() }, e);
+//          }
+//
+//        } catch (final SQLiteServiceException e1) {
+//          log.warn("\n" + sql + "\n" + e1.getMessage());
+//          throw e1;
+//
+//        }
+//      }
+//    }
+//
+//    return rc;
+//
+//  }
+//
+//  private boolean isBusyLocked(SQLException e) {
+//    final int eC = e.getErrorCode();
+//
+//    if (eC == SQLiteErrorCode.SQLITE_LOCKED.code
+//        || eC == SQLiteErrorCode.SQLITE_BUSY.code) {
+//      log.trace("SQLite db is busy looked");
+//      return true;
+//
+//    }
+//
+//    final String msg = e.getMessage();
+//    if (msg.contains("[SQLITE_LOCKED]") || msg.contains("[SQLITE_BUSY]")) {
+//      log.trace("SQLite db is busy looked");
+//      return true;
+//    }
+//
+//    return false;
+//  }
+//
+//  private boolean executeUpdateError(SQLException e, int theadSleepCounter) throws SQLiteServiceException {
+//    if (isBusyLocked(e)) {
+//      try {
+//        if (sleep) {
+//          Thread.sleep(theadSleepCounter++);
+//        }
+//
+//      } catch (final InterruptedException e1) {
+//        throw new SQLiteServiceException("internal.05", new Object[] { e1.getMessage() }, e1);
+//
+//      }
+//
+//      return true;
+//    }
+//
+//    return false;
+//
+//  }
+//}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/ICcSpecificEidProcessingService.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/ICcSpecificEidProcessingService.java
new file mode 100644
index 00000000..ebbc15e4
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/ICcSpecificEidProcessingService.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.service;
+
+import java.util.Map;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.ErnbEidData;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasAttributeException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidPostProcessingException;
+import at.gv.egiz.eaaf.core.api.IRequest;
+import eu.eidas.auth.commons.light.ILightRequest;
+import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
+
+public interface ICcSpecificEidProcessingService {
+
+  /**
+   * Post-process eIDAS eID attributes into national format.
+   * 
+   * @param eidasAttrMap Map of eIDAS attributes in format friendlyName and
+   *                     attribute
+   * 
+   * @return eID attributes for SZR request
+   * @throws EidPostProcessingException In case of a post-processing error
+   * @throws EidasAttributeException In case of an invalid eIDAS attribute value
+   */
+  ErnbEidData postProcess(Map<String, Object> eidasAttrMap) throws EidPostProcessingException,
+      EidasAttributeException;
+
+  /**
+   * Pre Process eIDAS request into national requirements.
+   * 
+   * @param selectedCC          Citizen Country from selection
+   * @param pendingReq          current pending request
+   * @param authnRequestBuilder eIDAS {@link ILightRequest} builder
+   * @throws EidPostProcessingException In case of a pre-processing error
+   */
+  void preProcess(String selectedCC, IRequest pendingReq, Builder authnRequestBuilder)
+      throws EidPostProcessingException;
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrClient.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrClient.java
new file mode 100644
index 00000000..763d8dab
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrClient.java
@@ -0,0 +1,408 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.szr;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.net.URL;
+import java.security.KeyManagementException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.SecureRandom;
+import java.security.UnrecoverableKeyException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+import javax.net.ssl.KeyManager;
+import javax.net.ssl.KeyManagerFactory;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.TrustManager;
+import javax.net.ssl.TrustManagerFactory;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import javax.xml.namespace.QName;
+import javax.xml.transform.Source;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerException;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.stream.StreamResult;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.ws.BindingProvider;
+import javax.xml.ws.Dispatch;
+import javax.xml.ws.handler.Handler;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.cxf.configuration.jsse.TLSClientParameters;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.jaxws.DispatchImpl;
+import org.apache.cxf.transport.http.HTTPConduit;
+import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
+import org.apache.xpath.XPathAPI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.SzrCommunicationException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.LoggingHandler;
+import at.gv.egiz.eaaf.core.api.data.XmlNamespaceConstants;
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
+import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
+import at.gv.egiz.eaaf.core.impl.utils.KeyStoreUtils;
+import szrservices.GetBPK;
+import szrservices.GetBPKResponse;
+import szrservices.GetIdentityLinkEidas;
+import szrservices.GetIdentityLinkEidasResponse;
+import szrservices.IdentityLinkType;
+import szrservices.ObjectFactory;
+import szrservices.PersonInfoType;
+import szrservices.SZR;
+import szrservices.SZRException_Exception;
+
+@Service("SZRClientForeIDAS")
+public class SzrClient {
+  private static final Logger log = LoggerFactory.getLogger(SzrClient.class);
+
+  private static final String CLIENT_DEFAULT = "DefaultClient";
+  private static final String CLIENT_RAW = "RawClient";
+
+  @Autowired
+  private IConfiguration basicConfig;
+
+  // client for anything, without identitylink
+  private SZR szr = null;
+
+  // RAW client is needed for identitylink
+  private Dispatch<Source> dispatch = null;
+
+  private SzrService szrService = null;
+  private String szrUrl = null;
+  private QName qname = null;
+
+  /**
+   * Get IdentityLink of a person.
+   * 
+   * @param personInfo Person identification information
+   * @return IdentityLink
+   * @throws SzrCommunicationException In case of a SZR error
+   */
+  public IdentityLinkType getIdentityLinkInRawMode(PersonInfoType personInfo)
+      throws SzrCommunicationException {
+    try {
+      final GetIdentityLinkEidas getIdl = new GetIdentityLinkEidas();
+      getIdl.setPersonInfo(personInfo);
+
+      final JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
+      final Marshaller jaxbMarshaller = jaxbContext.createMarshaller();
+
+      final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
+      jaxbMarshaller.marshal(getIdl, outputStream);
+      outputStream.flush();
+
+      final Source source = new StreamSource(new ByteArrayInputStream(outputStream.toByteArray()));
+      outputStream.close();
+
+      log.trace("Requesting SZR ... ");
+      final Source response = dispatch.invoke(source);
+      log.trace("Receive RAW response from SZR");
+
+      final byte[] szrResponse = sourceToByteArray(response);
+      final GetIdentityLinkEidasResponse jaxbElement = (GetIdentityLinkEidasResponse) jaxbContext
+          .createUnmarshaller().unmarshal(new ByteArrayInputStream(szrResponse));
+
+      // build response
+      log.trace(new String(szrResponse, "UTF-8"));
+
+      // ok, we have success
+      final Document doc = DomUtils.parseDocument(
+          new ByteArrayInputStream(szrResponse),
+          true,
+          XmlNamespaceConstants.ALL_SCHEMA_LOCATIONS + " " + Constants.SZR_SCHEMA_LOCATIONS,
+          null, null);
+      final String xpathExpression = "//saml:Assertion";
+      final Element nsNode = doc.createElementNS("urn:oasis:names:tc:SAML:1.0:assertion", "saml:NSNode");
+
+      log.trace("Selecting signed doc " + xpathExpression);
+      final Element documentNode = (Element) XPathAPI.selectSingleNode(doc,
+          xpathExpression, nsNode);
+      log.trace("Signed document: " + DomUtils.serializeNode(documentNode));
+
+      final IdentityLinkType idl = new IdentityLinkType();
+      idl.setAssertion(documentNode);
+      idl.setPersonInfo(jaxbElement.getGetIdentityLinkReturn().getPersonInfo());
+
+      return idl;
+
+    } catch (final Exception e) {
+      log.warn("SZR communication FAILED. Reason: " + e.getMessage(), e);
+      throw new SzrCommunicationException("ernb.02", new Object[] { e.getMessage() }, e);
+
+    }
+
+  }
+
+  /**
+   * Get bPK of person.
+   * 
+   * @param personInfo Person identification information
+   * @param target requested bPK target
+   * @param vkz Verfahrenskennzeichen
+   * @return bPK for this person
+   * @throws SzrCommunicationException In case of a SZR error
+   */
+  public String getBpk(PersonInfoType personInfo, String target, String vkz)
+      throws SzrCommunicationException {
+    try {
+      final GetBPK parameters = new GetBPK();
+      parameters.setPersonInfo(personInfo);
+      parameters.setBereichsKennung(target);
+      parameters.setVKZ(vkz);
+      final GetBPKResponse result = this.szr.getBPK(parameters);
+
+      return result.getGetBPKReturn();
+
+    } catch (final SZRException_Exception e) {
+      log.warn("SZR communication FAILED. Reason: " + e.getMessage(), e);
+      throw new SzrCommunicationException("ernb.02", new Object[] { e.getMessage() }, e);
+
+    }
+
+  }
+
+  @PostConstruct
+  private void initialize() {
+    log.info("Starting SZR-Client initialization .... ");
+    final URL url = SzrClient.class.getResource("/szr_client/SZR-1.1.WSDL");
+
+    final boolean useTestSzr = basicConfig.getBasicConfigurationBoolean(
+        Constants.CONIG_PROPS_EIDAS_SZRCLIENT_USETESTSERVICE,
+        true);
+
+    if (useTestSzr) {
+      log.debug("Initializing SZR test environment configuration.");
+      qname = SzrService.SZRTestumgebung;
+      szrService = new SzrService(url, new QName("urn:SZRServices", "SZRService"));
+      szr = szrService.getSzrTestumgebung();
+      szrUrl = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_ENDPOINT_TEST);
+
+    } else {
+      log.debug("Initializing SZR productive configuration.");
+      qname = SzrService.SZRProduktionsumgebung;
+      szrService = new SzrService(url, new QName("urn:SZRServices", "SZRService"));
+      szr = szrService.getSzrProduktionsumgebung();
+      szrUrl = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_ENDPOINT_PROD);
+
+    }
+
+    // create raw client;
+    dispatch = szrService.createDispatch(qname, Source.class, javax.xml.ws.Service.Mode.PAYLOAD);
+
+    if (StringUtils.isEmpty(szrUrl)) {
+      log.error("No SZR service-URL found. SZR-Client initalisiation failed.");
+      throw new RuntimeException("No SZR service URL found. SZR-Client initalisiation failed.");
+
+    }
+
+    // check if Clients can be initialized
+    if (szr == null) {
+      log.error("SZR " + CLIENT_DEFAULT + " is 'NULL'. Something goes wrong");
+      throw new RuntimeException("SZR " + CLIENT_DEFAULT + " is 'NULL'. Something goes wrong");
+
+    }
+    if (dispatch == null) {
+      log.error("SZR " + CLIENT_RAW + " is 'NULL'. Something goes wrong");
+      throw new RuntimeException("SZR " + CLIENT_RAW + " is 'NULL'. Something goes wrong");
+
+    }
+
+    // inject handler
+    log.info("Use SZR service-URL: " + szrUrl);
+    injectBindingProvider((BindingProvider) szr, CLIENT_DEFAULT);
+    injectBindingProvider(dispatch, CLIENT_RAW);
+
+    // inject http parameters and SSL context
+    log.debug("Inject HTTP client settings ... ");
+    injectHttpClient(szr, CLIENT_DEFAULT);
+    injectHttpClient(dispatch, CLIENT_RAW);
+
+    log.info("SZR-Client initialization successfull");
+  }
+
+  private void injectHttpClient(Object raw, String clientType) {
+    // extract client from implementation
+    Client client = null;
+    if (raw instanceof DispatchImpl<?>) {
+      client = ((DispatchImpl<?>) raw).getClient();
+    } else if (raw instanceof Client) {
+      client = ClientProxy.getClient(raw);
+    } else {
+      throw new RuntimeException("SOAP Client for SZR connection is of UNSUPPORTED type: " + raw.getClass()
+          .getName());
+    }
+
+    // set basic connection policies
+    final HTTPConduit http = (HTTPConduit) client.getConduit();
+
+    // set timeout policy
+    final HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();
+    httpClientPolicy.setConnectionTimeout(
+        Integer.parseInt(basicConfig.getBasicConfiguration(
+            Constants.CONIG_PROPS_EIDAS_SZRCLIENT_TIMEOUT_CONNECTION,
+            Constants.HTTP_CLIENT_DEFAULT_TIMEOUT_CONNECTION)) * 1000);
+    httpClientPolicy.setReceiveTimeout(
+        Integer.parseInt(basicConfig.getBasicConfiguration(
+            Constants.CONIG_PROPS_EIDAS_SZRCLIENT_TIMEOUT_RESPONSE,
+            Constants.HTTP_CLIENT_DEFAULT_TIMEOUT_RESPONSE)) * 1000);
+    http.setClient(httpClientPolicy);
+
+    // inject SSL context in case of https
+    if (szrUrl.toLowerCase().startsWith("https")) {
+      log.debug("Adding SSLContext to client: " + clientType + " ... ");
+      final TLSClientParameters tlsParams = new TLSClientParameters();
+      tlsParams.setSSLSocketFactory(createSslContext(clientType).getSocketFactory());
+      http.setTlsClientParameters(tlsParams);
+      log.info("SSLContext initialized for client: " + clientType);
+
+    }
+
+  }
+
+  private void injectBindingProvider(BindingProvider bindingProvider, String clientType) {
+    final Map<String, Object> requestContext = bindingProvider.getRequestContext();
+    requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, szrUrl);
+
+    log.trace("Adding JAX-WS request/response trace handler to client: " + clientType);
+    List<Handler> handlerList = bindingProvider.getBinding().getHandlerChain();
+    if (handlerList == null) {
+      handlerList = new ArrayList<>();
+      bindingProvider.getBinding().setHandlerChain(handlerList);
+
+    }
+
+    // add logging handler to trace messages if required
+    if (basicConfig.getBasicConfigurationBoolean(
+        Constants.CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_TRACEMESSAGES,
+        false)) {
+      final LoggingHandler loggingHandler = new LoggingHandler();
+      handlerList.add(loggingHandler);
+
+    }
+    bindingProvider.getBinding().setHandlerChain(handlerList);
+  }
+
+  private SSLContext createSslContext(String clientType) {
+    try {
+      final SSLContext context = SSLContext.getInstance("TLS");
+
+      // initialize key-mangager for SSL client-authentication
+      KeyManager[] keyManager = null;
+      final String keyStorePath = basicConfig.getBasicConfiguration(
+          Constants.CONIG_PROPS_EIDAS_SZRCLIENT_SSL_KEYSTORE_PATH);
+      final String keyStorePassword = basicConfig.getBasicConfiguration(
+          Constants.CONIG_PROPS_EIDAS_SZRCLIENT_SSL_KEYSTORE_PASSWORD);
+      if (StringUtils.isNotEmpty(keyStorePath)) {
+        log.trace("Find keyStore path: " + keyStorePath + " Injecting SSL client certificate ... ");
+        try {
+          final KeyStore keyStore = KeyStoreUtils.loadKeyStore(
+              FileUtils.makeAbsoluteUrl(keyStorePath, basicConfig.getConfigurationRootDirectory()),
+              keyStorePassword);
+
+          final KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
+          kmf.init(keyStore, keyStorePassword.toCharArray());
+          keyManager = kmf.getKeyManagers();
+          log.debug("SSL client certificate injected to client: " + clientType);
+
+        } catch (KeyStoreException | IOException | UnrecoverableKeyException e) {
+          log.error("Can NOT load SSL client certificate from path: " + keyStorePath);
+          throw new RuntimeException("Can NOT load SSL client certificate from path: " + keyStorePath, e);
+
+        }
+      } else {
+        log.debug(
+            "No KeyStore for SSL Client Auth. found. Initializing SSLContext without authentication ... ");
+
+      }
+
+      // initialize SSL TrustStore
+      TrustManager[] trustManager = null;
+      final String trustStorePath = basicConfig.getBasicConfiguration(
+          Constants.CONIG_PROPS_EIDAS_SZRCLIENT_SSL_TRUSTSTORE_PATH);
+      final String trustStorePassword = basicConfig.getBasicConfiguration(
+          Constants.CONIG_PROPS_EIDAS_SZRCLIENT_SSL_TRUSTSTORE_PASSWORD);
+      if (StringUtils.isNotEmpty(trustStorePath)) {
+        log.trace("Find trustStore path: " + trustStorePath + " Injecting SSL TrustStore ... ");
+        try {
+          final KeyStore trustStore = KeyStoreUtils.loadKeyStore(
+              FileUtils.makeAbsoluteUrl(trustStorePath, basicConfig.getConfigurationRootDirectory()),
+              trustStorePassword);
+
+          final TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
+          tmf.init(trustStore);
+          trustManager = tmf.getTrustManagers();
+          log.debug("SSL TrustStore injected to client: " + clientType);
+
+        } catch (KeyStoreException | IOException e) {
+          log.error("Can NOT open SSL TrustStore from path: " + trustStorePath);
+          throw new RuntimeException("Can NOT open SSL TrustStore from path: " + trustStorePath, e);
+
+        }
+
+      } else {
+        log.debug("No custom SSL TrustStore found. Initializing SSLContext with JVM default truststore ... ");
+
+      }
+
+      context.init(keyManager, trustManager, new SecureRandom());
+      return context;
+
+    } catch (NoSuchAlgorithmException | KeyManagementException e) {
+      log.error("SSLContext initialization FAILED.", e);
+      throw new RuntimeException("SSLContext initialization FAILED.", e);
+
+    }
+
+  }
+
+  private byte[] sourceToByteArray(Source result) throws TransformerException {
+    final TransformerFactory factory = TransformerFactory.newInstance();
+    final Transformer transformer = factory.newTransformer();
+    transformer.setOutputProperty("omit-xml-declaration", "yes");
+    transformer.setOutputProperty("method", "xml");
+    final ByteArrayOutputStream out = new ByteArrayOutputStream();
+    final StreamResult streamResult = new StreamResult();
+    streamResult.setOutputStream(out);
+    transformer.transform(result, streamResult);
+    return out.toByteArray();
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrService.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrService.java
new file mode 100644
index 00000000..dde868b1
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/szr/SzrService.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.szr;
+
+import java.net.URL;
+
+import javax.xml.namespace.QName;
+import javax.xml.ws.Service;
+import javax.xml.ws.WebEndpoint;
+import javax.xml.ws.WebServiceClient;
+import javax.xml.ws.WebServiceFeature;
+
+import szrservices.SZR;
+
+/**
+ * This class was generated by Apache CXF 3.1.16 2018-07-10T09:36:01.466+02:00
+ * Generated source version: 3.1.16
+ *
+ */
+@WebServiceClient(name = "SZRService",
+    wsdlLocation = "./src/main/resources/szr_client/SZR-1.WSDL",
+    targetNamespace = "urn:SZRServices")
+public class SzrService extends Service {
+
+  public static final URL WSDL_LOCATION;
+
+  public static final QName SERVICE = new QName("urn:SZRServices", "SZRService");
+  public static final QName SZRProduktionsumgebung = new QName("urn:SZRServices", "SZRProduktionsumgebung");
+  public static final QName SZRTestumgebung = new QName("urn:SZRServices", "SZRTestumgebung");
+  public static final QName SZRBusinesspartnerTestumgebung = new QName("urn:SZRServices",
+      "SZRBusinesspartnerTestumgebung");
+  
+  static {
+    URL url = SzrService.class.getResource("./src/main/resources/szr_client/SZR-1.WSDL");
+    if (url == null) {
+      url = SzrService.class.getClassLoader().getResource("/szr_client/SZR-1.WSDL");
+    }
+    if (url == null) {
+      java.util.logging.Logger.getLogger(SzrService.class.getName())
+          .log(java.util.logging.Level.INFO,
+              "Can not initialize the default wsdl from {0}", "/szr_client/SZR-1.WSDL");
+    }
+    WSDL_LOCATION = url;
+
+  }
+
+  public SzrService(URL wsdlLocation) {
+    super(wsdlLocation, SERVICE);
+  }
+
+  public SzrService(URL wsdlLocation, QName serviceName) {
+    super(wsdlLocation, serviceName);
+  }
+
+  public SzrService() {
+    super(WSDL_LOCATION, SERVICE);
+  }
+
+  public SzrService(WebServiceFeature... features) {
+    super(WSDL_LOCATION, SERVICE, features);
+  }
+
+  public SzrService(URL wsdlLocation, WebServiceFeature... features) {
+    super(wsdlLocation, SERVICE, features);
+  }
+
+  public SzrService(URL wsdlLocation, QName serviceName, WebServiceFeature... features) {
+    super(wsdlLocation, serviceName, features);
+  }
+
+  /**
+   * Get SZR Web-Service.
+   *
+   * @return returns SZR
+   */
+  @WebEndpoint(name = "SZRProduktionsumgebung")
+  public SZR getSzrProduktionsumgebung() {
+    return super.getPort(SZRProduktionsumgebung, SZR.class);
+  }
+
+  /**
+   * Get SZR Web-Service.
+   * 
+   * @param features A list of {@link javax.xml.ws.WebServiceFeature} to configure
+   *                 on the proxy. Supported features not in the
+   *                 <code>features</code> parameter will have their default
+   *                 values.
+   * @return returns SZR
+   */
+  @WebEndpoint(name = "SZRProduktionsumgebung")
+  public SZR getSzrProduktionsumgebung(WebServiceFeature... features) {
+    return super.getPort(SZRProduktionsumgebung, SZR.class, features);
+  }
+
+  /**
+   *Get SZR Web-Service.
+   *
+   * @return returns SZR
+   */
+  @WebEndpoint(name = "SZRTestumgebung")
+  public SZR getSzrTestumgebung() {
+    return super.getPort(SZRTestumgebung, SZR.class);
+  }
+
+  /**
+   * Get SZR Web-Service.
+   * 
+   * @param features A list of {@link javax.xml.ws.WebServiceFeature} to configure
+   *                 on the proxy. Supported features not in the
+   *                 <code>features</code> parameter will have their default
+   *                 values.
+   * @return returns SZR
+   */
+  @WebEndpoint(name = "SZRTestumgebung")
+  public SZR getSzrTestumgebung(WebServiceFeature... features) {
+    return super.getPort(SZRTestumgebung, SZR.class, features);
+  }
+
+  /**
+   * Get SZR Web-Service.
+   *
+   * @return returns SZR
+   */
+  @WebEndpoint(name = "SZRBusinesspartnerTestumgebung")
+  public SZR getSzrBusinesspartnerTestumgebung() {
+    return super.getPort(SZRBusinesspartnerTestumgebung, SZR.class);
+  }
+
+  /**
+   * Get SZR Web-Service.
+   * 
+   * @param features A list of {@link javax.xml.ws.WebServiceFeature} to configure
+   *                 on the proxy. Supported features not in the
+   *                 <code>features</code> parameter will have their default
+   *                 values.
+   * @return returns SZR
+   */
+  @WebEndpoint(name = "SZRBusinesspartnerTestumgebung")
+  public SZR getSzrBusinesspartnerTestumgebung(WebServiceFeature... features) {
+    return super.getPort(SZRBusinesspartnerTestumgebung, SZR.class, features);
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
new file mode 100644
index 00000000..8f49d57d
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
@@ -0,0 +1,406 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks;
+
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+
+import at.asitplus.eidas.specific.connector.MsConnectorEventCodes;
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.ErnbEidData;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.SzrCommunicationException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasAttributeException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.ICcSpecificEidProcessingService;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.szr.SzrClient;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils;
+import at.gv.e_government.reference.namespace.persondata._20020228.AlternativeNameType;
+import at.gv.e_government.reference.namespace.persondata._20020228.PersonNameType;
+import at.gv.e_government.reference.namespace.persondata._20020228.PhysicalPersonType;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
+import at.gv.egiz.eaaf.core.api.data.PvpAttributeDefinitions;
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
+import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
+import at.gv.egiz.eaaf.core.impl.data.Pair;
+import at.gv.egiz.eaaf.core.impl.idp.auth.builder.BpkBuilder;
+import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
+import at.gv.egiz.eaaf.core.impl.idp.auth.data.SimpleIdentityLinkAssertionParser;
+import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
+import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
+import at.gv.egiz.eaaf.core.impl.utils.XPathUtils;
+import eu.eidas.auth.commons.attribute.AttributeDefinition;
+import eu.eidas.auth.commons.attribute.AttributeValue;
+import eu.eidas.auth.commons.light.ILightResponse;
+import eu.eidas.auth.commons.protocol.eidas.impl.PostalAddress;
+import szrservices.IdentityLinkType;
+import szrservices.PersonInfoType;
+import szrservices.TravelDocumentType;
+
+/**
+ * Task that creates the IdentityLink for an eIDAS authenticated person.
+ * 
+ * @author tlenz
+ *
+ */
+@Component("CreateIdentityLinkTask")
+public class CreateIdentityLinkTask extends AbstractAuthServletTask {
+  private static final Logger log = LoggerFactory.getLogger(CreateIdentityLinkTask.class);
+
+  @Autowired
+  private IConfiguration basicConfig;
+  @Autowired
+  private SzrClient szrClient;
+  @Autowired
+  private ICcSpecificEidProcessingService eidPostProcessor;
+
+  /*
+   * (non-Javadoc)
+   * 
+   * @see at.gv.egovernment.moa.id.process.springweb.MoaIdTask#execute(at.gv.
+   * egovernment.moa.id.process.api.ExecutionContext,
+   * javax.servlet.http.HttpServletRequest,
+   * javax.servlet.http.HttpServletResponse)
+   */
+  @Override
+  public void execute(ExecutionContext executionContext,
+      HttpServletRequest request, HttpServletResponse response)
+      throws TaskExecutionException {
+    try {
+      final AuthProcessDataWrapper authProcessData = pendingReq.getSessionData(AuthProcessDataWrapper.class);
+      final ILightResponse eidasResponse = authProcessData.getGenericDataFromSession(
+          Constants.DATA_FULL_EIDAS_RESPONSE, ILightResponse.class);
+
+      final Map<String, Object> simpleAttrMap = convertEidasAttrToSimpleMap(eidasResponse.getAttributes()
+          .getAttributeMap());
+
+      IIdentityLink identityLink = null;
+      String bpk = null;
+
+      // post-process eIDAS attributes
+      final ErnbEidData eidData = eidPostProcessor.postProcess(simpleAttrMap);
+
+      // write MDS into technical log and revision log
+      writeMdsLogInformation(eidData);
+
+      // connect SZR-Gateway
+      if (basicConfig.getBasicConfigurationBoolean(
+          Constants.CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_USEDUMMY, false)) {
+        log.warn("SZR-Dummy IS ACTIVE! IdentityLink is NOT VALID!!!!");
+        // create fake IdL
+        // - fetch IdL template from resources
+        final InputStream s = CreateIdentityLinkTask.class.getResourceAsStream(
+            "/resources/xmldata/fakeIdL_IdL_template.xml");
+        final Element idlTemplate = DomUtils.parseXmlValidating(s);
+
+        identityLink = new SimpleIdentityLinkAssertionParser(idlTemplate).parseIdentityLink();
+
+        // replace data
+        final Element idlassertion = identityLink.getSamlAssertion();
+
+        // - set fake baseID;
+        final Node prIdentification = XPathUtils.selectSingleNode(idlassertion,
+            SimpleIdentityLinkAssertionParser.PERSON_IDENT_VALUE_XPATH);
+        prIdentification.getFirstChild().setNodeValue(eidData.getPseudonym());
+
+        // - set last name
+        final Node prFamilyName = XPathUtils.selectSingleNode(idlassertion,
+            SimpleIdentityLinkAssertionParser.PERSON_FAMILY_NAME_XPATH);
+        prFamilyName.getFirstChild().setNodeValue(eidData.getFamilyName());
+
+        // - set first name
+        final Node prGivenName = XPathUtils.selectSingleNode(idlassertion,
+            SimpleIdentityLinkAssertionParser.PERSON_GIVEN_NAME_XPATH);
+        prGivenName.getFirstChild().setNodeValue(eidData.getGivenName());
+
+        // - set date of birth
+        final Node prDateOfBirth = XPathUtils.selectSingleNode(idlassertion,
+            SimpleIdentityLinkAssertionParser.PERSON_DATE_OF_BIRTH_XPATH);
+
+        prDateOfBirth.getFirstChild().setNodeValue(eidData.getFormatedDateOfBirth());
+
+        identityLink = new SimpleIdentityLinkAssertionParser(idlassertion).parseIdentityLink();
+
+        new BpkBuilder();
+        final Pair<String, String> bpkCalc = BpkBuilder.generateAreaSpecificPersonIdentifier(
+            identityLink.getIdentificationValue(),
+            identityLink.getIdentificationType(),
+            pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
+        bpk = bpkCalc.getFirst();
+
+      } else {
+        // contact SZR Gateway
+        log.debug("Starting connecting SZR Gateway");
+        final PersonInfoType personInfo = new PersonInfoType();
+        final PersonNameType personName = new PersonNameType();
+        final PhysicalPersonType naturalPerson = new PhysicalPersonType();
+        final TravelDocumentType eDocument = new TravelDocumentType();
+
+        naturalPerson.setName(personName);
+        personInfo.setPerson(naturalPerson);
+        personInfo.setTravelDocument(eDocument);
+
+        // person information
+        personName.setFamilyName(eidData.getFamilyName());
+        personName.setGivenName(eidData.getGivenName());
+        naturalPerson.setDateOfBirth(eidData.getFormatedDateOfBirth());
+        eDocument.setIssuingCountry(eidData.getCitizenCountryCode());
+        eDocument.setDocumentNumber(eidData.getPseudonym());
+
+        // eID document information
+        eDocument.setDocumentType(basicConfig.getBasicConfiguration(
+            Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_EDOCUMENTTYPE,
+            Constants.SZR_CONSTANTS_DEFAULT_DOCUMENT_TYPE));
+
+        // set PlaceOfBirth if available
+        if (eidData.getPlaceOfBirth() != null) {
+          log.trace("Find 'PlaceOfBirth' attribute: " + eidData.getPlaceOfBirth());
+          if (basicConfig.getBasicConfigurationBoolean(
+              Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETPLACEOFBIRTHIFAVAILABLE,
+              true)) {
+            naturalPerson.setPlaceOfBirth(eidData.getPlaceOfBirth());
+            log.trace("Adding 'PlaceOfBirth' to ERnB request ... ");
+
+          }
+        }
+
+        // set BirthName if available
+        if (eidData.getBirthName() != null) {
+          log.trace("Find 'BirthName' attribute: " + eidData.getBirthName());
+          if (basicConfig.getBasicConfigurationBoolean(
+              Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETBIRTHNAMEIFAVAILABLE,
+              true)) {
+            final AlternativeNameType alternativeName = new AlternativeNameType();
+            naturalPerson.setAlternativeName(alternativeName);
+            alternativeName.setFamilyName(eidData.getBirthName());
+            log.trace("Adding 'BirthName' to ERnB request ... ");
+
+          }
+        }
+
+        final IdentityLinkType result = szrClient.getIdentityLinkInRawMode(personInfo);
+
+        final Element idlFromSzr = (Element) result.getAssertion();
+        identityLink = new SimpleIdentityLinkAssertionParser(idlFromSzr).parseIdentityLink();
+
+        // write ERnB inputdata into revisionlog
+        if (basicConfig.getBasicConfigurationBoolean(
+            Constants.CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_REVISIONLOGDATASTORE_ACTIVE, false)) {
+          revisionsLogger.logEvent(pendingReq,
+              MsConnectorEventCodes.SZR_ERNB_EIDAS_RAW_ID,
+              (String) simpleAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER));
+          revisionsLogger.logEvent(pendingReq,
+              MsConnectorEventCodes.SZR_ERNB_EIDAS_ERNB_ID, eidData.getPseudonym());
+
+        }
+
+        // get bPK from SZR
+        if (basicConfig.getBasicConfigurationBoolean(
+            Constants.CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_USESRZFORBPKGENERATION, true)) {
+          bpk = szrClient.getBpk(
+              personInfo,
+              pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier(),
+              basicConfig.getBasicConfiguration(
+                  Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_VKZ,
+                  "no VKZ defined"));
+
+        } else {
+          log.debug("Calculating bPK from baseId ... ");
+          new BpkBuilder();
+          final Pair<String, String> bpkCalc = BpkBuilder.generateAreaSpecificPersonIdentifier(
+              identityLink.getIdentificationValue(),
+              identityLink.getIdentificationType(),
+              pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
+          bpk = bpkCalc.getFirst();
+
+        }
+
+      }
+
+      if (identityLink == null) {
+        log.error("ERnB did not return an identity link.");
+        throw new SzrCommunicationException("ernb.00", null);
+
+      }
+      revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.SZR_IDL_RECEIVED,
+          identityLink.getSamlAssertion().getAttribute(SimpleIdentityLinkAssertionParser.ASSERTIONID));
+
+      if (bpk == null) {
+        log.error("ERnB did not return a bPK for target: " + pendingReq.getServiceProviderConfiguration()
+            .getAreaSpecificTargetIdentifier());
+        throw new SzrCommunicationException("ernb.01", null);
+
+      }
+      revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.SZR_BPK_RECEIVED);
+
+      log.debug("ERnB communication was successfull");
+
+      authProcessData.setForeigner(true);
+      authProcessData.setIdentityLink(identityLink);
+      authProcessData.setGenericDataToSession(
+          PvpAttributeDefinitions.EID_ISSUING_NATION_NAME,
+          EidasResponseUtils.parseEidasPersonalIdentifier((String) simpleAttrMap.get(
+              Constants.eIDAS_ATTR_PERSONALIDENTIFIER)).getFirst());
+
+      // set bPK and bPKType into auth session
+      authProcessData.setGenericDataToSession(
+          PvpAttributeDefinitions.BPK_NAME,
+          extendBpkByPrefix(
+              bpk,
+              pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier()));
+      authProcessData.setGenericDataToSession(
+          PvpAttributeDefinitions.EID_SECTOR_FOR_IDENTIFIER_NAME,
+          pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
+
+      // store pending-request
+      requestStoreage.storePendingRequest(pendingReq);
+
+    } catch (final EidasAttributeException e) {
+      throw new TaskExecutionException(pendingReq, "Minimum required eIDAS attributeset not found.", e);
+
+    } catch (final EaafException e) {
+      throw new TaskExecutionException(pendingReq, "IdentityLink generation for foreign person FAILED.", e);
+
+    } catch (final Exception e) {
+      log.error("IdentityLink generation for foreign person FAILED.", e);
+      throw new TaskExecutionException(pendingReq, "IdentityLink generation for foreign person FAILED.", e);
+
+    }
+  }
+
+  private String extendBpkByPrefix(String bpk, String type) {
+    String bpkType = null;
+
+    if (type.startsWith(EaafConstants.URN_PREFIX_WBPK)) {
+      bpkType = type.substring(EaafConstants.URN_PREFIX_WBPK.length());
+    } else if (type.startsWith(EaafConstants.URN_PREFIX_CDID)) {
+      bpkType = type.substring(EaafConstants.URN_PREFIX_CDID.length());
+    } else if (type.startsWith(EaafConstants.URN_PREFIX_EIDAS)) {
+      bpkType = type.substring(EaafConstants.URN_PREFIX_EIDAS.length());
+    }
+
+    if (bpkType != null) {
+      log.trace("Authenticate user with bPK/wbPK " + bpk + " and Type=" + bpkType);
+      return bpkType + ":" + bpk;
+
+    } else {
+      log.warn("Service Provider Target with: " + type + " is NOT supported. Set bPK as it is ...");
+      return bpk;
+
+    }
+
+  }
+
+  private Map<String, Object> convertEidasAttrToSimpleMap(
+      ImmutableMap<AttributeDefinition<?>, ImmutableSet<? extends AttributeValue<?>>> attributeMap) {
+    final Map<String, Object> result = new HashMap<>();
+
+    for (final AttributeDefinition<?> el : attributeMap.keySet()) {
+
+      final Class parameterizedType = el.getParameterizedType();
+      if (DateTime.class.equals(parameterizedType)) {
+        final DateTime attribute = EidasResponseUtils.translateDateAttribute(el, attributeMap.get(el)
+            .asList());
+        if (attribute != null) {
+          result.put(el.getFriendlyName(), attribute);
+          log.trace("Find attr '" + el.getFriendlyName() + "' with value: " + attribute.toString());
+
+        } else {
+          log.info("Ignore empty 'DateTime' attribute");
+        }
+
+      } else if (PostalAddress.class.equals(parameterizedType)) {
+        final PostalAddress addressAttribute = EidasResponseUtils.translateAddressAttribute(el, attributeMap
+            .get(el).asList());
+        if (addressAttribute != null) {
+          result.put(el.getFriendlyName(), addressAttribute);
+          log.trace("Find attr '" + el.getFriendlyName() + "' with value: " + addressAttribute.toString());
+
+        } else {
+          log.info("Ignore empty 'PostalAddress' attribute");
+        }
+
+      } else {
+        final List<String> natPersonIdObj = EidasResponseUtils.translateStringListAttribute(el, attributeMap
+            .get(el).asList());
+        final String stringAttr = natPersonIdObj.get(0);
+        if (StringUtils.isNotEmpty(stringAttr)) {
+          result.put(el.getFriendlyName(), stringAttr);
+          log.trace("Find attr '" + el.getFriendlyName() + "' with value: " + stringAttr);
+
+        } else {
+          log.info("Ignore empty 'String' attribute");
+        }
+
+      }
+    }
+
+    log.debug("Receive #" + result.size() + " attributes with names: " + result.keySet().toString());
+
+    return result;
+  }
+
+  private void writeMdsLogInformation(ErnbEidData eidData) {
+    // log MDS and country code into technical log
+    if (basicConfig.getBasicConfigurationBoolean(
+        MsEidasNodeConstants.PROP_CONFIG_TECHNICALLOG_WRITE_MDS_INTO_TECH_LOG, false)) {
+      log.info("eIDAS Auth. for user: "
+          + eidData.getGivenName() + " "
+          + eidData.getFamilyName() + " "
+          + eidData.getFormatedDateOfBirth() + " "
+          + "from " + eidData.getCitizenCountryCode());
+    }
+
+    // log MDS and country code into revision log
+    if (basicConfig.getBasicConfigurationBoolean(
+        MsEidasNodeConstants.PROP_CONFIG_REVISIONLOG_WRITE_MDS_INTO_REVISION_LOG, false)) {
+      revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.RESPONSE_FROM_EIDAS_MDSDATA,
+          "{" + eidData.getGivenName() + ","
+              + eidData.getFamilyName() + ","
+              + eidData.getFormatedDateOfBirth() + ","
+              + eidData.getCitizenCountryCode() + "}");
+    }
+
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
new file mode 100644
index 00000000..da849c8f
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
@@ -0,0 +1,288 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks;
+
+import java.util.UUID;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import at.asitplus.eidas.specific.connector.MsConnectorEventCodes;
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
+import at.asitplus.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.ICcSpecificEidProcessingService;
+import at.gv.egiz.eaaf.core.api.data.EaafConstants;
+import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
+import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
+import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
+import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
+import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
+import eu.eidas.auth.commons.EidasParameterKeys;
+import eu.eidas.auth.commons.light.ILightRequest;
+import eu.eidas.auth.commons.light.impl.LightRequest;
+import eu.eidas.auth.commons.tx.BinaryLightToken;
+import eu.eidas.specificcommunication.BinaryLightTokenHelper;
+import eu.eidas.specificcommunication.SpecificCommunicationDefinitionBeanNames;
+import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
+import eu.eidas.specificcommunication.protocol.SpecificCommunicationService;
+
+/**
+ * Authentication-process task that generates the Authn. Request to eIDAS Node.
+ * 
+ * @author tlenz
+ *
+ */
+@Component("ConnecteIDASNodeTask")
+public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
+  private static final Logger log = LoggerFactory.getLogger(GenerateAuthnRequestTask.class);
+
+  @Autowired
+  IConfiguration basicConfig;
+  @Autowired
+  ApplicationContext context;
+  @Autowired
+  ITransactionStorage transactionStore;
+  @Autowired
+  ISpringMvcGuiFormBuilder guiBuilder;
+  @Autowired
+  ICcSpecificEidProcessingService ccSpecificProcessing;
+
+  @Override
+  public void execute(ExecutionContext executionContext,
+      HttpServletRequest request, HttpServletResponse response)
+      throws TaskExecutionException {
+
+    try {
+      // get service-provider configuration
+      final ISpConfiguration spConfig = pendingReq.getServiceProviderConfiguration();
+
+      // get target, environment and validate citizen countryCode
+      final String citizenCountryCode = (String) executionContext.get(
+          MsEidasNodeConstants.REQ_PARAM_SELECTED_COUNTRY);
+      final String environment = (String) executionContext.get(
+          MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT);
+
+      if (StringUtils.isEmpty(citizenCountryCode)) {
+        // illegal state; task should not have been executed without a selected country
+        throw new EidasSAuthenticationException("eidas.03", new Object[] { "" });
+
+      }
+
+      // TODO: maybe add countryCode validation before request ref. impl. eIDAS node
+      log.info("Request eIDAS auth. for citizen of country: " + citizenCountryCode);
+      revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.COUNTRY_SELECTED, citizenCountryCode);
+
+      // build eIDAS AuthnRequest
+      final LightRequest.Builder authnRequestBuilder = LightRequest.builder();
+      authnRequestBuilder.id(UUID.randomUUID().toString());
+
+      final String issur = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_ENTITYID);
+      if (StringUtils.isEmpty(issur)) {
+        log.error("Found NO 'eIDAS node issuer' in configuration. Authentication NOT possible!");
+        throw new EaafConfigurationException("config.27",
+            new Object[] { "Application config containts NO " + Constants.CONIG_PROPS_EIDAS_NODE_ENTITYID });
+
+      }
+      authnRequestBuilder.issuer(issur);
+
+      // TODO: set matching mode if eIDAS ref. impl. support this method
+
+      // TODO: update if eIDAS ref. impl. supports exact matching for non-notified LoA
+      // schemes
+      String loa = EaafConstants.EIDAS_LOA_HIGH;
+      if (spConfig.getRequiredLoA() != null) {
+        if (spConfig.getRequiredLoA().isEmpty()) {
+          log.info("No eIDAS LoA requested. Use LoA HIGH as default");
+        } else {
+          if (spConfig.getRequiredLoA().size() > 1) {
+            log.info(
+                "Currently only ONE requested LoA is supported for service provider. Use first one ... ");
+          }
+
+          loa = spConfig.getRequiredLoA().get(0);
+
+        }
+      }
+
+      log.debug("Request eIdAS node with LoA: " + loa);
+      authnRequestBuilder.levelOfAssurance(loa);
+
+      // set nameIDFormat
+      authnRequestBuilder.nameIdFormat(Constants.eIDAS_REQ_NAMEID_FORMAT);
+
+      // set citizen country code for foreign uses
+      authnRequestBuilder.citizenCountryCode(citizenCountryCode);
+
+      // set relay state
+      /*
+       * TODO: SecureToken PendingRequestId generates a validation exception in
+       * eIDASNode because eIDASNode implements limit on size for RelayState
+       * (80characaters)
+       */
+      // authnRequestBuilder.relayState(pendingReq.getPendingRequestId());
+
+      // Add country-specific informations into eIDAS request
+      ccSpecificProcessing.preProcess(citizenCountryCode, pendingReq, authnRequestBuilder);
+
+      // build request
+      final LightRequest lightAuthnReq = authnRequestBuilder.build();
+
+      // put request into Hazelcast cache
+      final BinaryLightToken token = putRequestInCommunicationCache(lightAuthnReq);
+      final String tokenBase64 = BinaryLightTokenHelper.encodeBinaryLightTokenBase64(token);
+
+      // Workaround, because eIDAS node ref. impl. does not return relayState
+      if (basicConfig.getBasicConfigurationBoolean(
+          Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_USEREQUESTIDASTRANSACTIONIDENTIFIER,
+          false)) {
+        log.trace("Put lightRequestId into transactionstore as session-handling backup");
+        transactionStore.put(lightAuthnReq.getId(), pendingReq.getPendingRequestId(), -1);
+
+      }
+
+      // select forward URL regarding the selected environment
+      String forwardUrl = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL);
+      if (StringUtils.isNotEmpty(environment)) {
+        forwardUrl = selectedForwardUrlForEnvironment(environment);
+      }
+
+      if (StringUtils.isEmpty(forwardUrl)) {
+        log.warn("NO ForwardURL defined in configuration. Can NOT forward to eIDAS node! Process stops");
+        throw new EaafConfigurationException("config.08", new Object[] {
+            environment == null ? Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL
+                : Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL + "." + environment
+        });
+
+      }
+      log.debug("ForwardURL: " + forwardUrl + " selected to forward eIDAS request");
+
+      if (basicConfig.getBasicConfiguration(
+          Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_METHOD,
+          Constants.FORWARD_METHOD_GET).equals(Constants.FORWARD_METHOD_GET)) {
+
+        log.debug("Use http-redirect for eIDAS node forwarding ...  ");
+        // send redirect
+        final UriComponentsBuilder redirectUrl = UriComponentsBuilder.fromHttpUrl(forwardUrl);
+        redirectUrl.queryParam(EidasParameterKeys.TOKEN.toString(), tokenBase64);
+        response.sendRedirect(redirectUrl.build().encode().toString());
+
+      } else {
+        log.debug("Use http-post for eIDAS node forwarding ...  ");
+        final StaticGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
+            basicConfig,
+            pendingReq,
+            Constants.TEMPLATE_POST_FORWARD_NAME,
+            null,
+            resourceLoader);
+
+        config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_ENDPOINT, forwardUrl);
+        config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_TOKEN_NAME,
+            EidasParameterKeys.TOKEN.toString());
+        config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_TOKEN_VALUE,
+            tokenBase64);
+
+        guiBuilder.build(request, response, config, "Forward to eIDASNode form");
+
+      }
+
+      revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.EIDAS_NODE_CONNECTED, lightAuthnReq.getId());
+
+    } catch (final EidasSAuthenticationException e) {
+      throw new TaskExecutionException(pendingReq, "eIDAS AuthnRequest generation FAILED.", e);
+
+    } catch (final Exception e) {
+      log.warn("eIDAS AuthnRequest generation FAILED.", e);
+      throw new TaskExecutionException(pendingReq, e.getMessage(), e);
+
+    }
+
+  }
+
+  /**
+   * Select a forward URL from configuration for a specific environment <br>
+   * <br>
+   * <b>Info: </b> This method is needed, because eIDAS Ref. Impl only supports
+   * one countrycode on each instance. In consequence, more than one eIDAS Ref.
+   * Impl nodes are required to support producation, testing, or QS stages for one
+   * country by using one ms-specific eIDAS connector
+   * 
+   * @param environment Environment selector from CountrySlection page
+   * @return
+   */
+  private String selectedForwardUrlForEnvironment(String environment) {
+    log.trace("Starting endpoint selection process for environment: " + environment + " ... ");
+    if (environment.equalsIgnoreCase(MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_PRODUCTION)) {
+      return basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL);
+    } else if (environment.equalsIgnoreCase(MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_QS)) {
+      return basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL
+          + "." + MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_QS);
+    } else if (environment.equalsIgnoreCase(
+        MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_TESTING)) {
+      return basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL
+          + "." + MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_TESTING);
+    } else if (environment.equalsIgnoreCase(
+        MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_DEVELOPMENT)) {
+      return basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL
+          + "." + MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_DEVELOPMENT);
+    }
+
+    log.info("Environment selector: " + environment + " is not supported");
+    return null;
+
+  }
+
+  private BinaryLightToken putRequestInCommunicationCache(ILightRequest lightRequest)
+      throws ServletException {
+    final BinaryLightToken binaryLightToken;
+    try {
+      final SpecificCommunicationService springManagedSpecificConnectorCommunicationService =
+          (SpecificCommunicationService) context.getBean(
+              SpecificCommunicationDefinitionBeanNames.SPECIFIC_CONNECTOR_COMMUNICATION_SERVICE.toString());
+
+      binaryLightToken = springManagedSpecificConnectorCommunicationService.putRequest(lightRequest);
+
+    } catch (final SpecificCommunicationException e) {
+      log.error("Unable to process specific request");
+      throw new ServletException(e);
+
+    }
+
+    return binaryLightToken;
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java
new file mode 100644
index 00000000..60049323
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java
@@ -0,0 +1,126 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import at.asitplus.eidas.specific.connector.MsConnectorEventCodes;
+import at.asitplus.eidas.specific.connector.MsEidasNodeConstants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.validator.EidasResponseValidator;
+import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
+import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
+import at.gv.egiz.eaaf.core.exceptions.EaafException;
+import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
+import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
+import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
+import eu.eidas.auth.commons.light.ILightResponse;
+
+@Component("ReceiveResponseFromeIDASNodeTask")
+public class ReceiveAuthnResponseTask extends AbstractAuthServletTask {
+  private static final Logger log = LoggerFactory.getLogger(ReceiveAuthnResponseTask.class);
+
+  @Autowired
+  private IConfiguration basicConfig;
+  @Autowired
+  private EidasAttributeRegistry attrRegistry;
+
+  @Override
+  public void execute(ExecutionContext executionContext, HttpServletRequest request,
+      HttpServletResponse response) throws TaskExecutionException {
+    try {
+      final ILightResponse eidasResponse = (ILightResponse) request.getAttribute(
+          Constants.DATA_FULL_EIDAS_RESPONSE);
+      if (eidasResponse == null) {
+        log.warn("NO eIDAS response-message found.");
+        throw new EidasSAuthenticationException("eidas.01", null);
+
+      }
+
+      log.debug("Receive eIDAS response with RespId:" + eidasResponse.getId() + " for ReqId:" + eidasResponse
+          .getInResponseToId());
+      log.trace("Full eIDAS-Resp: " + eidasResponse.toString());
+      revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE, eidasResponse
+          .getId());
+
+      // check response StatusCode
+      if (!eidasResponse.getStatus().getStatusCode().equals(Constants.SUCCESS_URI)) {
+        log.info("Receice eIDAS Response with StatusCode:" + eidasResponse.getStatus().getStatusCode()
+            + " Subcode:" + eidasResponse.getStatus().getSubStatusCode() + " Msg:" + eidasResponse.getStatus()
+                .getStatusMessage());
+        throw new EidasSAuthenticationException("eidas.02", new Object[] { eidasResponse.getStatus()
+            .getStatusCode(), eidasResponse.getStatus().getStatusMessage() });
+
+      }
+
+      // extract all Attributes from response
+
+      // **********************************************************
+      // ******* MS-specificresponse validation **********
+      // **********************************************************
+      final String spCountry = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_COUNTRYCODE,
+          "AT");
+      final String citizenCountryCode = (String) executionContext.get(
+          MsEidasNodeConstants.REQ_PARAM_SELECTED_COUNTRY);
+      EidasResponseValidator.validateResponse(pendingReq, eidasResponse, spCountry, citizenCountryCode,
+          attrRegistry);
+
+      // **********************************************************
+      // ******* Store resonse infos into session object **********
+      // **********************************************************
+
+      // update MOA-Session data with received information
+      log.debug("Store eIDAS response information into pending-request.");
+      final AuthProcessDataWrapper authProcessData = pendingReq.getSessionData(AuthProcessDataWrapper.class);
+      authProcessData.setQaaLevel(eidasResponse.getLevelOfAssurance());
+      authProcessData.setGenericDataToSession(Constants.DATA_FULL_EIDAS_RESPONSE, eidasResponse);
+
+      // store MOA-session to database
+      requestStoreage.storePendingRequest(pendingReq);
+
+      revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_VALID);
+
+    } catch (final EaafException e) {
+      revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_NOT_VALID);
+      throw new TaskExecutionException(pendingReq, "eIDAS Response processing FAILED.", e);
+
+    } catch (final Exception e) {
+      log.warn("eIDAS Response processing FAILED.", e);
+      revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_NOT_VALID);
+      throw new TaskExecutionException(pendingReq, e.getMessage(),
+          new EidasSAuthenticationException("eidas.05", new Object[] { e.getMessage() }, e));
+
+    }
+
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
new file mode 100644
index 00000000..17efc2ff
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
@@ -0,0 +1,172 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.utils;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import javax.annotation.Nullable;
+
+import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ImmutableList;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.gv.egiz.eaaf.core.impl.data.Trible;
+import eu.eidas.auth.commons.attribute.AttributeDefinition;
+import eu.eidas.auth.commons.attribute.AttributeValue;
+import eu.eidas.auth.commons.attribute.AttributeValueMarshaller;
+import eu.eidas.auth.commons.attribute.AttributeValueMarshallingException;
+import eu.eidas.auth.commons.attribute.AttributeValueTransliterator;
+import eu.eidas.auth.commons.protocol.eidas.impl.PostalAddress;
+
+public class EidasResponseUtils {
+  private static final Logger log = LoggerFactory.getLogger(EidasResponseUtils.class);
+
+  public static final String PERSONALIDENIFIER_VALIDATION_PATTERN = "^[A-Z,a-z]{2}/[A-Z,a-z]{2}/.*";
+
+  /**
+   * Validate a eIDAS PersonalIdentifier attribute value This validation is done
+   * according to eIDAS SAML Attribute Profile - Section 2.2.3 Unique Identifier
+   * 
+   * @param uniqueID eIDAS attribute value of a unique identifier
+   * @return true if the uniqueID matches to eIDAS to Unique Identifier
+   *         specification, otherwise false
+   */
+  public static boolean validateEidasPersonalIdentifier(String uniqueID) {
+    final Pattern pattern = Pattern.compile(PERSONALIDENIFIER_VALIDATION_PATTERN);
+    final Matcher matcher = pattern.matcher(uniqueID);
+    return matcher.matches();
+
+  }
+
+  /**
+   * Parse an eIDAS PersonalIdentifier attribute value into it components. This
+   * processing is done according to eIDAS SAML Attribute Profile - Section 2.2.3
+   * Unique Identifier
+   * 
+   * @param uniqueID eIDAS attribute value of a unique identifier
+   * @return {@link Trible} that contains: <br>
+   *         First : citizen country <br>
+   *         Second: destination country <br>
+   *         Third : unique identifier <br>
+   *         or null if the attribute value has a wrong format
+   */
+  public static Trible<String, String, String> parseEidasPersonalIdentifier(String uniqueID) {
+    if (!validateEidasPersonalIdentifier(uniqueID)) {
+      log.error("eIDAS attribute value for {} looks wrong formated. Value: {}", 
+          Constants.eIDAS_ATTR_PERSONALIDENTIFIER, uniqueID);
+      return null;
+
+    }
+    return Trible.newInstance(uniqueID.substring(0, 2), uniqueID.substring(3, 5), uniqueID.substring(6));
+
+  }
+
+  /**
+   * Get eIDAS attribute-values from eIDAS Node attributes. 
+   * 
+   * @param attributeDefinition eIDAS attribute definition
+   * @param attributeValues Attributes from eIDAS response
+   * @return Set of attribute values. If more then one value than the first value contains the 'Latin' value. 
+   */
+  // TODO: check possible problem with nonLatinCharacters
+  public static List<String> translateStringListAttribute(AttributeDefinition<?> attributeDefinition,
+      ImmutableList<? extends AttributeValue<?>> attributeValues) {
+    final List<String> stringListAttribute = new ArrayList<>();
+    final AttributeValueMarshaller<?> attributeValueMarshaller = attributeDefinition
+        .getAttributeValueMarshaller();
+    for (final AttributeValue<?> attributeValue : attributeValues) {
+      String valueString = null;
+      try {
+        valueString = attributeValueMarshaller.marshal((AttributeValue) attributeValue);
+
+        log.trace("Find attr: {} with value: {} nonLatinFlag: {} needTransliteration: {}",
+            attributeDefinition.getFriendlyName(), attributeValue.toString(),
+            attributeValue.isNonLatinScriptAlternateVersion(), 
+            AttributeValueTransliterator.needsTransliteration(valueString));
+
+        // if (attributeValue.isNonLatinScriptAlternateVersion()) {
+        if (!AttributeValueTransliterator.needsTransliteration(valueString)) {
+          stringListAttribute.add(0, valueString);
+
+        } else {
+          log.trace("Find 'needsTransliteration' flag. Setting this value at last list element ... ");
+          stringListAttribute.add(valueString);
+
+        }
+
+      } catch (final AttributeValueMarshallingException e) {
+        throw new IllegalStateException(e);
+
+      }
+    }
+
+    log.trace("Extract values: {} for attr: {}", 
+        StringUtils.join(stringListAttribute, ","), attributeDefinition.getFriendlyName());
+
+    return stringListAttribute;
+
+  }
+
+  /**
+   * Convert eIDAS DateTime attribute to Java Object. 
+   * 
+   * @param attributeDefinition eIDAS attribute definition.
+   * @param attributeValues eIDAS attribute value
+   * @return
+   */
+  @Nullable
+  public static DateTime translateDateAttribute(AttributeDefinition<?> attributeDefinition,
+      ImmutableList<? extends AttributeValue<?>> attributeValues) {
+    if (attributeValues.size() != 0) {
+      final AttributeValue<?> firstAttributeValue = attributeValues.get(0);
+      return (DateTime) firstAttributeValue.getValue();
+
+    }
+
+    return null;
+  }
+
+  /**
+   * Concert eIDAS Address attribute to Java object.
+   * 
+   * @param attributeDefinition eIDAS attribute definition
+   * @param attributeValues eIDAS attribute value
+   * @return
+   */
+  @Nullable
+  public static PostalAddress translateAddressAttribute(AttributeDefinition<?> attributeDefinition,
+      ImmutableList<? extends AttributeValue<?>> attributeValues) {
+    final AttributeValue<?> firstAttributeValue = attributeValues.get(0);
+    return (PostalAddress) firstAttributeValue.getValue();
+
+  }
+
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/utils/LoggingHandler.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/LoggingHandler.java
index 5ca3a25a..70290cd3 100644
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/utils/LoggingHandler.java
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/LoggingHandler.java
@@ -1,6 +1,6 @@
-/*******************************************************************************
+/*
  * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
  * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
  *
  * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
@@ -19,8 +19,9 @@
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
  * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils;
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.utils;
 
 import java.io.ByteArrayOutputStream;
 import java.util.Set;
@@ -36,39 +37,36 @@ import org.slf4j.LoggerFactory;
 
 public class LoggingHandler implements SOAPHandler<SOAPMessageContext> {
 
-	Logger log = LoggerFactory.getLogger(LoggingHandler.class);
+  Logger log = LoggerFactory.getLogger(LoggingHandler.class);
+
+  @Override
+  public boolean handleMessage(SOAPMessageContext context) {
+    final SOAPMessage msg = context.getMessage();
+    final ByteArrayOutputStream bos = new ByteArrayOutputStream();
 
-	public boolean handleMessage(SOAPMessageContext context) {
-		SOAPMessage msg = context.getMessage();
-		boolean request = ((Boolean) context
-		    .get(SOAPMessageContext.MESSAGE_OUTBOUND_PROPERTY)).booleanValue();
-		ByteArrayOutputStream bos = new ByteArrayOutputStream();
+    try {
+      msg.writeTo(bos);
+      log.trace(bos.toString("UTF-8"));
+      log.trace(new String(bos.toByteArray(), "UTF-8"));
 
-		try {
-			if (request) {
-				msg.writeTo(bos);
-			} else { // This is the response message
-				msg.writeTo(bos);
-			}
-										
-			log.trace(bos.toString());
-			log.trace(new String(bos.toByteArray()));
-			
-		} catch (Exception e) {
-			log.trace(e.getMessage(), e);
-		}
-		return true;
-	}
+    } catch (final Exception e) {
+      log.trace(e.getMessage(), e);
+    }
+    return true;
+  }
 
-	public boolean handleFault(SOAPMessageContext context) {
-		return handleMessage(context);
-	}
+  @Override
+  public boolean handleFault(SOAPMessageContext context) {
+    return handleMessage(context);
+  }
 
-	public void close(MessageContext context) {
-	}
+  @Override
+  public void close(MessageContext context) {
+  }
 
-	public Set<QName> getHeaders() {
-		return null;
-	}
+  @Override
+  public Set<QName> getHeaders() {
+    return null;
+  }
 
 }
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/validator/EidasResponseValidator.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/validator/EidasResponseValidator.java
new file mode 100644
index 00000000..053694cf
--- /dev/null
+++ b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/validator/EidasResponseValidator.java
@@ -0,0 +1,175 @@
+/*
+ * Copyright 2018 A-SIT Plus GmbH
+ * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ,
+ * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "License");
+ * You may not use this work except in compliance with the License.
+ * You may obtain a copy of the License at:
+ * https://joinup.ec.europa.eu/news/understanding-eupl-v12
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+*/
+
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.validator;
+
+import java.util.List;
+
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.collect.ImmutableList;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasValidationException;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils;
+import at.gv.egiz.eaaf.core.api.IRequest;
+import at.gv.egiz.eaaf.core.impl.data.Trible;
+import eu.eidas.auth.commons.attribute.AttributeDefinition;
+import eu.eidas.auth.commons.attribute.AttributeValue;
+import eu.eidas.auth.commons.light.ILightResponse;
+import eu.eidas.auth.commons.protocol.eidas.LevelOfAssurance;
+
+/**
+ * eIDAS Response validator implementation.
+ * 
+ * @author tlenz
+ *
+ */
+public class EidasResponseValidator {
+  private static final Logger log = LoggerFactory.getLogger(EidasResponseValidator.class);
+
+  /**
+   * Validate an eIDAS Response according to internal state.
+   * 
+   * @param pendingReq Current pending request
+   * @param eidasResponse eIDAS response object
+   * @param spCountry Country-Code of the Service Provider
+   * @param citizenCountryCode Country-Code of the Citizen
+   * @param attrRegistry eIDAS Attribute registry implementation
+   * @throws EidasValidationException In case of an validation error
+   */
+  public static void validateResponse(IRequest pendingReq, ILightResponse eidasResponse, String spCountry,
+      String citizenCountryCode, EidasAttributeRegistry attrRegistry) throws EidasValidationException {
+
+    /*-----------------------------------------------------|
+     * validate received LoA against minimum required LoA  |
+     *_____________________________________________________|
+     */
+    final LevelOfAssurance respLoA = LevelOfAssurance.fromString(eidasResponse.getLevelOfAssurance());
+    final List<String> allowedLoAs = pendingReq.getServiceProviderConfiguration().getRequiredLoA();
+    boolean loaValid = false;
+    for (final String allowedLoaString : allowedLoAs) {
+      final LevelOfAssurance allowedLoa = LevelOfAssurance.fromString(allowedLoaString);
+      if (respLoA.numericValue() >= allowedLoa.numericValue()) {
+        log.debug("Response contains valid LoA. Resume process ... ");
+        loaValid = true;
+        break;
+
+      } else {
+        log.trace("Allowed LoA: " + allowedLoaString + " DOES NOT match response LoA: " + eidasResponse
+            .getLevelOfAssurance());
+      }
+
+    }
+
+    if (!loaValid) {
+      log.error("eIDAS Response LevelOfAssurance is lower than the required! "
+          + "(Resp-LoA:{} Req-LoA:{} )", respLoA.getValue(), allowedLoAs.toArray());
+      throw new EidasValidationException("eidas.06", new Object[] { respLoA.getValue() });
+
+    }
+
+    /*-----------------------------------------------------|
+     *     validate 'PersonalIdentifier' attribute         |
+     *_____________________________________________________|
+     */
+    final AttributeDefinition<?> attrDefinition = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
+        Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
+    final ImmutableList<? extends AttributeValue<?>> attributeValues = eidasResponse.getAttributes()
+        .getAttributeMap().get(attrDefinition).asList();
+    final List<String> personalIdObj = EidasResponseUtils.translateStringListAttribute(attrDefinition,
+        attributeValues);
+
+    // check if attribute exists
+    if (personalIdObj == null || personalIdObj.isEmpty()) {
+      log.warn("eIDAS Response include NO 'PersonalIdentifier' attriubte "
+          + ".... That can be a BIG problem in further processing steps");
+      throw new EidasValidationException("eidas.05", new Object[] { "NO 'PersonalIdentifier' attriubte" });
+
+    } else if (personalIdObj.size() > 1) {
+      log.warn("eIDAS Response include MORE THAN ONE 'PersonalIdentifier' attriubtes "
+          + ".... That can be a BIG problem in further processing steps");
+      throw new EidasValidationException("eidas.05", new Object[] {
+          "MORE THAN ONE 'PersonalIdentifier' attriubtes" });
+
+    } else {
+      final String natPersId = personalIdObj.get(0);
+      // validate attribute value format
+      final Trible<String, String, String> split =
+          EidasResponseUtils.parseEidasPersonalIdentifier(natPersId);
+      if (split == null) {
+        throw new EidasValidationException("eidas.07",
+            new Object[] {
+                Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+                "Wrong identifier format" });
+
+      } else {
+        // validation according to eIDAS SAML Attribute Profile, Section 2.2.3
+        if (StringUtils.isEmpty(split.getSecond())) {
+          log.warn("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER
+              + " includes NO destination country. Value:" + natPersId);
+          throw new EidasValidationException("eidas.07",
+              new Object[] {
+                  Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+                  "No or empty destination country" });
+
+        }
+        if (!split.getSecond().equalsIgnoreCase(spCountry)) {
+          log.warn("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER
+              + " includes wrong destination country. Value:" + natPersId
+              + " SP-Country:" + spCountry);
+          throw new EidasValidationException("eidas.07",
+              new Object[] {
+                  Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+                  "Destination country does not match to SP country" });
+
+        }
+
+        if (StringUtils.isEmpty(split.getFirst())) {
+          log.warn("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER
+              + " includes NO citizen country. Value:" + natPersId);
+          throw new EidasValidationException("eidas.07",
+              new Object[] {
+                  Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+                  "No or empty citizen country" });
+
+        }
+        if (!split.getFirst().equalsIgnoreCase(citizenCountryCode)) {
+          log.warn("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER
+              + " includes a citizen country that does not match to service-provider country. "
+              + " Value:" + natPersId
+              + " citiczen Country:" + spCountry);
+          throw new EidasValidationException("eidas.07",
+              new Object[] {
+                  Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+                  "Citizen country does not match to eIDAS-node country that generates the response" });
+
+        }
+      }
+    }
+
+  }
+}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/Constants.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/Constants.java
deleted file mode 100644
index 79515032..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/Constants.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egiz.eaaf.core.api.data.EaafConstants;
-
-public class Constants {
- 	
-	public static final String DATA_REQUESTERID = "req_requesterId";
-	public static final String DATA_PROVIDERNAME = "req_providerName";
-	public static final String DATA_REQUESTED_LOA_LIST = "req_requestedLoA";
-	public static final String DATA_REQUESTED_LOA_COMPERISON = "req_requestedLoAComperision";	
-	public static final String DATA_FULL_EIDAS_RESPONSE = "resp_fulleIDASResponse";
-	
-	
-	//templates for post-binding forwarding
-	public static final String TEMPLATE_POST_FORWARD_NAME = "eidas_node_forward.html";
-	public static final String TEMPLATE_POST_FORWARD_ENDPOINT = "endPoint";
-	public static final String TEMPLATE_POST_FORWARD_TOKEN_NAME = "tokenName";
-	public static final String TEMPLATE_POST_FORWARD_TOKEN_VALUE = "tokenValue";
-	
-	
-	//configuration properties
-	public static final String CONIG_PROPS_EIDAS_PREFIX="auth.eIDAS";
-	public static final String CONIG_PROPS_EIDAS_NODE= CONIG_PROPS_EIDAS_PREFIX + ".node_v2";
-	public static final String CONIG_PROPS_EIDAS_NODE_COUNTRYCODE = CONIG_PROPS_EIDAS_NODE + ".countrycode";
-	public static final String CONIG_PROPS_EIDAS_NODE_PUBLICSECTOR_TARGETS = CONIG_PROPS_EIDAS_NODE + ".publicSectorTargets";
-	public static final String CONIG_PROPS_EIDAS_NODE_ENTITYID = CONIG_PROPS_EIDAS_NODE + ".entityId";
-	public static final String CONIG_PROPS_EIDAS_NODE_FORWARD_URL = CONIG_PROPS_EIDAS_NODE + ".forward.endpoint";
-	public static final String CONIG_PROPS_EIDAS_NODE_FORWARD_METHOD = CONIG_PROPS_EIDAS_NODE + ".forward.method";
-	public static final String CONIG_PROPS_EIDAS_NODE_ATTRIBUTES_REQUESTED_DEFAULT_ONLYNATURAL = CONIG_PROPS_EIDAS_NODE + ".attributes.requested.onlynatural.";
-	public static final String CONIG_PROPS_EIDAS_NODE_ATTRIBUTES_REQUESTED_CC_SPECIFIC_ONLYNATURAL = CONIG_PROPS_EIDAS_NODE + ".attributes.requested.{0}.onlynatural.";
-	public static final String CONIG_PROPS_EIDAS_NODE_ATTRIBUTES_REQUESTED_REPRESENTATION = CONIG_PROPS_EIDAS_NODE + ".attributes.requested.representation.";
-	public static final String CONIG_PROPS_EIDAS_NODE_WORKAROUND_ADD_ALWAYS_PROVIDERNAME = CONIG_PROPS_EIDAS_NODE + ".workarounds.addAlwaysProviderName";
-	public static final String CONIG_PROPS_EIDAS_NODE_WORKAROUND_USEREQUESTIDASTRANSACTIONIDENTIFIER = CONIG_PROPS_EIDAS_NODE + ".workarounds.useRequestIdAsTransactionIdentifier";
-	public static final String CONIG_PROPS_EIDAS_NODE_WORKAROUND_USE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP = CONIG_PROPS_EIDAS_NODE + ".workarounds.useStaticProviderNameForPublicSPs";
-	public static final String CONIG_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP = CONIG_PROPS_EIDAS_NODE + ".staticProviderNameForPublicSPs";;
-	public static final String DEFAULT_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP = "ERnB";
-	
-	public static final String FORWARD_METHOD_POST = "POST";
-	public static final String FORWARD_METHOD_GET = "GET";
-	
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT= CONIG_PROPS_EIDAS_PREFIX + ".szrclient";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_USETESTSERVICE= CONIG_PROPS_EIDAS_SZRCLIENT + ".useTestService";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_TRACEMESSAGES= CONIG_PROPS_EIDAS_SZRCLIENT + ".debug.logfullmessages";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_USEDUMMY= CONIG_PROPS_EIDAS_SZRCLIENT + ".debug.useDummySolution";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_TIMEOUT_CONNECTION= CONIG_PROPS_EIDAS_SZRCLIENT + ".timeout.connection";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_TIMEOUT_RESPONSE= CONIG_PROPS_EIDAS_SZRCLIENT + ".timeout.response";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_ENDPOINT_PROD= CONIG_PROPS_EIDAS_SZRCLIENT + ".endpoint.prod";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_ENDPOINT_TEST= CONIG_PROPS_EIDAS_SZRCLIENT + ".endpoint.test";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_SSL_KEYSTORE_PATH = CONIG_PROPS_EIDAS_SZRCLIENT + ".ssl.keyStore.path";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_SSL_KEYSTORE_PASSWORD = CONIG_PROPS_EIDAS_SZRCLIENT + ".ssl.keyStore.password";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_SSL_TRUSTSTORE_PATH = CONIG_PROPS_EIDAS_SZRCLIENT + ".ssl.trustStore.path";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_SSL_TRUSTSTORE_PASSWORD = CONIG_PROPS_EIDAS_SZRCLIENT + ".ssl.trustStore.password";
-	
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_EDOCUMENTTYPE = CONIG_PROPS_EIDAS_SZRCLIENT + ".params.documenttype";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_VKZ = CONIG_PROPS_EIDAS_SZRCLIENT + ".params.vkz";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_ISSUING_DATE = CONIG_PROPS_EIDAS_SZRCLIENT + ".params.issuingdate";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_ISSUING_AUTHORITY = CONIG_PROPS_EIDAS_SZRCLIENT + ".params.issuingauthority";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_KEYS_USEDUMMY= CONIG_PROPS_EIDAS_SZRCLIENT + ".params.usedummykeys";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_USESRZFORBPKGENERATION= CONIG_PROPS_EIDAS_SZRCLIENT + ".params.useSZRForbPKCalculation";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETPLACEOFBIRTHIFAVAILABLE= CONIG_PROPS_EIDAS_SZRCLIENT + ".params.setPlaceOfBirthIfAvailable";
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETBIRTHNAMEIFAVAILABLE = CONIG_PROPS_EIDAS_SZRCLIENT + ".params.setBirthNameIfAvailable";
-	
-	public static final String CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_REVISIONLOGDATASTORE_ACTIVE = CONIG_PROPS_EIDAS_SZRCLIENT + ".revisionlog.eidmapping.active";
-
-	
-	@Deprecated public static final String CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_SQLLITEDATASTORE_URL = CONIG_PROPS_EIDAS_SZRCLIENT + ".workarounds.datastore.sqlite.url";
-	@Deprecated public static final String CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_SQLLITEDATASTORE_ACTIVE = CONIG_PROPS_EIDAS_SZRCLIENT + ".workarounds.datastore.sqlite.active";
-	
-	
-	//http endpoint descriptions
-	public static final String eIDAS_HTTP_ENDPOINT_SP_POST = "/eidas/light/sp/post";
-	public static final String eIDAS_HTTP_ENDPOINT_SP_REDIRECT = "/eidas/light/sp/redirect";
-	public static final String eIDAS_HTTP_ENDPOINT_IDP_COLLEAGUEREQUEST = "/eidas/light/ColleagueRequest";
-	public static final String eIDAS_HTTP_ENDPOINT_METADATA = "/eidas/light/metadata";
-	
-	//eIDAS request parameters
-	public static final String eIDAS_REQ_NAMEID_FORMAT = "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent";
-	
-	//eIDAS attribute names	
-	public static final String eIDAS_ATTR_PERSONALIDENTIFIER = "PersonIdentifier";
-	public static final String eIDAS_ATTR_DATEOFBIRTH = "DateOfBirth";
-	public static final String eIDAS_ATTR_CURRENTGIVENNAME = "FirstName";	
-	public static final String eIDAS_ATTR_CURRENTFAMILYNAME = "FamilyName";
-	public static final String eIDAS_ATTR_PLACEOFBIRTH = "PlaceOfBirth";
-	public static final String eIDAS_ATTR_BIRTHNAME = "BirthName";	
-	public static final String eIDAS_ATTR_CURRENTADDRESS = "CurrentAddress";
-	
-	public static final String eIDAS_ATTR_LEGALPERSONIDENTIFIER = "LegalPersonIdentifier";
-	public static final String eIDAS_ATTR_LEGALNAME = "LegalName";
-	
-	 public static final List<URI> NATURALPERSONMINIMUMDATASETLIST = Collections.unmodifiableList(new ArrayList<URI>() {
-			private static final long serialVersionUID = 1L;
-			{
-				//TODO: find correct location of attribute definitions
-//				add(eu.eidas.auth.engine.core.eidas.spec.NaturalPersonSpec.Definitions.CURRENT_FAMILY_NAME.getNameUri());
-//				add(eu.eidas.auth.engine.core.eidas.spec.NaturalPersonSpec.Definitions.CURRENT_GIVEN_NAME.getNameUri());
-//				add(eu.eidas.auth.engine.core.eidas.spec.NaturalPersonSpec.Definitions.DATE_OF_BIRTH.getNameUri());
-//				add(eu.eidas.auth.engine.core.eidas.spec.NaturalPersonSpec.Definitions.PERSON_IDENTIFIER.getNameUri());
-			}
-		});
-	 
-	 public static final String POLICY_DEFAULT_ALLOWED_TARGETS = 
-				EaafConstants.URN_PREFIX_CDID.replaceAll("\\.", "\\\\.").replaceAll("\\+", "\\\\+") + ".*";
-	 
-	 //SAML2 Constants
-	 public static final String SUCCESS_URI = "urn:oasis:names:tc:SAML:2.0:status:Success";
-	 
-	 public static final String HTTP_CLIENT_DEFAULT_TIMEOUT_CONNECTION = "30";  //seconds
-	 public static final String HTTP_CLIENT_DEFAULT_TIMEOUT_RESPONSE = "60";    //seconds
-	
-	 
-	 public static final String SZR_SCHEMA_LOCATIONS =
-			    ("urn:SZRServices" + " " + "/szr_client/szr.xsd");
-	 
-	 //Default values for SZR communication
-	 public static final String SZR_CONSTANTS_DEFAULT_DOCUMENT_TYPE = "ELEKTR_DOKUMENT";
-	 
-	 //TODO remove!!!
-	 public static final String SZR_CONSTANTS_DEFAULT_ISSUING_DATE = "2014-01-01";
-	 public static final String SZR_CONSTANTS_DEFAULT_ISSUING_AUTHORITY = "ms-specific eIDAS-Node for AT";
-  	 public static final String SZR_CONSTANTS_DEFAULT_PUBKEY_EXPONENT = "AQAB";
-	 public static final String SZR_CONSTANTS_DEFAULT_PUBKEY_MODULUS = "AJZyj/+sdCMDRq9RkvbFcgSTVn/OfS8EUE81ddwP8MNuJ1kd1SWBUJPaQX2JLJHrL54mkOhrkhH2M/zcuOTu8nW9TOEgXGjrRB/0HpiYKpV+VDJViyyc/GacNLxN4Anw4pima6gHYaJIw9hQkL/nuO2hyh8PGJd7rxeFXJmbLy+X";
-
-
-
-
-	 
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/DAO/ERnBeIDData.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/DAO/ERnBeIDData.java
deleted file mode 100644
index 53711070..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/DAO/ERnBeIDData.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.DAO;
-
-import java.text.SimpleDateFormat;
-
-import org.joda.time.DateTime;
-
-import at.gv.e_government.reference.namespace.persondata._20020228.PostalAddressType;
-
-public class ERnBeIDData {
-
-	private String citizenCountryCode = null;
-	
-	//MDS
-	private String pseudonym = null;
-	private String givenName = null;
-	private String familyName = null;
-	private DateTime dateOfBirth = null;
-	
-	//additional attributes
-	private String placeOfBirth = null;
-	private String birthName = null;
-	private PostalAddressType address = null;
-	
-	
-	
-	
-	
-	public String getCitizenCountryCode() {
-		return citizenCountryCode;
-	}
-	public void setCitizenCountryCode(String citizenCountryCode) {
-		this.citizenCountryCode = citizenCountryCode;
-	}
-	public String getPseudonym() {
-		return pseudonym;
-	}
-	public void setPseudonym(String pseudonym) {
-		this.pseudonym = pseudonym;
-	}
-	public String getGivenName() {
-		return givenName;
-	}
-	public void setGivenName(String givenName) {
-		this.givenName = givenName;
-	}
-	public String getFamilyName() {
-		return familyName;
-	}
-	public void setFamilyName(String familyName) {
-		this.familyName = familyName;
-	}
-	public DateTime getDateOfBirth() {
-		return dateOfBirth;
-	}
-	public void setDateOfBirth(DateTime dateOfBirth) {
-		this.dateOfBirth = dateOfBirth;
-	}
-	public String getPlaceOfBirth() {
-		return placeOfBirth;
-	}
-	public void setPlaceOfBirth(String placeOfBirth) {
-		this.placeOfBirth = placeOfBirth;
-	}
-	public String getBirthName() {
-		return birthName;
-	}
-	public void setBirthName(String birthName) {
-		this.birthName = birthName;
-	}
-	public PostalAddressType getAddress() {
-		return address;
-	}
-	public void setAddress(PostalAddressType address) {
-		this.address = address;
-	}
-	
-	public String getFormatedDateOfBirth() {
-		return new SimpleDateFormat("yyyy-MM-dd").format(dateOfBirth.toDate());
-	}
-	
-	
-
-	
-	
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/DAO/eIDASPersonalIdStoreDAO.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/DAO/eIDASPersonalIdStoreDAO.java
deleted file mode 100644
index ae96f805..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/DAO/eIDASPersonalIdStoreDAO.java
+++ /dev/null
@@ -1,146 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.DAO;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import at.gv.egiz.eaaf.core.impl.data.Pair;
-
-@Deprecated
-public class eIDASPersonalIdStoreDAO {					
-	public static final String NAME = "foreigneIDMap";
-	
-	//Enum with all cols of this table
-	public enum COLS {
-		timestamp, transactionId, eidasId, eidasSourceCountry, eidasDestinationCountry, ernbId		
-	}
-	
-	public enum T {
-		ID("INTEGER"),
-		BIGINT("VARCHAR(265)"),
-		URI("VARCHAR(256)"),
-		DATE("Long"),
-		TEXT("TEXT"),
-		Long("BIGINT"),
-		Int("INTEGER"),
-		BLOB("BLOB"),
-		CC("CHAR(2)"),
-		BOOL("INTEGER");
-
-		public String s_;
-
-		private T(String s) {
-			s_ = s;
-		}
-
-		@Override
-		public String toString() {
-			return s_;
-		}
-	}
-	
-	//define Cols of the table
-	public static final List<Pair<String, T>> TABLE_COLS;
-	static {
-		List<Pair<String, T>> cols = new ArrayList<Pair<String, T>>();
-		cols.add(Pair.newInstance(COLS.timestamp.name(),				T.DATE));
-		cols.add(Pair.newInstance(COLS.transactionId.name(),			T.TEXT));
-		cols.add(Pair.newInstance(COLS.eidasId.name(),					T.TEXT));			
-		cols.add(Pair.newInstance(COLS.eidasSourceCountry.name(),		T.CC));
-		cols.add(Pair.newInstance(COLS.eidasDestinationCountry.name(),	T.CC));
-		cols.add(Pair.newInstance(COLS.ernbId.name(),					T.TEXT));
-					
-		TABLE_COLS = Collections.unmodifiableList(cols);
-		
-	}
-	
-	public static final String CREATE = "CREATE TABLE " + NAME
-		    + " (" + "id" + " " + T.ID.toString()
-		    + " PRIMARY KEY AUTOINCREMENT, " + buildCreateTableQuery(TABLE_COLS) + ")";
-	
-	public static final String INSERT = "INSERT INTO " + NAME 
-			+ "(" + buildInsertQueryKeys(TABLE_COLS) + ")"
-			+ " VALUES (" + buildInsertQueryValues(TABLE_COLS) + ");";
-
-	public static final String SELECT_BY_ERNB_ID = "SELECT * FROM " + NAME
-			+ " WHERE " + COLS.ernbId.name() + "=?;";
-	
-	public static final String SELECT_BY_EIDAS_RAW_ID = "SELECT * FROM " + NAME
-			+ " WHERE " + COLS.eidasId.name() + "=?"
-			+ " and " + COLS.eidasSourceCountry.name() + "=?" + ";";
-	
-	
-	/**
-	 * Build a part of a SQL query, which contains the cols of a table that should be created
-	 * 
-	 * @param cols List of DB col definitions {@link Pair}
-	 * @return Part of a SQL query, which contains cols that should be created
-	 */
-	private static String buildCreateTableQuery(List<Pair<String, T>> cols) {
-		String sql = "";
-		
-		for (Pair<String, T> el : cols) {
-			sql += el.getFirst() + " " + el.getSecond().toString() + ",";
-			
-		}
-		
-		return sql.substring(0, sql.length()-1);
-	}
-	
-	/**
-	 * Build a part of a SQL query, which contains the cols keys of a table for insert operation
-	 * 
-	 * @param cols List of DB col definitions {@link Pair}
-	 * @return Part of a SQL query, which contains cols that should be created
-	 */
-	protected static String buildInsertQueryKeys(List<Pair<String, T>> cols) {
-		String sql = "";
-		
-		for (Pair<String, T> el : cols) {
-			sql += el.getFirst() + ",";
-			
-		}
-		
-		return sql.substring(0, sql.length()-1);
-	}
-	
-	/**
-	 * Build a part of a SQL query, which contains the cols values of a table for insert operation
-	 * 
-	 * @param cols List of DB col definitions {@link Pair}
-	 * @return Part of a SQL query, which contains cols that should be created
-	 */
-	protected static String buildInsertQueryValues(List<Pair<String, T>> cols) {
-		String sql = "";
-		
-		for (Pair<String, T> el : cols) {
-			sql += "?,";
-			
-		}
-		
-		return sql.substring(0, sql.length()-1);
-	}
-	
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASAuthenticationModulImpl.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASAuthenticationModulImpl.java
deleted file mode 100644
index 43222931..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASAuthenticationModulImpl.java
+++ /dev/null
@@ -1,76 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2;
-
-import org.apache.commons.lang3.StringUtils;
-
-import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
-import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.api.idp.auth.modules.AuthModule;
-import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-
-/**
- * @author tlenz
- *
- */
-public class eIDASAuthenticationModulImpl implements AuthModule {
-
-	private int priority = 1;
-
-	@Override
-	public int getPriority() { 
-		return priority;
-	} 
-
-	/**
-	 * Sets the priority of this module. Default value is {@code 0}.
-	 * @param priority The priority.
-	 */
-	public void setPriority(int priority) {
-		this.priority = priority;
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.modules.AuthModule#selectProcess(at.gv.egovernment.moa.id.process.api.ExecutionContext)
-	 */
-	@Override
-	public String selectProcess(ExecutionContext context, IRequest pendingReq) {
-		if (StringUtils.isNotBlank((String) context.get(MSeIDASNodeConstants.REQ_PARAM_SELECTED_COUNTRY)) || 
-				StringUtils.isNotBlank((String) context.get(MSeIDASNodeConstants.REQ_PARAM_SELECTED_COUNTRY)))
-			return "eIDASAuthentication_v2";
-		else
-			return null;
-		
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.auth.modules.AuthModule#getProcessDefinitions()
-	 */
-	@Override
-	public String[] getProcessDefinitions() {
-		return new String[] { "classpath:eIDAS.Authentication.process.xml" };
-	}
-
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASSignalServlet.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASSignalServlet.java
deleted file mode 100644
index 0f4a3710..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/eIDASSignalServlet.java
+++ /dev/null
@@ -1,154 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2;
-
-import java.io.IOException;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-
-import com.google.common.collect.ImmutableSortedSet;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASAttributeRegistry;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-import at.gv.egiz.eaaf.core.impl.idp.controller.AbstractProcessEngineSignalController;
-import eu.eidas.auth.commons.EidasParameterKeys;
-import eu.eidas.auth.commons.light.ILightResponse;
-import eu.eidas.specificcommunication.SpecificCommunicationDefinitionBeanNames;
-import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
-import eu.eidas.specificcommunication.protocol.impl.SpecificConnectorCommunicationServiceImpl;
-
-
-/**
- * @author tlenz
- *
- */
-@Controller
-public class eIDASSignalServlet extends AbstractProcessEngineSignalController {
-	
-	private static final Logger log = LoggerFactory.getLogger(eIDASSignalServlet.class);
-	@Autowired private ApplicationContext context;
-	@Autowired private eIDASAttributeRegistry attrRegistry;
-	
-	public eIDASSignalServlet() { 
-		super();
-		log.debug("Registering servlet " + getClass().getName() + 
-				" with mappings '"+ Constants.eIDAS_HTTP_ENDPOINT_SP_POST + 
-				"' and '"+ Constants.eIDAS_HTTP_ENDPOINT_SP_REDIRECT + "'.");
-		
-	}
-	
-	@RequestMapping(value = { Constants.eIDAS_HTTP_ENDPOINT_SP_POST, 
-							  Constants.eIDAS_HTTP_ENDPOINT_SP_REDIRECT
-							}, 
-					method = {RequestMethod.POST, RequestMethod.GET})
-	public void restoreEidasAuthProcess(HttpServletRequest req, HttpServletResponse resp) throws IOException, EaafException {
-		signalProcessManagement(req, resp);
-	}
-	
-	
-	/**
-	 * Protocol specific implementation to get the pending-requestID 
-	 * from http request object
-	 * 
-	 * @param request The http Servlet-Request object
-	 * @return The Pending-request id 
-	 * 
-	 */
-	@Override
-	public String getPendingRequestId(HttpServletRequest request) {
-		//String sessionId = super.getPendingRequestId(request);
-		
-		try {
-			//get token from Request
-			final String tokenBase64 = request.getParameter(EidasParameterKeys.TOKEN.toString());			
-			if (StringUtils.isEmpty(tokenBase64)) {
-				log.warn("NO eIDAS message token found.");
-				throw new eIDASAuthenticationException("eidas.04", null);
-				
-			}
-			log.trace("Receive eIDAS-node token: " + tokenBase64 + " Starting transaction-restore process ... ");
-			
-			
-			
-			final SpecificConnectorCommunicationServiceImpl specificConnectorCommunicationService =
-	                (SpecificConnectorCommunicationServiceImpl) context.getBean(SpecificCommunicationDefinitionBeanNames.SPECIFIC_CONNECTOR_COMMUNICATION_SERVICE.toString());
-			ILightResponse eIDASResponse = specificConnectorCommunicationService.getAndRemoveResponse(tokenBase64, 
-    			ImmutableSortedSet.copyOf(attrRegistry.getCoreAttributeRegistry().getAttributes()));
-				
-			String pendingReqId = null;
-			if (StringUtils.isEmpty(eIDASResponse.getRelayState())) {
-				log.debug("eIDAS Node returns no RelayState. ");
-				
-				if (authConfig.getBasicConfigurationBoolean(
-						Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_USEREQUESTIDASTRANSACTIONIDENTIFIER, 
-						false)) {
-					log.trace("Use lightRequestId to recover session ... ");
-					pendingReqId = transactionStorage.get(eIDASResponse.getInResponseToId(), String.class);
-					if (StringUtils.isNotEmpty(pendingReqId)) {
-						log.debug("Restoring session with lightRequestId ... ");
-						transactionStorage.remove(eIDASResponse.getInResponseToId());
-						
-					}		
-				} 
-											
-			} else {			
-				log.debug("Find transaction identifier in SAML2 'RelayState': " + eIDASResponse.getRelayState());
-				pendingReqId = eIDASResponse.getRelayState();
-				 				
-			}
-
-			if (StringUtils.isNotEmpty(pendingReqId)) {
-				request.setAttribute(Constants.DATA_FULL_EIDAS_RESPONSE, eIDASResponse);
-				return pendingReqId;
-				
-			}
-
-			log.info("NO transaction identifier found! Stopping process ....");
-			log.trace("FullResponse: " + eIDASResponse.toString());
-			
-		} catch (SpecificCommunicationException e) {
-			log.warn("Can NOT load eIDAS Response from cache.", e);
-			log.debug("eIDAS response token was: " + request.getParameter(EidasParameterKeys.TOKEN.toString()));
-			
-		} catch (Exception e) {
-			log.warn("Unable to retrieve moa session id.", e);
-			
-		}
-
-		return null;
-	}
-	
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/AbstracteIDProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/AbstracteIDProcessor.java
deleted file mode 100644
index 01f7c1fa..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/AbstracteIDProcessor.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler;
-
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-import com.google.common.collect.ImmutableSortedSet;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.DAO.ERnBeIDData;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAttributeException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASAttributeRegistry;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
-import at.gv.e_government.reference.namespace.persondata._20020228.PostalAddressType;
-import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
-import at.gv.egiz.eaaf.core.impl.data.Trible;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import eu.eidas.auth.commons.attribute.AttributeDefinition;
-import eu.eidas.auth.commons.attribute.ImmutableAttributeMap;
-import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
-import eu.eidas.auth.commons.protocol.eidas.SpType;
-import eu.eidas.auth.commons.protocol.eidas.impl.PostalAddress;
-
-public abstract class AbstracteIDProcessor implements INationaleIDProcessor {
-	private static final Logger log = LoggerFactory.getLogger(AbstracteIDProcessor.class);
-	
-	@Autowired protected eIDASAttributeRegistry attrRegistry;
-	@Autowired protected IConfigurationWithSP basicConfig;
-	
-	@Override
-	public final void preProcess(IRequest pendingReq, Builder authnRequestBuilder) {
-		
-		buildProviderNameAttribute(pendingReq, authnRequestBuilder);	
-		buildRequestedAttributes(pendingReq, authnRequestBuilder);
-		
-		
-	}
-		
-	@Override
-	public final ERnBeIDData postProcess(Map<String, Object> eIDASAttrMap) throws eIDPostProcessingException, eIDASAttributeException{
-		ERnBeIDData result = new ERnBeIDData();
-		
-		Object eIdentifierObj = eIDASAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);		 
-		Trible<String, String, String> eIdentifier = 
-					eIDASResponseUtils.parseEidasPersonalIdentifier((String)eIdentifierObj);
-		result.setCitizenCountryCode(eIdentifier.getFirst());
-		
-		//MDS attributes
-		result.setPseudonym(processPseudonym(eIDASAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER)));
-		result.setFamilyName(processFamilyName(eIDASAttrMap.get(Constants.eIDAS_ATTR_CURRENTFAMILYNAME)));
-		result.setGivenName(processGivenName(eIDASAttrMap.get(Constants.eIDAS_ATTR_CURRENTGIVENNAME)));
-		result.setDateOfBirth(processDateOfBirth(eIDASAttrMap.get(Constants.eIDAS_ATTR_DATEOFBIRTH)));
-		
-		//additional attributes
-		result.setPlaceOfBirth(processPlaceOfBirth(eIDASAttrMap.get(Constants.eIDAS_ATTR_PLACEOFBIRTH)));
-		result.setBirthName(processBirthName(eIDASAttrMap.get(Constants.eIDAS_ATTR_BIRTHNAME)));
-		result.setAddress(processAddress(eIDASAttrMap.get(Constants.eIDAS_ATTR_CURRENTADDRESS)));
-				
-		return result;
-		
-	}
-
-	@NonNull
-	/**
-	 * Get a Map of country-specific requested attributes
-	 * 
-	 * @return
-	 */
-	protected abstract Map<String, Boolean> getCountrySpecificRequestedAttributes();
-	
-	/**
-	 * Post-Process the eIDAS CurrentAddress attribute
-	 * 
-	 * @param currentAddressObj
-	 * @return current address or null if no attribute is available 
-	 * @throws eIDPostProcessingException if post-processing fails
-	 * @throws eIDASAttributeException if eIDAS attribute is of a wrong type
-	 */
-	protected PostalAddressType processAddress(Object currentAddressObj) throws eIDPostProcessingException, eIDASAttributeException {
-		
-		if (currentAddressObj != null) { 
-			if ((currentAddressObj instanceof PostalAddress)) {
-				PostalAddressType result = new PostalAddressType();				
-				result.setPostalCode(((PostalAddress)currentAddressObj).getPostCode());				
-				result.setMunicipality(((PostalAddress)currentAddressObj).getPostName());
-				
-				//TODO: add more mappings
-				
-			} else {
-				log.warn("eIDAS attr: " +  Constants.eIDAS_ATTR_CURRENTADDRESS + " is of WRONG type");
-				throw new eIDASAttributeException(Constants.eIDAS_ATTR_CURRENTADDRESS);	
-				
-			}
-						
-		} else
-			log.debug("NO '" + Constants.eIDAS_ATTR_CURRENTADDRESS + "' attribute. Post-Processing skipped ... ");
-			
-		return null;
-		
-	}
-
-	/**
-	 * Post-Process the eIDAS BirthName attribute
-	 * 
-	 * @param birthNameObj
-	 * @return birthName or null if no attribute is available 
-	 * @throws eIDPostProcessingException if post-processing fails
-	 * @throws eIDASAttributeException if eIDAS attribute is of a wrong type
-	 */
-	protected String processBirthName(Object birthNameObj) throws eIDPostProcessingException, eIDASAttributeException {
-		if (birthNameObj != null) { 
-			if ((birthNameObj instanceof String)) {
-				return (String)birthNameObj;
-				
-			} else {
-				log.warn("eIDAS attr: " +  Constants.eIDAS_ATTR_BIRTHNAME + " is of WRONG type");
-				throw new eIDASAttributeException(Constants.eIDAS_ATTR_BIRTHNAME);	
-				
-			}
-				
-		} else
-			log.debug("NO '" + Constants.eIDAS_ATTR_BIRTHNAME + "' attribute. Post-Processing skipped ... ");
-			
-        			
-		return null;
-		
-	}
-
-	/**
-	 * Post-Process the eIDAS PlaceOfBirth attribute
-	 * 
-	 * @param placeOfBirthObj
-	 * @return place of Birth or null if no attribute is available 
-	 * @throws eIDPostProcessingException if post-processing fails
-	 * @throws eIDASAttributeException if eIDAS attribute is of a wrong type
-	 */
-	protected String processPlaceOfBirth(Object placeOfBirthObj) throws eIDPostProcessingException, eIDASAttributeException {
-		if (placeOfBirthObj != null) { 
-			if ((placeOfBirthObj instanceof String)) {
-				return (String)placeOfBirthObj;
-				
-			} else {
-				log.warn("eIDAS attr: " +  Constants.eIDAS_ATTR_PLACEOFBIRTH + " is of WRONG type");
-				throw new eIDASAttributeException(Constants.eIDAS_ATTR_PLACEOFBIRTH);	
-				
-			}
-				
-		} else
-			log.debug("NO '" + Constants.eIDAS_ATTR_PLACEOFBIRTH + "' attribute. Post-Processing skipped ... ");
-			
-        			
-		return null;
-		
-	}
-
-	/**
-	 * Post-Process the eIDAS DateOfBirth attribute
-	 * 
-	 * @param dateOfBirthObj
-	 * @return
-	 * @throws eIDASAttributeException if NO attribute is available
-	 * @throws eIDPostProcessingException if post-processing fails 
-	 */
-	protected DateTime processDateOfBirth(Object dateOfBirthObj) throws eIDPostProcessingException, eIDASAttributeException {
-		if (dateOfBirthObj == null || !(dateOfBirthObj instanceof DateTime))
-        	throw new eIDASAttributeException(Constants.eIDAS_ATTR_DATEOFBIRTH);
-		
-		return (DateTime)dateOfBirthObj;
-		
-	}
-
-	/**
-	 * Post-Process the eIDAS GivenName attribute
-	 * 
-	 * @param givenNameObj
-	 * @return
-	 * @throws eIDASAttributeException if NO attribute is available
-	 * @throws eIDPostProcessingException if post-processing fails
-	 */
-	protected String processGivenName(Object givenNameObj) throws eIDPostProcessingException, eIDASAttributeException {
-		if (givenNameObj == null || !(givenNameObj instanceof String))
-        	throw new eIDASAttributeException(Constants.eIDAS_ATTR_CURRENTGIVENNAME);
-		
-		return (String)givenNameObj;
-		
-	}
-
-	/**
-	 * Post-Process the eIDAS FamilyName attribute
-	 * 
-	 * @param familyNameObj
-	 * @return
-	 * @throws eIDASAttributeException if NO attribute is available
-	 * @throws eIDPostProcessingException if post-processing fails
-	 */
-	protected String processFamilyName(Object familyNameObj) throws eIDPostProcessingException, eIDASAttributeException {
-		if (familyNameObj == null || !(familyNameObj instanceof String))
-        	throw new eIDASAttributeException(Constants.eIDAS_ATTR_CURRENTFAMILYNAME);
-				
-		return (String) familyNameObj;
-		
-	}
-
-	/**
-	 * Post-Process the eIDAS pseudonym to ERnB unique identifier
-	 * 
-	 * @param eIdentifierObj eIDAS PersonalIdentifierAttribute
-	 * @return
-	 * @throws eIDPostProcessingException
-	 * @throws eIDASAttributeException if NO attribute is available
-	 * @throws eIDPostProcessingException if post-processing fails
-	 */
-	protected String processPseudonym(Object eIdentifierObj) throws eIDPostProcessingException, eIDASAttributeException {
-		if (eIdentifierObj == null || !(eIdentifierObj instanceof String))
-	        	throw new eIDASAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
-		 
-		Trible<String, String, String> eIdentifier = 
-					eIDASResponseUtils.parseEidasPersonalIdentifier((String)eIdentifierObj);
-				
-		return eIdentifier.getThird();
-		
-	}
-	
-	private void buildRequestedAttributes(IRequest pendingReq, Builder authnRequestBuilder) {
-		//build and add requested attribute set		
-		Map<String, Boolean> ccSpecificReqAttr = getCountrySpecificRequestedAttributes();
-		log.debug("Get #{} country-specific requested attributes", ccSpecificReqAttr.size());
-		
-		Map<String, Boolean> mdsReqAttr = attrRegistry.getDefaultAttributeSetFromConfiguration();
-		log.trace("Get #{} default requested attributes", mdsReqAttr.size());
- 
-		//put it together
-		ccSpecificReqAttr.putAll(mdsReqAttr);
-		
-		//convert it to eIDAS attributes
-		ImmutableAttributeMap reqAttrMap = translateToEidasAttributes(ccSpecificReqAttr);						
-		authnRequestBuilder.requestedAttributes(reqAttrMap);
-		
-	}
-	
-	private ImmutableAttributeMap translateToEidasAttributes(final Map<String, Boolean> requiredAttributes) {
-        ImmutableAttributeMap.Builder builder = ImmutableAttributeMap.builder();
-        for (Map.Entry<String,Boolean> attribute : requiredAttributes.entrySet()) {
-            final String name = attribute.getKey();
-            final ImmutableSortedSet<AttributeDefinition<?>> byFriendlyName = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(name);            
-            if (!byFriendlyName.isEmpty()) {
-                final AttributeDefinition<?> attributeDefinition = byFriendlyName.first();
-                builder.put(AttributeDefinition.builder(attributeDefinition).required(attribute.getValue()).build());
-                                
-            } else
-            	log.warn("Can NOT request UNKNOWN attribute: " + attribute.getKey() + " Ignore it!");
-            	
-        }
-
-        return builder.build();
-        
-    }
-	
-	private void buildProviderNameAttribute(IRequest pendingReq, Builder authnRequestBuilder) {
-		ISpConfiguration spConfig = pendingReq.getServiceProviderConfiguration();
-		
-		//set correct SPType for requested target sector				
-		String publicSectorTargetSelector = basicConfig.getBasicConfiguration(
-				Constants.CONIG_PROPS_EIDAS_NODE_PUBLICSECTOR_TARGETS, 
-				Constants.POLICY_DEFAULT_ALLOWED_TARGETS);		
-		Pattern p = Pattern.compile(publicSectorTargetSelector);
-		Matcher m = p.matcher(spConfig.getAreaSpecificTargetIdentifier());
-		if (m.matches()) {
-			log.debug("Map " + spConfig.getAreaSpecificTargetIdentifier() + " to 'PublicSector'");
-			authnRequestBuilder.spType(SpType.PUBLIC.getValue());
-
-			if ( basicConfig.getBasicConfigurationBoolean(
-					Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_USE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP, 
-					false) ) {
-				authnRequestBuilder.providerName(basicConfig.getBasicConfiguration(
-						Constants.CONIG_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP, 
-						Constants.DEFAULT_PROPS_EIDAS_NODE_STATIC_PROVIDERNAME_FOR_PUBLIC_SP));
-				
-			} else {				
-				//TODO: only for eIDAS ref. node 2.0 and 2.1 because it need 'Providername' for any SPType				 
-				String providerName = pendingReq.getRawData(Constants.DATA_PROVIDERNAME, String.class);
-				if ( StringUtils.isNotEmpty(providerName) 
-						&& basicConfig.getBasicConfigurationBoolean(
-								Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_ADD_ALWAYS_PROVIDERNAME, 
-								false)
-					) {
-					authnRequestBuilder.providerName(providerName);
-				
-				}
-			}
-			
-		} else {
-			log.debug("Map " + spConfig.getAreaSpecificTargetIdentifier() + " to 'PrivateSector'");
-			authnRequestBuilder.spType(SpType.PRIVATE.getValue());
-		
-			//TODO: switch to RequesterId in further version
-			//set provider name for private sector applications
-			String providerName = pendingReq.getRawData(Constants.DATA_PROVIDERNAME, String.class);
-			if (StringUtils.isNotEmpty(providerName))
-				authnRequestBuilder.providerName(providerName);
-		
-		}
-		
-	}
-	
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/DEeIDProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/DEeIDProcessor.java
deleted file mode 100644
index a3880b3f..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/DEeIDProcessor.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler;
-
-import java.util.Base64;
-import java.util.Map;
-
-import org.apache.commons.codec.DecoderException;
-import org.apache.commons.codec.binary.Hex;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAttributeException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
-import at.gv.egiz.eaaf.core.impl.data.Trible;
-
-public class DEeIDProcessor extends AbstracteIDProcessor {
-	private static final Logger log = LoggerFactory.getLogger(DEeIDProcessor.class);	
-	private static final String canHandleCC = "DE";
-	
-	private int priority = 1;
-	
-	@Override
-	public int getPriority() {
-		return priority;
-	}
-
-	@Override
-	public boolean canHandle(String countryCode) {		
-		return countryCode != null && countryCode.equalsIgnoreCase(canHandleCC);
-		
-	}
-
-	
-	public void setPriority(int priority) {
-		this.priority = priority;
-	}
-
-	@Override
-	public String getName() {
-		return "DE-PostProcessor";
-		
-	}
-	
-	@Override
-	protected String processPseudonym(Object eIdentifierObj) throws eIDPostProcessingException, eIDASAttributeException {
-		if (eIdentifierObj == null || !(eIdentifierObj instanceof String))
-	        	throw new eIDASAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
-		 
-		Trible<String, String, String> eIdentifier = 
-					eIDASResponseUtils.parseEidasPersonalIdentifier((String)eIdentifierObj);
-				
-		log.trace(getName() + " starts processing of attribute: " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
-		String result = convertDEIdentifier(eIdentifier.getThird());
-		log.debug(getName() + " finished processing of attribute: " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
-		
-		return result; 
-		
-		
-	}
-	
-	private String convertDEIdentifier(String hexEncodedDEIdentifier) throws eIDPostProcessingException
-	{
-		if(hexEncodedDEIdentifier.length() != 64)
-			throw new eIDPostProcessingException("ernb.03", new Object[] {"Input has wrong length, expected 64 chars"});
-
-		byte[] data;
-		try {			
-			data = Hex.decodeHex(hexEncodedDEIdentifier);
-			
-		} catch (DecoderException e) {
-			throw new eIDPostProcessingException("ernb.03", null, e);
-			
-		}
-		
-		byte[] encoded = Base64.getEncoder().encode(data);
-		return new String(encoded);
-	}
-
-	@Override
-	protected Map<String, Boolean> getCountrySpecificRequestedAttributes() {
-		return attrRegistry.getAttributeSetFromConfiguration(canHandleCC);
-		
-	}
-
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/GenericeIDProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/GenericeIDProcessor.java
deleted file mode 100644
index 110635d9..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/GenericeIDProcessor.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler;
-
-import java.util.HashMap;
-import java.util.Map;
-
-public class GenericeIDProcessor extends AbstracteIDProcessor {
-
-	private int priority = 0;
-	
-	@Override
-	public int getPriority() {
-		return priority;
-		
-	}
-
-	@Override
-	public boolean canHandle(String countryCode) {
-		return true;
-		
-	}
-	
-	public void setPriority(int priority) {
-		this.priority = priority;
-	}
-
-	@Override
-	public String getName() {
-		return "Default-PostProcessor";
-		
-	}
-
-	@Override
-	protected Map<String, Boolean> getCountrySpecificRequestedAttributes() {
-		return new HashMap<>();
-		
-	}	
-	
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/INationaleIDProcessor.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/INationaleIDProcessor.java
deleted file mode 100644
index 46cfcb2b..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/handler/INationaleIDProcessor.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler;
-
-import java.util.Map;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.DAO.ERnBeIDData;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAttributeException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
-import at.gv.egiz.eaaf.core.api.IRequest;
-import eu.eidas.auth.commons.light.ILightRequest;
-import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
-
-public interface INationaleIDProcessor {
-
-	/**
-	 * Get a friendlyName of this post-processor implementation
-	 * 
-	 * @return
-	 */
-	public String getName();
-	
-	/**
-	 * Get the priority of this eID Post-Processor
-	 * <br>
-	 * If more than one Post-Processor implementations can handle the eID data, the post-processor with the highest priority are selected.
-	 * The Default-Processor has priority '0'
-	 * 
-	 * @return Priority of this handler
-	 */
-	public int getPriority();
-
-	/**
-	 * Check if this postProcessor is sensitive for a specific country 
-	 * 
-	 * @param countryCode of the eID data that should be processed 
-	 * @return true if this implementation can handle the country, otherwise false
-	 * 
-	 */
-	public boolean canHandle(String countryCode);
-	
-	
-	
-	
-	/**
-	 * Post-Process eIDAS eID data into national format 
-	 * @param eIDASAttrMap Map of eIDAS attributes in format friendlyName and attribute
-	 * @throws eIDPostProcessingException 
-	 * @throws eIDASAttributeException 
-	 * 
-	 */
-	public ERnBeIDData postProcess(Map<String, Object> eIDASAttrMap) throws eIDPostProcessingException, eIDASAttributeException;
-
-	/**
-	 * Pre-Process eIDAS Request to national requirements
-	 * 
-	 * @param pendingReq current pending request
-	 * @param authnRequestBuilder eIDAS {@link ILightRequest} builder
-	 */
-	public void preProcess(IRequest pendingReq, Builder authnRequestBuilder); 
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/CCSpecificEIDProcessingService.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/CCSpecificEIDProcessingService.java
deleted file mode 100644
index 602982d6..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/CCSpecificEIDProcessingService.java
+++ /dev/null
@@ -1,131 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-
-import javax.annotation.PostConstruct;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Service;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.DAO.ERnBeIDData;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAttributeException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler.INationaleIDProcessor;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
-import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.impl.data.Trible;
-import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
-
-@Service
-public class CCSpecificEIDProcessingService implements ICCSpecificEIDProcessingService{
-	private static final Logger log = LoggerFactory.getLogger(CCSpecificEIDProcessingService.class);
-	
-	@Autowired private ApplicationContext context;
-	
-	private List<INationaleIDProcessor> handlers = new ArrayList<INationaleIDProcessor>();
-		
-	@PostConstruct
-	private void initialize()  {
-		log.debug("Initialize eID PostProcessing-Service ... ");		
-		Map<String, INationaleIDProcessor> postProcessors = context.getBeansOfType(INationaleIDProcessor.class);
-		Iterator<Entry<String, INationaleIDProcessor>> iterator = postProcessors.entrySet().iterator();
-		while (iterator.hasNext()) {
-			Entry<String, INationaleIDProcessor> el = iterator.next();
-			log.debug("Find eID-PostProcessor with name: " + el.getKey());
-			handlers.add(el.getValue());
-			
-		}	
-		
-		log.trace("Sorting eID-PostProcessors on priority ... ");
-		Collections.sort(handlers, new Comparator<INationaleIDProcessor>() {
-			@Override
-			public int compare(INationaleIDProcessor thisAuthModule, INationaleIDProcessor otherAuthModule) {
-				int thisOrder = thisAuthModule.getPriority();
-				int otherOrder = otherAuthModule.getPriority();
-				return (thisOrder < otherOrder ? 1 : (thisOrder == otherOrder ? 0 : -1));
-			}
-		});
-		
-		log.info("# " + handlers.size() + " eID PostProcessing services are registrated");
-		
-	}
-	
-	@Override
-	public void preProcess(String selectedCitizenCountry, IRequest pendingReq, Builder authnRequestBuilder) throws eIDPostProcessingException {
-		if (StringUtils.isEmpty(selectedCitizenCountry))
-			log.info("No CountryCode for eID Pre-Processor. Default Pre-Processor will be used");
-
-		for (INationaleIDProcessor el : handlers) {
-			if (el.canHandle(selectedCitizenCountry)) {
-				log.debug("Pre-Process eIDAS request for " + selectedCitizenCountry + " by using:  " + el.getName());
-				el.preProcess(pendingReq, authnRequestBuilder);
-				return;
-				
-			}			
-		}
-		
-		log.error("NO eID PostProcessor FOUND. Looks like a depentency problem!");
-		throw new eIDPostProcessingException("internal.00", null);
-				
-	}
-	
-	@Override
-	public ERnBeIDData postProcess(Map<String, Object> eIDASAttrMap) throws eIDPostProcessingException, eIDASAttributeException {
-		//extract citizen country from eIDAS unique identifier
-		Object eIdentifierObj = eIDASAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
-		if (eIdentifierObj == null || !(eIdentifierObj instanceof String))
-	        	throw new eIDASAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
-		 
-		Trible<String, String, String> eIdentifier = 
-					eIDASResponseUtils.parseEidasPersonalIdentifier((String)eIdentifierObj);
-		String citizenCountry = eIdentifier.getFirst();
-		 		
-		if (StringUtils.isEmpty(citizenCountry))
-			log.info("No CountryCode for eID PostProcessor. Default-PostProcessor will be used");
-
-		for (INationaleIDProcessor el : handlers) {
-			if (el.canHandle(citizenCountry)) {
-				log.debug("Post-Process eIDAS eID from " + citizenCountry + " by using:  " + el.getName());
-				return el.postProcess(eIDASAttrMap);
-				
-			}			
-		}
-		
-		log.error("NO eID PostProcessor FOUND. Looks like a depentency problem!");
-		throw new eIDPostProcessingException("internal.00", null);			
-	}
-	
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/ICCSpecificEIDProcessingService.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/ICCSpecificEIDProcessingService.java
deleted file mode 100644
index 02802126..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/ICCSpecificEIDProcessingService.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service;
-
-import java.util.Map;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.DAO.ERnBeIDData;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAttributeException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDPostProcessingException;
-import at.gv.egiz.eaaf.core.api.IRequest;
-import eu.eidas.auth.commons.light.ILightRequest;
-import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
-
-public interface ICCSpecificEIDProcessingService {
-
-	/**
-	 * Post-process eIDAS eID attributes into national format
-	 * 
-	 * @param eIDASAttrMap Map of eIDAS attributes in format friendlyName and attribute
-	 *  
-	 * @return eID attributes for SZR request
-	 * @throws eIDPostProcessingException
-	 * @throws eIDASAttributeException 
-	 */
-	public ERnBeIDData postProcess(Map<String, Object> eIDASAttrMap) throws eIDPostProcessingException, eIDASAttributeException;
-
-	/**
-	 * Pre Process eIDAS request into national requirements
-	 * 
-	 * @param selectedCC Citizen Country from selection
-	 * @param pendingReq current pending request
-	 * @param authnRequestBuilder eIDAS {@link ILightRequest} builder
-	 * @throws eIDPostProcessingException 
-	 */
-	public void preProcess(String selectedCC, IRequest pendingReq, Builder authnRequestBuilder) throws eIDPostProcessingException;
-	
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java
deleted file mode 100644
index a093800e..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/eIDASAttributeRegistry.java
+++ /dev/null
@@ -1,164 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service;
-
-import java.io.File;
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
-import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
-import edu.umd.cs.findbugs.annotations.NonNull;
-import eu.eidas.auth.commons.attribute.AttributeRegistries;
-import eu.eidas.auth.commons.attribute.AttributeRegistry;
-
-@Service("attributeRegistry")
-public class eIDASAttributeRegistry {
-	private static final Logger log = LoggerFactory.getLogger(eIDASAttributeRegistry.class);	
-	@Autowired private IConfigurationWithSP basicConfig;
-	
-	private AttributeRegistry coreAttributeRegistry;
-	 
-	private String eidasAttributesFile;
-	private String additionalAttributesFile;
-	
-	@PostConstruct
-	private void initialize() throws RuntimeException {
-		try {
-			if (eidasAttributesFile.isEmpty()) {
-				log.error("Basic eIDAS addribute definition NOT defined");
-				throw new EaafConfigurationException("config.30", 
-						new Object[] {"eidas-attributes.xml"});
-			
-			}
-        
-			boolean additionalAttrAvailabe = false;
-			if (!additionalAttributesFile.isEmpty()) {
-				File file = new File(additionalAttributesFile);
-				if (file.exists())
-					additionalAttrAvailabe = true;
-								
-			}
-			
-			if (!additionalAttrAvailabe) {
-				log.info("Start eIDAS ref. impl. Core without additional eIDAS attribute definitions ... ");
-				coreAttributeRegistry = AttributeRegistries.fromFiles(eidasAttributesFile, null);
-				
-			} else {
-				//load attribute definitions
-				log.info("Start eIDAS ref. impl. Core with additional eIDAS attribute definitions ... ");
-				coreAttributeRegistry = AttributeRegistries.fromFiles(eidasAttributesFile, null, additionalAttributesFile);
-
-			}
-						
-        } catch (Throwable e) {
-			log.error("Can NOT initialize eIDAS attribute definition." , e);
-			new RuntimeException("Can NOT initialize eIDAS attribute definition.", e);
-			
-		}        	
-	}
-	
-	
-    public AttributeRegistry getCoreAttributeRegistry() {
-        return coreAttributeRegistry;
-    }
-
-    @NonNull
-	public Map<String, Boolean> getDefaultAttributeSetFromConfiguration() {		
-		/*TODO: select set for representation if mandates should be used.
-		 * It's an open task in respect to requested eIDAS attributes and isRequired flag,
-		 * because there can be a decision problem in case of natural or legal person representation!
-		 * From an Austrian use-case point of view, an Austrian service provider can support mandates for 
-		 * natural and legal persons at the same time. However, we CAN NOT request attributes for natural AND
-		 * legal persons on the same time, because it's not possible to represent both simultaneously.
-		 */
-		Map<String, String> configAttributes = 
-				basicConfig.getBasicConfigurationWithPrefix(
-						Constants.CONIG_PROPS_EIDAS_NODE_ATTRIBUTES_REQUESTED_DEFAULT_ONLYNATURAL);
-		return processAttributeInfosFromConfig(configAttributes);
-		
-	}
-
-	@NonNull
-	public Map<String, Boolean> getAttributeSetFromConfiguration(String countryCode) {
-		
-		
-		/*TODO: select set for representation if mandates should be used.
-		 * It's an open task in respect to requested eIDAS attributes and isRequired flag,
-		 * because there can be a decision problem in case of natural or legal person representation!
-		 * From an Austrian use-case point of view, an Austrian service provider can support mandates for 
-		 * natural and legal persons at the same time. However, we CAN NOT request attributes for natural AND
-		 * legal persons on the same time, because it's not possible to represent both simultaneously.
-		 */
-		Map<String, String> configAttributes = 
-				basicConfig.getBasicConfigurationWithPrefix(
-						MessageFormat.format(
-								Constants.CONIG_PROPS_EIDAS_NODE_ATTRIBUTES_REQUESTED_CC_SPECIFIC_ONLYNATURAL, 
-								countryCode.toLowerCase()));
-		return processAttributeInfosFromConfig(configAttributes);
-		
-	}
-	
-	private Map<String, Boolean> processAttributeInfosFromConfig(Map<String, String> configAttributes) {
-		
-		Map<String, Boolean> result = new HashMap<String, Boolean>();
-		for (String el: configAttributes.values()) {
-			if (StringUtils.isNotEmpty(el.trim())) {
-				List<String> attrDef = KeyValueUtils.getListOfCsvValues(el.trim());
-				boolean isRequired = false;
-				if (attrDef.size() == 2)
-					isRequired = Boolean.parseBoolean(attrDef.get(1));
-				
-				result.put(attrDef.get(0), isRequired);
-				
-			}			
-		}
-		
-		log.trace("Load #" + result.size() + " requested attributes from configuration");
-		return result;
-		
-	}
-	
-	public void setEidasAttributesFile(String eidasAttributesFile) {
-		this.eidasAttributesFile = eidasAttributesFile;
-	}
-
-	public void setAdditionalAttributesFile(String additionalAttributesFile) {
-		this.additionalAttributesFile = additionalAttributesFile;
-	}
-	
-	
-}
-
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/eIDASDataStore.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/eIDASDataStore.java
deleted file mode 100644
index 5c5c5270..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/service/eIDASDataStore.java
+++ /dev/null
@@ -1,351 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-//package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service;
-//
-//import java.io.File;
-//import java.io.IOException;
-//import java.sql.Connection;
-//import java.sql.DriverManager;
-//import java.sql.PreparedStatement;
-//import java.sql.ResultSet;
-//import java.sql.SQLException;
-//import java.sql.Statement;
-//import java.time.Instant;
-//import java.util.Properties;
-//
-//import javax.annotation.PostConstruct;
-//
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//import org.sqlite.SQLiteConfig;
-//import org.sqlite.SQLiteConfig.LockingMode;
-//import org.sqlite.SQLiteConfig.SynchronousMode;
-//import org.sqlite.SQLiteErrorCode;
-//
-//import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-//import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.DAO.eIDASPersonalIdStoreDAO;
-//import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.SQLiteServiceException;
-//import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-//import at.gv.egiz.eaaf.core.impl.data.Pair;
-//import at.gv.egiz.eaaf.core.impl.data.Trible;
-//
-//@Component
-//@Deprecated
-//public class eIDASDataStore {
-//
-//	private static final String SQLITE_JDBC_DRIVER_CLASS = "org.sqlite.JDBC";
-//	private static final String SQLITE_CONNECTION_PARAM = "jdbc:sqlite:%s";
-//	private static final boolean sleep = true;
-//	private static final int howLongToSleepOnBusyLock_ = 100;
-//	
-//	private static final Logger log = LoggerFactory.getLogger(eIDASDataStore.class);
-//	
-//	@Autowired private IConfiguration basicConfig;
-//		
-//	private String connectionURL;
-//	private Connection conn = null;
-//	
-//	@PostConstruct
-//	private void initialize() throws SQLiteServiceException {
-//		try {
-//			String sqlLiteDBUrl = basicConfig.getBasicConfiguration(
-//					Constants.CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_SQLLITEDATASTORE_URL, 
-//					basicConfig.getConfigurationRootDirectory().toString() + "/sqlite/database.db"
-//					
-//					);
-//			
-//			log.info("Use SQLite database with URL: " + sqlLiteDBUrl);
-//			
-//			//check if SQLite lib is in Classpath
-//			Class.forName(SQLITE_JDBC_DRIVER_CLASS);
-//			
-//			//open DB connection
-//			boolean isNewFileCreated = false;
-//			
-//			//open file or create file if not already exists
-//			File dbFile = new File(sqlLiteDBUrl);
-//			if (!dbFile.exists()) {
-//				log.info("SQLite database does not exist. Creating new database file ... ");
-//				dbFile.createNewFile();
-//				isNewFileCreated = true;
-//				
-//			}
-//			
-//			//open database connection
-//			connectionURL = String.format(SQLITE_CONNECTION_PARAM, dbFile.getPath());			
-//					
-//			//create DB scheme if new DB file was created
-//			if (isNewFileCreated) {
-//				executeUpdate(startConnection().createStatement(), eIDASPersonalIdStoreDAO.CREATE);
-//				log.debug("SQLite db scheme created");
-//			
-//			}
-//						
-//		} catch (ClassNotFoundException e) {
-//			log.warn("Can NOT initialize SQLite database for temporarly identity mapping. ", e);
-//			throw new SQLiteServiceException("internal.05", new Object[] {e.getMessage()}, e);
-//			
-//		} catch (SQLException | IOException e) {
-//			log.warn("Can NOT initialize SQLite database for temporarly identity mapping. ", e);
-//			throw new SQLiteServiceException("internal.05", new Object[] {e.getMessage()}, e);
-//		
-//		}
-//		
-//	}
-//			
-//
-//	
-//	
-//	/**
-//	 * Store a mapping entry with eIDAS personal identifier (source country / destination country / personal identifier)
-//	 * and the identifier that is used for ERnB communication
-//	 * 
-//	 * @param transactionId Id of this authentication transaction
-//	 * @param eIDASId eIDAS personal identifier without country prefixes
-//	 * @param ernbId personal identifier that is used to request the ERnB
-//	 * @throws SQLiteServiceException 
-//	 */
-//	public void storeNationalId(String transactionId, Trible<String, String, String> eIDASId, String ernbId) throws SQLiteServiceException {
-//		try {
-//			PreparedStatement preStatment = startConnection().prepareStatement(
-//					eIDASPersonalIdStoreDAO.INSERT,
-//					Statement.RETURN_GENERATED_KEYS);
-//			
-//			for (int i=1; i<=eIDASPersonalIdStoreDAO.TABLE_COLS.size(); i++)  {
-//				Pair<String, eIDASPersonalIdStoreDAO.T> col = eIDASPersonalIdStoreDAO.TABLE_COLS.get(i-1);
-//				if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.timestamp.name()))
-//					preStatment.setDate(i, new java.sql.Date(Instant.now().toEpochMilli()));
-//				
-//				else if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.transactionId.name()))
-//					preStatment.setString(i, transactionId);
-//				
-//				else if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.eidasId.name()))
-//					preStatment.setString(i, eIDASId.getThird());
-//				
-//				else if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.eidasSourceCountry.name()))
-//					preStatment.setString(i, eIDASId.getFirst());
-//				
-//				else if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.eidasDestinationCountry.name()))
-//					preStatment.setString(i, eIDASId.getSecond());
-//				
-//				else if (col.getFirst().equals(eIDASPersonalIdStoreDAO.COLS.ernbId.name()))
-//					preStatment.setString(i, ernbId);
-//				
-//				else
-//					log.warn("SQLite table:" + eIDASPersonalIdStoreDAO.NAME + " contains no col with name:" + col.getFirst());
-//				
-//			}
-//			
-//			//execute SQL query
-//			int sqlResult = preStatment.executeUpdate();
-//			
-//			if (sqlResult != 1) {
-//				log.warn("SQLite query execution FAILED!");
-//				throw new SQLiteServiceException("internal.06", new Object[] {"Queryresult is '-1'"});
-//				
-//			}
-//			
-//		} catch (SQLiteServiceException | SQLException e) {
-//			log.warn("SQLite query execution FAILED!", e);
-//			throw new SQLiteServiceException("internal.05", new Object[] {e.getMessage()}, e);
-//			
-//		}
-//				
-//	}
-//
-//	public String getErnbNationalId(Trible<String, String, String> eIDASId) throws SQLiteServiceException {
-//		try {
-//			PreparedStatement preStatment = startConnection().prepareStatement(
-//					eIDASPersonalIdStoreDAO.SELECT_BY_EIDAS_RAW_ID,
-//					Statement.RETURN_GENERATED_KEYS);
-//			
-//			preStatment.setString(1, eIDASId.getThird());
-//			preStatment.setString(2, eIDASId.getFirst());
-//			
-//			ResultSet rs = preStatment.executeQuery();
-//			
-//			if(!rs.next())				
-//				return null;
-//				
-//			else
-//				return rs.getString(eIDASPersonalIdStoreDAO.COLS.ernbId.name());
-//							
-//		} catch (SQLiteServiceException | SQLException e) {
-//			log.warn("SQLite query execution FAILED!", e);
-//			throw new SQLiteServiceException("internal.05", new Object[] {e.getMessage()}, e);
-//			
-//		}
-//		
-//		
-//	}
-//	
-//	public String getEidasRawNationalId(String ernbId) throws SQLiteServiceException { 
-//		try {
-//			PreparedStatement preStatment = startConnection().prepareStatement(
-//					eIDASPersonalIdStoreDAO.SELECT_BY_ERNB_ID,
-//					Statement.RETURN_GENERATED_KEYS);
-//			
-//			preStatment.setString(1, ernbId);
-//			
-//			ResultSet rs = preStatment.executeQuery();
-//			
-//			if(!rs.next())				
-//				return null;
-//				
-//			else
-//				return rs.getString(eIDASPersonalIdStoreDAO.COLS.eidasId.name());
-//			
-//		} catch (SQLiteServiceException | SQLException e) {
-//			log.warn("SQLite query execution FAILED!", e);
-//			throw new SQLiteServiceException("internal.05", new Object[] {e.getMessage()}, e);
-//			
-//		}
-//		
-//	}
-//	
-//	private Connection startConnection() throws SQLiteServiceException {		
-//		int i = howLongToSleepOnBusyLock_;
-//			
-//		while (true) {
-//			try {
-//				if (conn == null) {
-//					log.info("Initializing SQLite database with URL: " + connectionURL + " ... ");				
-//					conn = DriverManager.getConnection(connectionURL, getConnectionProperties());
-//				
-//				} else {
-//					if (!conn.isValid(10)) {
-//						log.info("SQLite connection is not valid any more --> restarting connection ...");
-//						conn.close();
-//						conn = DriverManager.getConnection(connectionURL, getConnectionProperties());
-//					}					
-//				}
-//				
-//				log.info("SQLite database connected");
-//				return conn;
-//				
-//			} catch (SQLException e) {
-//				String msg = e.getLocalizedMessage();
-//				if (isBusyLocked( e)) {
-//					log.warn(msg, e);
-//					try {					
-//						if (sleep)
-//							Thread.sleep(i++);
-//					
-//					} catch (InterruptedException e1) {
-//						throw new SQLiteServiceException("internal.05", new Object[] {e1.getMessage()}, e1);
-//						
-//					}
-//					continue;
-//					
-//				}
-//				throw new SQLiteServiceException("internal.05", new Object[] {e.getMessage()}, e);
-//				
-//			}
-//		}
-//	}
-//	
-//	
-//	/*
-//	 *     SQLite query code
-//	 */
-//	
-//	protected Properties getConnectionProperties() {
-//		SQLiteConfig config = new SQLiteConfig();
-//		config.enforceForeignKeys(true);
-//		config.setCacheSize(8000);
-//		config.setLockingMode(LockingMode.NORMAL);
-//		config.setSharedCache(false);
-//		config.setReadUncommited(true);
-//		config.setSynchronous(SynchronousMode.NORMAL);
-//		return config.toProperties();
-//		
-//	}
-//	
-//	private int executeUpdate(Statement statement, String sql) throws SQLiteServiceException {
-//		int i = 10;
-//
-//		int rc = -1;
-//		while (true) {
-//			try {
-//				rc = statement.executeUpdate(sql);
-//				break;
-//				
-//			} catch (SQLException e) {
-//				try {
-//					if (executeUpdateError(e, i))
-//						continue;
-//					else
-//						throw new SQLiteServiceException("internal.06",
-//								new Object[] {e.getMessage()}, e);
-//					
-//				} catch (SQLiteServiceException e1) {
-//					log.warn("\n" + sql + "\n" + e1.getMessage());
-//					throw e1;
-//					
-//				}									
-//			}
-//		}
-//		
-//		return rc;
-//		
-//	}
-//	
-//	private boolean isBusyLocked(SQLException e) {
-//		int eC = e.getErrorCode();
-//		
-//		if (eC == SQLiteErrorCode.SQLITE_LOCKED.code
-//		    || eC == SQLiteErrorCode.SQLITE_BUSY.code) {
-//			log.trace("SQLite db is busy looked");			
-//			return true;
-//			
-//		}
-//		
-//		String msg = e.getMessage();
-//		if ( msg.contains("[SQLITE_LOCKED]") || msg.contains("[SQLITE_BUSY]")) {
-//			log.trace("SQLite db is busy looked");
-//			return true;
-//		}
-//		
-//		return false;
-//	}
-//
-//	private boolean executeUpdateError(SQLException e, int theadSleepCounter) throws SQLiteServiceException {
-//		if (isBusyLocked(e)) {			
-//			try {
-//				if (sleep) Thread.sleep(theadSleepCounter++);
-//				
-//			} catch (InterruptedException e1) {
-//				throw new SQLiteServiceException("internal.05", new Object[] {e1.getMessage()}, e1);
-//				
-//			}
-//			
-//			return true;
-//		}
-//				
-//		return false;
-//				
-//	}
-//}
-//	
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java
deleted file mode 100644
index 6bffef3b..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRClient.java
+++ /dev/null
@@ -1,398 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.szr;
-
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.net.URL;
-import java.security.KeyManagementException;
-import java.security.KeyStore;
-import java.security.KeyStoreException;
-import java.security.NoSuchAlgorithmException;
-import java.security.SecureRandom;
-import java.security.UnrecoverableKeyException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.Resource;
-import javax.net.ssl.KeyManager;
-import javax.net.ssl.KeyManagerFactory;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.TrustManager;
-import javax.net.ssl.TrustManagerFactory;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.namespace.QName;
-import javax.xml.transform.Source;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.stream.StreamResult;
-import javax.xml.transform.stream.StreamSource;
-import javax.xml.ws.BindingProvider;
-import javax.xml.ws.Dispatch;
-import javax.xml.ws.WebServiceContext;
-import javax.xml.ws.handler.Handler;
-
-import org.apache.commons.lang3.StringUtils;
-import org.apache.cxf.configuration.jsse.TLSClientParameters;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.frontend.ClientProxy;
-import org.apache.cxf.jaxws.DispatchImpl;
-import org.apache.cxf.transport.http.HTTPConduit;
-import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
-import org.apache.xpath.XPathAPI;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.SZRCommunicationException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.LoggingHandler;
-import at.gv.egiz.eaaf.core.api.data.XmlNamespaceConstants;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
-import at.gv.egiz.eaaf.core.impl.utils.FileUtils;
-import at.gv.egiz.eaaf.core.impl.utils.KeyStoreUtils;
-import szrservices.GetBPK;
-import szrservices.GetBPKResponse;
-import szrservices.GetIdentityLinkEidas;
-import szrservices.GetIdentityLinkEidasResponse;
-import szrservices.IdentityLinkType;
-import szrservices.ObjectFactory;
-import szrservices.PersonInfoType;
-import szrservices.SZR;
-import szrservices.SZRException_Exception;
-
-@Service("SZRClientForeIDAS")
-public class SZRClient {
-	private static final Logger log = LoggerFactory.getLogger(SZRClient.class);
-	
-	private static final String CLIENT_DEFAULT = "DefaultClient";	
-	private static final String CLIENT_RAW = "RawClient";
-	
-	@Autowired private IConfiguration basicConfig;
-	@Resource private WebServiceContext wsContext;
-	 
-	//client for anything, without identitylink
-	private SZR szr = null;
-	 
-	//RAW client is needed for identitylink 
-	private Dispatch<Source> dispatch = null; 
-	
-	 
-	private SZRService szrService = null;
-	private String szrURL = null;
-	private QName qname = null;
-	
-	public IdentityLinkType getIdentityLinkInRawMode(PersonInfoType personInfo) throws SZRCommunicationException  {					
-		try {
-				GetIdentityLinkEidas getIDL = new GetIdentityLinkEidas();
-				getIDL.setPersonInfo(personInfo);
-
-				JAXBContext jaxbContext = JAXBContext.newInstance(ObjectFactory.class);
-				Marshaller jaxbMarshaller = jaxbContext.createMarshaller();
-		
-				final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-				jaxbMarshaller.marshal(getIDL, outputStream);
-				outputStream.flush();
-		
-				Source source = new StreamSource(new ByteArrayInputStream(outputStream.toByteArray()));
-				outputStream.close();
-		
-				log.trace("Requesting SZR ... ");
-				Source response = dispatch.invoke(source);
-				log.trace("Receive RAW response from SZR");
-				
-				byte[] szrResponse = sourceToByteArray(response);
-				//JAXBContext ctx = JAXBContext.newInstance(IdentityLinkType.class
-//				    .getPackage().getName());
-				GetIdentityLinkEidasResponse jaxbElement = (GetIdentityLinkEidasResponse) jaxbContext
-				    .createUnmarshaller().unmarshal(new ByteArrayInputStream(szrResponse));
-		
-				
-				//build response
-				log.trace(new String(szrResponse));
-				
-				// ok, we have success
-				Document doc = DomUtils.parseDocument(
-							new ByteArrayInputStream(szrResponse),
-							true, 
-							XmlNamespaceConstants.ALL_SCHEMA_LOCATIONS + " " + Constants.SZR_SCHEMA_LOCATIONS, 
-							null, null
-						);				
-				String xpathExpression = "//saml:Assertion";				
-				Element nsNode = doc.createElementNS("urn:oasis:names:tc:SAML:1.0:assertion", "saml:NSNode");
-
-				log.trace("Selecting signed doc " + xpathExpression);
-				Element documentNode = (Element) XPathAPI.selectSingleNode(doc,
-				    xpathExpression, nsNode);
-				log.trace("Signed document: " + DomUtils.serializeNode(documentNode));
-
-				
-				IdentityLinkType idl = new IdentityLinkType();
-				idl.setAssertion(documentNode);
-				idl.setPersonInfo(jaxbElement.getGetIdentityLinkReturn().getPersonInfo());
-				
-				return idl;
-							
-		} catch ( Exception e) {
-			log.warn("SZR communication FAILED. Reason: " + e.getMessage(), e);
-			throw new SZRCommunicationException("ernb.02", new Object[] {e.getMessage()}, e);
-			
-		}
-				
-	}
-	
-	public String getBPK(PersonInfoType personInfo, String target, String vkz) throws SZRCommunicationException {		
-		try {
-			GetBPK parameters = new GetBPK();
-			parameters.setPersonInfo(personInfo);
-			parameters.setBereichsKennung(target);
-			parameters.setVKZ(vkz);
-			GetBPKResponse result = this.szr.getBPK(parameters);
-
-			return result.getGetBPKReturn();
-			
-		} catch (SZRException_Exception e) {
-			log.warn("SZR communication FAILED. Reason: " + e.getMessage(), e);
-			throw new SZRCommunicationException("ernb.02", new Object[] {e.getMessage()}, e);
-			
-		}
-
-	}
-	
-	
-	@PostConstruct
-	private void initialize() {
-		log.info("Starting SZR-Client initialization .... ");
-		URL url = SZRClient.class.getResource("/szr_client/SZR-1.1.WSDL");
-		
-		boolean useTestSZR = basicConfig.getBasicConfigurationBoolean(
-				Constants.CONIG_PROPS_EIDAS_SZRCLIENT_USETESTSERVICE, 
-				true);
-			
-		if (useTestSZR) {
-			log.debug("Initializing SZR test environment configuration.");
-			qname = SZRService.SZRTestumgebung;
-			szrService = new SZRService(url, new QName("urn:SZRServices", "SZRService"));
-			szr = szrService.getSZRTestumgebung();
-			szrURL = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_ENDPOINT_TEST);
-			
-			
-		} else {
-			log.debug("Initializing SZR productive configuration.");
-			qname = SZRService.SZRProduktionsumgebung;
-			szrService = new SZRService(url, new QName("urn:SZRServices", "SZRService"));
-			szr = szrService.getSZRProduktionsumgebung();			
-			szrURL = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_ENDPOINT_PROD);
-			
-		}
-		
-		//create raw client;
-		dispatch = szrService.createDispatch(qname, Source.class, javax.xml.ws.Service.Mode.PAYLOAD);
-				
-		if (StringUtils.isEmpty(szrURL)) {
-			log.error("No SZR service-URL found. SZR-Client initalisiation failed.");
-			throw new RuntimeException("No SZR service URL found. SZR-Client initalisiation failed.");
-			
-		}
-		
-		//check if Clients can be initialized
-		if (szr == null ) {
-			log.error("SZR " + CLIENT_DEFAULT + " is 'NULL'. Something goes wrong");
-			throw new RuntimeException("SZR " + CLIENT_DEFAULT + " is 'NULL'. Something goes wrong");
-			
-		}		
-		if (dispatch == null ) {
-			log.error("SZR " + CLIENT_RAW + " is 'NULL'. Something goes wrong");
-			throw new RuntimeException("SZR " + CLIENT_RAW + " is 'NULL'. Something goes wrong");
-			
-		}
-		
-		//inject handler
-		log.info("Use SZR service-URL: " + szrURL);		
-		injectBindingProvider((BindingProvider) szr, CLIENT_DEFAULT);
-		injectBindingProvider((BindingProvider) dispatch, CLIENT_RAW);
-		
-		//inject http parameters and SSL context
-		log.debug("Inject HTTP client settings ... ");
-		injectHTTPClient(szr, CLIENT_DEFAULT);
-		injectHTTPClient(dispatch, CLIENT_RAW);
-
-
-		
-	  	log.info("SZR-Client initialization successfull");
-	}
-	
-	private void injectHTTPClient(Object raw, String clientType) {
-		//extract client from implementation
-		Client client = null;
-		if (raw instanceof DispatchImpl<?>)
-			client = ((DispatchImpl<?>)raw).getClient();
-		else if (raw instanceof Client)
-			 client = ClientProxy.getClient(raw);
-		else 
-			throw new RuntimeException("SOAP Client for SZR connection is of UNSUPPORTED type: " + raw.getClass().getName());
-		
-		//set basic connection policies
-		HTTPConduit http = (HTTPConduit) client.getConduit();
-				
-		//set timeout policy
-		HTTPClientPolicy httpClientPolicy = new HTTPClientPolicy();			  
-		httpClientPolicy.setConnectionTimeout(
-				Integer.parseInt(basicConfig.getBasicConfiguration(
-						Constants.CONIG_PROPS_EIDAS_SZRCLIENT_TIMEOUT_CONNECTION, 
-						Constants.HTTP_CLIENT_DEFAULT_TIMEOUT_CONNECTION)) * 1000);
-		httpClientPolicy.setReceiveTimeout(
-				Integer.parseInt(basicConfig.getBasicConfiguration(
-						Constants.CONIG_PROPS_EIDAS_SZRCLIENT_TIMEOUT_RESPONSE, 
-						Constants.HTTP_CLIENT_DEFAULT_TIMEOUT_RESPONSE)) * 1000); 
-		http.setClient(httpClientPolicy);
-		
-		//inject SSL context in case of https
-	  	if (szrURL.toLowerCase().startsWith("https")) {
-	  		log.debug("Adding SSLContext to client: " + clientType +" ... "); 	  		
-			TLSClientParameters tlsParams = new TLSClientParameters();			
-			tlsParams.setSSLSocketFactory(createSSLContext(clientType).getSocketFactory());	  		
-			http.setTlsClientParameters(tlsParams );	  		
-			log.info("SSLContext initialized for client: " + clientType);
-			
-	  	}
-		
-	}
-
-	private void injectBindingProvider(BindingProvider bindingProvider, String clientType) {
-		Map<String, Object> requestContext = bindingProvider.getRequestContext();
-		requestContext.put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, szrURL);
-		
-		log.trace("Adding JAX-WS request/response trace handler to client: " + clientType);
-	  	List<Handler> handlerList = bindingProvider.getBinding().getHandlerChain();
-	  	if (handlerList == null) {
-	  		handlerList = new ArrayList<Handler>();
-	  		bindingProvider.getBinding().setHandlerChain(handlerList);
-	  		
-	  	}
-	  	
-	  	//add logging handler to trace messages if required
-	  	if (basicConfig.getBasicConfigurationBoolean(
-	  			Constants.CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_TRACEMESSAGES, 
-	  			false)) {	  	
-	  		LoggingHandler loggingHandler = new LoggingHandler();
-	  		handlerList.add(loggingHandler);
-	  		
-	  	}
-	  	bindingProvider.getBinding().setHandlerChain(handlerList);
-	}
-
-	private SSLContext createSSLContext(String clientType) {
-		try {
-			SSLContext context = SSLContext.getInstance("TLS");
-			
-			//initialize key-mangager for SSL client-authentication
-			KeyManager[] keyManager = null;
-			String keyStorePath = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_SSL_KEYSTORE_PATH);
-			String keyStorePassword = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_SSL_KEYSTORE_PASSWORD);
-			if (StringUtils.isNotEmpty(keyStorePath)) {
-				log.trace("Find keyStore path: " + keyStorePath + " Injecting SSL client certificate ... ");
-				try {
-					KeyStore keyStore = KeyStoreUtils.loadKeyStore(
-							FileUtils.makeAbsoluteUrl(keyStorePath, basicConfig.getConfigurationRootDirectory()), 
-							keyStorePassword);
-				
-					KeyManagerFactory kmf = KeyManagerFactory.getInstance("SunX509");
-					kmf.init(keyStore, keyStorePassword.toCharArray());
-					keyManager = kmf.getKeyManagers();
-					log.debug("SSL client certificate injected to client: " + clientType);
-					
-				} catch (KeyStoreException | IOException | UnrecoverableKeyException e) {
-					log.error("Can NOT load SSL client certificate from path: " + keyStorePath);
-					throw new RuntimeException("Can NOT load SSL client certificate from path: " + keyStorePath, e);
-					
-				}				
-			} else {
-				log.debug("No KeyStore for SSL Client Auth. found. Initializing SSLContext without authentication ... ");
-				
-			}
-			
-			
-			//initialize SSL TrustStore
-			TrustManager[] trustManager = null;
-			String trustStorePath = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_SSL_TRUSTSTORE_PATH);
-			String trustStorePassword = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_SZRCLIENT_SSL_TRUSTSTORE_PASSWORD);
-			if (StringUtils.isNotEmpty(trustStorePath)) {
-				log.trace("Find trustStore path: " + trustStorePath + " Injecting SSL TrustStore ... ");
-				try {
-					KeyStore trustStore = KeyStoreUtils.loadKeyStore(
-							FileUtils.makeAbsoluteUrl(trustStorePath, basicConfig.getConfigurationRootDirectory()), 
-							trustStorePassword);
-				
-					TrustManagerFactory tmf = TrustManagerFactory.getInstance("SunX509");
-					tmf.init(trustStore);
-					trustManager = tmf.getTrustManagers();
-					log.debug("SSL TrustStore injected to client: " + clientType);
-					
-				} catch (KeyStoreException | IOException e) {
-					log.error("Can NOT open SSL TrustStore from path: " + trustStorePath);
-					throw new RuntimeException("Can NOT open SSL TrustStore from path: " + trustStorePath, e);
-					
-				}	
-				
-			} else {
-				log.debug("No custom SSL TrustStore found. Initializing SSLContext with JVM default truststore ... ");
-				
-			}
-			
-			
-			context.init(keyManager, trustManager, new SecureRandom());
-		    return context;
-			
-		} catch (NoSuchAlgorithmException | KeyManagementException e) {
-			log.error("SSLContext initialization FAILED.", e);
-			throw new RuntimeException("SSLContext initialization FAILED.", e);
-			
-		}
-		
-	}
-	
-	private byte[] sourceToByteArray(Source result) throws TransformerException {
-		TransformerFactory factory = TransformerFactory.newInstance();
-		Transformer transformer = factory.newTransformer();
-		transformer.setOutputProperty("omit-xml-declaration", "yes");
-		transformer.setOutputProperty("method", "xml");
-		ByteArrayOutputStream out = new ByteArrayOutputStream();
-		StreamResult streamResult = new StreamResult();
-		streamResult.setOutputStream(out);
-		transformer.transform(result, streamResult);
-		return out.toByteArray();
-	}
-	
-	
-	
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRService.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRService.java
deleted file mode 100644
index a5a2d31e..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/szr/SZRService.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.szr;
-
-import java.net.URL;
-
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-import szrservices.SZR;
-
-/**
- * This class was generated by Apache CXF 3.1.16
- * 2018-07-10T09:36:01.466+02:00
- * Generated source version: 3.1.16
- * 
- */
-@WebServiceClient(name = "SZRService", 
-                  wsdlLocation = "./src/main/resources/szr_client/SZR-1.WSDL",
-                  targetNamespace = "urn:SZRServices") 
-public class SZRService extends Service {
-
-    public final static URL WSDL_LOCATION;
-
-    public final static QName SERVICE = new QName("urn:SZRServices", "SZRService");
-    public final static QName SZRProduktionsumgebung = new QName("urn:SZRServices", "SZRProduktionsumgebung");
-    public final static QName SZRTestumgebung = new QName("urn:SZRServices", "SZRTestumgebung");
-    public final static QName SZRBusinesspartnerTestumgebung = new QName("urn:SZRServices", "SZRBusinesspartnerTestumgebung");
-    static {
-    	URL url = SZRService.class.getResource("./src/main/resources/szr_client/SZR-1.WSDL");
-        if (url == null) {
-            url = SZRService.class.getClassLoader().getResource("/szr_client/SZR-1.WSDL");
-        } 
-        if (url == null) {
-            java.util.logging.Logger.getLogger(SZRService.class.getName())
-                .log(java.util.logging.Level.INFO, 
-                     "Can not initialize the default wsdl from {0}", "/szr_client/SZR-1.WSDL");
-        }       
-        WSDL_LOCATION = url;
-
-    }
-
-    public SZRService(URL wsdlLocation) {
-        super(wsdlLocation, SERVICE);
-    }
-
-    public SZRService(URL wsdlLocation, QName serviceName) {
-        super(wsdlLocation, serviceName);
-    }
-
-    public SZRService() {
-        super(WSDL_LOCATION, SERVICE);
-    }
-    
-    public SZRService(WebServiceFeature ... features) {
-        super(WSDL_LOCATION, SERVICE, features);
-    }
-
-    public SZRService(URL wsdlLocation, WebServiceFeature ... features) {
-        super(wsdlLocation, SERVICE, features);
-    }
-
-    public SZRService(URL wsdlLocation, QName serviceName, WebServiceFeature ... features) {
-        super(wsdlLocation, serviceName, features);
-    }    
-
-
-
-
-    /**
-     *
-     * @return
-     *     returns SZR
-     */
-    @WebEndpoint(name = "SZRProduktionsumgebung")
-    public SZR getSZRProduktionsumgebung() {
-        return super.getPort(SZRProduktionsumgebung, SZR.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns SZR
-     */
-    @WebEndpoint(name = "SZRProduktionsumgebung")
-    public SZR getSZRProduktionsumgebung(WebServiceFeature... features) {
-        return super.getPort(SZRProduktionsumgebung, SZR.class, features);
-    }
-
-
-    /**
-     *
-     * @return
-     *     returns SZR
-     */
-    @WebEndpoint(name = "SZRTestumgebung")
-    public SZR getSZRTestumgebung() {
-        return super.getPort(SZRTestumgebung, SZR.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns SZR
-     */
-    @WebEndpoint(name = "SZRTestumgebung")
-    public SZR getSZRTestumgebung(WebServiceFeature... features) {
-        return super.getPort(SZRTestumgebung, SZR.class, features);
-    }
-
-
-    /**
-     *
-     * @return
-     *     returns SZR
-     */
-    @WebEndpoint(name = "SZRBusinesspartnerTestumgebung")
-    public SZR getSZRBusinesspartnerTestumgebung() {
-        return super.getPort(SZRBusinesspartnerTestumgebung, SZR.class);
-    }
-
-    /**
-     * 
-     * @param features
-     *     A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy.  Supported features not in the <code>features</code> parameter will have their default values.
-     * @return
-     *     returns SZR
-     */
-    @WebEndpoint(name = "SZRBusinesspartnerTestumgebung")
-    public SZR getSZRBusinesspartnerTestumgebung(WebServiceFeature... features) {
-        return super.getPort(SZRBusinesspartnerTestumgebung, SZR.class, features);
-    }
-
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java
deleted file mode 100644
index 26dab045..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/CreateIdentityLinkTask.java
+++ /dev/null
@@ -1,392 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks;
-
-import java.io.InputStream;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
-
-import at.asitplus.eidas.specific.connector.MSConnectorEventCodes;
-import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.DAO.ERnBeIDData;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.SZRCommunicationException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAttributeException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.ICCSpecificEIDProcessingService;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.szr.SZRClient;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
-import at.gv.e_government.reference.namespace.persondata._20020228.AlternativeNameType;
-import at.gv.e_government.reference.namespace.persondata._20020228.PersonNameType;
-import at.gv.e_government.reference.namespace.persondata._20020228.PhysicalPersonType;
-import at.gv.egiz.eaaf.core.api.data.EaafConstants;
-import at.gv.egiz.eaaf.core.api.data.PvpAttributeDefinitions;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.auth.data.IIdentityLink;
-import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.data.Pair;
-import at.gv.egiz.eaaf.core.impl.idp.auth.builder.BpkBuilder;
-import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
-import at.gv.egiz.eaaf.core.impl.idp.auth.data.SimpleIdentityLinkAssertionParser;
-import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
-import at.gv.egiz.eaaf.core.impl.utils.DomUtils;
-import at.gv.egiz.eaaf.core.impl.utils.XPathUtils;
-import eu.eidas.auth.commons.attribute.AttributeDefinition;
-import eu.eidas.auth.commons.attribute.AttributeValue;
-import eu.eidas.auth.commons.light.ILightResponse;
-import eu.eidas.auth.commons.protocol.eidas.impl.PostalAddress;
-import szrservices.IdentityLinkType;
-import szrservices.PersonInfoType;
-import szrservices.TravelDocumentType;
-
-/** 
- * @author tlenz
- * 
- */
-@Component("CreateIdentityLinkTask")
-public class CreateIdentityLinkTask extends AbstractAuthServletTask {
-	private static final Logger log = LoggerFactory.getLogger(CreateIdentityLinkTask.class);
-	
-	@Autowired private IConfiguration basicConfig;
-	@Autowired private SZRClient szrClient; 
-	@Autowired private ICCSpecificEIDProcessingService eIDPostProcessor;
-	 
-	/* (non-Javadoc) 
-	 * @see at.gv.egovernment.moa.id.process.springweb.MoaIdTask#execute(at.gv.egovernment.moa.id.process.api.ExecutionContext, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
-	 */
-	@Override
-	public void execute(ExecutionContext executionContext,
-			HttpServletRequest request, HttpServletResponse response)
-			throws TaskExecutionException {
-		try{
-			AuthProcessDataWrapper authProcessData = pendingReq.getSessionData(AuthProcessDataWrapper.class);
-			ILightResponse eIDASResponse = authProcessData.getGenericDataFromSession(
-					Constants.DATA_FULL_EIDAS_RESPONSE, ILightResponse.class);
-			
-		    Map<String, Object> simpleAttrMap = converteIDASAttrToSimpleMap(eIDASResponse.getAttributes().getAttributeMap());		    		    
-		    
-		    IIdentityLink identityLink = null;
-		    String bPK = null;
-		    
-		    //post-process eIDAS attributes
-		    ERnBeIDData eIDData = eIDPostProcessor.postProcess(simpleAttrMap);
-
-		    //write MDS into technical log and revision log
-		    writeMDSLogInformation(eIDData);
-		    			   		    		    
-			//connect SZR-Gateway
-			if(basicConfig.getBasicConfigurationBoolean(
-					Constants.CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_USEDUMMY, false)) {
-				log.warn("SZR-Dummy IS ACTIVE! IdentityLink is NOT VALID!!!!");
-				// create fake IdL
-				// - fetch IdL template from resources
-				InputStream s = CreateIdentityLinkTask.class.getResourceAsStream("/resources/xmldata/fakeIdL_IdL_template.xml");
-				Element idlTemplate = DomUtils.parseXmlValidating(s);
-
-			    identityLink = new SimpleIdentityLinkAssertionParser(idlTemplate).parseIdentityLink();
-
-			    // replace data
-	            Element idlassertion = identityLink.getSamlAssertion();
-	            	            
-	            // - set fake baseID;
-		        Node prIdentification = XPathUtils.selectSingleNode(idlassertion, SimpleIdentityLinkAssertionParser.PERSON_IDENT_VALUE_XPATH);		        		        
-		        prIdentification.getFirstChild().setNodeValue(eIDData.getPseudonym());
-		        
-		        //build personal identifier which looks like a baseID		        
-//		        String fakeBaseID = new BPKBuilder().buildBPK(eIdentifier, "baseID");
-//		        Logger.info("Map eIDAS eIdentifier:" + eIdentifier + " to fake baseID:" + fakeBaseID);
-//		        prIdentification.getFirstChild().setNodeValue(fakeBaseID);
- 
-		        // - set last name
-		        Node prFamilyName = XPathUtils.selectSingleNode(idlassertion, SimpleIdentityLinkAssertionParser.PERSON_FAMILY_NAME_XPATH);		        	        
-				prFamilyName.getFirstChild().setNodeValue(eIDData.getFamilyName());
-
-		        // - set first name
-		        Node prGivenName = XPathUtils.selectSingleNode(idlassertion, SimpleIdentityLinkAssertionParser.PERSON_GIVEN_NAME_XPATH);
-				prGivenName.getFirstChild().setNodeValue(eIDData.getGivenName());
-
-		        // - set date of birth
-		        Node prDateOfBirth = XPathUtils.selectSingleNode(idlassertion, SimpleIdentityLinkAssertionParser.PERSON_DATE_OF_BIRTH_XPATH);		        		        
-				
-				prDateOfBirth.getFirstChild().setNodeValue(eIDData.getFormatedDateOfBirth());
-
-	            identityLink = new SimpleIdentityLinkAssertionParser(idlassertion).parseIdentityLink();
-
-	            Pair<String, String> bPKCalc = new BpkBuilder().generateAreaSpecificPersonIdentifier(
-	            		identityLink.getIdentificationValue(), 
-	            		identityLink.getIdentificationType(), 
-	            		pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
-	            bPK = bPKCalc.getFirst();
-	            
-	            	            				
-			} else {
-				//contact SZR Gateway
-				log.debug("Starting connecting SZR Gateway");											
-				PersonInfoType personInfo = new PersonInfoType();
-				PersonNameType personName = new PersonNameType();
-				PhysicalPersonType naturalPerson = new PhysicalPersonType();
-				TravelDocumentType eDocument = new TravelDocumentType();								
-
-				naturalPerson.setName(personName );
-				personInfo.setPerson(naturalPerson );
-				personInfo.setTravelDocument(eDocument );
-															
-				//person information
-				personName.setFamilyName(eIDData.getFamilyName());
-				personName.setGivenName(eIDData.getGivenName());
-				naturalPerson.setDateOfBirth(eIDData.getFormatedDateOfBirth());
-				eDocument.setIssuingCountry(eIDData.getCitizenCountryCode());
-				eDocument.setDocumentNumber(eIDData.getPseudonym());
-				
-				//eID document information								
-				eDocument.setDocumentType(basicConfig.getBasicConfiguration(
-						Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_EDOCUMENTTYPE, 
-						Constants.SZR_CONSTANTS_DEFAULT_DOCUMENT_TYPE));
-				
-				//set PlaceOfBirth if available	
-				if (eIDData.getPlaceOfBirth() != null) {
-					log.trace("Find 'PlaceOfBirth' attribute: " + eIDData.getPlaceOfBirth());
-					if (basicConfig.getBasicConfigurationBoolean(
-							Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETPLACEOFBIRTHIFAVAILABLE, 
-							true)) {
-						naturalPerson.setPlaceOfBirth(eIDData.getPlaceOfBirth());
-						log.trace("Adding 'PlaceOfBirth' to ERnB request ... ");
-						
-					}
-				}
-				
-				//set BirthName if available
-				if (eIDData.getBirthName() != null) {
-					log.trace("Find 'BirthName' attribute: " + eIDData.getBirthName());
-					if (basicConfig.getBasicConfigurationBoolean(
-							Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_SETBIRTHNAMEIFAVAILABLE, 
-							true)) {
-						AlternativeNameType alternativeName = new AlternativeNameType();
-						naturalPerson.setAlternativeName(alternativeName );				
-						alternativeName.setFamilyName(eIDData.getBirthName());						
-						log.trace("Adding 'BirthName' to ERnB request ... ");
-						
-					}
-				}
-				
-				
-				IdentityLinkType result = szrClient.getIdentityLinkInRawMode(personInfo);
-
-				Element idlFromSZR = (Element)result.getAssertion();			
-				identityLink = new SimpleIdentityLinkAssertionParser(idlFromSZR).parseIdentityLink();
-								
-				//write ERnB inputdata into revisionlog
-				if (basicConfig.getBasicConfigurationBoolean(
-						Constants.CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_REVISIONLOGDATASTORE_ACTIVE, false)) {										 				
-					revisionsLogger.logEvent(pendingReq, 
-							MSConnectorEventCodes.SZR_ERNB_EIDAS_RAW_ID, 
-							(String)simpleAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER));
-					revisionsLogger.logEvent(pendingReq, 
-							MSConnectorEventCodes.SZR_ERNB_EIDAS_ERNB_ID, eIDData.getPseudonym());
-				
-				}
-				
-				//get bPK from SZR
-				if (basicConfig.getBasicConfigurationBoolean(
-						Constants.CONIG_PROPS_EIDAS_SZRCLIENT_DEBUG_USESRZFORBPKGENERATION, true)) {
-					bPK = szrClient.getBPK(
-						personInfo, 
-						pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier(), 
-						basicConfig.getBasicConfiguration(
-								Constants.CONIG_PROPS_EIDAS_SZRCLIENT_PARAMS_VKZ, 
-								"no VKZ defined"));
-					
-				} else {
-					log.debug("Calculating bPK from baseId ... ");
-					Pair<String, String> bPKCalc = new BpkBuilder().generateAreaSpecificPersonIdentifier(
-		            		identityLink.getIdentificationValue(), 
-		            		identityLink.getIdentificationType(), 
-		            		pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
-		            bPK = bPKCalc.getFirst();
-					
-				}
-								
-			}
-						
-			if (identityLink == null) {
-				log.error("ERnB did not return an identity link.");
-				throw new SZRCommunicationException("ernb.00", null);
-				
-			}
-			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.SZR_IDL_RECEIVED, 
-					identityLink.getSamlAssertion().getAttribute(SimpleIdentityLinkAssertionParser.ASSERTIONID));
-			
-			
-			if (bPK == null) {
-				log.error("ERnB did not return a bPK for target: " + pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
-				throw new SZRCommunicationException("ernb.01", null);
-				
-			}
-			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.SZR_BPK_RECEIVED);
-			
-			log.debug("ERnB communication was successfull");
-					
-			authProcessData.setForeigner(true);
-			authProcessData.setIdentityLink(identityLink);
-			authProcessData.setGenericDataToSession(
-					PvpAttributeDefinitions.EID_ISSUING_NATION_NAME, 
-					eIDASResponseUtils.parseEidasPersonalIdentifier((String) simpleAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER)).getFirst());
-			
-			//set bPK and bPKType into auth session
-			authProcessData.setGenericDataToSession(
-					PvpAttributeDefinitions.BPK_NAME, 
-					extendBPKbyPrefix(
-							bPK, 
-							pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier())
-					);
-			authProcessData.setGenericDataToSession(
-					PvpAttributeDefinitions.EID_SECTOR_FOR_IDENTIFIER_NAME, 
-					pendingReq.getServiceProviderConfiguration().getAreaSpecificTargetIdentifier());
-
-			
-			
-			//store pending-request
-			requestStoreage.storePendingRequest(pendingReq);
-					
-		} catch (eIDASAttributeException e) {
-			throw new TaskExecutionException(pendingReq, "Minimum required eIDAS attributeset not found.", e);
-						
-		} catch (EaafException e) {
-			throw new TaskExecutionException(pendingReq, "IdentityLink generation for foreign person FAILED.", e);
-						
-		} catch (Exception e) {
-			log.error("IdentityLink generation for foreign person FAILED.", e);
-			throw new TaskExecutionException(pendingReq, "IdentityLink generation for foreign person FAILED.", e);
-			
-		}
-	}
-
-	private String extendBPKbyPrefix(String bpk, String type) {
-		String bPKType = null;
-		
-		if (type.startsWith(EaafConstants.URN_PREFIX_WBPK))
-			bPKType = type.substring((EaafConstants.URN_PREFIX_WBPK).length());
-		
-		else if (type.startsWith(EaafConstants.URN_PREFIX_CDID)) 
-			bPKType = type.substring((EaafConstants.URN_PREFIX_CDID).length());
-		
-		else if (type.startsWith(EaafConstants.URN_PREFIX_EIDAS)) 
-			bPKType = type.substring((EaafConstants.URN_PREFIX_EIDAS).length());
-		
-
-		if (bPKType != null ) {
-			log.trace("Authenticate user with bPK/wbPK " + bpk + " and Type=" + bPKType);
-			return bPKType + ":" + bpk;
-			
-		} else {		
-			log.warn("Service Provider Target with: " + type + " is NOT supported. Set bPK as it is ...");
-			return bpk;
-			
-		}
-		
-	}
-	
-	private Map<String, Object> converteIDASAttrToSimpleMap(
-			ImmutableMap<AttributeDefinition<?>, ImmutableSet<? extends AttributeValue<?>>> attributeMap) {
-		Map<String, Object> result = new HashMap<String, Object>();
-		
-		for (AttributeDefinition<?> el : attributeMap.keySet()) {
-			
-			final Class parameterizedType = el.getParameterizedType();
-		    if ((DateTime.class).equals(parameterizedType)) {
-		        DateTime attribute = eIDASResponseUtils.translateDateAttribute(el, attributeMap.get(el).asList());
-		        if (attribute != null) {
-		        	result.put(el.getFriendlyName(), attribute);
-		        	log.trace("Find attr '" + el.getFriendlyName() + "' with value: " + attribute.toString() );
-		        
-		        } else
-		        	log.info("Ignore empty 'DateTime' attribute");
-		        
-		    } else if ((PostalAddress.class).equals(parameterizedType)) {
-		        PostalAddress addressAttribute = eIDASResponseUtils.translateAddressAttribute(el, attributeMap.get(el).asList());
-		        if (addressAttribute != null) {
-		        	result.put(el.getFriendlyName(), addressAttribute);
-		        	log.trace("Find attr '" + el.getFriendlyName() + "' with value: " + addressAttribute.toString() );
-		        	
-		        } else
-		        	log.info("Ignore empty 'PostalAddress' attribute");
-		        
-		    } else {			
-		    	List<String> natPersonIdObj = eIDASResponseUtils.translateStringListAttribute(el, attributeMap.get(el).asList());		    
-		    	String stringAttr = natPersonIdObj.get(0);
-		    	if (StringUtils.isNotEmpty(stringAttr)) {
-		    		result.put(el.getFriendlyName(), stringAttr);
-		    		log.trace("Find attr '" + el.getFriendlyName() + "' with value: " + stringAttr );
-		    		
-		    	} else
-		    		log.info("Ignore empty 'String' attribute");
-		    	
-		    }			
-		}
-		
-		log.debug("Receive #" + result.size() + " attributes with names: " + result.keySet().toString());
-		
-		return result;
-	}
-
-	private void writeMDSLogInformation(ERnBeIDData eIDData) {
-	    //log MDS and country code into technical log
-	    if (basicConfig.getBasicConfigurationBoolean(
-	    		MSeIDASNodeConstants.PROP_CONFIG_TECHNICALLOG_WRITE_MDS_INTO_TECH_LOG, false))
-	    	log.info("eIDAS Auth. for user: " 
-	    		+ eIDData.getGivenName() + " " 
-	    		+ eIDData.getFamilyName() + " "
-	    		+ eIDData.getFormatedDateOfBirth() + " "
-	    		+ "from " + eIDData.getCitizenCountryCode());
-	   
-	    //log MDS and country code into revision log
-	    if (basicConfig.getBasicConfigurationBoolean(
-	    		MSeIDASNodeConstants.PROP_CONFIG_REVISIONLOG_WRITE_MDS_INTO_REVISION_LOG, false))
-	    	revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_MDSDATA, 
-	    			"{" + eIDData.getGivenName() + "," 
-	    		    		+ eIDData.getFamilyName() + ","
-	    		    		+ eIDData.getFormatedDateOfBirth() + ","
-	    		    		+ eIDData.getCitizenCountryCode() + "}");
-	    
-	}
-
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
deleted file mode 100644
index 7b61ef7e..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/GenerateAuthnRequestTask.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks;
-
-import java.util.UUID;
-
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.ApplicationContext;
-import org.springframework.stereotype.Component;
-import org.springframework.web.util.UriComponentsBuilder;
-
-import at.asitplus.eidas.specific.connector.MSConnectorEventCodes;
-import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
-import at.asitplus.eidas.specific.connector.gui.StaticGuiBuilderConfiguration;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.ICCSpecificEIDProcessingService;
-import at.gv.egiz.eaaf.core.api.data.EaafConstants;
-import at.gv.egiz.eaaf.core.api.gui.ISpringMvcGuiFormBuilder;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.ISpConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.api.storage.ITransactionStorage;
-import at.gv.egiz.eaaf.core.exceptions.EaafConfigurationException;
-import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
-import eu.eidas.auth.commons.EidasParameterKeys;
-import eu.eidas.auth.commons.light.ILightRequest;
-import eu.eidas.auth.commons.light.impl.LightRequest;
-import eu.eidas.auth.commons.tx.BinaryLightToken;
-import eu.eidas.specificcommunication.BinaryLightTokenHelper;
-import eu.eidas.specificcommunication.SpecificCommunicationDefinitionBeanNames;
-import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
-import eu.eidas.specificcommunication.protocol.SpecificCommunicationService;
-
-/**
- * @author tlenz
- *
- */  
-@Component("ConnecteIDASNodeTask")
-public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
-	private static final Logger log = LoggerFactory.getLogger(GenerateAuthnRequestTask.class);
-	
-	@Autowired IConfiguration basicConfig;
-	@Autowired ApplicationContext context;
-	@Autowired ITransactionStorage transactionStore; 
-	@Autowired ISpringMvcGuiFormBuilder guiBuilder;
-	@Autowired ICCSpecificEIDProcessingService ccSpecificProcessing;
-	 
-	@Override
-	public void execute(ExecutionContext executionContext,
-			HttpServletRequest request, HttpServletResponse response)
-			throws TaskExecutionException {
-		
-		try{						
-			//get service-provider configuration
-			ISpConfiguration spConfig = pendingReq.getServiceProviderConfiguration();
-
-			// get target, environment and validate citizen countryCode
-			String citizenCountryCode = (String) executionContext.get(MSeIDASNodeConstants.REQ_PARAM_SELECTED_COUNTRY);
-			String environment = (String) executionContext.get(MSeIDASNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT);
-			
-			if (StringUtils.isEmpty(citizenCountryCode)) {
-				// illegal state; task should not have been executed without a selected country
-				throw new eIDASAuthenticationException("eidas.03", new Object[] { "" });
-				
-			}
-
-			//TODO: maybe add countryCode validation before request ref. impl. eIDAS node
-			log.info("Request eIDAS auth. for citizen of country: " + citizenCountryCode);
-			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.COUNTRY_SELECTED, citizenCountryCode);
-									
-			//build eIDAS AuthnRequest			
-			LightRequest.Builder authnRequestBuilder = LightRequest.builder();			
-			authnRequestBuilder.id(UUID.randomUUID().toString());
-			
-			
-			String issur = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_ENTITYID);
-			if (StringUtils.isEmpty(issur)) {
-				log.error("Found NO 'eIDAS node issuer' in configuration. Authentication NOT possible!");
-				throw new EaafConfigurationException("config.27", 
-						new Object[] {"Application config containts NO " + Constants.CONIG_PROPS_EIDAS_NODE_ENTITYID });
-				
-			}
-			authnRequestBuilder.issuer(issur);
-			
-			
-			//TODO: set matching mode if eIDAS ref. impl. support this method
-
-				
-			//TODO: update if eIDAS ref. impl. supports exact matching for non-notified LoA schemes
-			String loa = EaafConstants.EIDAS_LOA_HIGH;
-			if (spConfig.getRequiredLoA() != null) {
-				if (spConfig.getRequiredLoA().isEmpty())
-					log.info("No eIDAS LoA requested. Use LoA HIGH as default");
-				
-				else {					
-					if (spConfig.getRequiredLoA().size() > 1 )
-						log.info("Currently only ONE requested LoA is supported for service provider. Use first one ... ");
-					
-					loa = spConfig.getRequiredLoA().get(0);
-					
-				}									
-			}
-						
-			log.debug("Request eIdAS node with LoA: " + loa);
-			authnRequestBuilder.levelOfAssurance(loa);
-						
-			//set nameIDFormat
-			authnRequestBuilder.nameIdFormat(Constants.eIDAS_REQ_NAMEID_FORMAT);
-			
-			//set citizen country code for foreign uses
-			authnRequestBuilder.citizenCountryCode(citizenCountryCode);
-			
-			//set relay state
-			/*TODO: SecureToken PendingRequestId generates a validation exception in eIDASNode because
-			 * eIDASNode implements limit on size for RelayState (80characaters)
-			 */
-			//authnRequestBuilder.relayState(pendingReq.getPendingRequestId());
-							
-			//Add country-specific informations into eIDAS request
-			ccSpecificProcessing.preProcess(citizenCountryCode, pendingReq, authnRequestBuilder);
-			
-			//build request
-			LightRequest lightAuthnReq = authnRequestBuilder.build();
-			
-			//put request into Hazelcast cache
-			BinaryLightToken token = putRequestInCommunicationCache(lightAuthnReq);
-			final String tokenBase64 = BinaryLightTokenHelper.encodeBinaryLightTokenBase64(token);
-
-			//Workaround, because eIDAS node ref. impl. does not return relayState
-			if (basicConfig.getBasicConfigurationBoolean(
-					Constants.CONIG_PROPS_EIDAS_NODE_WORKAROUND_USEREQUESTIDASTRANSACTIONIDENTIFIER, 
-					false)) {
-				log.trace("Put lightRequestId into transactionstore as session-handling backup");
-				transactionStore.put(lightAuthnReq.getId(), pendingReq.getPendingRequestId(), -1);
-				
-			}
-			
-			//select forward URL regarding the selected environment
-			String forwardURL = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL);
-			if (StringUtils.isNotEmpty(environment))
-				forwardURL = selectedForwardURLForEnvironment(environment);
-				
-			if (StringUtils.isEmpty(forwardURL)) {
-				log.warn("NO ForwardURL defined in configuration. Can NOT forward to eIDAS node! Process stops");
-				throw new EaafConfigurationException("config.08", new Object[] {
-						(environment==null)?Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL:Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL+"."+environment 
-					});
-				
-			}
-			log.debug("ForwardURL: " + forwardURL + " selected to forward eIDAS request");
-			
-			if (basicConfig.getBasicConfiguration(
-						Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_METHOD, 
-						Constants.FORWARD_METHOD_GET
-					).equals(Constants.FORWARD_METHOD_GET)) {
-				
-				log.debug("Use http-redirect for eIDAS node forwarding ...  ");
-				//send redirect
-				UriComponentsBuilder redirectUrl = UriComponentsBuilder.fromHttpUrl(forwardURL);
-				redirectUrl.queryParam(EidasParameterKeys.TOKEN.toString(), tokenBase64);			
-				response.sendRedirect(redirectUrl.build().encode().toString());
-				
-			} else {
-				log.debug("Use http-post for eIDAS node forwarding ...  ");
-				StaticGuiBuilderConfiguration config = new StaticGuiBuilderConfiguration(
-						basicConfig, 
-						pendingReq, 
-						Constants.TEMPLATE_POST_FORWARD_NAME, 
-						null);
-				
-				config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_ENDPOINT, forwardURL);
-				config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_TOKEN_NAME,
-						EidasParameterKeys.TOKEN.toString());				
-				config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_TOKEN_VALUE,
-						tokenBase64);
-				
-				guiBuilder.build(request, response, config, "Forward to eIDASNode form");
-								
-			} 				
-			
-			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.EIDAS_NODE_CONNECTED, lightAuthnReq.getId());
-			
-					
-		} catch (eIDASAuthenticationException  e) {
-			throw new TaskExecutionException(pendingReq, "eIDAS AuthnRequest generation FAILED.", e);
-			
-		} catch (Exception e) {
-			log.warn("eIDAS AuthnRequest generation FAILED.", e);
-			throw new TaskExecutionException(pendingReq, e.getMessage(), e);
-			
-		}
-		
-	}
-		
-	/**
-	 * Select a forward URL from configuration for a specific environment
-	 * <br><br>
-	 * <b>Info: </b> This method is needed, because eIDAS Ref. Impl only supports one countrycode on each instance. 
-	 * In consequence, more than one eIDAS Ref. Impl nodes are required to support producation, testing, or QS stages 
-	 * for one country by using one ms-specific eIDAS connector   
-	 * 
-	 * @param environment Environment selector from CountrySlection page
-	 * @return
-	 */
-    private String selectedForwardURLForEnvironment(String environment) {
-    	log.trace("Starting endpoint selection process for environment: " + environment + " ... ");
-    	if (environment.equalsIgnoreCase(MSeIDASNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_PRODUCTION))
-    		return basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL);
-    	
-    	else if (environment.equalsIgnoreCase(MSeIDASNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_QS))
-			return basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL 
-						+ "." + MSeIDASNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_QS);
-    	
-    	else if (environment.equalsIgnoreCase(MSeIDASNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_TESTING))
-			return basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL 
-						+ "." + MSeIDASNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_TESTING);
-    	
-    	else if (environment.equalsIgnoreCase(MSeIDASNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_DEVELOPMENT))
-			return basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL 
-						+ "." + MSeIDASNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_DEVELOPMENT);    	
-		
-    	log.info("Environment selector: " + environment + " is not supported");
-    	return null;
-		
-	}
-	
-    private BinaryLightToken putRequestInCommunicationCache(ILightRequest iLightRequest) throws ServletException {
-        final BinaryLightToken binaryLightToken;
-        try {
-            final SpecificCommunicationService springManagedSpecificConnectorCommunicationService =
-                    (SpecificCommunicationService) context.getBean(SpecificCommunicationDefinitionBeanNames.SPECIFIC_CONNECTOR_COMMUNICATION_SERVICE.toString());
-
-            binaryLightToken = springManagedSpecificConnectorCommunicationService.putRequest(iLightRequest);
-            
-        } catch (SpecificCommunicationException e) {
-            log.error("Unable to process specific request");
-            throw new ServletException(e);
-            
-        }
-        
-        return binaryLightToken;
-    }
-    
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java
deleted file mode 100644
index 4dd50f9a..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/tasks/ReceiveAuthnResponseTask.java
+++ /dev/null
@@ -1,120 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-/*******************************************************************************
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-
-import at.asitplus.eidas.specific.connector.MSConnectorEventCodes;
-import at.asitplus.eidas.specific.connector.MSeIDASNodeConstants;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASAuthenticationException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASAttributeRegistry;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.validator.eIDASResponseValidator;
-import at.gv.egiz.eaaf.core.api.idp.IConfiguration;
-import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
-import at.gv.egiz.eaaf.core.exceptions.EaafException;
-import at.gv.egiz.eaaf.core.exceptions.TaskExecutionException;
-import at.gv.egiz.eaaf.core.impl.idp.auth.data.AuthProcessDataWrapper;
-import at.gv.egiz.eaaf.core.impl.idp.auth.modules.AbstractAuthServletTask;
-import eu.eidas.auth.commons.light.ILightResponse;
-
-@Component("ReceiveResponseFromeIDASNodeTask")
-public class ReceiveAuthnResponseTask extends AbstractAuthServletTask {
-	private static final Logger log = LoggerFactory.getLogger(ReceiveAuthnResponseTask.class);
-	
-	@Autowired private IConfiguration basicConfig;
-	@Autowired private eIDASAttributeRegistry attrRegistry;
-		
-	@Override 
-	public void execute(ExecutionContext executionContext, HttpServletRequest request, HttpServletResponse response) throws TaskExecutionException {
-		try{					    
-			ILightResponse eIDASResponse = (ILightResponse) request.getAttribute(Constants.DATA_FULL_EIDAS_RESPONSE);
-			if (eIDASResponse == null) {
-				log.warn("NO eIDAS response-message found.");
-				throw new eIDASAuthenticationException("eidas.01", null);
-				
-			}  
-			
-	    	log.debug("Receive eIDAS response with RespId:" + eIDASResponse.getId() + " for ReqId:" + eIDASResponse.getInResponseToId());
-	    	log.trace("Full eIDAS-Resp: " + eIDASResponse.toString());
-			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE, eIDASResponse.getId());
-	    	
-	    	
-			//check response StatusCode 
-			if (!eIDASResponse.getStatus().getStatusCode().equals(Constants.SUCCESS_URI)) {
-				log.info("Receice eIDAS Response with StatusCode:" + eIDASResponse.getStatus().getStatusCode()
-				+ " Subcode:" + eIDASResponse.getStatus().getSubStatusCode() + " Msg:" + eIDASResponse.getStatus().getStatusMessage());
-				throw new eIDASAuthenticationException("eidas.02", new Object[]{eIDASResponse.getStatus().getStatusCode(), eIDASResponse.getStatus().getStatusMessage()});
-				
-			}
-
-			// extract all Attributes from response
-			
-			
-			
-			// **********************************************************
-			// *******   MS-specificresponse validation   **********
-			// **********************************************************
-			String spCountry = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_COUNTRYCODE, "AT");
-			String citizenCountryCode = (String) executionContext.get(MSeIDASNodeConstants.REQ_PARAM_SELECTED_COUNTRY);
-			eIDASResponseValidator.validateResponse(pendingReq, eIDASResponse, spCountry, citizenCountryCode, attrRegistry);
-
-			
-			// **********************************************************
-			// ******* Store resonse infos into session object **********
-			// **********************************************************
-			
-			//update MOA-Session data with received information			
-			log.debug("Store eIDAS response information into pending-request.");				
-			AuthProcessDataWrapper authProcessData = pendingReq.getSessionData(AuthProcessDataWrapper.class);
-			authProcessData.setQaaLevel(eIDASResponse.getLevelOfAssurance());
-			authProcessData.setGenericDataToSession(Constants.DATA_FULL_EIDAS_RESPONSE, eIDASResponse);
-			
-			//store MOA-session to database
-			requestStoreage.storePendingRequest(pendingReq);
-			
-			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_VALID);
-		
-		} catch (EaafException e) {
-			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_NOT_VALID);
-			throw new TaskExecutionException(pendingReq, "eIDAS Response processing FAILED.", e);
-					
-		} catch (Exception e) {
-			log.warn("eIDAS Response processing FAILED.", e);
-			revisionsLogger.logEvent(pendingReq, MSConnectorEventCodes.RESPONSE_FROM_EIDAS_NODE_NOT_VALID);
-			throw new TaskExecutionException(pendingReq, e.getMessage(), 
-					new eIDASAuthenticationException("eidas.05", new Object[]{e.getMessage()}, e));
-			
-		}	
-		
-	}
-
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/utils/eIDASResponseUtils.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/utils/eIDASResponseUtils.java
deleted file mode 100644
index 8422f204..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/utils/eIDASResponseUtils.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang3.StringUtils;
-import org.joda.time.DateTime;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableList;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-import at.gv.egiz.eaaf.core.impl.data.Trible;
-import eu.eidas.auth.commons.attribute.AttributeDefinition;
-import eu.eidas.auth.commons.attribute.AttributeValue;
-import eu.eidas.auth.commons.attribute.AttributeValueMarshaller;
-import eu.eidas.auth.commons.attribute.AttributeValueMarshallingException;
-import eu.eidas.auth.commons.attribute.AttributeValueTransliterator;
-import eu.eidas.auth.commons.protocol.eidas.impl.PostalAddress;
-
-public class eIDASResponseUtils {
-	private static final Logger log = LoggerFactory.getLogger(eIDASResponseUtils.class);
-	
-	public static final String PERSONALIDENIFIER_VALIDATION_PATTERN = "^[A-Z,a-z]{2}/[A-Z,a-z]{2}/.*";
-	 
-	/**
-	 * Validate a eIDAS PersonalIdentifier attribute value 
-	 * This validation is done according to eIDAS SAML Attribute Profile -  Section 2.2.3 Unique Identifier 
-	 * 
-	 * @param uniqueID eIDAS attribute value of a unique identifier
-	 * @return true if the uniqueID matches to eIDAS to Unique Identifier specification, otherwise false
-	 */
-	public static boolean validateEidasPersonalIdentifier(String uniqueID) {
-		Pattern pattern = Pattern.compile(PERSONALIDENIFIER_VALIDATION_PATTERN );
-		Matcher matcher = pattern.matcher(uniqueID);	
-		return matcher.matches();
-		
-	}
-	
-	
-	/**
-	 * Parse an eIDAS PersonalIdentifier attribute value into it components. 
-	 * This processing is done according to eIDAS SAML Attribute Profile -  Section 2.2.3 Unique Identifier 
-	 * 
-	 * @param uniqueID eIDAS attribute value of a unique identifier
-	 * @return {@link Trible} that contains: 
-	 * 				<br> First : citizen country
-	 * 				<br> Second: destination country
-	 * 				<br> Third : unique identifier
-	 * 	<br> or null if the attribute value has a wrong format
-	 */					
-	public static Trible<String, String, String> parseEidasPersonalIdentifier(String uniqueID) {
-		if (!validateEidasPersonalIdentifier(uniqueID)) {
-			log.error("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER 
-					+ " looks wrong formated. Value:" + ((String)uniqueID));				
-			return null;
-			
-		}		
-		return Trible.newInstance(uniqueID.substring(0, 2), uniqueID.substring(3, 5), uniqueID.substring(6)); 
-		
-	}
-
-	//TODO: check possible problem with nonLatinCharacters	
-    public static List<String> translateStringListAttribute(AttributeDefinition<?> attributeDefinition, ImmutableList<? extends AttributeValue<?>> attributeValues) {
-        final List<String> stringListAttribute = new ArrayList<String>();
-        AttributeValueMarshaller<?> attributeValueMarshaller = attributeDefinition.getAttributeValueMarshaller();
-        for (AttributeValue<?> attributeValue : attributeValues) {
-            String valueString = null;
-            try {
-            	valueString = attributeValueMarshaller.marshal((AttributeValue) attributeValue);
-            	
-            	log.trace("Find attr: " + attributeDefinition.getFriendlyName() 
-            				+ " with value: " + attributeValue.toString() 
-            				+ " nonLatinFlag: " + attributeValue.isNonLatinScriptAlternateVersion()
-            				+ " needTransliteration: " + AttributeValueTransliterator.needsTransliteration(valueString));
-            	            	
-            	//if (attributeValue.isNonLatinScriptAlternateVersion()) {
-            	if (!AttributeValueTransliterator.needsTransliteration(valueString)) {
-            		stringListAttribute.add(0, valueString);
-            		
-            	} else {
-            		log.trace("Find 'needsTransliteration' flag. Setting this value at last list element ... ");
-            		stringListAttribute.add(valueString);
-            		
-            	}
-            	
-            } catch (AttributeValueMarshallingException e) {
-                throw new IllegalStateException(e);
-                
-            }
-        }
-        
-        log.trace("Extract values: " + StringUtils.join(stringListAttribute, ",") 
-        	+ " for attr: " + attributeDefinition.getFriendlyName());
-        
-        return stringListAttribute;
-        
-    }
-    
-    public static DateTime translateDateAttribute(AttributeDefinition<?> attributeDefinition, ImmutableList<? extends AttributeValue<?>> attributeValues) {
-        if (attributeValues.size() != 0) {
-            final AttributeValue<?> firstAttributeValue = attributeValues.get(0);
-            return (DateTime) firstAttributeValue.getValue();
-
-        }
-        
-        return null;
-    }
-    
-    public static PostalAddress translateAddressAttribute(AttributeDefinition<?> attributeDefinition, ImmutableList<? extends AttributeValue<?>> attributeValues) {
-        final AttributeValue<?> firstAttributeValue = attributeValues.get(0);
-        return (PostalAddress) firstAttributeValue.getValue();
-
-    }
-	
-}
diff --git a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/validator/eIDASResponseValidator.java b/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/validator/eIDASResponseValidator.java
deleted file mode 100644
index f974232b..00000000
--- a/eidas_modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/authmodule_eIDASv2/validator/eIDASResponseValidator.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/*******************************************************************************
- * Copyright 2018 A-SIT Plus GmbH
- * AT-specific eIDAS Connector has been developed in a cooperation between EGIZ, 
- * A-SIT Plus GmbH, A-SIT, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
- * the European Commission - subsequent versions of the EUPL (the "License");
- * You may not use this work except in compliance with the License.
- * You may obtain a copy of the License at:
- * https://joinup.ec.europa.eu/news/understanding-eupl-v12
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * This product combines work with different licenses. See the "NOTICE" text
- * file for details on the various modules and licenses.
- * The "NOTICE" text file is part of the distribution. Any derivative works
- * that you distribute must include a readable copy of the "NOTICE" text file.
- *******************************************************************************/
-package at.asitplus.eidas.specific.modules.authmodule_eIDASv2.validator;
-
-import java.util.List;
-
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import com.google.common.collect.ImmutableList;
-
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.Constants;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.exception.eIDASValidationException;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASAttributeRegistry;
-import at.asitplus.eidas.specific.modules.authmodule_eIDASv2.utils.eIDASResponseUtils;
-import at.gv.egiz.eaaf.core.api.IRequest;
-import at.gv.egiz.eaaf.core.impl.data.Trible;
-import eu.eidas.auth.commons.attribute.AttributeDefinition;
-import eu.eidas.auth.commons.attribute.AttributeValue;
-import eu.eidas.auth.commons.light.ILightResponse;
-import eu.eidas.auth.commons.protocol.eidas.LevelOfAssurance;
-
-/**
- * @author tlenz
- *
- */
-public class eIDASResponseValidator {
-	private static final Logger log = LoggerFactory.getLogger(eIDASResponseValidator.class);
-
-	public static void validateResponse(IRequest pendingReq, ILightResponse eIDASResponse, String spCountry, String citizenCountryCode, eIDASAttributeRegistry attrRegistry) throws eIDASValidationException {		
-
-		/*-----------------------------------------------------|
-		 * validate received LoA against minimum required LoA  |
-		 *_____________________________________________________|
-		 */ 
-		LevelOfAssurance respLoA = LevelOfAssurance.fromString(eIDASResponse.getLevelOfAssurance());		
-		List<String> allowedLoAs = pendingReq.getServiceProviderConfiguration().getRequiredLoA();
-		boolean loaValid = false;
-		for (String allowedLoaString : allowedLoAs) {
-			LevelOfAssurance allowedLoa = LevelOfAssurance.fromString(allowedLoaString);
-			if (respLoA.numericValue() >= allowedLoa.numericValue()) {
-				log.debug("Response contains valid LoA. Resume process ... ");
-				loaValid = true;
-				break;
-				
-			} else
-				log.trace("Allowed LoA: " + allowedLoaString + " DOES NOT match response LoA: " + eIDASResponse.getLevelOfAssurance());
-			
-		}
-		
-		if (!loaValid) {
-			log.error("eIDAS Response LevelOfAssurance is lower than the required! "
-					+ "(Resp-LoA:" + respLoA.getValue() + " Req-LoA:" + allowedLoAs.toArray() + ")");
-			throw new eIDASValidationException("eidas.06", new Object[]{respLoA.getValue()});
-			
-		}
-						
-
-
-		/*-----------------------------------------------------|
-		 *     validate 'PersonalIdentifier' attribute         |
-		 *_____________________________________________________|
-		 */
-		AttributeDefinition<?> attrDefinition = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();        
-	    final ImmutableList<? extends AttributeValue<?>> attributeValues = eIDASResponse.getAttributes().getAttributeMap().get(attrDefinition).asList();
-	    List<String> personalIdObj = eIDASResponseUtils.translateStringListAttribute(attrDefinition, attributeValues);
-	    	   
-		//check if attribute exists
-		if (personalIdObj == null || personalIdObj.isEmpty()) {
-	        	log.warn("eIDAS Response include NO 'PersonalIdentifier' attriubte "
-	        			+ ".... That can be a BIG problem in further processing steps");	
-	        	throw new eIDASValidationException("eidas.05", new Object[] {"NO 'PersonalIdentifier' attriubte"});
-	        	
-		} else if (personalIdObj.size() > 1) {
-			log.warn("eIDAS Response include MORE THAN ONE 'PersonalIdentifier' attriubtes "
-        			+ ".... That can be a BIG problem in further processing steps");
-			throw new eIDASValidationException("eidas.05", new Object[] {"MORE THAN ONE 'PersonalIdentifier' attriubtes"});
-								
-		} else {
-			String natPersId = personalIdObj.get(0);
-			//validate attribute value format			
-			Trible<String, String, String> split = 
-					eIDASResponseUtils.parseEidasPersonalIdentifier(natPersId);
-			if (split == null) {
-				throw new eIDASValidationException("eidas.07", 
-						new Object[]{
-								Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
-								"Wrong identifier format"});
-				
-			} else {
-				//validation according to eIDAS SAML Attribute Profile, Section 2.2.3 
-				if (StringUtils.isEmpty(split.getSecond())) {
-					log.warn("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER 
-							+ " includes NO destination country. Value:" + natPersId);				
-					throw new eIDASValidationException("eidas.07", 
-							new Object[]{
-									Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
-									"No or empty destination country"});
-					
-				}
-				if (!split.getSecond().equalsIgnoreCase(spCountry)) {
-					log.warn("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER 
-							+ " includes wrong destination country. Value:" + natPersId
-							+ " SP-Country:" + spCountry);				
-					throw new eIDASValidationException("eidas.07", 
-							new Object[]{
-									Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
-									"Destination country does not match to SP country"});
-					
-				}
-				
-				if (StringUtils.isEmpty(split.getFirst())) {
-					log.warn("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER 
-							+ " includes NO citizen country. Value:" + natPersId);				
-					throw new eIDASValidationException("eidas.07", 
-							new Object[]{
-									Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
-									"No or empty citizen country"});
-					
-				}
-				if (!split.getFirst().equalsIgnoreCase(citizenCountryCode)) {
-					log.warn("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER 
-							+ " includes a citizen country that does not match to service-provider country. "
-							+ " Value:" + natPersId
-							+ " citiczen Country:" + spCountry);				
-					throw new eIDASValidationException("eidas.07", 
-							new Object[]{
-									Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
-									"Citizen country does not match to eIDAS-node country that generates the response"});
-					
-				}				
-			}									
-		}
-
-	}
-}
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
index 19134513..a8d2991d 100644
--- 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
@@ -1 +1 @@
-at.asitplus.eidas.specific.modules.authmodule_eIDASv2.eIDASAuthenticationSpringResourceProvider
\ No newline at end of file
+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
index 14ef4b42..55bb1ace 100644
--- 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
@@ -1,19 +1,29 @@
 <?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">
+  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: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: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_v2_auth.beans.xml b/eidas_modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
index 0a000112..708fd4e2 100644
--- 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
@@ -1,76 +1,87 @@
 <?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.authmodule_eIDASv2.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.authmodule_eIDASv2.eIDASAuthenticationModulImpl">
-		<property name="priority" value="2" />
-	</bean>
-
-	<bean id="eIDASSignalServlet"
-		class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.eIDASSignalServlet" />
-
-	<bean id="attributeRegistry"
-			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASAttributeRegistry">
-		<property name="eidasAttributesFile" ref="specificConnectorAttributesFileWithPath"/>
-        <property name="additionalAttributesFile" ref="specificConnectorAdditionalAttributesFileWithPath"/>		
-	</bean>
-
-	<!-- <bean id="eIDASDataStore"
- 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.eIDASDataStore" /> -->
-
-	<bean id="EIDPostProcessingService"
- 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.service.CCSpecificEIDProcessingService" />
-
-	<bean id="DE-Processor" 	
- 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler.DEeIDProcessor">
- 		<property name="priority" value="1" />
- 	</bean>
- 			
- 	<bean id="Default-Processor"
- 			class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.handler.GenericeIDProcessor">
- 		<property name="priority" value="0" />
- 	</bean>
-
-	<!-- Authentication Process Tasks -->
-	<bean id="ConnecteIDASNodeTask"
-		class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.GenerateAuthnRequestTask"
-		scope="prototype" />
-
-	<bean id="ReceiveResponseFromeIDASNodeTask"
-		class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.ReceiveAuthnResponseTask"
-		scope="prototype" />
-
-	<bean id="CreateIdentityLinkTask"
-		class="at.asitplus.eidas.specific.modules.authmodule_eIDASv2.tasks.CreateIdentityLinkTask"
-		scope="prototype" />
+  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="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="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
index 09084a34..91b8e5e4 100644
--- 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
@@ -1,51 +1,122 @@
-<?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>
+<?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