Merge branch 'nightlybuild' of gitlab.iaik.tugraz.at:egiz/eidas_at_proxy into nightlybuild

55 files changed, 1819 insertions, 572 deletions

diff --git a/modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml b/modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml
index 9b12a750..84efc85d 100644
--- a/modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml
+++ b/modules/authmodule-eIDAS-v2/checks/spotbugs-exclude.xml
@@ -23,13 +23,7 @@
       <Class name="at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasSignalServlet" />
       <Method name="restoreEidasAuthProcess" />
       <Bug pattern="SPRING_CSRF_UNRESTRICTED_REQUEST_MAPPING" />               
-    </Match>
-    <Match>
-      <!-- File path is only loaded from configuration -->
-      <Class name="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry" />
-      <Method name="initialize" />
-      <Bug pattern="PATH_TRAVERSAL_IN" />               
-    </Match>
+    </Match>    
     <Match>
       <!-- Redirect URL is only loaded from configuration -->
       <Class name="at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.GenerateAuthnRequestTask" />
diff --git a/modules/authmodule-eIDAS-v2/pom.xml b/modules/authmodule-eIDAS-v2/pom.xml
index 4fe775cc..1ac03fbb 100644
--- a/modules/authmodule-eIDAS-v2/pom.xml
+++ b/modules/authmodule-eIDAS-v2/pom.xml
@@ -30,7 +30,7 @@
         <repository>
           <id>eIDASNode-local</id>
           <name>local</name>
-          <url>file:${basedir}/repository</url>
+          <url>file:${basedir}/../../repository</url>
         </repository>
       </repositories>
     </profile>
@@ -46,6 +46,10 @@
       <artifactId>core_common_lib</artifactId>
     </dependency>
     <dependency>
+      <groupId>at.asitplus.eidas.ms_specific</groupId>
+      <artifactId>core_commons_eidas</artifactId>
+    </dependency>     
+    <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
       <artifactId>eaaf-core</artifactId>
     </dependency>
@@ -194,7 +198,12 @@
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>
-
+    <dependency>
+      <groupId>at.asitplus.eidas.ms_specific</groupId>
+      <artifactId>core_commons_eidas</artifactId>
+      <scope>test</scope>
+      <type>test-jar</type>        
+    </dependency>          
     <dependency>
       <groupId>at.gv.egiz.eaaf</groupId>
       <artifactId>eaaf_core_utils</artifactId>
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.6.0/eidas-commons-2.6.0-sources.jar b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.6.0/eidas-commons-2.6.0-sources.jar
new file mode 100644
index 00000000..9313fbe2
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.6.0/eidas-commons-2.6.0-sources.jar
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.6.0/eidas-commons-2.6.0.jar b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.6.0/eidas-commons-2.6.0.jar
new file mode 100644
index 00000000..489a118d
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.6.0/eidas-commons-2.6.0.jar
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.6.0/eidas-commons-2.6.0.pom b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.6.0/eidas-commons-2.6.0.pom
new file mode 100644
index 00000000..b254385d
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-commons/2.6.0/eidas-commons-2.6.0.pom
@@ -0,0 +1,114 @@
+<!--

+  ~ Copyright (c) 2021 by European Commission

+  ~

+  ~ Licensed under the EUPL, Version 1.2 or - as soon they will be

+  ~ approved by the European Commission - subsequent versions of the

+  ~ EUPL (the "Licence");

+  ~ You may not use this work except in compliance with the Licence.

+  ~ You may obtain a copy of the Licence at:

+  ~ https://joinup.ec.europa.eu/page/eupl-text-11-12

+  ~

+  ~ Unless required by applicable law or agreed to in writing, software

+  ~ distributed under the Licence is distributed on an "AS IS" basis,

+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+  ~ implied.

+  ~ See the Licence for the specific language governing permissions and

+  ~ limitations under the Licence.

+  -->

+

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+    <modelVersion>4.0.0</modelVersion>

+    <artifactId>eidas-commons</artifactId>

+    <packaging>${mod.packaging.type}</packaging>

+    <name>eIDAS Commons</name>

+    <description>

+        The EIDASCommons library provides beans, Java Interfaces and utility classes to integrate EidasNode and SAML

+        Engine.

+    </description>

+    <parent>

+        <groupId>eu.eidas</groupId>

+        <artifactId>eidas-parent</artifactId>

+        <version>2.6.0</version>

+        <relativePath>../EIDAS-Parent/pom.xml</relativePath>

+    </parent>

+    <dependencies>

+        <dependency>

+            <groupId>eu.eidas</groupId>

+            <artifactId>eidas-light-commons</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>org.slf4j</groupId>

+            <artifactId>slf4j-api</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>javax.servlet</groupId>

+            <artifactId>javax.servlet-api</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>org.owasp.encoder</groupId>

+            <artifactId>encoder</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>javax.cache</groupId>

+            <artifactId>cache-api</artifactId>

+            <version>1.1.0</version>

+        </dependency>

+        <!-- TEST -->

+        <dependency>

+            <groupId>ch.qos.logback</groupId>

+            <artifactId>logback-classic</artifactId>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>aopalliance</groupId>

+            <artifactId>aopalliance</artifactId>

+            <version>1.0</version>

+            <scope>test</scope>

+        </dependency>

+    </dependencies>

+

+    <build>

+        <resources>

+            <resource>

+                <directory>${project.basedir}/src/main/resources</directory>

+            </resource>

+        </resources>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-source-plugin</artifactId>

+            </plugin>

+        </plugins>

+        <testResources>

+            <testResource>

+                <directory>src/test/resources</directory>

+                <includes>

+                    <include>log4j.xml</include>

+                    <include>*.properties</include>

+                </includes>

+            </testResource>

+        </testResources>

+    </build>

+    <profiles>

+        <profile>

+            <id>metrics</id>

+            <build>

+                <plugins>

+                    <plugin>

+                        <groupId>org.jacoco</groupId>

+                        <artifactId>jacoco-maven-plugin</artifactId>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>

+    </profiles>

+    <reporting>

+        <plugins>

+            <plugin>

+                <groupId>org.jacoco</groupId>

+                <artifactId>jacoco-maven-plugin</artifactId>

+            </plugin>

+        </plugins>

+    </reporting>

+</project>

diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.6.0/eidas-jcache-ignite-specific-communication-2.6.0-sources.jar b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.6.0/eidas-jcache-ignite-specific-communication-2.6.0-sources.jar
new file mode 100644
index 00000000..76de9f21
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.6.0/eidas-jcache-ignite-specific-communication-2.6.0-sources.jar
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.6.0/eidas-jcache-ignite-specific-communication-2.6.0.jar b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.6.0/eidas-jcache-ignite-specific-communication-2.6.0.jar
new file mode 100644
index 00000000..f47d9387
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.6.0/eidas-jcache-ignite-specific-communication-2.6.0.jar
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.6.0/eidas-jcache-ignite-specific-communication-2.6.0.pom b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.6.0/eidas-jcache-ignite-specific-communication-2.6.0.pom
new file mode 100644
index 00000000..00c9b834
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite-specific-communication/2.6.0/eidas-jcache-ignite-specific-communication-2.6.0.pom
@@ -0,0 +1,61 @@
+<!--

+  ~ Copyright (c) 2020 by European Commission

+  ~

+  ~ Licensed under the EUPL, Version 1.2 or - as soon they will be

+  ~ approved by the European Commission - subsequent versions of the

+  ~ EUPL (the "Licence");

+  ~ You may not use this work except in compliance with the Licence.

+  ~ You may obtain a copy of the Licence at:

+  ~ https://joinup.ec.europa.eu/page/eupl-text-11-12

+  ~

+  ~ Unless required by applicable law or agreed to in writing, software

+  ~ distributed under the Licence is distributed on an "AS IS" basis,

+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+  ~ implied.

+  ~ See the Licence for the specific language governing permissions and

+  ~ limitations under the Licence

+  -->

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0

+                             http://maven.apache.org/maven-v4_0_0.xsd">

+    <modelVersion>4.0.0</modelVersion>

+    <artifactId>eidas-jcache-ignite-specific-communication</artifactId>

+    <packaging>jar</packaging>

+    <name>eIDAS JCache Ignite Specific Communication</name>

+    <description>Implements JCache using Ignite with Specific Communication Definition's beans configurations.</description>

+

+    <parent>

+        <groupId>eu.eidas</groupId>

+        <artifactId>eidas-parent</artifactId>

+        <version>2.6.0</version>

+        <relativePath>../EIDAS-Parent/pom.xml</relativePath>

+    </parent>

+

+    <properties>

+        <ignite.version>2.8.1</ignite.version>

+    </properties>

+

+    <dependencies>

+        <dependency>

+            <groupId>eu.eidas</groupId>

+            <artifactId>eidas-jcache-ignite</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>org.springframework</groupId>

+            <artifactId>spring-context</artifactId>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.slf4j</groupId>

+            <artifactId>slf4j-simple</artifactId>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.ignite</groupId>

+            <artifactId>ignite-slf4j</artifactId>

+            <version>${ignite.version}</version>

+            <scope>test</scope>

+        </dependency>

+    </dependencies>

+

+</project>

diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.6.0/eidas-jcache-ignite-2.6.0-sources.jar b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.6.0/eidas-jcache-ignite-2.6.0-sources.jar
new file mode 100644
index 00000000..f30cd314
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.6.0/eidas-jcache-ignite-2.6.0-sources.jar
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.6.0/eidas-jcache-ignite-2.6.0.jar b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.6.0/eidas-jcache-ignite-2.6.0.jar
new file mode 100644
index 00000000..10487964
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.6.0/eidas-jcache-ignite-2.6.0.jar
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.6.0/eidas-jcache-ignite-2.6.0.pom b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.6.0/eidas-jcache-ignite-2.6.0.pom
new file mode 100644
index 00000000..adc838fa
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-jcache-ignite/2.6.0/eidas-jcache-ignite-2.6.0.pom
@@ -0,0 +1,94 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0

+                             http://maven.apache.org/maven-v4_0_0.xsd">

+    <modelVersion>4.0.0</modelVersion>

+    <artifactId>eidas-jcache-ignite</artifactId>

+    <packaging>jar</packaging>

+    <name>eIDAS JCache Ignite</name>

+    <description>Implements JCache using Ignite.</description>

+

+    <parent>

+        <groupId>eu.eidas</groupId>

+        <artifactId>eidas-parent</artifactId>

+        <version>2.6.0</version>

+        <relativePath>../EIDAS-Parent/pom.xml</relativePath>

+    </parent>

+

+    <properties>

+        <ignite.version>2.8.1</ignite.version>

+    </properties>

+

+    <dependencies>

+        <dependency>

+            <groupId>eu.eidas</groupId>

+            <artifactId>eidas-commons</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>commons-logging</groupId>

+            <artifactId>commons-logging</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.ignite</groupId>

+            <artifactId>ignite-core</artifactId>

+            <version>${ignite.version}</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.gridgain</groupId>

+                    <artifactId>ignite-shmem</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.ignite</groupId>

+            <artifactId>ignite-spring</artifactId>

+            <version>${ignite.version}</version>

+            <exclusions>

+                <exclusion>

+                    <groupId>org.apache.ignite</groupId>

+                    <artifactId>ignite-indexing</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.springframework</groupId>

+                    <artifactId>spring-core</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.springframework</groupId>

+                    <artifactId>spring-aop</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.springframework</groupId>

+                    <artifactId>spring-beans</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.springframework</groupId>

+                    <artifactId>spring-context</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.springframework</groupId>

+                    <artifactId>spring-expression</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.springframework</groupId>

+                    <artifactId>spring-tx</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>org.springframework</groupId>

+                    <artifactId>spring-jdbc</artifactId>

+                </exclusion>

+                <exclusion>

+                    <groupId>commons-logging</groupId>

+                    <artifactId>commons-logging</artifactId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>javax.servlet</groupId>

+            <artifactId>javax.servlet-api</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>org.apache.ignite</groupId>

+            <artifactId>ignite-slf4j</artifactId>

+            <version>${ignite.version}</version>

+        </dependency>

+    </dependencies>

+</project>

diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.6.0/eidas-light-commons-2.6.0-sources.jar b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.6.0/eidas-light-commons-2.6.0-sources.jar
new file mode 100644
index 00000000..34de1733
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.6.0/eidas-light-commons-2.6.0-sources.jar
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.6.0/eidas-light-commons-2.6.0.jar b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.6.0/eidas-light-commons-2.6.0.jar
new file mode 100644
index 00000000..a24f36cd
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.6.0/eidas-light-commons-2.6.0.jar
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.6.0/eidas-light-commons-2.6.0.pom b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.6.0/eidas-light-commons-2.6.0.pom
new file mode 100644
index 00000000..1a9eccef
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-light-commons/2.6.0/eidas-light-commons-2.6.0.pom
@@ -0,0 +1,59 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">

+    <modelVersion>4.0.0</modelVersion>

+    <artifactId>eidas-light-commons</artifactId>

+    <packaging>${mod.packaging.type}</packaging>

+    <name>eIDAS Light Commons</name>

+    <description>

+        The EIDASLightCommons library provides Java Interfaces and utility classes to integrate EIDASCommons and eIDAS Specific Communication Definition.

+    </description>

+    <parent>

+        <groupId>eu.eidas</groupId>

+        <artifactId>eidas-parent</artifactId>

+        <version>2.6.0</version>

+        <relativePath>../EIDAS-Parent/pom.xml</relativePath>

+    </parent>

+    <dependencies>

+        <dependency>

+            <groupId>jakarta.xml.bind</groupId>

+            <artifactId>jakarta.xml.bind-api</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>joda-time</groupId>

+            <artifactId>joda-time</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>com.ibm.icu</groupId>

+            <artifactId>icu4j</artifactId>

+        </dependency>

+    </dependencies>

+    <build>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-source-plugin</artifactId>

+            </plugin>

+        </plugins>

+    </build>

+    <profiles>

+        <profile>

+            <id>metrics</id>

+            <build>

+                <plugins>

+                    <plugin>

+                        <groupId>org.jacoco</groupId>

+                        <artifactId>jacoco-maven-plugin</artifactId>

+                    </plugin>

+                </plugins>

+            </build>

+        </profile>

+    </profiles>

+    <reporting>

+        <plugins>

+            <plugin>

+                <groupId>org.jacoco</groupId>

+                <artifactId>jacoco-maven-plugin</artifactId>

+            </plugin>

+        </plugins>

+    </reporting>

+</project>

diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-parent/2.6.0/eidas-parent-2.6.0.pom b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-parent/2.6.0/eidas-parent-2.6.0.pom
new file mode 100644
index 00000000..fe858c92
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-parent/2.6.0/eidas-parent-2.6.0.pom
@@ -0,0 +1,900 @@
+<!--

+  ~ Copyright (c) 2022 by European Commission

+  ~

+  ~ Licensed under the EUPL, Version 1.2 or - as soon they will be

+  ~ approved by the European Commission - subsequent versions of the

+  ~ EUPL (the "Licence");

+  ~ You may not use this work except in compliance with the Licence.

+  ~ You may obtain a copy of the Licence at:

+  ~ https://joinup.ec.europa.eu/page/eupl-text-11-12

+  ~

+  ~ Unless required by applicable law or agreed to in writing, software

+  ~ distributed under the Licence is distributed on an "AS IS" basis,

+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+  ~ implied.

+  ~ See the Licence for the specific language governing permissions and

+  ~ limitations under the Licence.

+  -->

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0

+                             http://maven.apache.org/maven-v4_0_0.xsd">

+    <modelVersion>4.0.0</modelVersion>

+    <groupId>eu.eidas</groupId>

+    <artifactId>eidas-parent</artifactId>

+    <packaging>pom</packaging>

+    <name>eIDAS Node Parent</name>

+    <version>2.6.0</version>

+    <description>

+        The EIDAS-Parent provides artifacts versions for Eidas Node components.

+    </description>

+    <properties>

+        <!-- 1) Project properties -->

+        <proj.name>EIDASParent</proj.name>

+        <proj.name.eidas>EidasNode</proj.name.eidas>

+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

+        <app.packaging.type>war</app.packaging.type>

+        <mod.packaging.type>jar</mod.packaging.type>

+        <timestamp>${maven.build.timestamp}</timestamp>

+        <!-- java version targeted in the compile phase -->

+        <java.version>11</java.version>

+

+        <samlspec.version>0.5.2</samlspec.version>

+        <samlspecacept.version>0.5.1</samlspecacept.version>

+

+        <!-- 2) Library dependency versions -->

+        <spring.version>4.3.18.RELEASE</spring.version>

+        <opensaml.not-yet-commons-ssl.version>0.3.9</opensaml.not-yet-commons-ssl.version>

+        <opensaml.openws.version>1.5.5</opensaml.openws.version>

+        <opensaml.version>4.1.1</opensaml.version>

+        <opensaml.api.version>4.1.1</opensaml.api.version>

+        <xmlsec.version>2.2.3</xmlsec.version>

+        <shibboleth.xmlsupport.version>8.0.0</shibboleth.xmlsupport.version>

+        <servlet.version>3.0.1</servlet.version>

+        <jaxb.api.version>2.3.3</jaxb.api.version>

+        <jaxb.runtime.version>2.3.3</jaxb.runtime.version>

+        <json.runtime.version>1.1.4</json.runtime.version>

+        <jsp.api>2.0</jsp.api>

+        <jstl.version>1.2.6</jstl.version>

+        <jasper.version>6.0.53</jasper.version>

+        <slf4j.version>1.7.10</slf4j.version>

+        <logback.version>1.2.9</logback.version>

+        <mockito.version>3.7.0</mockito.version>

+        <junit.version>4.12</junit.version>

+        <hamcrest.version>1.3</hamcrest.version>

+        <commons.codec>1.15</commons.codec>

+        <commons.collections>3.2.2</commons.collections>

+        <commons.io>2.4</commons.io>

+        <commons.lang>2.6</commons.lang>

+        <commons.logging>1.1.3</commons.logging>

+        <commons.httpclient>4.5.13</commons.httpclient>

+        <commons.httpcore>4.4.9</commons.httpcore>

+        <commons.lang3>3.1</commons.lang3>

+        <bouncycastle.version>1.70</bouncycastle.version>

+        <owasp.version>1.2.3</owasp.version>

+        <owasp.dependency-check.version>1.4.0</owasp.dependency-check.version>

+        <joda.time.version>2.6</joda.time.version>

+        <log4j.version>1.2.17</log4j.version>

+        <log4j.api>2.3</log4j.api>

+        <xmlunit.version>1.5</xmlunit.version>

+        <bdr.econnector.version>1.2.2</bdr.econnector.version>

+        <struts.version>2.3.34</struts.version>

+        <vaadin.version>7.4.2</vaadin.version>

+        <vaadin.plugin.version>${vaadin.version}</vaadin.plugin.version>

+        <vaadin-spring.version>1.0.0.beta1</vaadin-spring.version>

+        <vaadin4spring.version>0.0.5.RELEASE</vaadin4spring.version>

+        <jetty.plugin.version>9.2.3.v20140905</jetty.plugin.version>

+        <guava.version>28.1-jre</guava.version>

+        <jsr305.version>3.0.1</jsr305.version>

+        <icu4j.version>57.1</icu4j.version>

+

+        <!-- 3) maven plugin versions -->

+        <javadoc.plugin.version>2.8.1</javadoc.plugin.version>

+        <compile.plugin.version>3.8.0</compile.plugin.version>

+        <surefire.plugin.version>2.19.1</surefire.plugin.version>

+        <war.plugin.version>3.2.0</war.plugin.version>

+        <ear.plugin.version>2.7</ear.plugin.version>

+        <resources.plugin.version>2.4</resources.plugin.version>

+        <jacoco.plugin.version>0.8.7</jacoco.plugin.version>

+        <remote.resources.plugin.version>1.5</remote.resources.plugin.version>

+        <source.plugin.version>2.1.2</source.plugin.version>

+        <install.plugin.version>2.5.2</install.plugin.version>

+        <clean.plugin.version>2.6.1</clean.plugin.version>

+        <maven.jar.plugin.version>3.1.2</maven.jar.plugin.version>

+        <jaxb.plugin.version>2.5.0</jaxb.plugin.version>

+    </properties>

+

+    <dependencyManagement>

+        <dependencies>

+            <!-- eIDAS modules -->

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>SimpleProtocol</artifactId>

+                <version>0.0.4-SNAPSHOT</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-commons</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-light-commons</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-encryption</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-saml-engine</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-updater</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-saml-metadata</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-specific-connector</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-specific-proxyservice</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-specific-communication-definition</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-jcache-dev</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-jcache-dev-node</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-jcache-dev-specific-communication</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-jcache-ignite</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-jcache-ignite-node</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-jcache-ignite-specific-communication</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-node</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-sp</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>eu.eidas</groupId>

+                <artifactId>eidas-idp</artifactId>

+                <version>${project.version}</version>

+            </dependency>

+

+            <!-- Servlets -->

+            <dependency>

+                <groupId>javax.servlet</groupId>

+                <artifactId>javax.servlet-api</artifactId>

+                <version>${servlet.version}</version>

+                <scope>provided</scope>

+            </dependency>

+            <dependency>

+                <groupId>org.glassfish.web</groupId>

+                <artifactId>jakarta.servlet.jsp.jstl</artifactId>

+                <version>${jstl.version}</version>

+                <scope>runtime</scope>

+            </dependency>

+

+            <!-- JSP Java Server Pages -->

+            <dependency>

+                <groupId>javax.servlet</groupId>

+                <artifactId>jsp-api</artifactId>

+                <version>${jsp.api}</version>

+                <scope>provided</scope>

+            </dependency>

+            <dependency>

+                <groupId>org.apache.tomcat</groupId>

+                <artifactId>jasper-el</artifactId>

+                <version>${jasper.version}</version>

+            </dependency>

+

+            <!-- Struts2 -->

+            <dependency>

+                <groupId>org.apache.struts</groupId>

+                <artifactId>struts2-core</artifactId>

+                <version>${struts.version}</version>

+            </dependency>

+

+            <!-- Spring -->

+            <dependency>

+                <groupId>org.springframework</groupId>

+                <artifactId>spring-core</artifactId>

+                <version>${spring.version}</version>

+                <exclusions>

+                    <exclusion>

+                        <groupId>commons-logging</groupId>

+                        <artifactId>commons-logging</artifactId>

+                    </exclusion>

+                </exclusions>

+            </dependency>

+            <dependency>

+                <groupId>org.springframework</groupId>

+                <artifactId>spring-beans</artifactId>

+                <version>${spring.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.springframework</groupId>

+                <artifactId>spring-context</artifactId>

+                <version>${spring.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.springframework</groupId>

+                <artifactId>spring-context-support</artifactId>

+                <version>${spring.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.springframework</groupId>

+                <artifactId>spring-web</artifactId>

+                <version>${spring.version}</version>

+            </dependency>

+

+            <!-- XML -->

+            <!-- JAXB Jakarta XML Binding -->

+            <dependency>

+                <groupId>jakarta.xml.bind</groupId>

+                <artifactId>jakarta.xml.bind-api</artifactId>

+                <version>${jaxb.api.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.glassfish.jaxb</groupId>

+                <artifactId>jaxb-runtime</artifactId>

+                <version>${jaxb.runtime.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.glassfish</groupId>

+                <artifactId>javax.json</artifactId>

+                <version>${json.runtime.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>xalan</groupId>

+                <artifactId>xalan</artifactId>

+                <version>${xalan.version}</version>

+            </dependency>

+            <!-- OpenSaml -->

+            <dependency>

+                <groupId>org.opensaml</groupId>

+                <artifactId>opensaml-core</artifactId>

+                <version>${opensaml.version}</version>

+                <exclusions>

+                    <exclusion>

+                        <groupId>commons-codec</groupId>

+                        <artifactId>commons-codec</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>commons-collections</groupId>

+                        <artifactId>commons-collections</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>commons-lang</groupId>

+                        <artifactId>commons-lang</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>commons-logging</groupId>

+                        <artifactId>commons-logging</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>javax.servlet</groupId>

+                        <artifactId>servlet-api</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>joda-time</groupId>

+                        <artifactId>joda-time</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>junit</groupId>

+                        <artifactId>junit</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>log4j</groupId>

+                        <artifactId>log4j</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>org.apache.velocity</groupId>

+                        <artifactId>velocity</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>org.bouncycastle</groupId>

+                        <artifactId>bcprov-jdk15on</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>org.slf4j</groupId>

+                        <artifactId>slf4j-api</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>org.slf4j</groupId>

+                        <artifactId>jcl-over-slf4j</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>org.slf4j</groupId>

+                        <artifactId>log4j-over-slf4j</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>org.slf4j</groupId>

+                        <artifactId>jul-to-slf4j</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>org.springframework</groupId>

+                        <artifactId>spring-test</artifactId>

+                    </exclusion>

+                </exclusions>

+            </dependency>

+            <dependency>

+                <groupId>org.opensaml</groupId>

+                <artifactId>opensaml-saml-api</artifactId>

+                <version>${opensaml.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.opensaml</groupId>

+                <artifactId>opensaml-saml-impl</artifactId>

+                <version>${opensaml.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.opensaml</groupId>

+                <artifactId>opensaml-security-api</artifactId>

+                <version>${opensaml.version}</version>

+                <exclusions>

+                    <exclusion>

+                        <groupId>org.bouncycastle</groupId>

+                        <artifactId>bcprov-jdk15on</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>org.bouncycastle</groupId>

+                        <artifactId>bcpkix-jdk15on</artifactId>

+                    </exclusion>

+                </exclusions>

+            </dependency>

+            <dependency>

+                <groupId>org.opensaml</groupId>

+                <artifactId>opensaml-security-impl</artifactId>

+                <version>${opensaml.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>net.shibboleth.utilities</groupId>

+                <artifactId>java-support</artifactId>

+                <version>${shibboleth.xmlsupport.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.opensaml</groupId>

+                <artifactId>opensaml-xmlsec-api</artifactId>

+                <exclusions>

+                    <exclusion>

+                        <groupId>org.bouncycastle</groupId>

+                        <artifactId>bcprov-jdk15on</artifactId>

+                    </exclusion>

+                </exclusions>

+                <version>${opensaml.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.opensaml</groupId>

+                <artifactId>opensaml-xmlsec-impl</artifactId>

+                <exclusions>

+                    <exclusion>

+                        <groupId>org.bouncycastle</groupId>

+                        <artifactId>bcprov-jdk15on</artifactId>

+                    </exclusion>

+                </exclusions>

+                <version>${opensaml.version}</version>

+            </dependency>

+            <dependency>

+                <!-- EIDINT-4171: Security upgrade of org.apache.santuario:xmlsec found in opensaml-xmlsec-impl -->

+                <groupId>org.apache.santuario</groupId>

+                <artifactId>xmlsec</artifactId>

+                <version>${xmlsec.version}</version>

+            </dependency>

+

+            <!--Logging-->

+            <dependency>

+                <groupId>org.slf4j</groupId>

+                <artifactId>slf4j-api</artifactId>

+                <version>${slf4j.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.slf4j</groupId>

+                <artifactId>jcl-over-slf4j</artifactId>

+                <version>${slf4j.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.slf4j</groupId>

+                <artifactId>log4j-over-slf4j</artifactId>

+                <version>${slf4j.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.slf4j</groupId>

+                <artifactId>jul-to-slf4j</artifactId>

+                <version>${slf4j.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.slf4j</groupId>

+                <artifactId>slf4j-simple</artifactId>

+                <version>${slf4j.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.slf4j</groupId>

+                <artifactId>slf4j-log4j12</artifactId>

+                <version>${slf4j.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>commons-logging</groupId>

+                <artifactId>commons-logging</artifactId>

+                <version>${commons.logging}</version>

+            </dependency>

+            <dependency>

+                <groupId>log4j</groupId>

+                <artifactId>log4j</artifactId>

+                <version>${log4j.version}</version>

+                <exclusions>

+                    <exclusion>

+                        <groupId>javax.jms</groupId>

+                        <artifactId>jms</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>com.sun.jdmk</groupId>

+                        <artifactId>jmxtools</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>com.sun.jmx</groupId>

+                        <artifactId>jmxri</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <artifactId>mail</artifactId>

+                        <groupId>javax.mail</groupId>

+                    </exclusion>

+                </exclusions>

+            </dependency>

+            <dependency>

+                <groupId>ch.qos.logback</groupId>

+                <artifactId>logback-classic</artifactId>

+                <version>${logback.version}</version>

+                <exclusions>

+                    <exclusion>

+                        <groupId>org.slf4j</groupId>

+                        <artifactId>slf4j-api</artifactId>

+                    </exclusion>

+                </exclusions>

+            </dependency>

+

+            <!-- Apache Commons -->

+            <dependency>

+                <groupId>commons-codec</groupId>

+                <artifactId>commons-codec</artifactId>

+                <version>${commons.codec}</version>

+            </dependency>

+            <dependency>

+                <groupId>commons-collections</groupId>

+                <artifactId>commons-collections</artifactId>

+                <version>${commons.collections}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.apache.httpcomponents</groupId>

+                <artifactId>httpclient</artifactId>

+                <version>${commons.httpclient}</version>

+                <exclusions>

+                    <exclusion>

+                        <groupId>commons-logging</groupId>

+                        <artifactId>commons-logging</artifactId>

+                    </exclusion>

+                    <exclusion>

+                        <groupId>commons-codec</groupId>

+                        <artifactId>commons-codec</artifactId>

+                    </exclusion>

+                </exclusions>

+            </dependency>

+            <dependency>

+                <groupId>org.apache.httpcomponents</groupId>

+                <artifactId>httpcore</artifactId>

+                <version>${commons.httpcore}</version>

+                <exclusions>

+                    <exclusion>

+                        <groupId>commons-logging</groupId>

+                        <artifactId>commons-logging</artifactId>

+                    </exclusion>

+                </exclusions>

+            </dependency>

+            <dependency>

+                <groupId>commons-io</groupId>

+                <artifactId>commons-io</artifactId>

+                <version>${commons.io}</version>

+            </dependency>

+            <dependency>

+                <groupId>commons-lang</groupId>

+                <artifactId>commons-lang</artifactId>

+                <version>${commons.lang}</version>

+            </dependency>

+

+            <!-- Additional Dependencies -->

+            <dependency>

+                <groupId>joda-time</groupId>

+                <artifactId>joda-time</artifactId>

+                <version>${joda.time.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.owasp.encoder</groupId>

+                <artifactId>encoder</artifactId>

+                <version>${owasp.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>org.owasp.encoder</groupId>

+                <artifactId>encoder-jsp</artifactId>

+                <version>${owasp.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>com.google.guava</groupId>

+                <artifactId>guava</artifactId>

+                <version>${guava.version}</version>

+            </dependency>

+            <dependency>

+                <groupId>com.google.code.findbugs</groupId>

+                <artifactId>jsr305</artifactId>

+                <version>${jsr305.version}</version>

+                <scope>provided</scope>

+            </dependency>

+

+            <!-- Bouncy Castle -->

+            <dependency>

+                <groupId>org.bouncycastle</groupId>

+                <artifactId>bcprov-jdk15on</artifactId>

+                <version>${bouncycastle.version}</version>

+            </dependency>

+

+            <!-- International Components for Unicode and Transliteration -->

+            <dependency>

+                <groupId>com.ibm.icu</groupId>

+                <artifactId>icu4j</artifactId>

+                <version>${icu4j.version}</version>

+            </dependency>

+

+            <!-- UNIT TEST Dependencies -->

+            <dependency>

+                <groupId>junit</groupId>

+                <artifactId>junit</artifactId>

+                <version>${junit.version}</version>

+                <scope>test</scope>

+            </dependency>

+            <dependency>

+                <groupId>org.hamcrest</groupId>

+                <artifactId>hamcrest-all</artifactId>

+                <version>${hamcrest.version}</version>

+                <scope>test</scope>

+            </dependency>

+            <dependency>

+                <groupId>org.mockito</groupId>

+                <artifactId>mockito-core</artifactId>

+                <version>${mockito.version}</version>

+                <scope>test</scope>

+            </dependency>

+            <dependency>

+                <groupId>xmlunit</groupId>

+                <artifactId>xmlunit</artifactId>

+                <version>${xmlunit.version}</version>

+                <scope>test</scope>

+            </dependency>

+            <dependency>

+                <groupId>org.springframework</groupId>

+                <artifactId>spring-test</artifactId>

+                <version>${spring.version}</version>

+                <scope>test</scope>

+            </dependency>

+        </dependencies>

+    </dependencyManagement>

+

+    <dependencies>

+        <!-- Dependencies in common for all modules -->

+        <dependency>

+            <groupId>commons-collections</groupId>

+            <artifactId>commons-collections</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>commons-io</groupId>

+            <artifactId>commons-io</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>commons-lang</groupId>

+            <artifactId>commons-lang</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>com.google.guava</groupId>

+            <artifactId>guava</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>com.google.code.findbugs</groupId>

+            <artifactId>jsr305</artifactId>

+        </dependency>

+

+        <!-- UNIT TEST Dependencies in common for all modules -->

+        <dependency>

+            <groupId>junit</groupId>

+            <artifactId>junit</artifactId>

+            <exclusions>

+                <exclusion>

+                    <artifactId>hamcrest-core</artifactId>

+                    <groupId>org.hamcrest</groupId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>org.hamcrest</groupId>

+            <artifactId>hamcrest-all</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>org.mockito</groupId>

+            <artifactId>mockito-core</artifactId>

+            <exclusions>

+                <exclusion>

+                    <artifactId>hamcrest-core</artifactId>

+                    <groupId>org.hamcrest</groupId>

+                </exclusion>

+            </exclusions>

+        </dependency>

+        <dependency>

+            <groupId>xmlunit</groupId>

+            <artifactId>xmlunit</artifactId>

+        </dependency>

+    </dependencies>

+

+    <build>

+        <pluginManagement>

+            <plugins>

+

+                <plugin>

+                    <groupId>com.orctom.mojo</groupId>

+                    <artifactId>was-maven-plugin</artifactId>

+                    <version>1.0.8</version>

+                    <configuration>

+                        <wasHome>c:/pgm/wlp</wasHome>

+                        <applicationName>${proj.name}</applicationName>

+                        <host>localhost</host>

+                        <server>server01</server>

+                        <node>node01</node>

+                        <virtualHost>default_host</virtualHost>

+                        <verbose>true</verbose>

+                    </configuration>

+                </plugin>

+

+                <plugin>

+                    <groupId>org.apache.tomcat.maven</groupId>

+                    <artifactId>tomcat7-maven-plugin</artifactId>

+                    <version>2.2</version>

+                    <configuration>

+                        <url>http://localhost:8080/manager/text</url>

+                        <server>tomcat</server>

+                        <path>/${proj.name}</path>

+                        <username>admin</username>

+                        <password>admin</password>

+                    </configuration>

+                </plugin>

+                <plugin>

+                    <groupId>org.apache.maven.plugins</groupId>

+                    <artifactId>maven-war-plugin</artifactId>

+                    <version>${war.plugin.version}</version>

+                    <configuration>

+                        <webResources>

+                            <resource>

+                                <directory>${project.basedir}/src/main/webapp/WEB-INF</directory>

+                                <filtering>true</filtering>

+                                <targetPath>WEB-INF</targetPath>

+                                <includes>

+                                    <include>**/web.xml</include>

+                                </includes>

+                            </resource>

+                        </webResources>

+                    </configuration>

+                </plugin>

+                <plugin>

+                    <groupId>org.apache.maven.plugins</groupId>

+                    <artifactId>maven-source-plugin</artifactId>

+                    <version>${source.plugin.version}</version>

+                    <executions>

+                        <execution>

+                            <id>attach-sources</id>

+                            <phase>verify</phase>

+                            <goals>

+                                <goal>jar-no-fork</goal>

+                            </goals>

+                        </execution>

+                    </executions>

+                </plugin>

+                <plugin>

+                    <groupId>org.jacoco</groupId>

+                    <artifactId>jacoco-maven-plugin</artifactId>

+                    <version>${jacoco.plugin.version}</version>

+                    <executions>

+                        <execution>

+                            <id>default-prepare-agent</id>

+                            <goals>

+                                <goal>prepare-agent</goal>

+                            </goals>

+                        </execution>

+                        <execution>

+                            <id>default-report</id>

+                            <goals>

+                                <goal>report</goal>

+                            </goals>

+                            <configuration>

+                                <formats>HTML,XML</formats>

+                            </configuration>

+                        </execution>

+                    </executions>

+                </plugin>

+                <plugin>

+                    <groupId>org.codehaus.mojo</groupId>

+                    <artifactId>jaxb2-maven-plugin</artifactId>

+                    <version>${jaxb.plugin.version}</version>

+                </plugin>

+                <plugin>

+                    <groupId>org.apache.maven.plugins</groupId>

+                    <artifactId>maven-resources-plugin</artifactId>

+                    <version>${resources.plugin.version}</version>

+                </plugin>

+                <plugin>

+                    <groupId>org.apache.maven.plugins</groupId>

+                    <artifactId>maven-jar-plugin</artifactId>

+                    <version>${maven.jar.plugin.version}</version>

+                </plugin>

+                <!--plugin>

+                    <groupId>org.owasp</groupId>

+                    <artifactId>dependency-check-maven</artifactId>

+                    <version>${owasp.dependency-check.version}</version>

+                    <configuration>

+                        <failBuildOnCVSS>8</failBuildOnCVSS>

+                    </configuration>

+                    <executions>

+                        <execution>

+                            <goals>

+                                <goal>check</goal>

+                            </goals>

+                        </execution>

+                    </executions>

+                </plugin-->

+            </plugins>

+        </pluginManagement>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-compiler-plugin</artifactId>

+                <version>${compile.plugin.version}</version>

+                <configuration>

+                    <source>${java.version}</source>

+                    <target>${java.version}</target>

+                </configuration>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-surefire-plugin</artifactId>

+                <version>${surefire.plugin.version}</version>

+                <configuration>

+                    <skip>false</skip>

+                </configuration>

+            </plugin>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-javadoc-plugin</artifactId>

+                <version>${javadoc.plugin.version}</version>

+                <configuration>

+                    <detectLinks>true</detectLinks>

+                    <additionalJOption>--add-exports java.base/sun.security.rsa=ALL-UNNAMED</additionalJOption>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+    <modules>

+        <module>../EIDAS-Light-Commons</module>

+        <module>../EIDAS-Commons</module>

+        <module>../EIDAS-Encryption</module>

+        <module>../EIDAS-Metadata</module>

+        <module>../EIDAS-SpecificCommunicationDefinition</module>

+        <!--start of TODO remove when/if EIDAS-Node pom does not depend on eidas-jcache-dev-node artifact to test-->

+        <module>../EIDAS-JCache-Dev</module>

+        <module>../EIDAS-JCache-Dev-Node</module>

+        <!--TODOEND-->

+    </modules>

+    <profiles>

+        <profile>

+            <id>NodeOnly</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <modules>

+                <module>../EIDAS-SAMLEngine</module>

+                <module>../EIDAS-UPDATER</module>

+                <module>../EIDAS-Node</module>

+            </modules>

+        </profile>

+        <profile>

+            <id>DemoToolsOnly</id>

+            <activation>

+                <activeByDefault>false</activeByDefault>

+            </activation>

+            <modules>

+                <module>../EIDAS-SimpleProtocol</module>

+                <module>../EIDAS-SpecificProxyService</module>

+                <module>../EIDAS-SpecificConnector</module>

+                <module>../EIDAS-SP</module>

+                <module>../EIDAS-IdP-1.0</module>

+            </modules>

+        </profile>

+        <profile>

+            <id>nodeJcacheIgnite</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <modules>

+                <module>../EIDAS-JCache-Ignite</module>

+                <module>../EIDAS-JCache-Ignite-Node</module>

+            </modules>

+        </profile>

+        <profile>

+            <id>nodeJcacheDev</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <modules>

+                <module>../EIDAS-JCache-Dev</module>

+                <module>../EIDAS-JCache-Dev-Node</module>

+            </modules>

+        </profile>

+        <profile>

+            <id>specificCommunicationJcacheIgnite</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <modules>

+                <module>../EIDAS-JCache-Ignite</module>

+                <module>../EIDAS-JCache-Ignite-Specific-Communication</module>

+            </modules>

+        </profile>

+        <profile>

+            <id>specificCommunicationJcacheDev</id>

+            <activation>

+                <activeByDefault>false</activeByDefault>

+                <property>

+                    <name>specificJar</name>

+                </property>

+            </activation>

+            <modules>

+                <module>../EIDAS-JCache-Dev</module>

+                <module>../EIDAS-JCache-Dev-Specific-Communication</module>

+            </modules>

+        </profile>

+    </profiles>

+</project>

diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.6.0/eidas-specific-communication-definition-2.6.0-sources.jar b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.6.0/eidas-specific-communication-definition-2.6.0-sources.jar
new file mode 100644
index 00000000..5e405828
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.6.0/eidas-specific-communication-definition-2.6.0-sources.jar
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.6.0/eidas-specific-communication-definition-2.6.0.jar b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.6.0/eidas-specific-communication-definition-2.6.0.jar
new file mode 100644
index 00000000..f56a139e
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.6.0/eidas-specific-communication-definition-2.6.0.jar
diff --git a/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.6.0/eidas-specific-communication-definition-2.6.0.pom b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.6.0/eidas-specific-communication-definition-2.6.0.pom
new file mode 100644
index 00000000..df092575
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/repository/eu/eidas/eidas-specific-communication-definition/2.6.0/eidas-specific-communication-definition-2.6.0.pom
@@ -0,0 +1,125 @@
+<!--

+  ~ Copyright (c) 2022 by European Commission

+  ~

+  ~ Licensed under the EUPL, Version 1.2 or - as soon they will be

+  ~ approved by the European Commission - subsequent versions of the

+  ~ EUPL (the "Licence");

+  ~ You may not use this work except in compliance with the Licence.

+  ~ You may obtain a copy of the Licence at:

+  ~ https://joinup.ec.europa.eu/page/eupl-text-11-12

+  ~

+  ~ Unless required by applicable law or agreed to in writing, software

+  ~ distributed under the Licence is distributed on an "AS IS" basis,

+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+  ~ implied.

+  ~ See the Licence for the specific language governing permissions and

+  ~ limitations under the Licence.

+  -->

+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0

+                             http://maven.apache.org/maven-v4_0_0.xsd">

+    <modelVersion>4.0.0</modelVersion>

+    <artifactId>eidas-specific-communication-definition</artifactId>

+    <packaging>jar</packaging>

+    <name>eIDAS Specific Communication Definition</name>

+    <description>Defines and implements the communication protocol to be used between specific and node modules.

+    </description>

+    <parent>

+        <groupId>eu.eidas</groupId>

+        <artifactId>eidas-parent</artifactId>

+        <version>2.6.0</version>

+        <relativePath>../EIDAS-Parent/pom.xml</relativePath>

+    </parent>

+    <properties>

+        <lightRequest.xsd>lightRequest.xsd</lightRequest.xsd>

+    </properties>

+    <dependencies>

+        <dependency>

+            <groupId>org.springframework</groupId>

+            <artifactId>spring-context</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>eu.eidas</groupId>

+            <artifactId>eidas-commons</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>javax.servlet</groupId>

+            <artifactId>javax.servlet-api</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>org.glassfish.jaxb</groupId>

+            <artifactId>jaxb-runtime</artifactId>

+        </dependency>

+        <dependency>

+            <groupId>org.springframework</groupId>

+            <artifactId>spring-test</artifactId>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>commons-logging</groupId>

+            <artifactId>commons-logging</artifactId>

+            <scope>test</scope>

+        </dependency>

+        <dependency>

+            <groupId>eu.eidas</groupId>

+            <artifactId>eidas-jcache-dev</artifactId>

+            <scope>test</scope>

+        </dependency>

+    </dependencies>

+    <build>

+        <plugins>

+            <plugin>

+                <groupId>org.apache.maven.plugins</groupId>

+                <artifactId>maven-source-plugin</artifactId>

+            </plugin>

+            <plugin>

+                <groupId>org.codehaus.mojo</groupId>

+                <artifactId>jaxb2-maven-plugin</artifactId>

+                <executions>

+                    <execution>

+                        <id>xjc</id>

+                        <goals>

+                            <goal>xjc</goal>

+                        </goals>

+                    </execution>

+                </executions>

+                <configuration>

+                    <sources>

+                        <source>src/main/resources/xsds/${lightRequest.xsd}</source>

+                        <source>src/main/resources/xsds/lightResponse.xsd</source>

+                    </sources>

+                    <packageName>eu.eidas.specificcommunication</packageName>

+                    <noPackageLevelAnnotations>true</noPackageLevelAnnotations>

+                </configuration>

+            </plugin>

+        </plugins>

+    </build>

+    <profiles>

+        <profile>

+            <id>specificCommunicationJcacheIgnite</id>

+            <activation>

+                <activeByDefault>true</activeByDefault>

+            </activation>

+            <dependencies>

+                <dependency>

+                    <groupId>eu.eidas</groupId>

+                    <artifactId>eidas-jcache-ignite-specific-communication</artifactId>

+                </dependency>

+            </dependencies>

+        </profile>

+        <profile>

+            <id>specificCommunicationJcacheDev</id>

+            <!-- <activation> -->

+                <!-- <property> -->

+                    <!-- <name>specificJar</name> -->

+                <!-- </property> -->

+            <!-- </activation> -->

+            <dependencies>

+                <dependency>

+                    <groupId>eu.eidas</groupId>

+                    <artifactId>eidas-jcache-dev-specific-communication</artifactId>

+                </dependency>

+            </dependencies>

+        </profile>

+    </profiles>

+</project>

diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
index 66848fcc..3c41bf0a 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/Constants.java
@@ -23,6 +23,7 @@
 
 package at.asitplus.eidas.specific.modules.auth.eidas.v2;
 
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 
 public class Constants {
@@ -54,38 +55,36 @@ public class Constants {
    */
   public static final String DATA_PERSON_MATCH_RESULT = "matching_result";
 
-  // 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_WORKAROUND_STAGING_MS_CONNECTOR =
-      CONIG_PROPS_EIDAS_PREFIX + ".workarounds.staging.msconnector.endpoint";  
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".workarounds.staging.msconnector.endpoint";  
   public static final String CONIG_PROPS_EIDAS_IS_TEST_IDENTITY = 
-      CONIG_PROPS_EIDAS_PREFIX  + ".eid.testidentity.default";
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX  + ".eid.testidentity.default";
   
-  public static final String CONIG_PROPS_EIDAS_NODE = CONIG_PROPS_EIDAS_PREFIX + ".node_v2";
+  public static final String CONIG_PROPS_EIDAS_NODE = EidasConstants.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
+  public static final String CONIG_PROPS_EIDAS_CONNECTOR_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";
+      EidasConstants.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";
+      EidasConstants.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";
+      EidasConstants.CONIG_PROPS_EIDAS_NODE + ".attributes.requested.representation";
+  
 
   public static final String CONIG_PROPS_EIDAS_NODE_REQUESTERID_USE_HASHED_VERSION =
-      CONIG_PROPS_EIDAS_NODE + ".requesterId.useHashedForm";
+      EidasConstants.CONIG_PROPS_EIDAS_NODE + ".requesterId.useHashedForm";
   public static final String CONIG_PROPS_EIDAS_NODE_WORKAROUND_USE_STATIC_REQUESTERID_FOR_LUX =
       CONIG_PROPS_EIDAS_NODE + ".requesterId.lu.useStaticRequesterForAll";
 
@@ -106,7 +105,8 @@ public class Constants {
 
   
   // Common SSL client configuration 
-  public static final String CONIG_PROPS_EIDAS_COMMON_CLIENT = CONIG_PROPS_EIDAS_PREFIX + ".client.common";
+  public static final String CONIG_PROPS_EIDAS_COMMON_CLIENT = 
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".client.common";
   public static final String CONIG_PROPS_EIDAS_COMMON_CLIENT_SSL_KEYSTORE_PATH = CONIG_PROPS_EIDAS_COMMON_CLIENT
       + ".ssl.keyStore.path";
   public static final String CONIG_PROPS_EIDAS_COMMON_CLIENT_SSL_KEYSTORE_PASSWORD = CONIG_PROPS_EIDAS_COMMON_CLIENT
@@ -129,15 +129,17 @@ public class Constants {
       + ".ssl.trustStore.name";
   
   /** Enable / Disable matching based on address search. **/
-  public static final String CONFIG_PROP_MATCHING_BY_ADDRESS = CONIG_PROPS_EIDAS_PREFIX + ".matching.byaddress.enable";
+  public static final String CONFIG_PROP_MATCHING_BY_ADDRESS =
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".matching.byaddress.enable";
   
   public static final String CONFIG_PROP_MATCHING_BY_ADDRESS_MAX_RESULTS = 
-      CONIG_PROPS_EIDAS_PREFIX + ".matching.byaddress.maxresults";
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".matching.byaddress.maxresults";
   public static final String DEFAULT_MATCHING_BY_ADDRESS_MAX_RESULTS = "250"; 
   
   
   // ZMR Client configuration properties
-  public static final String CONIG_PROPS_EIDAS_ZMRCLIENT = CONIG_PROPS_EIDAS_PREFIX + ".zmrclient";
+  public static final String CONIG_PROPS_EIDAS_ZMRCLIENT = 
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".zmrclient";
   public static final String CONIG_PROPS_EIDAS_ZMRCLIENT_ENDPOINT = CONIG_PROPS_EIDAS_ZMRCLIENT
       + ".endpoint";
   public static final String CONIG_PROPS_EIDAS_ZMRCLIENT_DEBUG_TRACEMESSAGES = CONIG_PROPS_EIDAS_ZMRCLIENT
@@ -174,7 +176,8 @@ public class Constants {
       + ".ssl.trustStore.name";
   
   // ErnP Client configuration properties
-  public static final String CONIG_PROPS_EIDAS_ERNPCLIENT = CONIG_PROPS_EIDAS_PREFIX + ".ernpclient";
+  public static final String CONIG_PROPS_EIDAS_ERNPCLIENT = 
+      EidasConstants.CONIG_PROPS_EIDAS_PREFIX + ".ernpclient";
   public static final String CONIG_PROPS_EIDAS_ERNPCLIENT_ENDPOINT = CONIG_PROPS_EIDAS_ERNPCLIENT
       + ".endpoint";
   public static final String CONIG_PROPS_EIDAS_ERNPCLIENT_SSL_KEYSTORE_PATH = CONIG_PROPS_EIDAS_ERNPCLIENT
@@ -209,7 +212,8 @@ public class Constants {
   
   
   // SZR Client configuration properties
-  public static final String CONIG_PROPS_EIDAS_SZRCLIENT = CONIG_PROPS_EIDAS_PREFIX + ".szrclient";
+  public static final String CONIG_PROPS_EIDAS_SZRCLIENT = 
+      EidasConstants.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
@@ -267,7 +271,7 @@ public class Constants {
   public static final String CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_REVISIONLOGDATASTORE_ACTIVE =
       CONIG_PROPS_EIDAS_SZRCLIENT + ".revisionlog.eidmapping.active";
 
-  public static final String DEFAULT_MS_NODE_COUNTRY_CODE = "AT";
+  
   
   @Deprecated
   public static final String CONIG_PROPS_EIDAS_SZRCLIENT_WORKAROUND_SQLLITEDATASTORE_URL =
@@ -285,46 +289,12 @@ public class Constants {
   // 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_TAXREFERENCE = "TaxReference";
-
-  public static final String eIDAS_ATTR_LEGALPERSONIDENTIFIER = "LegalPersonIdentifier";
-  public static final String eIDAS_ATTR_LEGALNAME = "LegalName";
-
-
-  //eIDAS attribute URN
-  public static final String eIDAS_ATTRURN_PREFIX = "http://eidas.europa.eu/attributes/";
-  public static final String eIDAS_ATTRURN_PREFIX_NATURAL = eIDAS_ATTRURN_PREFIX + "naturalperson/";
-
-  public static final String eIDAS_ATTRURN_PERSONALIDENTIFIER =
-      eIDAS_ATTRURN_PREFIX_NATURAL + eIDAS_ATTR_PERSONALIDENTIFIER;  
-  public static final String eIDAS_ATTRURN_CURRENTGIVENNAME =
-      eIDAS_ATTRURN_PREFIX_NATURAL + "CurrentGivenName";
-  public static final String eIDAS_ATTRURN_CURRENTFAMILYNAME =
-      eIDAS_ATTRURN_PREFIX_NATURAL + "CurrentFamilyName";
-  public static final String eIDAS_ATTRURN_DATEOFBIRTH =
-      eIDAS_ATTRURN_PREFIX_NATURAL + eIDAS_ATTR_DATEOFBIRTH;  
-  public static final String eIDAS_ATTRURN_PLACEOFBIRTH =
-      eIDAS_ATTRURN_PREFIX_NATURAL + eIDAS_ATTR_PLACEOFBIRTH;
-  public static final String eIDAS_ATTRURN_BIRTHNAME =
-      eIDAS_ATTRURN_PREFIX_NATURAL + eIDAS_ATTR_BIRTHNAME;
-
-
   public static final String eIDAS_REQ_PARAM_SECTOR_PUBLIC = "public";
   public static final String eIDAS_REQ_PARAM_SECTOR_PRIVATE = "private";
 
   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
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasSignalServlet.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasSignalServlet.java
index d3cac80c..e3600329 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasSignalServlet.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/EidasSignalServlet.java
@@ -40,7 +40,7 @@ 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.asitplus.eidas.specific.modules.core.eidas.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;
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/ernp/ErnpRestClient.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/ernp/ErnpRestClient.java
index 119a7c60..a847a519 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/ernp/ErnpRestClient.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/ernp/ErnpRestClient.java
@@ -65,6 +65,7 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenti
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.ErnpRestCommunicationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.WorkflowException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.VersionHolder;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.bmi.namespace.zmr_su.base._20040201_.ServiceFault;
 import at.gv.bmi.namespace.zmr_su.zmr._20040201.EidasSuchdatenType;
 import at.gv.bmi.namespace.zmr_su.zmr._20040201.PersonSuchenRequest;
@@ -104,7 +105,7 @@ public class ErnpRestClient implements IErnpClient {
   //    "ERnP anwser for transaction: {0} with code: {1} and message: {2}";
 
   private static final String PROCESS_SEARCH_PERSONAL_IDENTIFIER =
-      "Searching " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER;
+      "Searching " + EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER;
   private static final String PROCESS_SEARCH_MDS_ONLY = "Searching with MDS only";
   private static final String PROCESS_SEARCH_COUNTRY_SPECIFIC = "Searching {0} specific";
 
@@ -139,7 +140,7 @@ public class ErnpRestClient implements IErnpClient {
 
       // build search request
       final SuchEidas eidasInfos = new SuchEidas();
-      eidasInfos.setArt(Constants.eIDAS_ATTRURN_PERSONALIDENTIFIER);
+      eidasInfos.setArt(EidasConstants.eIDAS_ATTRURN_PERSONALIDENTIFIER);
       eidasInfos.setWert(personIdentifier);
       eidasInfos.setStaatscode2(citizenCountryCode);
 
@@ -427,15 +428,15 @@ public class ErnpRestClient implements IErnpClient {
     // build result
     return RegisterResult.builder()
         .pseudonym(selectAllEidasDocument(person, citizenCountryCode,
-            Constants.eIDAS_ATTRURN_PERSONALIDENTIFIER))
+            EidasConstants.eIDAS_ATTRURN_PERSONALIDENTIFIER))
         .familyName(person.getPersonendaten().getFamilienname())
         .givenName(person.getPersonendaten().getVorname())
         .dateOfBirth(getTextualBirthday(person.getPersonendaten().getGeburtsdatum()))
         .bpk(person.getPersonendaten().getBpkZp())
         .placeOfBirth(selectSingleEidasDocument(person, citizenCountryCode,
-            Constants.eIDAS_ATTRURN_PLACEOFBIRTH))
+            EidasConstants.eIDAS_ATTRURN_PLACEOFBIRTH))
         .birthName(selectSingleEidasDocument(person, citizenCountryCode,
-            Constants.eIDAS_ATTRURN_BIRTHNAME))
+            EidasConstants.eIDAS_ATTRURN_BIRTHNAME))
         .build();
 
   }
@@ -501,11 +502,11 @@ public class ErnpRestClient implements IErnpClient {
     //TODO: maybe we should re-factor SimpleEidasData to a generic data-model to facilitate arbitrary eIDAS attributes  
     Set<Eidas> result = new HashSet<>();   
     addEidasDocumentIfNotAvailable(result, ernpPersonToKitt, eidData.getCitizenCountryCode(), 
-        Constants.eIDAS_ATTRURN_PERSONALIDENTIFIER, eidData.getPseudonym(), true);    
+        EidasConstants.eIDAS_ATTRURN_PERSONALIDENTIFIER, eidData.getPseudonym(), true);    
     addEidasDocumentIfNotAvailable(result, ernpPersonToKitt, eidData.getCitizenCountryCode(), 
-        Constants.eIDAS_ATTRURN_PLACEOFBIRTH, eidData.getPlaceOfBirth(), false);
+        EidasConstants.eIDAS_ATTRURN_PLACEOFBIRTH, eidData.getPlaceOfBirth(), false);
     addEidasDocumentIfNotAvailable(result, ernpPersonToKitt, eidData.getCitizenCountryCode(), 
-        Constants.eIDAS_ATTRURN_BIRTHNAME, eidData.getBirthName(), false);
+        EidasConstants.eIDAS_ATTRURN_BIRTHNAME, eidData.getBirthName(), false);
         
     return result;
     
@@ -596,17 +597,17 @@ public class ErnpRestClient implements IErnpClient {
   
   private void buildNewEidasDocumens(PersonAnlegen ernpReq, SimpleEidasData eidData) {
     ernpReq.addEidasItem(buildNewEidasDocument(eidData.getCitizenCountryCode(), 
-        Constants.eIDAS_ATTRURN_PERSONALIDENTIFIER, eidData.getPseudonym()));
+        EidasConstants.eIDAS_ATTRURN_PERSONALIDENTIFIER, eidData.getPseudonym()));
     
     if (StringUtils.isNotEmpty(eidData.getPlaceOfBirth())) {
       ernpReq.addEidasItem(buildNewEidasDocument(eidData.getCitizenCountryCode(),
-          Constants.eIDAS_ATTRURN_PLACEOFBIRTH, eidData.getPlaceOfBirth()));
+          EidasConstants.eIDAS_ATTRURN_PLACEOFBIRTH, eidData.getPlaceOfBirth()));
         
     }
         
     if (StringUtils.isNotEmpty(eidData.getBirthName())) {
       ernpReq.addEidasItem(buildNewEidasDocument(eidData.getCitizenCountryCode(), 
-          Constants.eIDAS_ATTRURN_BIRTHNAME, eidData.getBirthName()));
+          EidasConstants.eIDAS_ATTRURN_BIRTHNAME, eidData.getBirthName()));
       
     }        
   }
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java
index 8dbd0632..904afc37 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/clients/zmr/ZmrSoapClient.java
@@ -31,6 +31,7 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenti
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.WorkflowException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.ZmrCommunicationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.VersionHolder;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.bmi.namespace.zmr_su.base._20040201.ClientInfoType;
 import at.gv.bmi.namespace.zmr_su.base._20040201.Organisation;
 import at.gv.bmi.namespace.zmr_su.base._20040201.RequestType;
@@ -95,7 +96,7 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
   private static final String PROCESS_TASK_UPDATE = "ZPR_VO_Person_aendern";
   
   private static final String PROCESS_SEARCH_PERSONAL_IDENTIFIER = 
-      "Searching " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER;
+      "Searching " + EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER;
   private static final String PROCESS_SEARCH_MDS_ONLY = "Searching with MDS only";
   private static final String PROCESS_SEARCH_COUNTRY_SPECIFIC = "Searching {0} specific";
   private static final String PROCESS_SEARCH_BY_RESIDENCE = "Searching by residence";
@@ -133,7 +134,7 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
       req.setPersonSuchenRequest(searchPersonReq);
       final EidasSuchdatenType eidasInfos = new EidasSuchdatenType();
       searchPersonReq.getEidasSuchdaten().add(eidasInfos);
-      eidasInfos.setEidasArt(Constants.eIDAS_ATTRURN_PERSONALIDENTIFIER);
+      eidasInfos.setEidasArt(EidasConstants.eIDAS_ATTRURN_PERSONALIDENTIFIER);
       eidasInfos.setEidasWert(personPseudonym);
       eidasInfos.setStaatscode2(citizenCountryCode);
       
@@ -589,15 +590,15 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
     // build result
     return RegisterResult.builder()
         .pseudonym(selectAllEidasDocument(person, citizenCountryCode,
-            Constants.eIDAS_ATTRURN_PERSONALIDENTIFIER))
+            EidasConstants.eIDAS_ATTRURN_PERSONALIDENTIFIER))
         .familyName(person.getNatuerlichePerson().getPersonenName().getFamilienname())
         .givenName(person.getNatuerlichePerson().getPersonenName().getVorname())
         .dateOfBirth(person.getNatuerlichePerson().getGeburtsdatum())
         .bpk(extractBpkZp(person.getNatuerlichePerson()))
         .placeOfBirth(selectSingleEidasDocument(person, citizenCountryCode,
-            Constants.eIDAS_ATTRURN_PLACEOFBIRTH))
+            EidasConstants.eIDAS_ATTRURN_PLACEOFBIRTH))
         .birthName(selectSingleEidasDocument(person, citizenCountryCode,
-            Constants.eIDAS_ATTRURN_BIRTHNAME))        
+            EidasConstants.eIDAS_ATTRURN_BIRTHNAME))        
         .build();
 
   }
@@ -765,19 +766,19 @@ public class ZmrSoapClient extends AbstractSoapClient implements IZmrClient {
     //TODO: maybe we should re-factor SimpleEidasData to a generic data-model to facilitate arbitrary eIDAS attributes  
     Set<EidasIdentitaetAnlageType> result = new HashSet<>();   
     addEidasDocumentIfNotAvailable(result, zmrPersonToKitt, eidData.getCitizenCountryCode(), 
-        Constants.eIDAS_ATTRURN_PERSONALIDENTIFIER, eidData.getPseudonym(), true);    
+        EidasConstants.eIDAS_ATTRURN_PERSONALIDENTIFIER, eidData.getPseudonym(), true);    
     addEidasDocumentIfNotAvailable(result, zmrPersonToKitt, eidData.getCitizenCountryCode(), 
-        Constants.eIDAS_ATTRURN_PLACEOFBIRTH, eidData.getPlaceOfBirth(), false);
+        EidasConstants.eIDAS_ATTRURN_PLACEOFBIRTH, eidData.getPlaceOfBirth(), false);
     addEidasDocumentIfNotAvailable(result, zmrPersonToKitt, eidData.getCitizenCountryCode(), 
-        Constants.eIDAS_ATTRURN_BIRTHNAME, eidData.getBirthName(), false);
+        EidasConstants.eIDAS_ATTRURN_BIRTHNAME, eidData.getBirthName(), false);
     
     // add MDS attributes as 'eIDAS-Documents' too, because ZMR does not allow a MDS update on regular places.
     addEidasDocumentIfNotAvailable(result, zmrPersonToKitt, eidData.getCitizenCountryCode(), 
-        Constants.eIDAS_ATTRURN_CURRENTGIVENNAME, eidData.getGivenName(), false);
+        EidasConstants.eIDAS_ATTRURN_CURRENTGIVENNAME, eidData.getGivenName(), false);
     addEidasDocumentIfNotAvailable(result, zmrPersonToKitt, eidData.getCitizenCountryCode(), 
-        Constants.eIDAS_ATTRURN_CURRENTFAMILYNAME, eidData.getFamilyName(), false);
+        EidasConstants.eIDAS_ATTRURN_CURRENTFAMILYNAME, eidData.getFamilyName(), false);
     addEidasDocumentIfNotAvailable(result, zmrPersonToKitt,  eidData.getCitizenCountryCode(), 
-        Constants.eIDAS_ATTRURN_DATEOFBIRTH, eidData.getDateOfBirth(), false);
+        EidasConstants.eIDAS_ATTRURN_DATEOFBIRTH, eidData.getDateOfBirth(), false);
         
     return result;
     
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
index 60138027..8716f80d 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/AbstractEidProcessor.java
@@ -31,6 +31,7 @@ import static at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasRespon
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
+import java.util.Arrays;
 import java.util.Base64;
 import java.util.Map;
 import java.util.regex.Matcher;
@@ -47,8 +48,9 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
 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.service.ConnectorEidasAttributeRegistry;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 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.data.EaafConstants;
@@ -64,7 +66,7 @@ import lombok.extern.slf4j.Slf4j;
 public abstract class AbstractEidProcessor implements INationalEidProcessor {
 
   @Autowired
-  protected EidasAttributeRegistry attrRegistry;
+  protected ConnectorEidasAttributeRegistry attrRegistry;
   @Autowired
   protected IConfigurationWithSP basicConfig;
 
@@ -80,28 +82,31 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
   @Override
   public final SimpleEidasData postProcess(Map<String, Object> eidasAttrMap) throws EidPostProcessingException,
       EidasAttributeException {
+
     SimpleEidasData.SimpleEidasDataBuilder builder = SimpleEidasData.builder()
         .personalIdentifier(EidasResponseUtils.processPersonalIdentifier(
-            eidasAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER)))
+            eidasAttrMap.get(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER)))
         
         // MDS attributes
-        .citizenCountryCode(processCountryCode(eidasAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER)))
-        .pseudonym(processPseudonym(eidasAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER)))
-        .familyName(processFamilyName(eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTFAMILYNAME)))
-        .givenName(processGivenName(eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTGIVENNAME)))
-        .dateOfBirth(processDateOfBirthToString(eidasAttrMap.get(Constants.eIDAS_ATTR_DATEOFBIRTH)))
+        .citizenCountryCode(processCountryCode(eidasAttrMap.get(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER)))
+        .pseudonym(processPseudonym(eidasAttrMap.get(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER)))
+        .familyName(processFamilyName(eidasAttrMap.get(EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME)))
+        .givenName(processGivenName(eidasAttrMap.get(EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME)))
+        .dateOfBirth(processDateOfBirthToString(eidasAttrMap.get(EidasConstants.eIDAS_ATTR_DATEOFBIRTH)))
 
         // additional attributes
-        .placeOfBirth(processPlaceOfBirth(eidasAttrMap.get(Constants.eIDAS_ATTR_PLACEOFBIRTH)))
-        .birthName(processBirthName(eidasAttrMap.get(Constants.eIDAS_ATTR_BIRTHNAME)))
-        .address(processAddress(eidasAttrMap.get(Constants.eIDAS_ATTR_CURRENTADDRESS)));
+        .placeOfBirth(processPlaceOfBirth(eidasAttrMap.get(EidasConstants.eIDAS_ATTR_PLACEOFBIRTH)))
+        .birthName(processBirthName(eidasAttrMap.get(EidasConstants.eIDAS_ATTR_BIRTHNAME)))
+        .address(processAddress(eidasAttrMap.get(EidasConstants.eIDAS_ATTR_CURRENTADDRESS)));
     
-    if (eidasAttrMap.containsKey(Constants.eIDAS_ATTR_TAXREFERENCE)) {
-      builder.taxNumber(EidasResponseUtils.processTaxReference(eidasAttrMap.get(Constants.eIDAS_ATTR_TAXREFERENCE)));
+    if (eidasAttrMap.containsKey(EidasConstants.eIDAS_ATTR_TAXREFERENCE)) {
+      builder.taxNumber(EidasResponseUtils.processTaxReference(
+          eidasAttrMap.get(EidasConstants.eIDAS_ATTR_TAXREFERENCE)));
       
     }
     
     return builder.build();
+
   }
 
 
@@ -124,6 +129,7 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
   protected PostalAddressType processAddress(Object currentAddressObj) throws EidPostProcessingException,
       EidasAttributeException {
     return EidasResponseUtils.processAddress(currentAddressObj);
+    
   }
 
   /**
@@ -137,6 +143,7 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
   protected String processBirthName(Object birthNameObj) throws EidPostProcessingException,
       EidasAttributeException {
     return EidasResponseUtils.processBirthName(birthNameObj);
+
   }
 
   /**
@@ -150,6 +157,7 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
   protected String processPlaceOfBirth(Object placeOfBirthObj) throws EidPostProcessingException,
       EidasAttributeException {
     return EidasResponseUtils.processPlaceOfBirth(placeOfBirthObj);
+
   }
 
   /**
@@ -163,6 +171,7 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
   protected DateTime processDateOfBirth(Object dateOfBirthObj) throws EidPostProcessingException,
       EidasAttributeException {
     return EidasResponseUtils.processDateOfBirth(dateOfBirthObj);
+
   }
 
   /**
@@ -176,6 +185,7 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
   protected String processGivenName(Object givenNameObj) throws EidPostProcessingException,
       EidasAttributeException {
     return EidasResponseUtils.processGivenName(givenNameObj);
+
   }
 
   /**
@@ -189,6 +199,7 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
   protected String processFamilyName(Object familyNameObj) throws EidPostProcessingException,
       EidasAttributeException {
     return EidasResponseUtils.processFamilyName(familyNameObj);
+
   }
 
   /**
@@ -202,13 +213,14 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
   protected String processPseudonym(Object personalIdObj) throws EidPostProcessingException,
       EidasAttributeException {
     return EidasResponseUtils.processPseudonym(personalIdObj);
+
   }
 
   /**
    * Set ProviderName and RequestId into eIDAS AuthnRequest.
    * 
    * @param pendingReq Current pendingRequest
-   * @param authnRequestBuilder AuthnREquest builer
+   * @param authnRequestBuilder AuthnRequest builder
    */
   protected void buildProviderNameAndRequesterIdAttribute(IRequest pendingReq, Builder authnRequestBuilder) {
     final ISpConfiguration spConfig = pendingReq.getServiceProviderConfiguration();
@@ -258,6 +270,37 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
     }
   }
   
+  /**
+   * Build LoA based on Service-Provider configuration.
+   * 
+   * @param spConfig Current SP configuration
+   * @param authnRequestBuilder AuthnRequest builder
+   */
+  protected void buildLevelOfAssurance(ISpConfiguration spConfig, Builder authnRequestBuilder) {
+    // 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.levelsOfAssuranceValues(Arrays.asList(loa));
+    
+  }
+  
   private String generateRequesterId(String requesterId) {
     if (requesterId != null && basicConfig.getBasicConfigurationBoolean(
         Constants.CONIG_PROPS_EIDAS_NODE_REQUESTERID_USE_HASHED_VERSION, true)) {            
@@ -302,7 +345,7 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
     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
+      final ImmutableSortedSet<AttributeDefinition<?>> byFriendlyName = attrRegistry.getCoreRegistry()
           .getCoreAttributeRegistry().getByFriendlyName(name);
       if (!byFriendlyName.isEmpty()) {
         final AttributeDefinition<?> attributeDefinition = byFriendlyName.first();
@@ -318,30 +361,4 @@ public abstract class AbstractEidProcessor implements INationalEidProcessor {
 
   }
   
-  protected void buildLevelOfAssurance(ISpConfiguration spConfig, Builder authnRequestBuilder) {
-
-    // 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);
-
-  }
-
 }
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeEidProcessor.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeEidProcessor.java
index 6dc08181..2c1e8fdd 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeEidProcessor.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeEidProcessor.java
@@ -32,10 +32,10 @@ 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.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.egiz.eaaf.core.impl.data.Triple;
 
 
@@ -70,15 +70,15 @@ public class DeEidProcessor extends AbstractEidProcessor {
   protected String processPseudonym(Object uniqeIdentifierObj) throws EidPostProcessingException,
       EidasAttributeException {
     if (uniqeIdentifierObj == null || !(uniqeIdentifierObj instanceof String)) {
-      throw new EidasAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+      throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER);
     }
 
     final Triple<String, String, String> eIdentifier =
         EidasResponseUtils.parseEidasPersonalIdentifier((String) uniqeIdentifierObj);
 
-    log.trace(getName() + " starts processing of attribute: " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+    log.trace(getName() + " starts processing of attribute: " + EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER);
     final String result = convertDeIdentifier(eIdentifier.getThird());
-    log.debug(getName() + " finished processing of attribute: " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+    log.debug(getName() + " finished processing of attribute: " + EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER);
 
     return result;
 
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeSpecificDetailSearchProcessor.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeSpecificDetailSearchProcessor.java
index e05fe86b..64db9eed 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeSpecificDetailSearchProcessor.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/handler/DeSpecificDetailSearchProcessor.java
@@ -27,6 +27,7 @@ import org.apache.commons.lang3.StringUtils;
 
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.bmi.namespace.zmr_su.zmr._20040201.EidasSuchdatenType;
 import at.gv.bmi.namespace.zmr_su.zmr._20040201.PersonSuchenRequest;
 import at.gv.e_government.reference.namespace.persondata.de._20040201.NatuerlichePersonTyp;
@@ -62,9 +63,9 @@ public class DeSpecificDetailSearchProcessor implements CountrySpecificDetailSea
     
     //add addtional eIDAS attributes from DE
     req.getEidasSuchdaten().add(buildEidasSuchData(
-        Constants.eIDAS_ATTRURN_PLACEOFBIRTH, eidData.getPlaceOfBirth()));
+        EidasConstants.eIDAS_ATTRURN_PLACEOFBIRTH, eidData.getPlaceOfBirth()));
     req.getEidasSuchdaten().add(buildEidasSuchData(
-        Constants.eIDAS_ATTRURN_BIRTHNAME, eidData.getBirthName()));
+        EidasConstants.eIDAS_ATTRURN_BIRTHNAME, eidData.getBirthName()));
   
     return req;
     
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/CcSpecificEidProcessingService.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/CcSpecificEidProcessingService.java
index b5493edb..bbfcb5ff 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/CcSpecificEidProcessingService.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/CcSpecificEidProcessingService.java
@@ -32,7 +32,6 @@ import java.util.Map.Entry;
 
 import javax.annotation.PostConstruct;
 
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,11 +39,12 @@ 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.SimpleEidasData;
 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.handler.INationalEidProcessor;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.impl.data.Triple;
 import eu.eidas.auth.commons.light.impl.LightRequest.Builder;
@@ -107,9 +107,9 @@ public class CcSpecificEidProcessingService implements ICcSpecificEidProcessingS
   public SimpleEidasData postProcess(Map<String, Object> eidasAttrMap) throws EidPostProcessingException,
       EidasAttributeException {
     // extract citizen country from eIDAS unique identifier
-    final Object eIdentifierObj = eidasAttrMap.get(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+    final Object eIdentifierObj = eidasAttrMap.get(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER);
     if (eIdentifierObj == null || !(eIdentifierObj instanceof String)) {
-      throw new EidasAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+      throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER);
     }
 
     final Triple<String, String, String> eIdentifier =
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/ConnectorEidasAttributeRegistry.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/ConnectorEidasAttributeRegistry.java
new file mode 100644
index 00000000..8a120093
--- /dev/null
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/ConnectorEidasAttributeRegistry.java
@@ -0,0 +1,107 @@
+package at.asitplus.eidas.specific.modules.auth.eidas.v2.service;
+
+import java.text.MessageFormat;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.lang.NonNull;
+
+import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
+import at.gv.egiz.eaaf.core.api.idp.IConfigurationWithSP;
+import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
+import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class ConnectorEidasAttributeRegistry {
+
+  @Autowired IConfigurationWithSP basicConfig;
+  
+  @Getter
+  private EidasAttributeRegistry coreRegistry;
+  
+  /**
+   * Attribute Registry for eIDAS Connector implementation.
+   * @param registry Core attribute registry
+   */
+  public ConnectorEidasAttributeRegistry(@Autowired EidasAttributeRegistry registry) {
+    this.coreRegistry = registry;
+        
+  }
+  
+  
+  /**
+   * 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;
+
+  }
+}
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/EidasAttributeRegistry.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/EidasAttributeRegistry.java
deleted file mode 100644
index e73491ab..00000000
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/service/EidasAttributeRegistry.java
+++ /dev/null
@@ -1,180 +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.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.lang.NonNull;
-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 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/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
index f3e2adc4..2379f39e 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/CreateIdentityLinkTask.java
@@ -146,6 +146,7 @@ public class CreateIdentityLinkTask extends AbstractAuthServletTask {
     }
   }
 
+
   private void storeGenericInfoToSession(SimpleEidasData eidData) throws EaafStorageException {
     AuthProcessDataWrapper authProcessData = MatchingTaskUtils.getAuthProcessDataWrapper(pendingReq);
     authProcessData.setForeigner(true);
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
index 849f8136..535c2958 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/GenerateAuthnRequestTask.java
@@ -44,6 +44,7 @@ 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.EidasSAuthenticationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.ICcSpecificEidProcessingService;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 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.process.ExecutionContext;
@@ -122,7 +123,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
       final String tokenBase64 = BinaryLightTokenHelper.encodeBinaryLightTokenBase64(token);
       workaroundRelayState(lightAuthnReq);
       final String forwardUrl = selectForwardUrl(environment);
-
+      
       String configValue = basicConfig.getBasicConfiguration(
           Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_METHOD, Constants.FORWARD_METHOD_GET);
       boolean useHttpRedirect = configValue.equals(Constants.FORWARD_METHOD_GET);
@@ -131,6 +132,7 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
 
       } else {
         sendPost(request, response, tokenBase64, forwardUrl);
+
       }
 
       revisionsLogger.logEvent(pendingReq, MsConnectorEventCodes.EIDAS_NODE_CONNECTED, lightAuthnReq.getId());
@@ -212,19 +214,20 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
 
   @NotNull
   private String selectForwardUrl(String environment) throws EaafConfigurationException {
-    String result = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL);
+    String result = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_CONNECTOR_NODE_FORWARD_URL);
     if (StringUtils.isNotEmpty(environment)) {
       result = selectedForwardUrlForEnvironment(environment);
     }
     if (StringUtils.isEmpty(result)) {
       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
+          environment == null ? Constants.CONIG_PROPS_EIDAS_CONNECTOR_NODE_FORWARD_URL
+              : Constants.CONIG_PROPS_EIDAS_CONNECTOR_NODE_FORWARD_URL + "." + environment
       });
     }
     log.debug("ForwardURL: {} selected to forward eIDAS request", result);
     return result;
+    
   }
 
   
@@ -256,19 +259,27 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
   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);
+      return basicConfig.getBasicConfiguration(EidasConstants.CONIG_PROPS_EIDAS_CONNECTOR_NODE_FORWARD_URL);
+
     } else if (environment.equalsIgnoreCase(MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_QS)) {
-      return basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL
+      return basicConfig.getBasicConfiguration(EidasConstants.CONIG_PROPS_EIDAS_CONNECTOR_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
+      
+    } else if (environment.equalsIgnoreCase(
+        MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_TESTING)) {
+      return basicConfig.getBasicConfiguration(EidasConstants.CONIG_PROPS_EIDAS_CONNECTOR_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
+      
+    } else if (environment.equalsIgnoreCase(
+        MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_DEVELOPMENT)) {
+      return basicConfig.getBasicConfiguration(EidasConstants.CONIG_PROPS_EIDAS_CONNECTOR_NODE_FORWARD_URL
           + "." + MsEidasNodeConstants.REQ_PARAM_SELECTED_ENVIRONMENT_VALUE_DEVELOPMENT);
+      
     }
+    
     log.info("Environment selector: {} is not supported", environment);
     return null;
+    
   }
 
   private void sendRedirect(HttpServletResponse response, String tokenBase64, String forwardUrl) throws IOException {
@@ -283,11 +294,11 @@ public class GenerateAuthnRequestTask extends AbstractAuthServletTask {
       throws GuiBuildException {
     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);
+        basicConfig, pendingReq, EidasConstants.TEMPLATE_POST_FORWARD_NAME, null, resourceLoader);
+    config.putCustomParameter(null, EidasConstants.TEMPLATE_POST_FORWARD_ENDPOINT, forwardUrl);
     String token = EidasParameterKeys.TOKEN.toString();
-    config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_TOKEN_NAME, token);
-    config.putCustomParameter(null, Constants.TEMPLATE_POST_FORWARD_TOKEN_VALUE, tokenBase64);
+    config.putCustomParameter(null, EidasConstants.TEMPLATE_POST_FORWARD_TOKEN_NAME, token);
+    config.putCustomParameter(null, EidasConstants.TEMPLATE_POST_FORWARD_TOKEN_VALUE, tokenBase64);
     guiBuilder.build(request, response, config, "Forward to eIDASNode form");
   }
 
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAustrianResidenceGuiResponseTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAustrianResidenceGuiResponseTask.java
index 09ef0129..403c3355 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAustrianResidenceGuiResponseTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAustrianResidenceGuiResponseTask.java
@@ -158,6 +158,7 @@ public class ReceiveAustrianResidenceGuiResponseTask extends AbstractLocaleAuthS
       } else {
         log.debug("Find single match by using residence information. Starting data validation ... ");
         compareSearchResultWithInitialData(residencyResult, eidasData);
+        executionContext.put(TRANSITION_TO_GENERATE_GUI_QUERY_AUSTRIAN_RESIDENCE_TASK, false);
 
       }
 
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java
index d2bd0128..ac70a2ac 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseAlternativeTask.java
@@ -39,8 +39,9 @@ import at.asitplus.eidas.specific.core.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.exception.EidasValidationException;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.validator.EidasResponseValidator;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 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;
@@ -135,7 +136,7 @@ public class ReceiveAuthnResponseAlternativeTask extends AbstractAuthServletTask
   }
 
   private void checkStatusCode(ILightResponse eidasResponse) throws EidasSAuthenticationException {
-    if (!eidasResponse.getStatus().getStatusCode().equals(Constants.SUCCESS_URI)) {
+    if (!eidasResponse.getStatus().getStatusCode().equals(EidasConstants.SUCCESS_URI)) {
       log.info("Receive eIDAS Response with StatusCode: {} Subcode: {} Msg: {}",
           eidasResponse.getStatus().getStatusCode(),
           eidasResponse.getStatus().getSubStatusCode(),
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java
index 5e4075de..a16da17f 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/tasks/ReceiveAuthnResponseTask.java
@@ -40,8 +40,9 @@ import at.asitplus.eidas.specific.core.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.exception.EidasValidationException;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.validator.EidasResponseValidator;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 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;
@@ -162,17 +163,20 @@ public class ReceiveAuthnResponseTask extends AbstractAuthServletTask {
     return eidasResponse;
   }
 
+
   private void checkStatusCode(ILightResponse eidasResponse) throws EidasSAuthenticationException {
-    if (!eidasResponse.getStatus().getStatusCode().equals(Constants.SUCCESS_URI)) {
+    if (!eidasResponse.getStatus().getStatusCode().equals(EidasConstants.SUCCESS_URI)) {
       log.info("Receive eIDAS Response with StatusCode: {} Subcode: {} Msg: {}",
           eidasResponse.getStatus().getStatusCode(),
           eidasResponse.getStatus().getSubStatusCode(),
           eidasResponse.getStatus().getStatusMessage());
       throw new EidasSAuthenticationException("eidas.02", new Object[]{eidasResponse.getStatus()
           .getStatusCode(), eidasResponse.getStatus().getStatusMessage()});
+      
     }
   }
 
+
   private void validateMsSpecificResponse(ExecutionContext executionContext, ILightResponse eidasResponse)
       throws EidasValidationException {
     final String spCountry = basicConfig.getBasicConfiguration(Constants.CONIG_PROPS_EIDAS_NODE_COUNTRYCODE, "AT");
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
index 2853d8ab..91a6ce42 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/utils/EidasResponseUtils.java
@@ -38,8 +38,8 @@ import org.joda.time.DateTime;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
 
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasAttributeException;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.e_government.reference.namespace.persondata._20020228.PostalAddressType;
 import at.gv.egiz.eaaf.core.impl.data.Triple;
 import eu.eidas.auth.commons.attribute.AttributeDefinition;
@@ -84,8 +84,9 @@ public class EidasResponseUtils {
    */
   public static Triple<String, String, String> parseEidasPersonalIdentifier(String uniqueID) {
     if (!validateEidasPersonalIdentifier(uniqueID)) {
-      log.error("eIDAS attribute value for {} looks wrong formated. Value: {}",
-          Constants.eIDAS_ATTR_PERSONALIDENTIFIER, uniqueID);
+      log.error("eIDAS attribute value for {} looks wrong formated. Value: {}", 
+          EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER, uniqueID);
+
       return null;
 
     }
@@ -210,11 +211,11 @@ public class EidasResponseUtils {
         // 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);
+        log.warn("eIDAS attr: " + EidasConstants.eIDAS_ATTR_CURRENTADDRESS + " is of WRONG type");
+        throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_CURRENTADDRESS);
       }
     } else {
-      log.debug("NO '" + Constants.eIDAS_ATTR_CURRENTADDRESS + "' attribute. Post-Processing skipped ... ");
+      log.debug("NO '" + EidasConstants.eIDAS_ATTR_CURRENTADDRESS + "' attribute. Post-Processing skipped ... ");
     }
     return null;
   }
@@ -231,11 +232,11 @@ public class EidasResponseUtils {
       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);
+        log.warn("eIDAS attr: " + EidasConstants.eIDAS_ATTR_BIRTHNAME + " is of WRONG type");
+        throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_BIRTHNAME);
       }
     } else {
-      log.debug("NO '" + Constants.eIDAS_ATTR_BIRTHNAME + "' attribute. Post-Processing skipped ... ");
+      log.debug("NO '" + EidasConstants.eIDAS_ATTR_BIRTHNAME + "' attribute. Post-Processing skipped ... ");
     }
     return null;
   }
@@ -253,13 +254,13 @@ public class EidasResponseUtils {
         return (String) placeOfBirthObj;
 
       } else {
-        log.warn("eIDAS attr: " + Constants.eIDAS_ATTR_PLACEOFBIRTH + " is of WRONG type");
-        throw new EidasAttributeException(Constants.eIDAS_ATTR_PLACEOFBIRTH);
+        log.warn("eIDAS attr: " + EidasConstants.eIDAS_ATTR_PLACEOFBIRTH + " is of WRONG type");
+        throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_PLACEOFBIRTH);
 
       }
 
     } else {
-      log.debug("NO '" + Constants.eIDAS_ATTR_PLACEOFBIRTH + "' attribute. Post-Processing skipped ... ");
+      log.debug("NO '" + EidasConstants.eIDAS_ATTR_PLACEOFBIRTH + "' attribute. Post-Processing skipped ... ");
     }
     return null;
   }
@@ -273,7 +274,7 @@ public class EidasResponseUtils {
    */
   public static DateTime processDateOfBirth(Object dateOfBirthObj) throws EidasAttributeException {
     if (!(dateOfBirthObj instanceof DateTime)) {
-      throw new EidasAttributeException(Constants.eIDAS_ATTR_DATEOFBIRTH);
+      throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_DATEOFBIRTH);
     }
     return (DateTime) dateOfBirthObj;
   }
@@ -291,11 +292,11 @@ public class EidasResponseUtils {
         new SimpleDateFormat("yyyy-MM-dd").parse((String) dateOfBirthObj);
         return (String) dateOfBirthObj;
       } catch (ParseException e) {
-        throw new EidasAttributeException(Constants.eIDAS_ATTR_DATEOFBIRTH);
+        throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_DATEOFBIRTH);
       }
     }
     if (!(dateOfBirthObj instanceof DateTime)) {
-      throw new EidasAttributeException(Constants.eIDAS_ATTR_DATEOFBIRTH);
+      throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_DATEOFBIRTH);
     }
     return new SimpleDateFormat("yyyy-MM-dd").format(((DateTime) dateOfBirthObj).toDate());
   }
@@ -309,7 +310,7 @@ public class EidasResponseUtils {
    */
   public static String processGivenName(Object givenNameObj) throws EidasAttributeException {
     if (!(givenNameObj instanceof String)) {
-      throw new EidasAttributeException(Constants.eIDAS_ATTR_CURRENTGIVENNAME);
+      throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME);
     }
     return (String) givenNameObj;
   }
@@ -323,7 +324,7 @@ public class EidasResponseUtils {
    */
   public static String processFamilyName(Object familyNameObj) throws EidasAttributeException {
     if (!(familyNameObj instanceof String)) {
-      throw new EidasAttributeException(Constants.eIDAS_ATTR_CURRENTFAMILYNAME);
+      throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME);
     }
     return (String) familyNameObj;
   }
@@ -337,7 +338,7 @@ public class EidasResponseUtils {
    */
   public static String processPersonalIdentifier(Object personalIdentifierObj) throws EidasAttributeException {
     if (!(personalIdentifierObj instanceof String)) {
-      throw new EidasAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+      throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER);
     }
     return (String) personalIdentifierObj;
   }
@@ -352,7 +353,7 @@ public class EidasResponseUtils {
    */
   public static String processPseudonym(Object personalIdObj) throws EidasAttributeException {
     if (!(personalIdObj instanceof String)) {
-      throw new EidasAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+      throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER);
     }
     final Triple<String, String, String> eIdentifier =
         EidasResponseUtils.parseEidasPersonalIdentifier((String) personalIdObj);
@@ -371,7 +372,7 @@ public class EidasResponseUtils {
    */
   public static String processCountryCode(Object personalIdObj) throws EidasAttributeException {
     if (!(personalIdObj instanceof String)) {
-      throw new EidasAttributeException(Constants.eIDAS_ATTR_PERSONALIDENTIFIER);
+      throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER);
     }
     final Triple<String, String, String> eIdentifier =
         EidasResponseUtils.parseEidasPersonalIdentifier((String) personalIdObj);
@@ -390,7 +391,7 @@ public class EidasResponseUtils {
    */
   public static String processTaxReference(Object taxReferenceObj) throws EidasAttributeException {
     if (!(taxReferenceObj instanceof String)) {
-      throw new EidasAttributeException(Constants.eIDAS_ATTR_TAXREFERENCE);
+      throw new EidasAttributeException(EidasConstants.eIDAS_ATTR_TAXREFERENCE);
     }
     return (String) taxReferenceObj;
   }
diff --git a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/validator/EidasResponseValidator.java b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/validator/EidasResponseValidator.java
index 9d9a0647..d1962654 100644
--- a/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/validator/EidasResponseValidator.java
+++ b/modules/authmodule-eIDAS-v2/src/main/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/validator/EidasResponseValidator.java
@@ -31,10 +31,10 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.collect.ImmutableSet;
 
-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.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.impl.data.Triple;
 import eu.eidas.auth.commons.attribute.AttributeDefinition;
@@ -97,7 +97,7 @@ public class EidasResponseValidator {
      *_____________________________________________________|
      */
     final AttributeDefinition<?> attrDefinition = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
+        EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
     final ImmutableSet<? extends AttributeValue<?>> attributeValues = eidasResponse.getAttributes()
         .getAttributeMap().get(attrDefinition);
     final List<String> personalIdObj = EidasResponseUtils.translateStringListAttribute(attrDefinition,
@@ -123,48 +123,48 @@ public class EidasResponseValidator {
       if (split == null) {
         throw new EidasValidationException("eidas.07",
             new Object[] {
-                Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+                EidasConstants.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
+          log.warn("eIDAS attribute value for " + EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER
               + " includes NO destination country. Value:" + natPersId);
           throw new EidasValidationException("eidas.07",
               new Object[] {
-                  Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+                  EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER,
                   "No or empty destination country" });
 
         }
         if (!split.getSecond().equalsIgnoreCase(spCountry)) {
-          log.warn("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER
+          log.warn("eIDAS attribute value for " + EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER
               + " includes wrong destination country. Value:" + natPersId
               + " SP-Country:" + spCountry);
           throw new EidasValidationException("eidas.07",
               new Object[] {
-                  Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+                  EidasConstants.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
+          log.warn("eIDAS attribute value for " + EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER
               + " includes NO citizen country. Value:" + natPersId);
           throw new EidasValidationException("eidas.07",
               new Object[] {
-                  Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+                  EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER,
                   "No or empty citizen country" });
 
         }
         if (!split.getFirst().equalsIgnoreCase(citizenCountryCode)) {
-          log.warn("eIDAS attribute value for " + Constants.eIDAS_ATTR_PERSONALIDENTIFIER
+          log.warn("eIDAS attribute value for " + EidasConstants.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,
+                  EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER,
                   "Citizen country does not match to eIDAS-node country that generates the response" });
 
         }
diff --git a/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml b/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
index 193513b0..ab4228fd 100644
--- a/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
+++ b/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth.beans.xml
@@ -38,13 +38,16 @@
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasSignalServlet" />
 
   <bean id="attributeRegistry"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry">
+    class="at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry">
     <property name="eidasAttributesFile"
       ref="specificConnectorAttributesFileWithPath" />
     <property name="additionalAttributesFile"
       ref="specificConnectorAdditionalAttributesFileWithPath" />
   </bean>
 
+  <bean id="connectorAttributeRegistry"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.ConnectorEidasAttributeRegistry" />
+
   <!-- <bean id="eIDASDataStore" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.eIDASDataStore"
     /> -->
 
@@ -55,17 +58,22 @@
     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">
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.DeEidProcessor">
     <property name="priority" value="1" />
   </bean>
 
   <bean id="LU-Processor"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.LuEidProcessor">
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.LuEidProcessor">
+    <property name="priority" value="1" />
+  </bean>
+
+  <bean id="NL-Processor"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.NlEidProcessor">
     <property name="priority" value="1" />
   </bean>
 
   <bean id="Default-Processor"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.GenericEidProcessor">
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.GenericEidProcessor">
     <property name="priority" value="0" />
   </bean>
 
diff --git a/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml b/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
deleted file mode 100644
index cde9687e..00000000
--- a/modules/authmodule-eIDAS-v2/src/main/resources/eidas_v2_auth_ref_impl_config.beans.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xmlns:context="http://www.springframework.org/schema/context"
-  xmlns:tx="http://www.springframework.org/schema/tx"
-  xmlns:aop="http://www.springframework.org/schema/aop"
-  xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.1.xsd
-    http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
-    http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.1.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-3.0.xsd">
-
-  <context:annotation-config />
-
-  <import
-    resource="classpath:specificCommunicationDefinitionApplicationContext.xml" />
-
-  <bean id="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>
-
-</beans>
\ No newline at end of file
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/EidasSignalServletTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/EidasSignalServletTest.java
index 4d4ac47d..3bc06092 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/EidasSignalServletTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/EidasSignalServletTest.java
@@ -29,7 +29,8 @@ import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummySpConfi
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasSignalServlet;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateIdentityLinkTask;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy.DummySpecificCommunicationService;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.test.dummy.DummySpecificCommunicationService;
 import at.gv.egiz.eaaf.core.api.IRequestStorage;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
@@ -138,7 +139,7 @@ public class EidasSignalServletTest {
     iLightResponse.id("_".concat(Random.nextHexRandom16()))
         .issuer(RandomStringUtils.randomAlphabetic(10))
         .subject(RandomStringUtils.randomAlphabetic(10))
-        .statusCode(Constants.SUCCESS_URI)
+        .statusCode(EidasConstants.SUCCESS_URI)
         .inResponseTo("_".concat(Random.nextHexRandom16()))
         .subjectNameIdFormat("afaf")
         .relayState(relayState);
@@ -177,7 +178,7 @@ public class EidasSignalServletTest {
     iLightResponse.id("_".concat(Random.nextHexRandom16()))
         .issuer(RandomStringUtils.randomAlphabetic(10))
         .subject(RandomStringUtils.randomAlphabetic(10))
-        .statusCode(Constants.SUCCESS_URI)
+        .statusCode(EidasConstants.SUCCESS_URI)
         .inResponseTo(inResponseTo)
         .subjectNameIdFormat("afaf");
 
@@ -213,7 +214,7 @@ public class EidasSignalServletTest {
     iLightResponse.id("_".concat(Random.nextHexRandom16()))
         .issuer(RandomStringUtils.randomAlphabetic(10))
         .subject(RandomStringUtils.randomAlphabetic(10))
-        .statusCode(Constants.SUCCESS_URI)
+        .statusCode(EidasConstants.SUCCESS_URI)
         .inResponseTo(inResponseTo)
         .subjectNameIdFormat("afaf");
 
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientProductionTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientProductionTest.java
index cb9df7e5..af1867e7 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientProductionTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientProductionTest.java
@@ -19,12 +19,12 @@ import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.TestPropertySource;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrSoapClient;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrSoapClient.ZmrRegisterResult;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.LoggingHandler;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.bmi.namespace.zmr_su.zmr._20040201.EidasSuchdatenType;
 import at.gv.bmi.namespace.zmr_su.zmr._20040201.PersonSuchenRequest;
 import at.gv.e_government.reference.namespace.persondata.de._20040201.NatuerlichePersonTyp;
@@ -453,9 +453,9 @@ public class ZmrClientProductionTest {
     searchNatPerson.setGeburtsdatum(dateOfBirth);
 
     // add addtional eIDAS attributes if available
-    addIfAvailable(req.getEidasSuchdaten(), cc, Constants.eIDAS_ATTRURN_PLACEOFBIRTH, placeOfBirth);
-    addIfAvailable(req.getEidasSuchdaten(), cc, Constants.eIDAS_ATTRURN_BIRTHNAME, birthName);
-    addIfAvailable(req.getEidasSuchdaten(), cc, Constants.eIDAS_ATTRURN_PERSONALIDENTIFIER, personalId);
+    addIfAvailable(req.getEidasSuchdaten(), cc, EidasConstants.eIDAS_ATTRURN_PLACEOFBIRTH, placeOfBirth);
+    addIfAvailable(req.getEidasSuchdaten(), cc, EidasConstants.eIDAS_ATTRURN_BIRTHNAME, birthName);
+    addIfAvailable(req.getEidasSuchdaten(), cc, EidasConstants.eIDAS_ATTRURN_PERSONALIDENTIFIER, personalId);
 
     return req;
 
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientTest.java
index 4e0a1f28..ef9cc9b7 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/clients/ZmrClientTest.java
@@ -38,7 +38,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import com.github.skjolber.mockito.soap.SoapServiceRule;
 
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrSoapClient;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.zmr.ZmrSoapClient.ZmrRegisterResult;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.controller.AdresssucheController.AdresssucheOutput;
@@ -46,6 +45,7 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.RegisterResult;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.WorkflowException;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.bmi.namespace.zmr_su.base._20040201.RequestType;
 import at.gv.bmi.namespace.zmr_su.base._20040201.ResponseType;
 import at.gv.bmi.namespace.zmr_su.base._20040201_.ServicePort;
@@ -1139,9 +1139,9 @@ public class ZmrClientTest {
     searchNatPerson.setGeburtsdatum(dateOfBirth);
 
     // add addtional eIDAS attributes if available
-    addIfAvailable(req.getEidasSuchdaten(), cc, Constants.eIDAS_ATTRURN_PLACEOFBIRTH, placeOfBirth);
-    addIfAvailable(req.getEidasSuchdaten(), cc, Constants.eIDAS_ATTRURN_BIRTHNAME, birthName);
-    addIfAvailable(req.getEidasSuchdaten(), cc, Constants.eIDAS_ATTRURN_PERSONALIDENTIFIER, personalId);
+    addIfAvailable(req.getEidasSuchdaten(), cc, EidasConstants.eIDAS_ATTRURN_PLACEOFBIRTH, placeOfBirth);
+    addIfAvailable(req.getEidasSuchdaten(), cc, EidasConstants.eIDAS_ATTRURN_BIRTHNAME, birthName);
+    addIfAvailable(req.getEidasSuchdaten(), cc, EidasConstants.eIDAS_ATTRURN_PERSONALIDENTIFIER, personalId);
 
     return req;
 
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/dummy/DummySpecificCommunicationService.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/dummy/DummySpecificCommunicationService.java
deleted file mode 100644
index d2b0c1ae..00000000
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/dummy/DummySpecificCommunicationService.java
+++ /dev/null
@@ -1,58 +0,0 @@
-package at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy;
-
-import java.util.Collection;
-
-import eu.eidas.auth.commons.attribute.AttributeDefinition;
-import eu.eidas.auth.commons.light.ILightRequest;
-import eu.eidas.auth.commons.light.ILightResponse;
-import eu.eidas.auth.commons.tx.BinaryLightToken;
-import eu.eidas.specificcommunication.BinaryLightTokenHelper;
-import eu.eidas.specificcommunication.exception.SpecificCommunicationException;
-import eu.eidas.specificcommunication.protocol.SpecificCommunicationService;
-
-public class DummySpecificCommunicationService implements SpecificCommunicationService {
-
-  private ILightRequest lightRequest;
-  private ILightResponse lightResponse;
-
-  @Override
-  public BinaryLightToken putRequest(ILightRequest lightRequest) throws SpecificCommunicationException {
-    this.lightRequest = lightRequest;
-    return BinaryLightTokenHelper.createBinaryLightToken("Test", "TestSecret", "SHA-256");
-  }
-
-  @Override
-  public ILightRequest getAndRemoveRequest(String tokenBase64, Collection<AttributeDefinition<?>> registry)
-      throws SpecificCommunicationException {
-    return lightRequest;
-  }
-
-  @Override
-  public BinaryLightToken putResponse(ILightResponse lightResponse) throws SpecificCommunicationException {
-    this.lightResponse = lightResponse;
-    return BinaryLightTokenHelper.createBinaryLightToken("Test", "TestSecret", "SHA-256");
-  }
-
-  @Override
-  public ILightResponse getAndRemoveResponse(String tokenBase64, Collection<AttributeDefinition<?>> registry)
-      throws SpecificCommunicationException {
-    return lightResponse;
-  }
-
-  public ILightRequest getiLightRequest() {
-    return lightRequest;
-  }
-
-  public void setiLightRequest(ILightRequest lightReques) {
-    this.lightRequest = lightReques;
-  }
-
-  public ILightResponse getiLightResponse() {
-    return lightResponse;
-  }
-
-  public void setiLightResponse(ILightResponse lightResponse) {
-    this.lightResponse = lightResponse;
-  }
-
-}
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/AlternativeSearchTaskWithRegisterTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/AlternativeSearchTaskWithRegisterTest.java
index 682db41e..176e95cb 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/AlternativeSearchTaskWithRegisterTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/AlternativeSearchTaskWithRegisterTest.java
@@ -67,6 +67,7 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.RegisterSearchSe
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.AlternativeSearchTask;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.test.clients.ZmrClientTest;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.MatchingTaskUtils;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.bmi.namespace.zmr_su.base._20040201.RequestType;
 import at.gv.bmi.namespace.zmr_su.base._20040201.ResponseType;
 import at.gv.bmi.namespace.zmr_su.base._20040201_.ServicePort;
@@ -913,24 +914,24 @@ public class AlternativeSearchTaskWithRegisterTest {
                                                         String dateOfBirth, String taxNumber, String placeOfBirth,
                                                         String birthName) throws URISyntaxException {
     ImmutableAttributeMap.Builder builder = ImmutableAttributeMap.builder()
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+        .put(generateStringAttribute(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER,
             randomAlphabetic(2), randomAlphabetic(2)), identifier)
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_CURRENTFAMILYNAME,
+        .put(generateStringAttribute(EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME,
             randomAlphabetic(3), randomAlphabetic(3)), familyName)
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_CURRENTGIVENNAME,
+        .put(generateStringAttribute(EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME,
             randomAlphabetic(4), randomAlphabetic(4)), givenName)
-        .put(generateDateTimeAttribute(Constants.eIDAS_ATTR_DATEOFBIRTH,
+        .put(generateDateTimeAttribute(EidasConstants.eIDAS_ATTR_DATEOFBIRTH,
             randomAlphabetic(5), randomAlphabetic(5)), dateOfBirth);
     if (taxNumber != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_TAXREFERENCE,
+      builder.put(generateStringAttribute(EidasConstants.eIDAS_ATTR_TAXREFERENCE,
           randomAlphabetic(6), randomAlphabetic(6)), taxNumber);
     }
     if (birthName != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_BIRTHNAME,
+      builder.put(generateStringAttribute(EidasConstants.eIDAS_ATTR_BIRTHNAME,
           randomAlphabetic(7), randomAlphabetic(7)), birthName);
     }
     if (placeOfBirth != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_PLACEOFBIRTH,
+      builder.put(generateStringAttribute(EidasConstants.eIDAS_ATTR_PLACEOFBIRTH,
           randomAlphabetic(8), randomAlphabetic(8)), placeOfBirth);
     }
     final ImmutableAttributeMap attributeMap = builder.build();
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java
index 023c196c..36c0c2af 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskEidNewTest.java
@@ -57,13 +57,14 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
 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.exception.SzrCommunicationException;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.ICcSpecificEidProcessingService;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateIdentityLinkTask;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.JoseUtils;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.JoseUtils.JwsResult;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.MatchingTaskUtils;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.IRequestStorage;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
@@ -605,18 +606,18 @@ public class CreateIdentityLinkTaskEidNewTest {
   @Nonnull
   private AuthenticationResponse buildDummyAuthResponse(boolean withAll, boolean withEmpty) throws URISyntaxException {
     final AttributeDefinition attributeDef = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
+        EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
     final AttributeDefinition attributeDef2 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
     final AttributeDefinition attributeDef3 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTGIVENNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME).first();
     final AttributeDefinition attributeDef4 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_DATEOFBIRTH).first();
+        EidasConstants.eIDAS_ATTR_DATEOFBIRTH).first();
     final AttributeDefinition attributeDef5 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_PLACEOFBIRTH).first();
+        EidasConstants.eIDAS_ATTR_PLACEOFBIRTH).first();
     final AttributeDefinition attributeDef6 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_BIRTHNAME).first();
-
+        EidasConstants.eIDAS_ATTR_BIRTHNAME).first();
+   
     final Builder attributeMap = ImmutableAttributeMap.builder();
     attributeMap.put(attributeDef, "LU/AT/" + RandomStringUtils.randomNumeric(64));
     attributeMap.put(attributeDef2, RandomStringUtils.randomAlphabetic(10));
@@ -638,7 +639,7 @@ public class CreateIdentityLinkTaskEidNewTest {
     return b.id("_".concat(Random.nextHexRandom16()))
         .issuer(RandomStringUtils.randomAlphabetic(10))
         .subject(RandomStringUtils.randomAlphabetic(10))
-        .statusCode(Constants.SUCCESS_URI)
+        .statusCode(EidasConstants.SUCCESS_URI)
         .inResponseTo("_".concat(Random.nextHexRandom16()))
         .subjectNameIdFormat("afaf")
         .levelOfAssurance(EaafConstants.EIDAS_LOA_PREFIX + RandomStringUtils.randomAlphabetic(5))
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskTest.java
index 5c528532..5db6e95d 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/CreateIdentityLinkTaskTest.java
@@ -41,11 +41,12 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.MatchedPersonResult;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
 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.service.ICcSpecificEidProcessingService;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.CreateIdentityLinkTask;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.EidasResponseUtils;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.MatchingTaskUtils;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.IRequestStorage;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
@@ -475,13 +476,13 @@ public class CreateIdentityLinkTaskTest {
   @NotNull
   private AuthenticationResponse buildDummyAuthResponse() throws URISyntaxException {
     final AttributeDefinition attributeDef = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
+        EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
     final AttributeDefinition attributeDef2 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
     final AttributeDefinition attributeDef3 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTGIVENNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME).first();
     final AttributeDefinition attributeDef4 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_DATEOFBIRTH).first();
+        EidasConstants.eIDAS_ATTR_DATEOFBIRTH).first();
 
     final ImmutableAttributeMap attributeMap = ImmutableAttributeMap.builder()
         .put(attributeDef, "LU/AT/" + RandomStringUtils.randomNumeric(64))
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateAuthnRequestTaskTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateAuthnRequestTaskTest.java
index 763d7d39..761738aa 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateAuthnRequestTaskTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/GenerateAuthnRequestTaskTest.java
@@ -26,7 +26,8 @@ import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigM
 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.tasks.GenerateAuthnRequestTask;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy.DummySpecificCommunicationService;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.test.dummy.DummySpecificCommunicationService;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
@@ -138,7 +139,7 @@ public class GenerateAuthnRequestTaskTest {
           .getErrorId());
       Assert.assertEquals("wrong parameter size", 1, ((EaafException) e.getOriginalException())
           .getParams().length);
-      Assert.assertEquals("wrong errorMsg", Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL, ((EaafException) e
+      Assert.assertEquals("wrong errorMsg", EidasConstants.CONIG_PROPS_EIDAS_CONNECTOR_NODE_FORWARD_URL, ((EaafException) e
           .getOriginalException()).getParams()[0]);
 
     }
@@ -163,7 +164,7 @@ public class GenerateAuthnRequestTaskTest {
           .getErrorId());
       Assert.assertEquals("wrong parameter size", 1, ((EaafException) e.getOriginalException())
           .getParams().length);
-      Assert.assertEquals("wrong errorMsg", Constants.CONIG_PROPS_EIDAS_NODE_FORWARD_URL + "." + stage, ((EaafException) e
+      Assert.assertEquals("wrong errorMsg", EidasConstants.CONIG_PROPS_EIDAS_CONNECTOR_NODE_FORWARD_URL + "." + stage, ((EaafException) e
           .getOriginalException()).getParams()[0]);
 
     }
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskTest.java
index 74ac065e..eef31a02 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskTest.java
@@ -83,6 +83,7 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.RegisterSearchSe
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.RegisterSearchService.RegisterStatusResults;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.InitialSearchTask;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.MatchingTaskUtils;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.bmi.namespace.zmr_su.zmr._20040201.PersonSuchenRequest;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.idp.process.ExecutionContext;
@@ -887,24 +888,24 @@ public class InitialSearchTaskTest {
                                                         String dateOfBirth, String taxNumber, String placeOfBirth,
                                                         String birthName) throws URISyntaxException {
     ImmutableAttributeMap.Builder builder = ImmutableAttributeMap.builder()
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+        .put(generateStringAttribute(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER,
             randomAlphabetic(2), randomAlphabetic(2)), identifier)
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_CURRENTFAMILYNAME,
+        .put(generateStringAttribute(EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME,
             randomAlphabetic(3), randomAlphabetic(3)), familyName)
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_CURRENTGIVENNAME,
+        .put(generateStringAttribute(EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME,
             randomAlphabetic(4), randomAlphabetic(4)), givenName)
-        .put(generateDateTimeAttribute(Constants.eIDAS_ATTR_DATEOFBIRTH,
+        .put(generateDateTimeAttribute(EidasConstants.eIDAS_ATTR_DATEOFBIRTH,
             randomAlphabetic(5), randomAlphabetic(5)), dateOfBirth);
     if (taxNumber != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_TAXREFERENCE,
+      builder.put(generateStringAttribute(EidasConstants.eIDAS_ATTR_TAXREFERENCE,
           randomAlphabetic(6), randomAlphabetic(6)), taxNumber);
     }
     if (birthName != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_BIRTHNAME,
+      builder.put(generateStringAttribute(EidasConstants.eIDAS_ATTR_BIRTHNAME,
           randomAlphabetic(7), randomAlphabetic(7)), birthName);
     }
     if (placeOfBirth != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_PLACEOFBIRTH,
+      builder.put(generateStringAttribute(EidasConstants.eIDAS_ATTR_PLACEOFBIRTH,
           randomAlphabetic(8), randomAlphabetic(8)), placeOfBirth);
     }
     final ImmutableAttributeMap attributeMap = builder.build();
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskWithRegistersTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskWithRegistersTest.java
index 6d0e7c31..4b9e9fe2 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskWithRegistersTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/InitialSearchTaskWithRegistersTest.java
@@ -88,6 +88,7 @@ import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.InitialSearchTask;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.test.clients.ErnpRestClientTest;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.test.clients.ZmrClientTest;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.utils.MatchingTaskUtils;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import at.gv.bmi.namespace.zmr_su.base._20040201.RequestType;
 import at.gv.bmi.namespace.zmr_su.base._20040201.ResponseType;
 import at.gv.bmi.namespace.zmr_su.base._20040201_.ServicePort;
@@ -607,24 +608,24 @@ public class InitialSearchTaskWithRegistersTest {
                                                         String dateOfBirth, String taxNumber, String placeOfBirth,
                                                         String birthName) throws URISyntaxException {
     ImmutableAttributeMap.Builder builder = ImmutableAttributeMap.builder()
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_PERSONALIDENTIFIER,
+        .put(generateStringAttribute(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER,
             randomAlphabetic(2), randomAlphabetic(2)), identifier)
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_CURRENTFAMILYNAME,
+        .put(generateStringAttribute(EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME,
             randomAlphabetic(3), randomAlphabetic(3)), familyName)
-        .put(generateStringAttribute(Constants.eIDAS_ATTR_CURRENTGIVENNAME,
+        .put(generateStringAttribute(EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME,
             randomAlphabetic(4), randomAlphabetic(4)), givenName)
-        .put(generateDateTimeAttribute(Constants.eIDAS_ATTR_DATEOFBIRTH,
+        .put(generateDateTimeAttribute(EidasConstants.eIDAS_ATTR_DATEOFBIRTH,
             randomAlphabetic(5), randomAlphabetic(5)), dateOfBirth);
     if (taxNumber != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_TAXREFERENCE,
+      builder.put(generateStringAttribute(EidasConstants.eIDAS_ATTR_TAXREFERENCE,
           randomAlphabetic(6), randomAlphabetic(6)), taxNumber);
     }
     if (birthName != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_BIRTHNAME,
+      builder.put(generateStringAttribute(EidasConstants.eIDAS_ATTR_BIRTHNAME,
           randomAlphabetic(7), randomAlphabetic(7)), birthName);
     }
     if (placeOfBirth != null) {
-      builder.put(generateStringAttribute(Constants.eIDAS_ATTR_PLACEOFBIRTH,
+      builder.put(generateStringAttribute(EidasConstants.eIDAS_ATTR_PLACEOFBIRTH,
           randomAlphabetic(8), randomAlphabetic(8)), placeOfBirth);
     }
     final ImmutableAttributeMap attributeMap = builder.build();
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveAuthnResponseTaskTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveAuthnResponseTaskTest.java
index 842c8bf7..53f83095 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveAuthnResponseTaskTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveAuthnResponseTaskTest.java
@@ -27,8 +27,9 @@ import at.asitplus.eidas.specific.core.MsEidasNodeConstants;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummySpConfiguration;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAuthnResponseTask;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.IRequestStorage;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
@@ -142,7 +143,7 @@ public class ReceiveAuthnResponseTaskTest {
   public void successAndForward() throws URISyntaxException, TaskExecutionException, 
       PendingReqIdValidationException, EaafStorageException {    
     
-    AuthenticationResponse eidasResponse = buildDummyAuthResponse(Constants.SUCCESS_URI);
+    AuthenticationResponse eidasResponse = buildDummyAuthResponse(EidasConstants.SUCCESS_URI);
     httpReq.setAttribute(Constants.DATA_FULL_EIDAS_RESPONSE, eidasResponse);
         
     String alternativReturnEndpoint = "http://ms-connector.alternative/" + RandomStringUtils.randomAlphabetic(10);
@@ -172,7 +173,7 @@ public class ReceiveAuthnResponseTaskTest {
   
   public void success() throws URISyntaxException, TaskExecutionException, PendingReqIdValidationException {
     @Nonnull
-    AuthenticationResponse eidasResponse = buildDummyAuthResponse(Constants.SUCCESS_URI);
+    AuthenticationResponse eidasResponse = buildDummyAuthResponse(EidasConstants.SUCCESS_URI);
     httpReq.setAttribute(Constants.DATA_FULL_EIDAS_RESPONSE, eidasResponse);
     executionContext.put(MsEidasNodeConstants.REQ_PARAM_SELECTED_COUNTRY, "LU");
 
@@ -200,7 +201,7 @@ public class ReceiveAuthnResponseTaskTest {
     basicConfig.putConfigValue("eidas.ms.auth.eIDAS.eid.testidentity.default", "true");
     
     @Nonnull      
-    AuthenticationResponse eidasResponse = buildDummyAuthResponse(Constants.SUCCESS_URI);
+    AuthenticationResponse eidasResponse = buildDummyAuthResponse(EidasConstants.SUCCESS_URI);
     httpReq.setAttribute(Constants.DATA_FULL_EIDAS_RESPONSE, eidasResponse);
     executionContext.put(MsEidasNodeConstants.REQ_PARAM_SELECTED_COUNTRY, "LU");    
       
@@ -226,13 +227,13 @@ public class ReceiveAuthnResponseTaskTest {
   @Nonnull
   private AuthenticationResponse buildDummyAuthResponse(String statusCode) throws URISyntaxException {
     final AttributeDefinition attributeDef = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
+        EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
     final AttributeDefinition attributeDef2 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
     final AttributeDefinition attributeDef3 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTGIVENNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME).first();
     final AttributeDefinition attributeDef4 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_DATEOFBIRTH).first();
+        EidasConstants.eIDAS_ATTR_DATEOFBIRTH).first();
 
     final ImmutableAttributeMap attributeMap = ImmutableAttributeMap.builder()
         .put(attributeDef, "LU/AT/" + RandomStringUtils.randomNumeric(64))
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveEidasResponseTaskTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveEidasResponseTaskTest.java
index 4148b138..4112e047 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveEidasResponseTaskTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/tasks/ReceiveEidasResponseTaskTest.java
@@ -27,8 +27,9 @@ import at.asitplus.eidas.specific.core.MsEidasNodeConstants;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummySpConfiguration;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.tasks.ReceiveAuthnResponseAlternativeTask;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 import at.gv.egiz.eaaf.core.api.IRequest;
 import at.gv.egiz.eaaf.core.api.IRequestStorage;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
@@ -141,7 +142,7 @@ public class ReceiveEidasResponseTaskTest {
   public void successAndForward() throws URISyntaxException, TaskExecutionException, 
       PendingReqIdValidationException, EaafStorageException {    
     
-    AuthenticationResponse eidasResponse = buildDummyAuthResponse(Constants.SUCCESS_URI);
+    AuthenticationResponse eidasResponse = buildDummyAuthResponse(EidasConstants.SUCCESS_URI);
     httpReq.setAttribute(Constants.DATA_FULL_EIDAS_RESPONSE, eidasResponse);
         
     String alternativReturnEndpoint = "http://ms-connector.alternative/" + RandomStringUtils.randomAlphabetic(10);
@@ -171,7 +172,7 @@ public class ReceiveEidasResponseTaskTest {
   
   public void success() throws URISyntaxException, TaskExecutionException, PendingReqIdValidationException {
     @Nonnull
-    AuthenticationResponse eidasResponse = buildDummyAuthResponse(Constants.SUCCESS_URI);
+    AuthenticationResponse eidasResponse = buildDummyAuthResponse(EidasConstants.SUCCESS_URI);
     httpReq.setAttribute(Constants.DATA_FULL_EIDAS_RESPONSE, eidasResponse);
 
     //execute test
@@ -198,7 +199,7 @@ public class ReceiveEidasResponseTaskTest {
     basicConfig.putConfigValue("eidas.ms.auth.eIDAS.eid.testidentity.default", "true");
     
     @Nonnull      
-    AuthenticationResponse eidasResponse = buildDummyAuthResponse(Constants.SUCCESS_URI);
+    AuthenticationResponse eidasResponse = buildDummyAuthResponse(EidasConstants.SUCCESS_URI);
     httpReq.setAttribute(Constants.DATA_FULL_EIDAS_RESPONSE, eidasResponse);
       
     //execute test
@@ -223,14 +224,14 @@ public class ReceiveEidasResponseTaskTest {
   @Nonnull
   private AuthenticationResponse buildDummyAuthResponse(String statusCode) throws URISyntaxException {
     final AttributeDefinition attributeDef = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
+        EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
     final AttributeDefinition attributeDef2 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME).first();
     final AttributeDefinition attributeDef3 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_CURRENTGIVENNAME).first();
+        EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME).first();
     final AttributeDefinition attributeDef4 = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_DATEOFBIRTH).first();
-
+        EidasConstants.eIDAS_ATTR_DATEOFBIRTH).first();
+   
     final ImmutableAttributeMap attributeMap = ImmutableAttributeMap.builder()
         .put(attributeDef, "LU/AT/" + RandomStringUtils.randomNumeric(64))
         .put(attributeDef2, RandomStringUtils.randomAlphabetic(10))
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasAttributePostProcessingTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasAttributePostProcessingTest.java
index 16efd84b..b8cb0642 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasAttributePostProcessingTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasAttributePostProcessingTest.java
@@ -40,12 +40,13 @@ import org.springframework.test.annotation.DirtiesContext.ClassMode;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import at.asitplus.eidas.specific.modules.auth.eidas.v2.Constants;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.dao.SimpleEidasData;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.exception.EidasSAuthenticationException;
 import at.asitplus.eidas.specific.modules.auth.eidas.v2.service.CcSpecificEidProcessingService;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
 import lombok.SneakyThrows;
 
+
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(locations = {
     "/SpringTest-context_tasks_test.xml",
@@ -352,12 +353,12 @@ public class EidasAttributePostProcessingTest {
   private Map<String, Object> generateInputData(String id, String familyName, String givenName,
       String dateOfBirth, String placeOfBirth, String birthName) {
     final Map<String, Object> result = new HashMap<>();
-    result.put(Constants.eIDAS_ATTR_PERSONALIDENTIFIER, id);
-    result.put(Constants.eIDAS_ATTR_CURRENTGIVENNAME, givenName);
-    result.put(Constants.eIDAS_ATTR_CURRENTFAMILYNAME, familyName);
-    result.put(Constants.eIDAS_ATTR_DATEOFBIRTH, dateOfBirth);
-    result.put(Constants.eIDAS_ATTR_PLACEOFBIRTH, placeOfBirth);
-    result.put(Constants.eIDAS_ATTR_BIRTHNAME, birthName);
+    result.put(EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER, id);
+    result.put(EidasConstants.eIDAS_ATTR_CURRENTGIVENNAME, givenName);
+    result.put(EidasConstants.eIDAS_ATTR_CURRENTFAMILYNAME, familyName);
+    result.put(EidasConstants.eIDAS_ATTR_DATEOFBIRTH, dateOfBirth);
+    result.put(EidasConstants.eIDAS_ATTR_PLACEOFBIRTH, placeOfBirth);
+    result.put(EidasConstants.eIDAS_ATTR_BIRTHNAME, birthName);
     return result;
 
   }
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasRequestPreProcessingFirstTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasRequestPreProcessingFirstTest.java
index 84da2344..ca292d4c 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasRequestPreProcessingFirstTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasRequestPreProcessingFirstTest.java
@@ -69,8 +69,9 @@ public class EidasRequestPreProcessingFirstTest {
 
   private TestRequestImpl pendingReq;
   private DummySpConfiguration oaParam;
-  private Builder authnRequestBuilder;
-
+  private Builder authnRequestBuilder;  
+  private Map<String, String> spConfig;
+  
   /**
    * jUnit class initializer.
    * 
@@ -91,9 +92,9 @@ public class EidasRequestPreProcessingFirstTest {
   @Before
   public void setUp() {
 
-    final Map<String, String> spConfig = new HashMap<>();
+    spConfig = new HashMap<>();
     spConfig.put(EaafConfigConstants.SERVICE_UNIQUEIDENTIFIER, "testSp");
-    spConfig.put("target", "urn:publicid:gv.at:cdid+XX");
+    spConfig.put("target", "urn:publicid:gv.at:cdid+XX");    
     oaParam = new DummySpConfiguration(spConfig, basicConfig);
 
     pendingReq = new TestRequestImpl();
@@ -154,5 +155,42 @@ public class EidasRequestPreProcessingFirstTest {
     Assert.assertEquals("Requested attribute size not match", 8, lightReq.getRequestedAttributes().size());
 
   }
+  
+  @Test
+  public void prePreProcessNlWithUpgrade() throws EidPostProcessingException {
+
+    final String testCountry = "NL";
+    spConfig.put("loa", EaafConstants.EIDAS_LOA_LOW);
+    authnRequestBuilder.citizenCountryCode(testCountry);
+    authnRequestBuilder.levelOfAssurance(EaafConstants.EIDAS_LOA_LOW);
+    
+    preProcessor.preProcess(testCountry, pendingReq, authnRequestBuilder);
+
+    final LightRequest lightReq = authnRequestBuilder.build();
+
+    Assert.assertNotSame("RequesterId was set", lightReq.getRequesterId());
+    Assert.assertEquals("no PublicSP", "public", lightReq.getSpType());
+    Assert.assertEquals("Requested attribute size not match", 4, lightReq.getRequestedAttributes().size());
+
+    Assert.assertEquals("wrong LoA", EaafConstants.EIDAS_LOA_SUBSTANTIAL, lightReq.getLevelOfAssurance());
     
+  }
+   
+  @Test
+  public void prePreProcessNlWithOutUpgrade() throws EidPostProcessingException {
+
+    final String testCountry = "NL";
+    authnRequestBuilder.citizenCountryCode(testCountry);
+    preProcessor.preProcess(testCountry, pendingReq, authnRequestBuilder);
+
+    final LightRequest lightReq = authnRequestBuilder.build();
+
+    Assert.assertNotSame("RequesterId was set", lightReq.getRequesterId());
+    Assert.assertEquals("no PublicSP", "public", lightReq.getSpType());
+    Assert.assertEquals("Requested attribute size not match", 4, lightReq.getRequestedAttributes().size());
+
+    Assert.assertEquals("wrong LoA", EaafConstants.EIDAS_LOA_HIGH, lightReq.getLevelOfAssurance());
+    
+  }
+  
 }
diff --git a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasResponseValidatorTest.java b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasResponseValidatorTest.java
index bbba56e2..91a50d28 100644
--- a/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasResponseValidatorTest.java
+++ b/modules/authmodule-eIDAS-v2/src/test/java/at/asitplus/eidas/specific/modules/auth/eidas/v2/test/validation/EidasResponseValidatorTest.java
@@ -21,10 +21,10 @@ import com.google.common.collect.ImmutableSet;
 
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummyConfigMap;
 import at.asitplus.eidas.specific.core.test.config.dummy.MsConnectorDummySpConfiguration;
-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.validator.EidasResponseValidator;
+import at.asitplus.eidas.specific.modules.core.eidas.EidasConstants;
+import at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry;
 import at.gv.egiz.eaaf.core.api.data.EaafConfigConstants;
 import at.gv.egiz.eaaf.core.api.data.EaafConstants;
 import at.gv.egiz.eaaf.core.exceptions.EaafStorageException;
@@ -300,7 +300,7 @@ public class EidasResponseValidatorTest {
 
 
     final AttributeDefinition personIdattributeDef = attrRegistry.getCoreAttributeRegistry().getByFriendlyName(
-        Constants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
+        EidasConstants.eIDAS_ATTR_PERSONALIDENTIFIER).first();
 
     final Builder attributeMap = ImmutableAttributeMap.builder();
     if (personalId != null) {
@@ -319,7 +319,7 @@ public class EidasResponseValidatorTest {
     return b.id("_".concat(Random.nextHexRandom16()))
         .issuer(RandomStringUtils.randomAlphabetic(10))
         .subject(RandomStringUtils.randomAlphabetic(10))
-        .statusCode(Constants.SUCCESS_URI)
+        .statusCode(EidasConstants.SUCCESS_URI)
         .inResponseTo("_".concat(Random.nextHexRandom16()))
         .subjectNameIdFormat("afaf")
         .levelOfAssurance(loa)
diff --git a/modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml b/modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
index f4fc72a7..d71a47dc 100644
--- a/modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
+++ b/modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_basic_test.xml
@@ -17,13 +17,13 @@
         class="at.asitplus.eidas.specific.modules.auth.eidas.v2.config.EidasConnectorMessageSource"/>
   
   <bean id="SZRClientForeIDAS"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.szr.SzrClient" />
+    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.clients.szr.SzrClient" />
 
   <!-- <bean id="eIDASDataStore" class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.eIDASDataStore" 
     /> -->
 
   <bean id="springManagedSpecificConnectorCommunicationService"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy.DummySpecificCommunicationService" />
+    class="at.asitplus.eidas.specific.modules.core.eidas.test.dummy.DummySpecificCommunicationService" />
 
   <bean id="specificConnectorAttributesFileWithPath"
     class="java.lang.String">
@@ -38,13 +38,16 @@
   </bean>
 
   <bean id="attributeRegistry"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.EidasAttributeRegistry">
+    class="at.asitplus.eidas.specific.modules.core.eidas.service.EidasAttributeRegistry">
     <property name="eidasAttributesFile"
       ref="specificConnectorAttributesFileWithPath" />
     <property name="additionalAttributesFile"
       ref="specificConnectorAdditionalAttributesFileWithPath" />
   </bean>
 
+  <bean id="connectorAttributeRegistry"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.ConnectorEidasAttributeRegistry" />
+
   <bean id="EIDPostProcessingService"
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.service.CcSpecificEidProcessingService" />
 
@@ -58,6 +61,11 @@
     <property name="priority" value="1" />
   </bean>
 
+  <bean id="NL-Processor"
+        class="at.asitplus.eidas.specific.modules.auth.eidas.v2.handler.NlEidProcessor">
+    <property name="priority" value="1" />
+  </bean>
+
  <bean id="eIDASAuthModule"
     class="at.asitplus.eidas.specific.modules.auth.eidas.v2.EidasAuthenticationModulImpl">
     <property name="priority" value="2" />
diff --git a/modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml b/modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
index 0afa0d7d..1b5391d5 100644
--- a/modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
+++ b/modules/authmodule-eIDAS-v2/src/test/resources/SpringTest-context_tasks_test.xml
@@ -25,7 +25,7 @@
     class="at.gv.egiz.eaaf.core.impl.gui.builder.SpringMvcGuiFormBuilderImpl" />
 
   <bean id="springManagedSpecificConnectorCommunicationService"
-    class="at.asitplus.eidas.specific.modules.auth.eidas.v2.test.dummy.DummySpecificCommunicationService" />
+    class="at.asitplus.eidas.specific.modules.core.eidas.test.dummy.DummySpecificCommunicationService" />
 
   <bean id="dummyPvpConfig"
         class="at.gv.egiz.eaaf.modules.pvp2.idp.test.dummy.DummyPvpConfiguration" />
@@ -36,17 +36,5 @@
   <bean id="dummyVelocityBuilder"
         class="at.gv.egiz.eaaf.core.impl.idp.module.gui.DummyVelocityGuiFormBuilder" />
 
-  <bean id="specificConnectorAttributesFileWithPath"
-    class="java.lang.String">
-    <constructor-arg
-      value="src/test/resources/config/eidas-attributes.xml" />
-  </bean>
-
-  <bean id="specificConnectorAdditionalAttributesFileWithPath"
-    class="java.lang.String">
-    <constructor-arg
-      value="src/test/resources/config/additional-attributes.xml" />
-  </bean>
-
 
 </beans>
\ No newline at end of file
diff --git a/modules/authmodule-eIDAS-v2/src/test/resources/config/junit_config_1.properties b/modules/authmodule-eIDAS-v2/src/test/resources/config/junit_config_1.properties
index 6d97513a..41f0fe7b 100644
--- a/modules/authmodule-eIDAS-v2/src/test/resources/config/junit_config_1.properties
+++ b/modules/authmodule-eIDAS-v2/src/test/resources/config/junit_config_1.properties
@@ -19,9 +19,9 @@ eidas.ms.revisionlog.write.MDS.into.revisionlog=true
 eidas.ms.revisionlog.logIPAddressOfUser=true
 
 ##Directory for static Web content
-eidas.ms.webcontent.static.directory=../../../../../../basicConfig/webcontent/
-eidas.ms.webcontent.templates=../../../../../../basicConfig/templates/
-eidas.ms.webcontent.properties=../../../../../../basicConfig/properties/messages
+eidas.ms.webcontent.static.directory=../../../../../../basicConfig/ms-connector/webcontent/
+eidas.ms.webcontent.templates=../../../../../../basicConfig/ms-connector/templates/
+eidas.ms.webcontent.properties=../../../../../../basicConfig/ms-connector/properties/messages
 
 ## extended validation of pending-request Id's
 eidas.ms.core.pendingrequestid.maxlifetime=300