368 files changed, 42321 insertions, 45990 deletions

diff --git a/id/server/idserverlib/pom.xml b/id/server/idserverlib/pom.xml
index 1b2e31cd4..7b3bc0841 100644
--- a/id/server/idserverlib/pom.xml
+++ b/id/server/idserverlib/pom.xml
@@ -93,7 +93,7 @@
         <dependency>

             <groupId>eu.stork</groupId>

             <artifactId>SamlEngine</artifactId>

-            <version>1.4.0</version>

+            <version>1.5.1</version>

         </dependency>

 

 		<dependency>

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
index 8c34d4806..aadbbd959 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
@@ -26,7 +26,6 @@ import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.config.stork.StorkAttributeProviderPlugin;
 import at.gv.egovernment.moa.id.protocols.stork2.attributeproviders.AttributeProvider;
 import at.gv.egovernment.moa.id.protocols.stork2.attributeproviders.EHvdAttributeProviderPlugin;
-import at.gv.egovernment.moa.id.protocols.stork2.attributeproviders.EHvdAttribute_deprecatedProviderPlugin;
 import at.gv.egovernment.moa.id.protocols.stork2.attributeproviders.MandateAttributeRequestProvider;
 import at.gv.egovernment.moa.id.protocols.stork2.attributeproviders.PVPAuthenticationProvider;
 import at.gv.egovernment.moa.id.protocols.stork2.attributeproviders.SignedDocAttributeRequestProvider;
@@ -65,8 +64,6 @@ public class AttributeProviderFactory {
             return new StorkAttributeRequestProvider(url, attributes);
         } else if (shortname.equals("EHvdAttributeProvider")) {
             return new EHvdAttributeProviderPlugin(url, attributes);
-        } else if (shortname.equals("EHvdAttributeProvider_deprecated")) {
-            return new EHvdAttribute_deprecatedProviderPlugin(url, attributes);
         } else if (shortname.equals("SignedDocAttributeRequestProvider")) {
             return new SignedDocAttributeRequestProvider(url, attributes);
         } else if (shortname.equals("MandateAttributeRequestProvider")) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java
deleted file mode 100644
index a16603beb..000000000
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttribute_deprecatedProviderPlugin.java
+++ /dev/null
@@ -1,260 +0,0 @@
-/*******************************************************************************
- * Copyright 2014 Federal Chancellery Austria
- * MOA-ID has been developed in a cooperation between BRZ, the Federal
- * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- *
- * Licensed under the EUPL, Version 1.1 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:
- * http://www.osor.eu/eupl/
- *
- * 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.
- *
- * 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.gv.egovernment.moa.id.protocols.stork2.attributeproviders;
-
-import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.soap.MessageFactory;
-import javax.xml.soap.SOAPBody;
-import javax.xml.soap.SOAPConnection;
-import javax.xml.soap.SOAPConnectionFactory;
-import javax.xml.soap.SOAPElement;
-import javax.xml.soap.SOAPEnvelope;
-import javax.xml.soap.SOAPMessage;
-import javax.xml.soap.SOAPPart;
-
-import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
-import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
-import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
-import at.gv.egovernment.moa.id.data.IAuthData;
-import at.gv.egovernment.moa.id.protocols.stork2.ExternalAttributeRequestRequiredException;
-import at.gv.egovernment.moa.id.protocols.stork2.MOASTORKRequest;
-import at.gv.egovernment.moa.id.protocols.stork2.UnsupportedAttributeException;
-import at.gv.egovernment.moa.logging.Logger;
-import eu.stork.peps.auth.commons.IPersonalAttributeList;
-import eu.stork.peps.auth.commons.PersonalAttribute;
-import eu.stork.peps.auth.commons.PersonalAttributeList;
-import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.AttributeStatusType;
-import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.IsHealthCareProfessionalDeprecatedType;
-import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.IsHealthCareProfessionalType; // IsHealthCareProfessionalDeprecatedType;
-//import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion. _1_0.assertion.IsHealthCareProfessionalType;
-import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.ObjectFactory;
-
-/**
- * Fetches the attribute IsHealthcareProfessional from the BAGDAD SOAP service
- */
-public class EHvdAttribute_deprecatedProviderPlugin extends AttributeProvider {
-	
-	/** The destination. */
-	private Object destination;
-	
-	/**
-	 * Instantiates a new e hvd attribute provider plugin.
-	 *
-	 * @param url the service url
-	 * @param supportedAttributes
-	 */
-	public EHvdAttribute_deprecatedProviderPlugin(String url, String supportedAttributes) {
-		super(supportedAttributes);
-		destination = url;
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#acquire(eu.stork.peps.auth.commons.PersonalAttribute)
-	 */
-	@Override
-	protected IPersonalAttributeList acquire(PersonalAttribute attribute, MOASTORKRequest moastorkRequest, IAuthData authData)
-			throws UnsupportedAttributeException,
-			ExternalAttributeRequestRequiredException, MOAIDException {
-
-		// break when we cannot handle the requested attribute
-		if(!attributes.contains(attribute.getName()))
-			throw new UnsupportedAttributeException();
-		
-		try {
-	    	Logger.debug("initializing SOAP connections...");
-			// create SOAP connection
-			SOAPConnection soapConnection = SOAPConnectionFactory.newInstance().createConnection();
-			
-			// assemble SOAP request
-			MessageFactory messageFactory = MessageFactory.newInstance();
-			SOAPMessage requestMessage = messageFactory.createMessage();
-			SOAPPart requestPart = requestMessage.getSOAPPart();
-
-			// (soap 1.1 relevant part. could not find a solution to use soap 1.2 in time.
-			requestMessage.getMimeHeaders().setHeader("SOAPAction", "http://gesundheit.gv.at/BAGDAD/DataAccessService/IsHealthcareProfessional");
-
-            /*
-            Construct SOAP Request Message:
-			<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-			  <soap:Body>
-			    <IsHealthcareProfessional xmlns="http://gesundheit.gv.at/BAGDAD/DataAccessService">
-			      <bPK>string</bPK>
-			    </IsHealthcareProfessional>
-			  </soap:Body>
-			</soap:Envelope>
-
-			see https://stork.ehealth.gv.at/GDAService.asmx?op=IsHealthcareProfessional
-             */
-
-			// SOAP Envelope
-			SOAPEnvelope envelope = requestPart.getEnvelope();
-
-			// SOAP Body
-			SOAPBody requestBody = envelope.getBody();
-			SOAPElement requestBodyElem = requestBody.addChildElement("IsHealthcareProfessional");
-			requestBodyElem.addAttribute(envelope.createName("xmlns"), "http://gesundheit.gv.at/BAGDAD/DataAccessService");
-
-			SOAPElement requestBodyElem1 = requestBodyElem.addChildElement("bPK");
-			
-			//TODO: CHECK: IdentificationValue containts wbPK if MOA-ID is used as VIDP 
-			requestBodyElem1.addTextNode(new BPKBuilder().buildBPK(authData.getIdentificationValue(), "GH"));
-
-			requestMessage.saveChanges();
-
-			// perform SOAP call
-	    	Logger.debug("call...");
-			SOAPMessage responseMessage = soapConnection.call(requestMessage, destination);
-
-			// parse SOAP response
-
-            /*
-			<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
-			  <soap:Body>
-			    <IsHealthcareProfessionalResponse xmlns="http://gesundheit.gv.at/BAGDAD/DataAccessService">
-			      <IsHealthcareProfessionalResult>
-			        <RequestOK>boolean</RequestOK>
-			        <Message>string</Message>
-			        <IsHealthcareProfessional>boolean</IsHealthcareProfessional>
-			        <NameOfOrganisation>string</NameOfOrganisation>
-			        <Type>string</Type>
-			        <Specialization>string</Specialization>
-			      </IsHealthcareProfessionalResult>
-			    </IsHealthcareProfessionalResponse>
-			  </soap:Body>
-			</soap:Envelope>
-
-			see https://stork.ehealth.gv.at/GDAService.asmx?op=IsHealthcareProfessional
-             */
-	    	Logger.debug("call successful. Parse...");
-			SOAPBody responseBody = responseMessage.getSOAPBody();
-
-			// iterate through tree
-			SOAPElement responseElement = (SOAPElement) responseBody.getChildElements().next();
-			SOAPElement resultElement = (SOAPElement) responseElement.getChildElements().next();
-
-			// collect all info in a map
-			Iterator<?> it = resultElement.getChildElements();
-			Map<String, String> collection = new HashMap<String, String>();
-			while (it.hasNext()) {
-				SOAPElement current = (SOAPElement) it.next();
-
-				collection.put(current.getNodeName(), current.getTextContent());
-			}
-
-			// check if there is anything valid in the map
-			if (collection.isEmpty() || collection.size() != 6) {
-				Logger.warn("eHVD returned an unexpected count of values. Expected 6 got " + collection.size());
-				throw new IndexOutOfBoundsException("response attributes not like specified");
-			}
-
-			// - fetch request validity
-			if (collection.get("RequestOK").equals("false")) {
-				Logger.warn("eHVD reported an invalid request. The error message is: " + collection.get("Message"));
-				throw new Exception("eHVD reported an invalid request");
-			}
-
-			PersonalAttribute acquiredAttribute = null;
-
-			if (collection.get("IsHealthcareProfessional").equals("false")) {
-				// the citizen is no HCP
-				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, new ArrayList<String>(), AttributeStatusType.NOT_AVAILABLE.value());
-			} else {
-				// go on and parse the data
-                IsHealthCareProfessionalDeprecatedType result = new IsHealthCareProfessionalDeprecatedType();
-				result.setNameOfOrganisation(collection.get("NameOfOrganisation"));
-
-				if (collection.get("Type").equals("Medical doctor"))
-					result.setHCPType("D");
-				else
-					result.setHCPType("?");
-
-				if (collection.get("Specialization").contains("Arzt für Allgemeinmedizin"))
-					result.setSpecialisation("GP");
-				else
-					result.setSpecialisation("??");
-
-				result.setAQAA(4);
-
-				final Marshaller m = JAXBContext.newInstance(IsHealthCareProfessionalDeprecatedType.class).createMarshaller();
-			    m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
-			    
-			    StringWriter stringWriter = new StringWriter();
-			    m.marshal(new ObjectFactory().createIsHealthCareProfessionalDeprecated(result), stringWriter);		    
-				
-				ArrayList<String> value = new ArrayList<String>();
-				value.add(stringWriter.toString());
-
-				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, value, AttributeStatusType.AVAILABLE.value());
-			}
-
-			// pack and return the result
-			PersonalAttributeList result = new PersonalAttributeList();
-			result.add(acquiredAttribute);
-
-			// add stork id for verification
-			ArrayList<String> value = new ArrayList<String>();
-			value.add(new BPKBuilder().buildStorkeIdentifier(authData.getIdentityLink(), moastorkRequest.getSpCountry()));
-			result.add(new PersonalAttribute("eIdentifier", false, value, AttributeStatusType.AVAILABLE.value()));
-
-			return result;
-		} catch (Exception e) {
-			throw new MOAIDException("stork.13", new Object[] { e });
-		}
-	}
-
-    /* (non-Javadoc)
-     * @see at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#performRedirect(java.lang.String, java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, at.gv.egovernment.moa.id.config.auth.OAAuthParameter)
-     */
-	public void performRedirect(String url,
-			HttpServletRequest req, HttpServletResponse resp,
-			OAAuthParameter oaParam) throws MOAIDException {
-		// there is no redirect required
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#parse(javax.servlet.http.HttpServletRequest)
-	 */
-	public IPersonalAttributeList parse(HttpServletRequest httpReq)
-			throws UnsupportedAttributeException, MOAIDException {
-		// there is no redirect required, so we throw an exception when someone asks us to parse a response
-		throw new UnsupportedAttributeException();
-	}
-
-	/* (non-Javadoc)
-	 * @see at.gv.egovernment.moa.id.protocols.stork2.attributeproviders.AttributeProvider#getPriority()
-	 */
-	@Override
-	public int getPriority() {
-		return 99;
-	}
-
-}
diff --git a/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java b/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
index 9ed726a32..49ef68cb9 100644
--- a/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
+++ b/id/server/legacy-backup/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
@@ -76,10 +76,4 @@ public class EIDSectorShareImpl extends AbstractSAMLObject implements
     public final List<XMLObject> getOrderedChildren() {
 	return null;
     }
-
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
 }
\ No newline at end of file
diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java
index b97813681..a04b8f454 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/MOAIDConstants.java
@@ -97,7 +97,6 @@ public class MOAIDConstants {
 	static {
 		List<String> storkAttrProvider = new ArrayList<String>();
 		storkAttrProvider.add("StorkAttributeRequestProvider");
-		storkAttrProvider.add("EHvdAttributeProvider_deprecated");
 		storkAttrProvider.add("EHvdAttributeProvider");
 		storkAttrProvider.add("SignedDocAttributeRequestProvider");
 		storkAttrProvider.add("MandateAttributeRequestProvider");
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 1a8dfd786..a989ea946 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -12,14 +12,13 @@
 	<name>Stork Commons</name>
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<stork.version>1.4.0</stork.version>
-		<opensaml.version>2.6.3</opensaml.version>
+		<stork.version>1.5.1</stork.version>
 	</properties>
 	<version>${stork.version}</version>
   <description>
         The STORKCommons library provides beans, Java Interfaces and utility classes to integrate PEPS and SAML Engine.
   </description>
-   
+  
   <repositories>
 		<repository>
 			<id>shibboleth.internet2.edu</id>
@@ -34,7 +33,7 @@
 		<dependency>
 			<groupId>joda-time</groupId>
 			<artifactId>joda-time</artifactId>
-			<version>${jodatime.version}</version>
+			<version>2.3</version>
 		</dependency>
 
 		<!-- Log4J -->
@@ -61,9 +60,15 @@
 			</exclusions>
 		</dependency>
 
+	<!-- Bouncy Castle -->
+		<dependency>
+			<groupId>org.bouncycastle</groupId>
+			<artifactId>bcprov-jdk16</artifactId>
+		</dependency>
+
 		<dependency>
-  		<groupId>org.opensaml</groupId>
-  		<artifactId>opensaml</artifactId>
+			<groupId>org.opensaml</groupId>
+			<artifactId>opensaml</artifactId>
 			<exclusions>
 				<exclusion>
 				    <groupId>org.slf4j</groupId>
@@ -88,18 +93,11 @@
 			</exclusions>			
 		</dependency>
 
-		<!-- Bouncy Castle -->
-		<dependency>
-			<groupId>org.bouncycastle</groupId>
-			<artifactId>bcprov-jdk16</artifactId>
-		</dependency>
-
 		<!-- Servlet API -->
 		<!-- provided by Application Server -->
 		<dependency>
 			<groupId>javax.servlet</groupId>
 			<artifactId>servlet-api</artifactId>
-			<version>2.5</version>
 			<scope>provided</scope>
 		</dependency>
 
@@ -128,7 +126,6 @@
 					<configuration>
 						<source>1.7</source>
 						<target>1.7</target>
-                        <encoding>UTF-8</encoding>
 					</configuration>
 				</plugin>
 				<plugin>
@@ -136,7 +133,7 @@
 					<artifactId>maven-surefire-plugin</artifactId>
 					<configuration>
             			<runOrder>reversealphabetical</runOrder>
-						<skip>false</skip>
+						<skip>true</skip>
           				<includes>
                             <runOrder>reversealphabetical</runOrder>
 				            <include>**/PEPSUtilTest.java</include>
@@ -150,27 +147,6 @@
 			</plugins>
 		</pluginManagement>
 		<plugins>
-		
-		           	 
-<!-- 		          <plugin>
-            		<groupId>org.codehaus.mojo</groupId>
-            		<artifactId>properties-maven-plugin</artifactId>
-            		<version>1.0-alpha-2</version>
-            		<executions>
-                		<execution>
-                    		<phase>initialize</phase>
-                    		<goals>
-                        		<goal>read-project-properties</goal>
-                    		</goals>
-                    		<configuration>
-    	                   		<files>
-		                            <file>${basedir}/../../../moa-id.properties</file>
-      		                  </files>
-          		          </configuration>
-              		  </execution>
-            		</executions>
-        		</plugin> -->
-		
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
@@ -178,8 +154,9 @@
 				<configuration>
 					<links>
 						<link>http://commons.apache.org/lang/api/</link>
+						<link>http://java.sun.com/j2se/1.6.0/docs/api/</link>
 						<link>http://www.bouncycastle.org/docs/docs1.6/</link>
-						<link>http://docs.oracle.com/javase/7/docs/api/</link>
+						<link>http://docs.oracle.com/javase/6/docs/api/</link>
 					</links>
 				</configuration>
 			</plugin>
diff --git a/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties b/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties
deleted file mode 100644
index acc79a8c9..000000000
--- a/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties
+++ /dev/null
@@ -1,273 +0,0 @@
-#Max allowed params size
-validation.active=true
-max.spUrl.size=150
-max.attrList.size=20000
-max.invalidAttributeList.size=20000
-max.attrName.size=100
-max.callback.size=300
-max.idp.url.size=300
-max.atp.url.size=300
-max.cpepsURL.size=300
-max.attrValue.size=20000
-max.attrType.size=25
-max.spId.size=40
-max.providerName.size=128
-max.spName.size=25
-max.country.size=150
-max.qaaLevel.size=1
-max.spQaaLevel.size=1
-max.errorCode.size=5
-max.errorMessage.size=300
-max.username.size=30
-max.spepsRedirectUrl.size=300
-max.speps.redirectUrl.size=300
-max.cpeps.redirectUrl.size=300
-max.cpepsRedirectUrl.size=300
-max.spepsAssertionUrl.size=300
-max.SAMLRequest.size=131072
-max.SAMLResponse.size=131072
-max.RelayState.size=80
-max.remoteAddr.size=300
-max.remoteHost.size=300
-max.localAddr.size=300
-max.localName.size=300
-max.apepsUrl.size=300
-max.apeps.callbackUrl.size=300
-max.spCountryCode.size=5
-
-dtl.url=http://localhost:8080/DocumentService/DocumentService
-
-#ERROR codes/messages (accordingly to specification)
-
-#CountrySelector Interface errors
-spCountrySelector.invalidSPQAA.code=0000001
-spCountrySelector.invalidSPQAA.message=invalid.spQAA.parameter
-
-spCountrySelector.invalidQaaSPid.code=0000001
-spCountrySelector.invalidQaaSPid.message=invalid.spQAAId.parameter
-
-spCountrySelector.invalidSpId.code=000002
-spCountrySelector.invalidSpId.message=invalid.spId.parameter
-
-spCountrySelector.invalidSpURL.code=000003
-spCountrySelector.invalidSpURL.message=invalid.spUrl.parameter
-
-domain.CountrySelectorAction.code=000003
-domain.CountrySelectorAction.message=invalid.cs.domain
-
-requests.CountrySelectorAction.code=000004
-requests.CountrySelectorAction.message=reached.max.requests.cs
-
-spCountrySelector.spNotAllowed.code=000006
-spCountrySelector.spNotAllowed.message=attr.access.deny
-
-spCountrySelector.invalidAttr.code=000007
-spCountrySelector.invalidAttr.message=invalid.spAttr.parameter
-
-spCountrySelector.invalidProviderName.code=000008
-spCountrySelector.invalidProviderName.message=invalid.spProvidername.parameter
-
-spCountrySelector.errorCreatingSAML.code=203001
-spCountrySelector.errorCreatingSAML.message=error.create.sp.saml
-
-spepsSAMLRequest.code=203001
-spepsSAMLRequest.message=error.create.saml.speps
-
-#ServiceProvider Interface errors
-sProviderAction.invalidSPQAA.code=200001
-sProviderAction.invalidSPQAA.message=invalid.sp.qaa
-
-sProviderAction.invalidSPQAAId.code=200001
-sProviderAction.invalidSPQAAId.message=invalid.sp.qaaid
-
-sProviderAction.invalidSPId.code=200002
-sProviderAction.invalidSPId.message=invalid.sp.id
-
-domain.ServiceProviderAction.code=200003
-domain.ServiceProviderAction.message=invalid.sp.domain
-
-sProviderAction.invalidSPDomain.code=200003
-sProviderAction.invalidSPDomain.message=invalid.sp.domain
-
-sProviderAction.invalidCountry.code=200004
-sProviderAction.invalidCountry.message=invalid.sp.country
-
-sProviderAction.spNotAllowed.code=200005
-sProviderAction.spNotAllowed.message=sp.not.allowed
-
-sProviderAction.invalidSaml.code=200006
-sProviderAction.invalidSaml.message=invalid.sp.samlrequest
-
-sProviderAction.invalidSPProviderName.code=200007
-sProviderAction.invalidSPProviderName.message=sp.not.identified
-
-sProviderAction.invalidSPRedirect.code=200008
-sProviderAction.invalidSPRedirect.message=invalid.sp.redirectUrl
-
-sProviderAction.invalidRelayState.code=200009
-sProviderAction.invalidRelayState.message=invalid.sp.relaystate
-
-sProviderAction.invalidAttr.code=200011
-sProviderAction.invalidAttr.message=invalid.sp.attr
-
-requests.ServiceProviderAction.code=200012
-requests.ServiceProviderAction.message=reached.max.requests.sp
-
-sPPowerValidationAction.invalidSPPVAttrList.code=200013
-sPPowerValidationAction.invalidSPPVAttrList.message=invalid.sp.pv.attrlist
-
-invalid.sp.pv.attrlist.code=200013
-invalid.sp.pv.attrlist.message=invalid.sp.pv.attrlist
-
-sProviderAction.invalidSPAlias.code=203003
-sProviderAction.invalidSPAlias.message=invalid.sp.alias
-
-sProviderAction.errorCreatingSAML.code=203001
-sProviderAction.errorCreatingSAML.message=error.create.saml.speps
-
-#Internal Error 
-internalError.code=203001
-internalError.message=internalError
-
-attrList.code=202005
-attrList.message=invalid.attrList.parameter
-
-missing.sessionId.code=203010
-missing.sessionId.message=missing.session.id
-
-sessionError.code=203011
-sessionError.message=invalid.session.id
-
-invalid.sessionId.code=203011
-invalid.sessionId.message=invalid.session.id
-
-missing.mandate.code=203013
-missing.mandate.message=missing.mandate
-
-invalid.session.code=203012
-invalid.session.message=invalid.session
-
-callback.code=203006
-callback.message=invalid.callback.url
-
-idp.url.code=203006
-idp.url.message=invalid.idp.url
-
-IdPSAMLResponse.code=002001
-IdPSAMLResponse.message=invalid.idp.response
-
-authenticationFailed.code=003002
-authenticationFailed.message=authentication.failed
-
-username.code=003002
-username.message=authentication.failed
-
-invalidAttributeList.code=203001
-invalidAttributeList.message=invalid.attrlist
-
-invalidAttributeValue.code=203001
-invalidAttributeValue.message=invalid.attr.value
-
-attVerification.mandatory.code=202010
-attVerification.mandatory.message=missing.mandatory.attr
-
-attrValue.verification.code=203008
-attrValue.verification.message=invalid.stork.attrValue
-
-cpepsSAMLResponse.code=202012
-cpepsSAMLResponse.message=error.gen.cpeps.saml
-
-AtPSAMLResponse.code=202009
-AtPSAMLResponse.message=error.gen.atp.saml
-
-atp.url.code=203006
-atp.url.message=invalid.atp.url
-
-hash.error.code=203001
-hash.error.message=error.hash
-
-qaaLevel.code=203006
-qaaLevel.message=invalid.cpeps.qaalevel
-
-SAMLRequest.code=203001
-SAMLRequest.message=invalid.SAMLRequest
-
-atp.response.error.code=202011
-atp.response.error.message=atp.response.error
-
-#Colleague Request Interface errors
-
-colleagueRequest.invalidSAML.code=201002
-colleagueRequest.invalidSAML.message=invalid.speps.samlrequest
-
-colleagueRequest.invalidCountryCode.code=002001
-colleagueRequest.invalidCountryCode.message=country.cpeps.nomatch
-
-colleagueRequest.errorCreatingSAML.code=203001
-colleagueRequest.errorCreatingSAML.message=error.create.saml.cpeps
-
-colleagueRequest.invalidQaa.code=202004
-colleagueRequest.invalidQaa.message=invalid.requested.cpeps.qaalevel
-
-colleagueRequest.attrNull.code=202005
-colleagueRequest.attrNull.message=invalid.requested.attrlist.cpeps
-
-colleaguePVRequest.invalidPVAttrList.code=202013
-colleaguePVRequest.invalidPVAttrList.message=invalid.speps.pv.attrlist
-
-colleagueRequest.invalidRedirect.code=202001
-colleagueRequest.invalidRedirect.message=invalid.redirecturl.cpeps
-
-colleagueRequest.invalidDestUrl.code=203006
-colleagueRequest.invalidDestUrl.message=invalid.cpeps.destUrl
-
-cpepsRedirectUrl.code=203006
-cpepsRedirectUrl.message=invalid.cpeps.redirectUrl
-
-#Citizen Consent Interfaces errors
-
-citizenResponse.mandatory.code=202007
-citizenResponse.mandatory.message=no.consent.mand.attr
-
-cPeps.attrNull.code=202005
-cPeps.attrNull.message=invalid.attrList.cpeps
-
-citizenNoConsent.mandatory.code=202012
-citizenNoConsent.mandatory.message=no.consent.val.mand.attr
-
-#Colleague Response Interface errors
-
-colleagueResponse.invalidSAML.code=202002
-colleagueResponse.invalidSAML.message=invalid.cpeps.samlresp
-
-auRequestIdError.code=201005
-auRequestIdError.message=invalid.speps.saml.id
-
-audienceRestrictionError.code=201004
-audienceRestrictionError.message=speps.saml.condition.notmet
-
-spepsSAMLResponse.code=200010
-spepsSAMLResponse.message=error.gen.speps.saml
-
-
-invalid.apepsRedirectUrl.code=204001
-invalid.apepsRedirectUrl.message=invalid.apeps.redirectUrl
-
-apepsSAMLRequest.code=204002
-apepsSAMLRequest.message=invalid.apeps.saml.request
-
-apepsSAMLResponse.code=204003
-apepsSAMLResponse.message=invalid.apeps.saml.response
-
-invalid.apepsCallbackUrl.code=204004
-invalid.apepsCallbackUrl.message=invalid.apeps.callback.url
-
-colleagueAttributeRequest.invalidSAML.code=204005
-colleagueAttributeRequest.invalidSAML.message=invalid.attr.request.saml
-
-colleagueAttributeRequest.invalidCountryCode.code=204006
-colleagueAttributeRequest.invalidCountryCode.message=invalid.attr.country.code
-
-
-#Hash Digests
-hashDigest.className=org.bouncycastle.crypto.digests.SHA512Digest
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java
index 09769641c..4d13c2d92 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeConstants.java
@@ -14,59 +14,57 @@
 package eu.stork.peps.auth.commons;
 
 /**
- * This enum class contains all the STORK PEPS, Commons and Specific errors
- * constant identifiers.
+ * This enum class contains all the STORK PEPS, Commons and Specific errors constant identifiers.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.2 $, $Date: 2010-11-17 05:15:28 $
  */
 public enum AttributeConstants {
-  
-  /**
-   * Represents the attribute's name index.
-   */
-  ATTR_NAME_INDEX(0),
-  /**
-   * Represents the attribute's type index.
-   */
-  ATTR_TYPE_INDEX(1),
-  /**
-   * Represents the attribute's value index.
-   */
-  ATTR_VALUE_INDEX(2),
-  /**
-   * Represents the attribute's status index.
-   */
-  ATTR_STATUS_INDEX(3),
-  /**
-   * Represents the number of allowed tuples.
-   */
-  NUMBER_TUPLES(4);
-  
-  /**
-   * Represents the constant's value.
-   */
-  private int attribute;
-  
-  /**
-   * Solo Constructor.
-   * 
-   * @param attr The Attribute Constant value.
-   */
-  AttributeConstants(final int attr) {
-    
-    this.attribute = attr;
-  }
-  
-  /**
-   * Return the Constant Value.
-   * 
-   * @return The constant value.
-   */
-  public int intValue() {
-    
-    return attribute;
-  }
+
+	/**
+	 * Represents the attribute's name index.
+	 */
+	ATTR_NAME_INDEX(0),
+	/**
+	 * Represents the attribute's type index.
+	 */
+	ATTR_TYPE_INDEX(1),
+	/**
+	 * Represents the attribute's value index.
+	 */
+	ATTR_VALUE_INDEX(2),
+	/**
+	 * Represents the attribute's status index.
+	 */
+	ATTR_STATUS_INDEX(3),
+	/**
+	 * Represents the number of allowed tuples.
+	 */
+	NUMBER_TUPLES(4);
+
+	/**
+	 * Represents the constant's value.
+	 */
+	private int attribute;
+
+	/**
+	 * Solo Constructor.
+	 * 
+	 * @param attr
+	 *            The Attribute Constant value.
+	 */
+	AttributeConstants(final int attr) {
+
+		this.attribute = attr;
+	}
+
+	/**
+	 * Return the Constant Value.
+	 * 
+	 * @return The constant value.
+	 */
+	public int intValue() {
+
+		return attribute;
+	}
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
index a44768c7e..28115ae62 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeName.java
@@ -1,74 +1,85 @@
 package eu.stork.peps.auth.commons;

 

+import java.io.Serializable;

+

 /**

  * This class is a bean used to store information relative to Attribute Names.

- * 

+ *

  * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)

  *

  * @version $Revision: 1.00 $, $Date: 2013-11-26 $

  */

-public final class AttributeName {

-  

-  /**

-   * Attribute Id.

-   */

-  private String attributeId;

-  

-  /**

-   * Attribute Name.

-   */

-  private String attributeName;

-

-  /**

-   * Attribute Name Constructor.

-   * 

-   * @param aId Id of the Attribute Name.

-   * @param aName Name of the Attribute Name.

-   */

-  public AttributeName(final String aId, final String aName) {

-    

-    this.attributeId = aId;

-    this.attributeName = aName;

-  }

-  

-  /**

-   * Getter for the attributeId value.

-   * 

-   * @return The attributeId value.

-   */

-  public String getAttributeId() {

-    

-    return attributeId;

-  }

-  

-  /**

-   * Setter for the attributeId value.

-   * 

-   * @param aId Id of the Attribute Name.

-   */

-  public void setAttributeId(final String aId) {

-    

-    this.attributeId = aId;

-  }

-  

-  /**

-   * Getter for the attributeName value.

-   * 

-   * @return The attributeName value.

-   */

-  public String getAttributeName() {

-    

-    return attributeName;

-  }

-  

-  /**

-   * Setter for the attributeName value.

-   * 

-   * @param name Name of the Attribute Name.

-   */

-  public void setAttributeName(final String name) {

-    

-    this.attributeName = name;

-  }

-  

+public final class AttributeName implements Serializable {

+

+	/**

+     *

+     */

+	private static final long serialVersionUID = -3537736618869722308L;

+

+	/**

+	 * Attribute Id.

+	 */

+	private String attributeId;

+

+	/**

+	 * Attribute Name.

+	 */

+	private String attributeName;

+

+	/**

+	 * Attribute Name Constructor.

+	 * 

+	 * @param aId

+	 *            Id of the Attribute Name.

+	 * @param aName

+	 *            Name of the Attribute Name.

+	 */

+	public AttributeName(final String aId, final String aName) {

+

+		this.attributeId = aId;

+		this.attributeName = aName;

+	}

+

+	/**

+	 * Getter for the attributeId value.

+	 * 

+	 * @return The attributeId value.

+	 */

+	public String getAttributeId() {

+

+		return attributeId;

+	}

+

+	/**

+	 * Setter for the attributeId value.

+	 * 

+	 * @param aId

+	 *            Id of the Attribute Name.

+	 */

+	public void setAttributeId(final String aId) {

+

+		this.attributeId = aId;

+	}

+

+	/**

+	 * Getter for the attributeName value.

+	 * 

+	 * @return The attributeName value.

+	 */

+	public String getAttributeName() {

+

+		return attributeName;

+	}

+

+	/**

+	 * Setter for the attributeName value.

+	 * 

+	 * @param name

+	 *            Name of the Attribute Name.

+	 */

+	public void setAttributeName(final String name) {

+

+		this.attributeName = name;

+	}

+

 }
\ No newline at end of file
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvider.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvider.java
index 575732e27..08265e8f0 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvider.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvider.java
@@ -11,113 +11,119 @@ import java.util.List;
  * @version $Revision: 1.01 $, $Date: 2014-01-13 $

  */

 public final class AttributeProvider implements Serializable {

-  /**

-   * Unique identifier.

-   */

-  private static final long serialVersionUID = 7210186241917444559L;

-

- /**

-   * Provider Id.

-   */

-  private String providerId;

-  

-  /**

-   * Provider Name.

-   */

-  private String providerName;

-

-  /**

-   * Allowed groups of attribute names.

-   */

-  private List<String> allowedGroups;

-

-  /**

-   * Attribute Provider Constructor.

-   * 

-   * @param pId Id of the Attribute Provider.

-   * @param pName Name of the Attribute Provider.

-   */

-  public AttributeProvider(final String pId, final String pName, final List<String> pAllowedGroups) {

-    

-    this.providerId = pId;

-    this.providerName = pName;

-    this.allowedGroups = pAllowedGroups;

-  }

-  

-  /**

-   * Getter for the providerId value.

-   * 

-   * @return The providerId value.

-   */

-  public String getProviderId() {

-    

-    return providerId;

-  }

-  

-  /**

-   * Setter for the providerId value.

-   * 

-   * @param pId Id of the Attribute Provider.

-   */

-  public void setProviderId(final String pId) {

-    

-    this.providerId = pId;

-  }

-  

-  /**

-   * Getter for the providerName value.

-   * 

-   * @return The providerName value.

-   */

-  public String getProviderName() {

-    

-    return providerName;

-  }

-  

-  /**

-   * Setter for the providerName value.

-   * 

-   * @param name Name of the Attribute Provider.

-   */

-  public void setProviderName(final String name) {

-    

-    this.providerName = name;

-  }

-

-  /**

-   * Getter for the allowedGroups value.

-   * 

-   * @return The allowedGroups value.

-   */

-  public List<String> getAllowedGroups() {

-    

-    return allowedGroups;

-  }

-  

-  /**

-   * Setter for the allowedGroups value.

-   * 

-   * @param name AllowedGroups of the Attribute Provider.

-   */

-  public void setAllowedGroups(final List<String> pAllowedGroups) {

-    

-    this.allowedGroups = pAllowedGroups;

-  }

-

-  /**

-   * Check if an attribute name is allowed for this Attribute Provider

-   * 

-   * @param pAttrName the Attribute Name to check

-   * @return true if the name is allowed, false otherwise

-   */

-  public boolean isAttributeNameAllowed(final String pAttrName) {

-	if ( allowedGroups==null || pAttrName==null )

-	  return false;

-	else if ( allowedGroups.contains(PEPSParameters.ATTRIBUTE_GROUPS_ALL.toString()) )

-		return true;

-	else if ( allowedGroups.contains(PEPSParameters.ATTRIBUTE_GROUPS_NONE.toString()) )

-		return false;

-	else

-	  return allowedGroups.contains(pAttrName);

-  }

+	/**

+	 * Unique identifier.

+	 */

+	private static final long serialVersionUID = 7210186241917444559L;

+

+	/**

+	 * Provider Id.

+	 */

+	private String providerId;

+

+	/**

+	 * Provider Name.

+	 */

+	private String providerName;

+

+	/**

+	 * Allowed groups of attribute names.

+	 */

+	private List<String> allowedGroups;

+

+	/**

+	 * Attribute Provider Constructor.

+	 * 

+	 * @param pId

+	 *            Id of the Attribute Provider.

+	 * @param pName

+	 *            Name of the Attribute Provider.

+	 */

+	public AttributeProvider(final String pId, final String pName, final List<String> pAllowedGroups) {

+

+		this.providerId = pId;

+		this.providerName = pName;

+		this.allowedGroups = pAllowedGroups;

+	}

+

+	/**

+	 * Getter for the providerId value.

+	 * 

+	 * @return The providerId value.

+	 */

+	public String getProviderId() {

+

+		return providerId;

+	}

+

+	/**

+	 * Setter for the providerId value.

+	 * 

+	 * @param pId

+	 *            Id of the Attribute Provider.

+	 */

+	public void setProviderId(final String pId) {

+

+		this.providerId = pId;

+	}

+

+	/**

+	 * Getter for the providerName value.

+	 * 

+	 * @return The providerName value.

+	 */

+	public String getProviderName() {

+

+		return providerName;

+	}

+

+	/**

+	 * Setter for the providerName value.

+	 * 

+	 * @param name

+	 *            Name of the Attribute Provider.

+	 */

+	public void setProviderName(final String name) {

+

+		this.providerName = name;

+	}

+

+	/**

+	 * Getter for the allowedGroups value.

+	 * 

+	 * @return The allowedGroups value.

+	 */

+	public List<String> getAllowedGroups() {

+

+		return allowedGroups;

+	}

+

+	/**

+	 * Setter for the allowedGroups value.

+	 * 

+	 * @param name

+	 *            AllowedGroups of the Attribute Provider.

+	 */

+	public void setAllowedGroups(final List<String> pAllowedGroups) {

+

+		this.allowedGroups = pAllowedGroups;

+	}

+

+	/**

+	 * Check if an attribute name is allowed for this Attribute Provider

+	 * 

+	 * @param pAttrName

+	 *            the Attribute Name to check

+	 * @return true if the name is allowed, false otherwise

+	 */

+	public boolean isAttributeNameAllowed(final String pAttrName) {

+		if (allowedGroups == null || pAttrName == null)

+			return false;

+		else if (allowedGroups.contains(PEPSParameters.ATTRIBUTE_GROUPS_ALL.toString()))

+			return true;

+		else if (allowedGroups.contains(PEPSParameters.ATTRIBUTE_GROUPS_NONE.toString()))

+			return false;

+		else

+			return allowedGroups.contains(pAttrName);

+	}

 }

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java
index 85aec2625..c59109092 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeProvidersMap.java
@@ -14,13 +14,12 @@ import org.apache.log4j.Logger;
  *

  * @see LinkedHashMap

  */

-public class AttributeProvidersMap extends LinkedHashMap<AttributeSource, IPersonalAttributeList>

-   implements IAttributeProvidersMap {

+public class AttributeProvidersMap extends LinkedHashMap<AttributeSource, IPersonalAttributeList> implements IAttributeProvidersMap {

 	/**

 	 * Logger object.

 	 */

 	private static final Logger LOG = Logger.getLogger(AttributeProvidersMap.class.getName());

-   

+

 	/**

 	 * Unique identifier.

 	 */

@@ -72,10 +71,9 @@ public class AttributeProvidersMap extends LinkedHashMap<AttributeSource, IPerso
 

 			LOG.trace("Source details: type [" + source.getSourceType() + "], URL [" + source.getProviderURL() + "]");

 

-			if(source.getSourceType() == AttributeSource.SOURCE_LOCAL_APROVIDER) {

+			if (source.getSourceType() == AttributeSource.SOURCE_LOCAL_APROVIDER) {

 				LOG.trace("-> Attribute Provider: ID [" + source.getProvider().getProviderId() + "], name [" + source.getProvider().getProviderName() + "]");

-			}

-			else {

+			} else {

 				LOG.trace("-> Country: ID [" + source.getCountry().getCountryId() + "], name [" + source.getCountry().getCountryName() + "]");

 			}

 

@@ -93,4 +91,22 @@ public class AttributeProvidersMap extends LinkedHashMap<AttributeSource, IPerso
 		}

 		LOG.trace("END\n=======================");

 	}

+

+	public void mergeWith(IAttributeProvidersMap aPMap) {

+		Iterator<AttributeSource> maKeys = aPMap.keyIterator();

+		while (maKeys.hasNext()) {

+			AttributeSource key = maKeys.next();

+			IPersonalAttributeList l2 = aPMap.get(key);

+			if (containsKey(key)) {

+				IPersonalAttributeList l1 = get(key);

+				for (PersonalAttribute pa : l2) {

+					if (!l1.containsKey(pa.getName())) {

+						l1.add(pa);

+					}

+				}

+			} else {

+				put(key, l2);

+			}

+		}

+	}

 }

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java
index 846f54f67..eb5e3ded4 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeSource.java
@@ -12,177 +12,186 @@ import org.apache.log4j.Logger;
  * @version $Revision: 1.10 $, $Date: 2013-11-29 $

  */

 public final class AttributeSource implements Serializable {

-  /**

-   * Unique identifier.

-   */

-  private static final long serialVersionUID = 432243595968469014L;

-

-  public static final int SOURCE_LOCAL_APROVIDER = 1;

-  public static final int SOURCE_REMOTE_COUNTRY = 2;

-

-  /**

-   * Logger object.

-   */

-  private static final Logger LOG = Logger.getLogger(AttributeSource.class.getName());

-

-  /**

-   * Provider source.

-   */

-  private int sourceType;

-  

-  /**

-   * Provider URL.

-   */

-  private String providerURL;

-

-  /**

-   * The local Attribute Provider.

-   */

-  private AttributeProvider provider;

-

-  /**

-   * The remote Country.

-   */

-  private Country country;

-  

-  /**

-   * Attribute Source Constructor.

-   * 

-   * @param provider The local Attribute Provider.

-   * @param pURL URL of the Attribute Provider.

-   */

-  public AttributeSource(final AttributeProvider provider, final String pURL) {

-    this.setSourceType(SOURCE_LOCAL_APROVIDER);

-

-    this.setProvider(provider);

-    this.setProviderURL(pURL);

-  }

-  

-  /**

-   * Attribute Source Constructor.

-   * 

-   * @param country The remote Country.

-   * @param pURL URL of the Country.

-   */

-  public AttributeSource(final Country country, final String pURL) {

-    this.setSourceType(SOURCE_REMOTE_COUNTRY);

-

-    this.setCountry(country);

-    this.setProviderURL(pURL);

-  }

-

-  /**

-   * @param sourceType the sourceType to set

-   */

-  public void setSourceType(final int sourceType) {

-	  this.sourceType = sourceType;

-  }

-

-  /**

-   * @return the sourceType

-   */

-  public int getSourceType() {

-	  return sourceType;

-  }

-

-  /**

-   * @param providerURL the providerURL to set

-   */

-  public void setProviderURL(final String providerURL) {

-	  this.providerURL = providerURL;

-  }

-

-  /**

-   * @return the providerURL

-   */

-  public String getProviderURL() {

-	  return providerURL;

-  }

-

-  /**

-   * @param provider the provider to set

-   */

-  public void setProvider(final AttributeProvider provider) {

-	  this.setSourceType(SOURCE_LOCAL_APROVIDER);

-

-	  this.provider = provider;

-  }

-

-  /**

-   * @return the provider

-   */

-  public AttributeProvider getProvider() {

-	  return provider;

-  }

-

-  /**

-   * @param country the country to set

-   */

-  public void setCountry(final Country country) {

-	  this.setSourceType(SOURCE_REMOTE_COUNTRY);

-

-	  this.country = country;

-  }

-

-  /**

-   * @return the country

-   */

-  public Country getCountry() {

-	  return country;

-  }

-

-  /**

-   * {@inheritDoc}

-   */

-  public boolean equals(Object obj) {

-	  boolean outcome = false;

-

-	  LOG.debug("Calling equals with Object.");

-	  if ( obj instanceof AttributeSource ) {

-		  LOG.debug("Calling equals with AttributeSource.");

-		  outcome = this.equals((AttributeSource)obj);

-	  }

-

-	  LOG.debug("Object equals outcome: " + outcome);

-	  return outcome;

-  }

-

-  /**

-   * Compare the given AttributeSource with the current object in order to determinine

-   * if they are equal.

-   * 

-   * @param obj The AttributeSource to compare to

-   * 

-   * @return true if the two objects are equal

-   */

-  public boolean equals(AttributeSource obj) {

-	  boolean outcome = false;

-

-	  if ( this.sourceType==obj.getSourceType() ) {

-		  if ( this.sourceType==AttributeSource.SOURCE_LOCAL_APROVIDER ) {

-			  if ( this.provider.getProviderId().equals(obj.getProvider().getProviderId()) )

-				  outcome = true;

-		  }

-		  else if ( this.sourceType==AttributeSource.SOURCE_REMOTE_COUNTRY ) {

-			  if ( this.country.getCountryId().equals(obj.getCountry().getCountryId()) )

-				  outcome = true;

-		  }

-	  }

-

-	  LOG.debug("AttributeSource equals outcome: " + outcome);

-	  return outcome;

-  }

-

-  /**

-   * {@inheritDoc}

-   */

-  public int hashCode() {

-	  int hash = 1;

-	  hash = hash * 17 + this.sourceType;

-	  if ( this.sourceType==AttributeSource.SOURCE_LOCAL_APROVIDER )

-		  hash = hash * 31 + this.provider.getProviderName().hashCode();

-	  else

-		  hash = hash * 31 + this.country.getCountryName().hashCode();

-	  return hash;

-  }

+	/**

+	 * Unique identifier.

+	 */

+	private static final long serialVersionUID = 432243595968469014L;

+

+	public static final int SOURCE_LOCAL_APROVIDER = 1;

+	public static final int SOURCE_REMOTE_COUNTRY = 2;

+

+	/**

+	 * Logger object.

+	 */

+	private static final Logger LOG = Logger.getLogger(AttributeSource.class.getName());

+

+	/**

+	 * Provider source.

+	 */

+	private int sourceType;

+

+	/**

+	 * Provider URL.

+	 */

+	private String providerURL;

+

+	/**

+	 * The local Attribute Provider.

+	 */

+	private AttributeProvider provider;

+

+	/**

+	 * The remote Country.

+	 */

+	private Country country;

+

+	/**

+	 * Attribute Source Constructor.

+	 * 

+	 * @param provider

+	 *            The local Attribute Provider.

+	 * @param pURL

+	 *            URL of the Attribute Provider.

+	 */

+	public AttributeSource(final AttributeProvider provider, final String pURL) {

+		this.setSourceType(SOURCE_LOCAL_APROVIDER);

+

+		this.setProvider(provider);

+		this.setProviderURL(pURL);

+	}

+

+	/**

+	 * Attribute Source Constructor.

+	 * 

+	 * @param country

+	 *            The remote Country.

+	 * @param pURL

+	 *            URL of the Country.

+	 */

+	public AttributeSource(final Country country, final String pURL) {

+		this.setSourceType(SOURCE_REMOTE_COUNTRY);

+

+		this.setCountry(country);

+		this.setProviderURL(pURL);

+	}

+

+	/**

+	 * @param sourceType

+	 *            the sourceType to set

+	 */

+	public void setSourceType(final int sourceType) {

+		this.sourceType = sourceType;

+	}

+

+	/**

+	 * @return the sourceType

+	 */

+	public int getSourceType() {

+		return sourceType;

+	}

+

+	/**

+	 * @param providerURL

+	 *            the providerURL to set

+	 */

+	public void setProviderURL(final String providerURL) {

+		this.providerURL = providerURL;

+	}

+

+	/**

+	 * @return the providerURL

+	 */

+	public String getProviderURL() {

+		return providerURL;

+	}

+

+	/**

+	 * @param provider

+	 *            the provider to set

+	 */

+	public void setProvider(final AttributeProvider provider) {

+		this.setSourceType(SOURCE_LOCAL_APROVIDER);

+

+		this.provider = provider;

+	}

+

+	/**

+	 * @return the provider

+	 */

+	public AttributeProvider getProvider() {

+		return provider;

+	}

+

+	/**

+	 * @param country

+	 *            the country to set

+	 */

+	public void setCountry(final Country country) {

+		this.setSourceType(SOURCE_REMOTE_COUNTRY);

+

+		this.country = country;

+	}

+

+	/**

+	 * @return the country

+	 */

+	public Country getCountry() {

+		return country;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	public boolean equals(Object obj) {

+		boolean outcome = false;

+

+		LOG.debug("Calling equals with Object.");

+		if (obj instanceof AttributeSource) {

+			LOG.debug("Calling equals with AttributeSource.");

+			outcome = this.innerEquals((AttributeSource) obj);

+		}

+		if (LOG.isDebugEnabled()) {

+			LOG.debug("Object equals outcome: " + outcome);

+		}

+		return outcome;

+	}

+

+	/**

+	 * Compare the given AttributeSource with the current object in order to determinine if they are equal.

+	 * 

+	 * @param obj

+	 *            The AttributeSource to compare to

+	 * 

+	 * @return true if the two objects are equal

+	 */

+	public boolean innerEquals(AttributeSource obj) {

+		boolean outcome = false;

+

+		if (this.sourceType == obj.getSourceType()) {

+			if (this.sourceType == AttributeSource.SOURCE_LOCAL_APROVIDER) {

+				if (this.provider.getProviderId().equals(obj.getProvider().getProviderId()))

+					outcome = true;

+			} else if (this.sourceType == AttributeSource.SOURCE_REMOTE_COUNTRY) {

+				if (this.country.getCountryId().equals(obj.getCountry().getCountryId()))

+					outcome = true;

+			}

+		}

+		if (LOG.isDebugEnabled()) {

+			LOG.debug("AttributeSource equals outcome: " + outcome);

+		}

+		return outcome;

+	}

+

+	/**

+	 * {@inheritDoc}

+	 */

+	public int hashCode() {

+		int hash = 1;

+		hash = hash * 17 + this.sourceType;

+		if (this.sourceType == AttributeSource.SOURCE_LOCAL_APROVIDER)

+			hash = hash * 31 + this.provider.getProviderName().hashCode();

+		else

+			hash = hash * 31 + this.country.getCountryName().hashCode();

+		return hash;

+	}

 }

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java
index af7ab6cf3..f49986aaf 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/AttributeUtil.java
@@ -23,209 +23,196 @@ import org.apache.commons.lang.StringUtils;
 /**
  * This class holds static helper methods.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.5 $, $Date: 2010-12-15 23:19:59 $
  */
 public final class AttributeUtil {
-  
-  /**
-   * Private constructor. Prevents the class from being instantiated.
-   */
-  private AttributeUtil() {
-    // empty constructor
-  }
-  
-  /**
-   * Safe escape any given string.
-   * 
-   * @param value The HTTP Value to escaped.
-   * 
-   * @return The value escaped value.
-   */
-  public static String escape(final String value) {
-    
-    final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString();
-    final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString();
-    final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString();
-    
-    final String escAttrSep = "%" + (int) attrSep.charAt(0);
-    final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0);
-    final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0);
-    
-    return value.replace(attrSep, escAttrSep)
-      .replace(attrTupleSep, escAttrTupleSep)
-      .replace(attrValueSep, escAttrValueSep);
-  }
-  
-  /**
-   * Unescape any given string.
-   * 
-   * @param value The HTTP Value to be unescaped.
-   * 
-   * @return The value unescaped value.
-   */
-  public static String unescape(final String value) {
-    final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString();
-    final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString();
-    final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString();
-    
-    final String escAttrSep = "%" + (int) attrSep.charAt(0);
-    final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0);
-    final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0);
-    
-    return value.replace(escAttrSep, attrSep)
-      .replace(escAttrTupleSep, attrTupleSep)
-      .replace(escAttrValueSep, attrValueSep);
-  }
-  
-  /**
-   * Appends the string representation of an object to a StringBuilder.
-   * 
-   * @param strBuilder The StringBuilder to append to.
-   * @param val The string representation of an object.
-   */
-  public static void appendIfNotNull(final StringBuilder strBuilder,
-    final Object val) {
-    
-    if (val != null) {
-      strBuilder.append(val);
-    }
-  }
-  
-  /**
-   * Given a separator and a list of strings, joins the list, as a string,
-   * separated by the separator string.
-   * 
-   * @param list The list of strings to join.
-   * @param separator The separator string.
-   * @return the list, as a string, separated by the separator string.
-   */
-  public static String listToString(final List<String> list,
-    final String separator) {
-    
-    final StringBuilder strBuilder = new StringBuilder();
-    for (final String s : list) {
-      if (!StringUtils.isEmpty(s)) {
-        strBuilder.append(AttributeUtil.escape(s) + separator);
-      }
-    }
-    return strBuilder.toString();
-  }
-  
-  /**
-   * Given a separator and a map of strings to strings, joins the map, as a
-   * string, separated by the separator string with the pair key/value
-   * concatenated with a '='.
-   * 
-   * @param map The map of strings to join.
-   * @param separator The separator string.
-   * 
-   * @return the map of strings, as a string, separated by the separator string
-   *         with the pair key/value concatenated with a '='.
-   */
-  public static String mapToString(final Map<String, String> map,
-    final String separator) {
-    
-    final StringBuilder strBuilder = new StringBuilder();
-    final Iterator<Entry<String, String>> valuesIt = map.entrySet().iterator();
-    while (valuesIt.hasNext()) {
-      final Entry<String, String> entry = valuesIt.next();
-      strBuilder.append(entry.getKey());
-      strBuilder.append('=');
-      strBuilder.append(AttributeUtil.escape(entry.getValue()));
-      strBuilder.append(separator);
-    }
-    return strBuilder.toString();
-  }
-  
-  /**
-   * Validates the attribute value format.
-   * 
-   * @param value The attribute value to validate.
-   * 
-   * @return true if value has a valid format.
-   */
-  public static boolean isValidValue(final String value) {
-    boolean retVal = false;
-    if (value != null && value.charAt(0) == '[' && value.endsWith("]")) {
-      final String tmpAttrValue = value.substring(1, value.length() - 1);
-      final String[] vals =
-        tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-      
-      if (tmpAttrValue.length() >= 0
-        || (vals.length > 0 && vals[0].length() > 0)) {
-        retVal = true;
-      }
-    }
-    return retVal;
-  }
-  
-  /**
-   * Validates the attribute type value. It's case insensitive. E.g. return true
-   * value to: a) "true", "TRUE", "True", ... b) "false", "FALSE", "False", ...
-   * 
-   * @param type The attribute type value.
-   * 
-   * @return true if type has a true or false (case insensitive) value.
-   */
-  public static boolean isValidType(final String type) {
-      return StringUtils.isNotEmpty(type) && (PEPSValues.TRUE.toString().equalsIgnoreCase(type) || PEPSValues.FALSE.toString().equalsIgnoreCase(type)) ;
-  }
-  
-  /**
-   * Validates the Personal attribute tuple. E.g. name:type:[value]:status
-   * 
-   * @param tuples The Personal attribute's tuple.
-   * 
-   * @return true if the tuples' format is valid.
-   * 
-   * @see PEPSUtil#validateParameter(String, String, String)
-   * @see String#equalsIgnoreCase(String)
-   */
-  public static boolean hasValidTuples(final String[] tuples) {
-    boolean retVal = false;
-
-      final int numberTuples = AttributeConstants.NUMBER_TUPLES.intValue();
-      if (tuples != null && tuples.length == numberTuples) {
-      // validate attrName
-      final int attrNameIndex = AttributeConstants.ATTR_NAME_INDEX.intValue();
-      final int attrTypeIndex = AttributeConstants.ATTR_TYPE_INDEX.intValue();
-      final int attrValueIndex = AttributeConstants.ATTR_VALUE_INDEX.intValue();
-      
-      retVal =
-        StringUtils.isNotEmpty(tuples[attrNameIndex])
-          && StringUtils.isNotEmpty(tuples[attrTypeIndex])
-          && StringUtils.isNotEmpty(tuples[attrValueIndex])
-          && AttributeUtil.isValidType(tuples[attrTypeIndex])
-          && AttributeUtil.isValidValue(tuples[attrValueIndex]);
-    }
-    return retVal;
-  }
-  
-  /**
-   * Check if all mandatory attributes have values.
-   * 
-   * @param personalAttrList The Personal Attributes List.
-   * 
-   * @return true if all mandatory attributes have values, false if at least one
-   *         attribute doesn't have value.
-   */
-  public static boolean checkMandatoryAttributes(
-    final IPersonalAttributeList personalAttrList) {
-    
-    final Iterator<PersonalAttribute> itAttributes =
-      personalAttrList.values().iterator();
-    boolean retVal = true;
-    while (itAttributes.hasNext() && retVal) {
-      final PersonalAttribute attr = itAttributes.next();
-      if (attr.isRequired()
-        && !STORKStatusCode.STATUS_AVAILABLE.toString()
-          .equals(attr.getStatus())) {
-        retVal = false;
-      }
-    }
-    return retVal;
-  }
+
+	/**
+	 * Private constructor. Prevents the class from being instantiated.
+	 */
+	private AttributeUtil() {
+		// empty constructor
+	}
+
+	/**
+	 * Safe escape any given string.
+	 * 
+	 * @param value
+	 *            The HTTP Value to escaped.
+	 * 
+	 * @return The value escaped value.
+	 */
+	public static String escape(final String value) {
+
+		final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString();
+		final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString();
+		final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString();
+
+		final String escAttrSep = "%" + (int) attrSep.charAt(0);
+		final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0);
+		final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0);
+
+		return value.replace(attrSep, escAttrSep).replace(attrTupleSep, escAttrTupleSep).replace(attrValueSep, escAttrValueSep);
+	}
+
+	/**
+	 * Unescape any given string.
+	 * 
+	 * @param value
+	 *            The HTTP Value to be unescaped.
+	 * 
+	 * @return The value unescaped value.
+	 */
+	public static String unescape(final String value) {
+		final String attrSep = PEPSValues.ATTRIBUTE_SEP.toString();
+		final String attrTupleSep = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString();
+		final String attrValueSep = PEPSValues.ATTRIBUTE_VALUE_SEP.toString();
+
+		final String escAttrSep = "%" + (int) attrSep.charAt(0);
+		final String escAttrTupleSep = "%" + (int) attrTupleSep.charAt(0);
+		final String escAttrValueSep = "%" + (int) attrValueSep.charAt(0);
+
+		return value.replace(escAttrSep, attrSep).replace(escAttrTupleSep, attrTupleSep).replace(escAttrValueSep, attrValueSep);
+	}
+
+	/**
+	 * Appends the string representation of an object to a StringBuilder.
+	 * 
+	 * @param strBuilder
+	 *            The StringBuilder to append to.
+	 * @param val
+	 *            The string representation of an object.
+	 */
+	public static void appendIfNotNull(final StringBuilder strBuilder, final Object val) {
+
+		if (val != null) {
+			strBuilder.append(val);
+		}
+	}
+
+	/**
+	 * Given a separator and a list of strings, joins the list, as a string, separated by the separator string.
+	 * 
+	 * @param list
+	 *            The list of strings to join.
+	 * @param separator
+	 *            The separator string.
+	 * @return the list, as a string, separated by the separator string.
+	 */
+	public static String listToString(final List<String> list, final String separator) {
+
+		final StringBuilder strBuilder = new StringBuilder();
+		for (final String s : list) {
+			if (!StringUtils.isEmpty(s)) {
+				strBuilder.append(AttributeUtil.escape(s) + separator);
+			}
+		}
+		return strBuilder.substring(0, strBuilder.length() - 1).toString();
+	}
+
+	/**
+	 * Given a separator and a map of strings to strings, joins the map, as a string, separated by the separator string with the pair key/value concatenated with a '='.
+	 * 
+	 * @param map
+	 *            The map of strings to join.
+	 * @param separator
+	 *            The separator string.
+	 * 
+	 * @return the map of strings, as a string, separated by the separator string with the pair key/value concatenated with a '='.
+	 */
+	public static String mapToString(final Map<String, String> map, final String separator) {
+
+		final StringBuilder strBuilder = new StringBuilder();
+		final Iterator<Entry<String, String>> valuesIt = map.entrySet().iterator();
+		while (valuesIt.hasNext()) {
+			final Entry<String, String> entry = valuesIt.next();
+			strBuilder.append(entry.getKey());
+			strBuilder.append('=');
+			strBuilder.append(AttributeUtil.escape(entry.getValue()));
+			strBuilder.append(separator);
+		}
+		return strBuilder.substring(0, strBuilder.length() - 1).toString();
+	}
+
+	/**
+	 * Validates the attribute value format.
+	 * 
+	 * @param value
+	 *            The attribute value to validate.
+	 * 
+	 * @return true if value has a valid format.
+	 */
+	public static boolean isValidValue(final String value) {
+		boolean retVal = false;
+		if (value != null && value.charAt(0) == '[' && value.endsWith("]")) {
+			final String tmpAttrValue = value.substring(1, value.length() - 1);
+			final String[] vals = tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+
+			if (tmpAttrValue.length() >= 0 || (vals.length > 0 && vals[0].length() > 0)) {
+				retVal = true;
+			}
+		}
+		return retVal;
+	}
+
+	/**
+	 * Validates the attribute type value. It's case insensitive. E.g. return true value to: a) "true", "TRUE", "True", ... b) "false", "FALSE", "False", ...
+	 * 
+	 * @param type
+	 *            The attribute type value.
+	 * 
+	 * @return true if type has a true or false (case insensitive) value.
+	 */
+	public static boolean isValidType(final String type) {
+		return StringUtils.isNotEmpty(type) && (PEPSValues.TRUE.toString().equalsIgnoreCase(type) || PEPSValues.FALSE.toString().equalsIgnoreCase(type));
+	}
+
+	/**
+	 * Validates the Personal attribute tuple. E.g. name:type:[value]:status
+	 * 
+	 * @param tuples
+	 *            The Personal attribute's tuple.
+	 * 
+	 * @return true if the tuples' format is valid.
+	 * 
+	 * @see PEPSUtil#validateParameter(String, String, String)
+	 * @see String#equalsIgnoreCase(String)
+	 */
+	public static boolean hasValidTuples(final String[] tuples) {
+		boolean retVal = false;
+
+		final int numberTuples = AttributeConstants.NUMBER_TUPLES.intValue();
+		if (tuples != null && tuples.length == numberTuples) {
+			// validate attrName
+			final int attrNameIndex = AttributeConstants.ATTR_NAME_INDEX.intValue();
+			final int attrTypeIndex = AttributeConstants.ATTR_TYPE_INDEX.intValue();
+			final int attrValueIndex = AttributeConstants.ATTR_VALUE_INDEX.intValue();
+
+			retVal = StringUtils.isNotEmpty(tuples[attrNameIndex]) && StringUtils.isNotEmpty(tuples[attrTypeIndex]) && StringUtils.isNotEmpty(tuples[attrValueIndex])
+					&& AttributeUtil.isValidType(tuples[attrTypeIndex]) && AttributeUtil.isValidValue(tuples[attrValueIndex]);
+		}
+		return retVal;
+	}
+
+	/**
+	 * Check if all mandatory attributes have values.
+	 * 
+	 * @param personalAttrList
+	 *            The Personal Attributes List.
+	 * 
+	 * @return true if all mandatory attributes have values, false if at least one attribute doesn't have value.
+	 */
+	public static boolean checkMandatoryAttributes(final IPersonalAttributeList personalAttrList) {
+
+		final Iterator<PersonalAttribute> itAttributes = personalAttrList.values().iterator();
+		boolean retVal = true;
+		while (itAttributes.hasNext() && retVal) {
+			final PersonalAttribute attr = itAttributes.next();
+			if (attr.isRequired() && !STORKStatusCode.STATUS_AVAILABLE.toString().equals(attr.getStatus())) {
+				retVal = false;
+			}
+		}
+		return retVal;
+	}
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CitizenConsent.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CitizenConsent.java
index 9ebcfbd5a..a1b6c5a53 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CitizenConsent.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CitizenConsent.java
@@ -17,107 +17,105 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * This class is a bean used to store the information relative to the Citizen
- * Consent.
+ * This class is a bean used to store the information relative to the Citizen Consent.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $
  */
 public final class CitizenConsent {
-  
-  /**
-   * Mandatory attributes list.
-   */
-  private List<String> mandatoryList;
-  
-  /**
-   * Optional attributes list.
-   */
-  private List<String> optionalList;
-  
-  /**
-   * Citizen Consent default Constructor.
-   */
-  public CitizenConsent() {
-    this.mandatoryList = new ArrayList<String>();
-    this.optionalList = new ArrayList<String>();
-  }
-  
-  /**
-   * Getter for the mandatoryList value.
-   * 
-   * @return The mandatoryList value.
-   */
-  public List<String> getMandatoryList() {
-    return this.mandatoryList;
-  }
-  
-  /**
-   * Setter for the mandatoryList value.
-   * 
-   * @param mandatoryAttrList Mandatory parameters list.
-   */
-  public void setMandatoryList(final List<String> mandatoryAttrList) {
-    this.mandatoryList = mandatoryAttrList;
-  }
-  
-  /**
-   * Setter for some mandatoryAttribute. Adds the input parameter to the
-   * mandatoryList.
-   * 
-   * @param mandatoryAttr Attribute to add to the mandatoryList.
-   */
-  public void setMandatoryAttribute(final String mandatoryAttr) {
-    this.mandatoryList.add(mandatoryAttr);
-  }
-  
-  /**
-   * Getter for the optionalList value.
-   * 
-   * @return The optionalList value.
-   */
-  public List<String> getOptionalList() {
-    return optionalList;
-  }
-  
-  /**
-   * Setter for the optionalList value.
-   * 
-   * @param optAttrList Optional parameters list.
-   */
-  public void setOptionalList(final List<String> optAttrList) {
-    this.optionalList = optAttrList;
-  }
-  
-  /**
-   * Setter for some optionalAttr. Adds the input parameter to the optionalList.
-   * 
-   * @param optionalAttr Attribute to add to the optionalList.
-   */
-  public void setOptionalAttribute(final String optionalAttr) {
-    this.optionalList.add(optionalAttr);
-  }
-  
-  /**
-   * Returns a string in the following format. "Mandatory attributes:
-   * mandatoryAttr1;mandatoryAttr2;mandatoryAttrN Optional attributes:
-   * optionalAttr1;optionalAttr2;optionalAttrN"
-   * 
-   * @return {@inheritDoc}
-   */
-  public String toString() {
-    final StringBuilder strbldr = new StringBuilder(46);
-    strbldr.append("Mandatory attributes: ");
-    for (final String str : mandatoryList) {
-      strbldr.append(str).append(';');
-    }
-    strbldr.append(" Optional attributes: ");
-    for (final String str : optionalList) {
-      strbldr.append(str).append(';');
-    }
-    return strbldr.toString();
-  }
-  
+
+	/**
+	 * Mandatory attributes list.
+	 */
+	private List<String> mandatoryList;
+
+	/**
+	 * Optional attributes list.
+	 */
+	private List<String> optionalList;
+
+	/**
+	 * Citizen Consent default Constructor.
+	 */
+	public CitizenConsent() {
+		this.mandatoryList = new ArrayList<String>();
+		this.optionalList = new ArrayList<String>();
+	}
+
+	/**
+	 * Getter for the mandatoryList value.
+	 * 
+	 * @return The mandatoryList value.
+	 */
+	public List<String> getMandatoryList() {
+		return this.mandatoryList;
+	}
+
+	/**
+	 * Setter for the mandatoryList value.
+	 * 
+	 * @param mandatoryAttrList
+	 *            Mandatory parameters list.
+	 */
+	public void setMandatoryList(final List<String> mandatoryAttrList) {
+		this.mandatoryList = mandatoryAttrList;
+	}
+
+	/**
+	 * Setter for some mandatoryAttribute. Adds the input parameter to the mandatoryList.
+	 * 
+	 * @param mandatoryAttr
+	 *            Attribute to add to the mandatoryList.
+	 */
+	public void setMandatoryAttribute(final String mandatoryAttr) {
+		this.mandatoryList.add(mandatoryAttr);
+	}
+
+	/**
+	 * Getter for the optionalList value.
+	 * 
+	 * @return The optionalList value.
+	 */
+	public List<String> getOptionalList() {
+		return optionalList;
+	}
+
+	/**
+	 * Setter for the optionalList value.
+	 * 
+	 * @param optAttrList
+	 *            Optional parameters list.
+	 */
+	public void setOptionalList(final List<String> optAttrList) {
+		this.optionalList = optAttrList;
+	}
+
+	/**
+	 * Setter for some optionalAttr. Adds the input parameter to the optionalList.
+	 * 
+	 * @param optionalAttr
+	 *            Attribute to add to the optionalList.
+	 */
+	public void setOptionalAttribute(final String optionalAttr) {
+		this.optionalList.add(optionalAttr);
+	}
+
+	/**
+	 * Returns a string in the following format. "Mandatory attributes: mandatoryAttr1;mandatoryAttr2;mandatoryAttrN Optional attributes: optionalAttr1;optionalAttr2;optionalAttrN"
+	 * 
+	 * @return {@inheritDoc}
+	 */
+	public String toString() {
+		final StringBuilder strbldr = new StringBuilder(46);
+		strbldr.append("Mandatory attributes: ");
+		for (final String str : mandatoryList) {
+			strbldr.append(str).append(';');
+		}
+		strbldr.append(" Optional attributes: ");
+		for (final String str : optionalList) {
+			strbldr.append(str).append(';');
+		}
+		return strbldr.toString();
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java
index 001f9317a..7bef0c628 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Country.java
@@ -18,78 +18,80 @@ import java.io.Serializable;
 /**
  * This class is a bean used to store the information relative to the Country.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.10 $, $Date: 2010-11-17 05:15:28 $
  */
 public final class Country implements Serializable {
-  
-  /**
+
+	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1135994036496370993L;
 
-/**
-   * Country Id.
-   */
-  private String countryId;
-  
-  /**
-   * Country Name.
-   */
-  private String countryName;
-  
-  /**
-   * Country Constructor.
-   * 
-   * @param cId Id of the Country.
-   * @param cName Name of the Country.
-   */
-  public Country(final String cId, final String cName) {
-    
-    this.countryId = cId;
-    this.countryName = cName;
-  }
-  
-  /**
-   * Getter for the countryId value.
-   * 
-   * @return The countryId value.
-   */
-  public String getCountryId() {
-    
-    return countryId;
-  }
-  
-  /**
-   * Setter for the countryId value.
-   * 
-   * @param cId Id of the Country.
-   */
-  public void setCountryId(final String cId) {
-    
-    this.countryId = cId;
-  }
-  
-  /**
-   * Getter for the countryName value.
-   * 
-   * @return The countryName value.
-   */
-  public String getCountryName() {
-    
-    return countryName;
-  }
-  
-  /**
-   * Setter for the countryName value.
-   * 
-   * @param name Name of the Country.
-   */
-  public void setCountryName(final String name) {
-    
-    this.countryName = name;
-  }
-  
+	/**
+	 * Country Id.
+	 */
+	private String countryId;
+
+	/**
+	 * Country Name.
+	 */
+	private String countryName;
+
+	/**
+	 * Country Constructor.
+	 * 
+	 * @param cId
+	 *            Id of the Country.
+	 * @param cName
+	 *            Name of the Country.
+	 */
+	public Country(final String cId, final String cName) {
+
+		this.countryId = cId;
+		this.countryName = cName;
+	}
+
+	/**
+	 * Getter for the countryId value.
+	 * 
+	 * @return The countryId value.
+	 */
+	public String getCountryId() {
+
+		return countryId;
+	}
+
+	/**
+	 * Setter for the countryId value.
+	 * 
+	 * @param cId
+	 *            Id of the Country.
+	 */
+	public void setCountryId(final String cId) {
+
+		this.countryId = cId;
+	}
+
+	/**
+	 * Getter for the countryName value.
+	 * 
+	 * @return The countryName value.
+	 */
+	public String getCountryName() {
+
+		return countryName;
+	}
+
+	/**
+	 * Setter for the countryName value.
+	 * 
+	 * @param name
+	 *            Name of the Country.
+	 */
+	public void setCountryName(final String name) {
+
+		this.countryName = name;
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CountryCodes.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CountryCodes.java
index 54345f3ea..5cf7a9751 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CountryCodes.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/CountryCodes.java
@@ -19,61 +19,43 @@ import java.util.List;
 /**
  * This class contains all the ISO 3166-1 Alpha 3 Country Codes.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.2 $, $Date: 2011-04-14 00:24:56 $
  */
 public final class CountryCodes {
-  
-  /**
-   * Private Constructor.
-   */
-  private CountryCodes() {
-    
-  }
-  
-  /**
-   * ISO 3166-1 Alpha 3 Country Codes.
-   */
-  private static List<String> countrysAlpha3 = Arrays.asList("ABW", "AFG",
-    "AGO", "AIA", "ALA", "ALB", "AND", "ANT", "ARE", "ARG", "ARM", "ASM",
-    "ATA", "ATF", "ATG", "AUS", "AUT", "AZE", "BDI", "BEL", "BEN", "BES",
-    "BFA", "BGD", "BGR", "BHR", "BHS", "BIH", "BLM", "BLR", "BLZ", "BMU",
-    "BOL", "BRA", "BRB", "BRN", "BTN", "BUR", "BVT", "BWA", "BYS", "CAF",
-    "CAN", "CCK", "CHE", "CHL", "CHN", "CIV", "CMR", "COD", "COG", "COK",
-    "COL", "COM", "CPV", "CRI", "CSK", "CUB", "CUW", "CXR", "CYM", "CYP",
-    "CZE", "DEU", "DJI", "DMA", "DNK", "DOM", "DZA", "ECU", "EGY", "ERI",
-    "ESH", "ESP", "EST", "ETH", "FIN", "FJI", "FLK", "FRA", "FRO", "FSM",
-    "GAB", "GBR", "GEO", "GGY", "GHA", "GIB", "GIN", "GLP", "GMB", "GNB",
-    "GNQ", "GRC", "GRD", "GRL", "GTM", "GUF", "GUM", "GUY", "HKG", "HMD",
-    "HND", "HRV", "HTI", "HUN", "IDN", "IMN", "IND", "IOT", "IRL", "IRN",
-    "IRQ", "ISL", "ISR", "ITA", "JAM", "JEY", "JOR", "JPN", "KAZ", "KEN",
-    "KGZ", "KHM", "KIR", "KNA", "KOR", "KWT", "LAO", "LBN", "LBR", "LBY",
-    "LCA", "LIE", "LKA", "LSO", "LTU", "LUX", "LVA", "MAC", "MAF", "MAR",
-    "MCO", "MDA", "MDG", "MDV", "MEX", "MHL", "MKD", "MLI", "MLT", "MMR",
-    "MNE", "MNG", "MNP", "MOZ", "MRT", "MSR", "MTQ", "MUS", "MWI", "MYS",
-    "MYT", "NAM", "NCL", "NER", "NFK", "NGA", "NIC", "NIU", "NLD", "NOR",
-    "NPL", "NRU", "NZL", "OMN", "PAK", "PAN", "PCN", "PER", "PHL", "PLW",
-    "PNG", "POL", "PRI", "PRK", "PRT", "PRY", "PSE", "PYF", "QAT", "REU",
-    "ROM", "ROU", "RUS", "RWA", "SAU", "SCG", "SDN", "SEN", "SGP", "SGS",
-    "SHN", "SJM", "SLB", "SLE", "SLV", "SMR", "SOM", "SPM", "SRB", "STP",
-    "SUR", "SVK", "SVN", "SXW", "SWE", "SWZ", "SYC", "SYR", "TCA", "TCD",
-    "TGO", "THA", "TJK", "TKL", "TKM", "TLS", "TMP", "TON", "TTO", "TUN",
-    "TUR", "TUV", "TWN", "TZA", "UGA", "UKR", "UMI", "URY", "USA", "UZB",
-    "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM",
-    "YUG", "ZAF", "ZAR", "ZMB", "ZWE");
-  
-  /**
-   * Searches the CountryCode (3166-1 alpha3 format) an return true if it
-   * exists.
-   * 
-   * @param countryCode The Country code to search.
-   * 
-   * @return true if the CountryCode exists, false otherwise.
-   */
-  public static boolean hasCountryCodeAlpha3(final String countryCode) {
-    
-    return CountryCodes.countrysAlpha3.contains(countryCode);
-  }
+
+	/**
+	 * Private Constructor.
+	 */
+	private CountryCodes() {
+
+	}
+
+	/**
+	 * ISO 3166-1 Alpha 3 Country Codes.
+	 */
+	private static List<String> countrysAlpha3 = Arrays.asList("ABW", "AFG", "AGO", "AIA", "ALA", "ALB", "AND", "ANT", "ARE", "ARG", "ARM", "ASM", "ATA", "ATF", "ATG", "AUS", "AUT", "AZE", "BDI",
+			"BEL", "BEN", "BES", "BFA", "BGD", "BGR", "BHR", "BHS", "BIH", "BLM", "BLR", "BLZ", "BMU", "BOL", "BRA", "BRB", "BRN", "BTN", "BUR", "BVT", "BWA", "BYS", "CAF", "CAN", "CCK", "CHE",
+			"CHL", "CHN", "CIV", "CMR", "COD", "COG", "COK", "COL", "COM", "CPV", "CRI", "CSK", "CUB", "CUW", "CXR", "CYM", "CYP", "CZE", "DEU", "DJI", "DMA", "DNK", "DOM", "DZA", "ECU", "EGY",
+			"ERI", "ESH", "ESP", "EST", "ETH", "FIN", "FJI", "FLK", "FRA", "FRO", "FSM", "GAB", "GBR", "GEO", "GGY", "GHA", "GIB", "GIN", "GLP", "GMB", "GNB", "GNQ", "GRC", "GRD", "GRL", "GTM",
+			"GUF", "GUM", "GUY", "HKG", "HMD", "HND", "HRV", "HTI", "HUN", "IDN", "IMN", "IND", "IOT", "IRL", "IRN", "IRQ", "ISL", "ISR", "ITA", "JAM", "JEY", "JOR", "JPN", "KAZ", "KEN", "KGZ",
+			"KHM", "KIR", "KNA", "KOR", "KWT", "LAO", "LBN", "LBR", "LBY", "LCA", "LIE", "LKA", "LSO", "LTU", "LUX", "LVA", "MAC", "MAF", "MAR", "MCO", "MDA", "MDG", "MDV", "MEX", "MHL", "MKD",
+			"MLI", "MLT", "MMR", "MNE", "MNG", "MNP", "MOZ", "MRT", "MSR", "MTQ", "MUS", "MWI", "MYS", "MYT", "NAM", "NCL", "NER", "NFK", "NGA", "NIC", "NIU", "NLD", "NOR", "NPL", "NRU", "NZL",
+			"OMN", "PAK", "PAN", "PCN", "PER", "PHL", "PLW", "PNG", "POL", "PRI", "PRK", "PRT", "PRY", "PSE", "PYF", "QAT", "REU", "ROM", "ROU", "RUS", "RWA", "SAU", "SCG", "SDN", "SEN", "SGP",
+			"SGS", "SHN", "SJM", "SLB", "SLE", "SLV", "SMR", "SOM", "SPM", "SRB", "STP", "SUR", "SVK", "SVN", "SXW", "SWE", "SWZ", "SYC", "SYR", "TCA", "TCD", "TGO", "THA", "TJK", "TKL", "TKM",
+			"TLS", "TMP", "TON", "TTO", "TUN", "TUR", "TUV", "TWN", "TZA", "UGA", "UKR", "UMI", "URY", "USA", "UZB", "VAT", "VCT", "VEN", "VGB", "VIR", "VNM", "VUT", "WLF", "WSM", "YEM", "YUG",
+			"ZAF", "ZAR", "ZMB", "ZWE");
+
+	/**
+	 * Searches the CountryCode (3166-1 alpha3 format) an return true if it exists.
+	 * 
+	 * @param countryCode
+	 *            The Country code to search.
+	 * 
+	 * @return true if the CountryCode exists, false otherwise.
+	 */
+	public static boolean hasCountryCodeAlpha3(final String countryCode) {
+
+		return CountryCodes.countrysAlpha3.contains(countryCode);
+	}
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/DateUtil.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/DateUtil.java
index 9c0bd6775..0c59e117f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/DateUtil.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/DateUtil.java
@@ -27,143 +27,134 @@ import eu.stork.peps.auth.commons.exceptions.SecurityPEPSException;
 /**
  * This class holds static helper methods for Date Operations.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.4 $, $Date: 2010-11-17 05:15:28 $
  */
 public final class DateUtil {
-  
-  /**
-   * Logger object.
-   */
-  private static final Logger LOG = Logger.getLogger(DateUtil.class.getName());
-  
-  /**
-   * yyyy Date format size.
-   */
-  private static final int YEAR_DATE_SIZE = 4;
-  
-  /**
-   * yyyyMM Date format size.
-   */
-  private static final int MONTH_DATE_SIZE = 6;
-  
-  /**
-   * Private constructor. Prevents the class from being instantiated.
-   */
-  private DateUtil() {
-    // empty constructor
-  }
-  
-  /**
-   * Fulfils dateValue with a valid date. The following roles are applied: a) If
-   * the dateValue only contains the year then fulfils with last year's day.
-   * e.g. this method returns 19951231 to the 1995 dateValue. b) If the
-   * dateValue contains the year and the month then fulfils with last month's
-   * day. e.g. this method returns 19950630 to the 199505 dateValue.
-   * 
-   * @param dateValue The date to be fulfilled.
-   * 
-   * @return The dateValue fulfilled.
-   */
-  private static String fulfilDate(final String dateValue) {
-    
-    final StringBuffer strBuf = new StringBuffer();
-    strBuf.append(dateValue);
-    // if the IdP just provides the year then we must fullfil the date.
-    if (dateValue.length() == YEAR_DATE_SIZE) {
-      strBuf.append(PEPSValues.LAST_MONTH.toString());
-    }
-    // if the IdP provides the year and the month then we must fullfil the
-    // date.
-    if (dateValue.length() == MONTH_DATE_SIZE
-      || strBuf.length() == MONTH_DATE_SIZE) {
-      // IdP doesn't provide the day, so we will use DateTime to
-      // calculate it.
-      final String noDayCons = PEPSValues.NO_DAY_DATE_FORMAT.toString();
-      final DateTimeFormatter fmt = DateTimeFormat.forPattern(noDayCons);
-      final DateTime dateTime = fmt.parseDateTime(strBuf.toString());
-      // Append the last month's day.
-      strBuf.append(dateTime.dayOfMonth().withMaximumValue().getDayOfMonth());
-    }
-    
-    return strBuf.toString();
-  }
-  
-  /**
-   * Validates the dateValue format: a) if has a valid size; b) if has a numeric
-   * value; Note: dateValue must have the format yyyyMMdd.
-   * 
-   * @param dateValueTmp The date to be validated.
-   * @param pattern The accepted date format.
-   * 
-   * @return true if the date has a valid format.
-   */
-  public static boolean isValidFormatDate(final String dateValueTmp,
-    final String pattern) {
-    
-    boolean retVal = true;
-    try {
-      final String dateValue = DateUtil.fulfilDate(dateValueTmp);
-      
-      final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern);
-      fmt.parseDateTime(dateValue);
-    } catch (final Exception e) {
-      // We catch Exception because we only have to return false
-      // value!
-      retVal = false;
-    }
-    return retVal;
-  }
-  
-  /**
-   * Calculates the age for a given date string.
-   * 
-   * @param dateVal The date to be validated.
-   * @param now The current date.
-   * @param pattern The date pattern.
-   * 
-   * @return The age value.
-   */
-  public static int calculateAge(final String dateVal, final DateTime now,
-    final String pattern) {
-    
-    if (DateUtil.isValidFormatDate(dateVal, pattern)) {
-      try {
-        final String dateValueTemp = DateUtil.fulfilDate(dateVal);
-        final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern);
-        final DateTime dateTime = fmt.parseDateTime(dateValueTemp);
-        // Calculating age
-        final Years age = Years.yearsBetween(dateTime, now);
-        
-        return age.getYears();
-      } catch (final IllegalArgumentException e) {
-        LOG.warn("Invalid date format (" + pattern
-          + ") or an invalid dateValue.");
-        throw new SecurityPEPSException(
-          PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()),
-          PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage()),
-          e);
-      }
-    } else {
-      LOG.warn("Couldn't calculate Age, invalid date!");
-      throw new SecurityPEPSException(
-        PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()),
-        PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage()));
-    }
-    
-  }
-  
-  /**
-   * Generates the current timestamp.
-   * 
-   * @return timestamp The current timestamp
-   */
-  public static Timestamp currentTimeStamp() {
-    final GregorianCalendar cal = new GregorianCalendar();
-    final long millis = cal.getTimeInMillis();
-    return new Timestamp(millis);
-  }
-  
+
+	/**
+	 * Logger object.
+	 */
+	private static final Logger LOG = Logger.getLogger(DateUtil.class.getName());
+
+	/**
+	 * yyyy Date format size.
+	 */
+	private static final int YEAR_DATE_SIZE = 4;
+
+	/**
+	 * yyyyMM Date format size.
+	 */
+	private static final int MONTH_DATE_SIZE = 6;
+
+	/**
+	 * Private constructor. Prevents the class from being instantiated.
+	 */
+	private DateUtil() {
+		// empty constructor
+	}
+
+	/**
+	 * Fulfils dateValue with a valid date. The following roles are applied: a) If the dateValue only contains the year then fulfils with last year's day. e.g. this method returns 19951231 to the 1995
+	 * dateValue. b) If the dateValue contains the year and the month then fulfils with last month's day. e.g. this method returns 19950630 to the 199505 dateValue.
+	 * 
+	 * @param dateValue
+	 *            The date to be fulfilled.
+	 * 
+	 * @return The dateValue fulfilled.
+	 */
+	private static String fulfilDate(final String dateValue) {
+
+		final StringBuffer strBuf = new StringBuffer();
+		strBuf.append(dateValue);
+		// if the IdP just provides the year then we must fullfil the date.
+		if (dateValue.length() == YEAR_DATE_SIZE) {
+			strBuf.append(PEPSValues.LAST_MONTH.toString());
+		}
+		// if the IdP provides the year and the month then we must fullfil the
+		// date.
+		if (dateValue.length() == MONTH_DATE_SIZE || strBuf.length() == MONTH_DATE_SIZE) {
+			// IdP doesn't provide the day, so we will use DateTime to
+			// calculate it.
+			final String noDayCons = PEPSValues.NO_DAY_DATE_FORMAT.toString();
+			final DateTimeFormatter fmt = DateTimeFormat.forPattern(noDayCons);
+			final DateTime dateTime = fmt.parseDateTime(strBuf.toString());
+			// Append the last month's day.
+			strBuf.append(dateTime.dayOfMonth().withMaximumValue().getDayOfMonth());
+		}
+
+		return strBuf.toString();
+	}
+
+	/**
+	 * Validates the dateValue format: a) if has a valid size; b) if has a numeric value; Note: dateValue must have the format yyyyMMdd.
+	 * 
+	 * @param dateValueTmp
+	 *            The date to be validated.
+	 * @param pattern
+	 *            The accepted date format.
+	 * 
+	 * @return true if the date has a valid format.
+	 */
+	public static boolean isValidFormatDate(final String dateValueTmp, final String pattern) {
+
+		boolean retVal = true;
+		try {
+			final String dateValue = DateUtil.fulfilDate(dateValueTmp);
+
+			final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern);
+			fmt.parseDateTime(dateValue);
+		} catch (final Exception e) {
+			// We catch Exception because we only have to return false
+			// value!
+			retVal = false;
+		}
+		return retVal;
+	}
+
+	/**
+	 * Calculates the age for a given date string.
+	 * 
+	 * @param dateVal
+	 *            The date to be validated.
+	 * @param now
+	 *            The current date.
+	 * @param pattern
+	 *            The date pattern.
+	 * 
+	 * @return The age value.
+	 */
+	public static int calculateAge(final String dateVal, final DateTime now, final String pattern) {
+
+		if (DateUtil.isValidFormatDate(dateVal, pattern)) {
+			try {
+				final String dateValueTemp = DateUtil.fulfilDate(dateVal);
+				final DateTimeFormatter fmt = DateTimeFormat.forPattern(pattern);
+				final DateTime dateTime = fmt.parseDateTime(dateValueTemp);
+				// Calculating age
+				final Years age = Years.yearsBetween(dateTime, now);
+
+				return age.getYears();
+			} catch (final IllegalArgumentException e) {
+				LOG.warn("Invalid date format (" + pattern + ") or an invalid dateValue.");
+				throw new SecurityPEPSException(PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()), PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage()), e);
+			}
+		} else {
+			LOG.warn("Couldn't calculate Age, invalid date!");
+			throw new SecurityPEPSException(PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorCode()), PEPSUtil.getConfig(PEPSErrors.INVALID_ATTRIBUTE_VALUE.errorMessage()));
+		}
+
+	}
+
+	/**
+	 * Generates the current timestamp.
+	 * 
+	 * @return timestamp The current timestamp
+	 */
+	public static Timestamp currentTimeStamp() {
+		final GregorianCalendar cal = new GregorianCalendar();
+		final long millis = cal.getTimeInMillis();
+		return new Timestamp(millis);
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java
index b13c70f04..bdcf58fec 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeListProcessor.java
@@ -13,136 +13,191 @@ import java.util.Map;
  * @see IPersonalAttributeList
  */
 public interface IAttributeListProcessor {
-  
-  /**
-   * Checks if attribute list only contains allowed attributes.
-   * 
-   * @param attrList the requested attribute list
-   * @param attributes the allowed attributes
-   * 
-   * @return true is all the attributes are allowed.
-   * 
-   * @see IPersonalAttributeList
-   */
-  boolean hasAllowedAttributes(final IPersonalAttributeList attrList, final List<String> attributes);
-  
-  /**
-   * Lookup for business attribute.
-   * 
-   * @param attrList the requested attribute list
-   * @param normalAttributes the normal attributes
-   * 
-   * @return true is at least one business attribute was requested.
-   * 
-   * @see IPersonalAttributeList
-   */
-  boolean hasBusinessAttributes(final IPersonalAttributeList attrList, final List<String> normalAttributes);
-  
-  /**
-   * Lookup for business attribute in normal attribute list (loaded by
-   * implementation).
-   * 
-   * @param attrList the requested attribute list
-   * 
-   * @return true is at least one business attribute was requested.
-   * 
-   * @see IPersonalAttributeList
-   */
-  boolean hasBusinessAttributes(final IPersonalAttributeList attrList);
-  
-  /**
-   * Adds eIdentifier, name, surname, and DateOfBirth attributes to get business
-   * attributes from some AP.
-   * 
-   * @param attrList the requested attribute list
-   * @param attributes the list of attributes to add (eIdentifier, name,
-   *          surname, and DateOfBirth).
-   * 
-   * @return the requested attribute list and the new attributes added
-   *         (eIdentifier, name, surname, and DateOfBirth).
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList, final List<String> attributes);
-  
-  /**
-   * Adds eIdentifier, name, surname, and DateOfBirth attributes, loaded by
-   * implementation, to get business attributes from some AP.
-   * 
-   * @param attrList the requested attribute list
-   * 
-   * @return the requested attribute list and the new attributes added
-   *         (eIdentifier, name, surname, and DateOfBirth).
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList);
-  
-  /**
-   * Removes from attribute list the given list of attributes.
-   * 
-   * @param attrList the requested attribute list
-   * @param attributes the list of attributes to remove.
-   * 
-   * @return the requested attribute list and the attributes removed.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList removeAPMandatoryAttributes(final IPersonalAttributeList attrList, final List<String> attributes);
-  
-  /**
-   * Removes from attribute list the given list of attributes and change
-   * attributes status if attribute was optional in the request.
-   * 
-   * @param attrList the requested attribute list
-   * @param attributes the map of attributes (attribute name, mandatory/optional) to remove.
-   * 
-   * @return the requested attribute list and the attributes removed
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList removeAPMandatoryAttributes(IPersonalAttributeList attrList, Map<String, Boolean> attributes);
-  
-  /**
-   * Checks if mandate attribute exist in the requested Attribute List. Power
-   * attribute name to lookup is loaded by implementation.
-   * 
-   * @param attrList the requested attribute list.
-   * 
-   * @return true if mandate attribute exists or false otherwise.
-   * 
-   * @see IPersonalAttributeList
-   */
-  boolean hasPowerAttribute(final IPersonalAttributeList attrList);
-  
-  /**
-   * Checks if attribute name was requested and has value.
-   * 
-   * @param attrList the requested attribute list.
-   * @param attrName the attribute name to lookup for .
-   * 
-   * @return true if attribute was requested and has value or false otherwise.
-   * 
-   * @see IPersonalAttributeList
-   */
-  boolean hasAttributeValue(final IPersonalAttributeList attrList, final String attrName);
-  
-  /**
-   * Checks if attribute has value.
-   * 
-   * @param attr the attribute to check.
-   * 
-   * @return true if has value;
-   * 
-   * @see PersonalAttribute
-   */
-  boolean hasAttributeValue(final PersonalAttribute attr);
-  
-  /**
-   * Gets a map (attribute name, attribute isRequired) of attributes added to attribute list.
-   * 
-   * @return the Map of attributes added and if is required to attribute list.
-   */
-  Map<String, Boolean> getNormalAttributesAdded();
-
-}
\ No newline at end of file
+
+	/**
+	 * Checks if attribute list only contains allowed attributes.
+	 * 
+	 * @param attrList
+	 *            the requested attribute list
+	 * @param attributes
+	 *            the allowed attributes
+	 * 
+	 * @return true is all the attributes are allowed.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	boolean hasAllowedAttributes(final IPersonalAttributeList attrList, final List<String> attributes);
+
+	/**
+	 * Lookup for business attribute.
+	 * 
+	 * @param attrList
+	 *            the requested attribute list
+	 * @param normalAttributes
+	 *            the normal attributes
+	 * 
+	 * @return true is at least one business attribute was requested.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	boolean hasBusinessAttributes(final IPersonalAttributeList attrList, final List<String> normalAttributes);
+
+	/**
+	 * Lookup for business attribute in normal attribute list (loaded by implementation).
+	 * 
+	 * @param attrList
+	 *            the requested attribute list
+	 * 
+	 * @return true is at least one business attribute was requested.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	boolean hasBusinessAttributes(final IPersonalAttributeList attrList);
+
+	/**
+	 * Adds eIdentifier, name, surname, and DateOfBirth attributes to get business attributes from some AP.
+	 * 
+	 * @param attrList
+	 *            the requested attribute list
+	 * @param attributes
+	 *            the list of attributes to add (eIdentifier, name, surname, and DateOfBirth).
+	 * 
+	 * @return the requested attribute list and the new attributes added (eIdentifier, name, surname, and DateOfBirth).
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList, final List<String> attributes);
+
+	/**
+	 * Adds eIdentifier, name, surname, and DateOfBirth attributes, loaded by implementation, to get business attributes from some AP.
+	 * 
+	 * @param attrList
+	 *            the requested attribute list
+	 * 
+	 * @return the requested attribute list and the new attributes added (eIdentifier, name, surname, and DateOfBirth).
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList addAPMandatoryAttributes(final IPersonalAttributeList attrList);
+
+	/**
+	 * Removes from attribute list the given list of attributes.
+	 * 
+	 * @param attrList
+	 *            the requested attribute list
+	 * @param attributes
+	 *            the list of attributes to remove.
+	 * 
+	 * @return the requested attribute list and the attributes removed.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList removeAPMandatoryAttributes(final IPersonalAttributeList attrList, final List<String> attributes);
+
+	/**
+	 * Removes from attribute list the given list of attributes and change attributes status if attribute was optional in the request.
+	 * 
+	 * @param attrList
+	 *            the requested attribute list
+	 * @param attributes
+	 *            the map of attributes (attribute name, mandatory/optional) to remove.
+	 * 
+	 * @return the requested attribute list and the attributes removed
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList removeAPMandatoryAttributes(IPersonalAttributeList attrList, Map<String, Boolean> attributes);
+
+	/**
+	 * Removes from attribute list the Stork list of attributes.
+	 *
+	 * @param attrList
+	 *            the requested attribute list
+	 *
+	 * @return the attribute list without rejected attributes.
+	 *
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList removeAPRejectedAttributes(IPersonalAttributeList attrList);
+
+	/**
+	 * Checks if mandate attribute exist in the requested Attribute List. Power attribute name to lookup is loaded by implementation.
+	 * 
+	 * @param attrList
+	 *            the requested attribute list.
+	 * 
+	 * @return true if mandate attribute exists or false otherwise.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	boolean hasPowerAttribute(final IPersonalAttributeList attrList);
+
+	/**
+	 * Checks if attribute name was requested and has value.
+	 * 
+	 * @param attrList
+	 *            the requested attribute list.
+	 * @param attrName
+	 *            the attribute name to lookup for .
+	 * 
+	 * @return true if attribute was requested and has value or false otherwise.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	boolean hasAttributeValue(final IPersonalAttributeList attrList, final String attrName);
+
+	/**
+	 * Checks if attribute has value.
+	 * 
+	 * @param attr
+	 *            the attribute to check.
+	 * 
+	 * @return true if has value;
+	 * 
+	 * @see PersonalAttribute
+	 */
+	boolean hasAttributeValue(final PersonalAttribute attr);
+
+	/**
+	 * Gets a map (attribute name, attribute isRequired) of attributes added to attribute list.
+	 * 
+	 * @return the Map of attributes added and if is required to attribute list.
+	 */
+	Map<String, Boolean> getNormalAttributesAdded();
+
+	/**
+	 * Adds normal attributes to personal attribute list if exist in original list (allAttrList).
+	 *
+	 * @param attrList
+	 *            the list which will be updated
+	 * @param allAttrList
+	 *            the list to check if attributes are to be included.
+	 *
+	 *
+	 * @return the attributes list updated.
+	 */
+	IPersonalAttributeList addNormalAttributes(IPersonalAttributeList attrList, IPersonalAttributeList allAttrList);
+
+	/**
+	 * Updates list by filtering any attribute that must be requested instead of using a value obtained from cache (business and legal attrs)
+	 *
+	 * @param attrList
+	 *            the list which will be updated
+	 * @return the filtered list
+	 */
+	IPersonalAttributeList filterAttrList(IPersonalAttributeList attrList);
+
+	/**
+	 * Updates the list of cached attrs by inserting the business and/or legal attrs requested by the user
+	 *
+	 * @param cachedAttrList
+	 * @param requestedAttrsList
+	 */
+	void updateAttrList(IPersonalAttributeList cachedAttrList, IPersonalAttributeList requestedAttrsList);
+
+	/**
+	 * Verifies if normal attribute list contains any attribute that we must always request (usually business attributes)
+	 */
+	boolean hasAlwaysRequestAttributes(IPersonalAttributeList attributeList);
+
+}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java
index 733399ca3..cc5fe977f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IAttributeProvidersMap.java
@@ -10,73 +10,79 @@ import java.util.Iterator;
  * @version $Revision: 1.00 $, $Date: 2013-09-20 $

  */

 public interface IAttributeProvidersMap {

-  

-  /**

-   * Returns the object associated the the given key.

-   * 

-   * @param key with which the specified value is to be associated.

-   * 

-   * @return The object associated the the given key.

-   */

-  IPersonalAttributeList get(AttributeSource key);

-  

-  /**

-   * Associates a key to a value, and inserts them in the session object.

-   * 

-   * @param key with which the specified value is to be associated.

-   * @param value to be associated with the specified key.

-   * 

-   * @return previous value associated with specified key, or null if there was

-   *         no mapping for key. A null return can also indicate that the map

-   *         previously associated null with the specified key.

-   */

-  Object put(AttributeSource key, IPersonalAttributeList value);

-  

-  /**

-   * Removes the mapping for this key.

-   * 

-   * @param key with which the specified value is to be associated.

-   * 

-   * @return previous value associated with specified key, or null if there was

-   *         no mapping for key. A null return can also indicate that the map

-   *         previously associated null with the specified key.

-   */

-  IPersonalAttributeList remove(AttributeSource key);

-  

-  /**

-   * Returns the number of key-value mappings in this map.

-   * 

-   * @return the number of key-value mappings in this map.

-   */

-  int size();

-  

-  /**

-   * Returns true if this map contains a mapping for the specified key.

-   * 

-   * @param key with which the specified value is to be associated.

-   * 

-   * @return true if this map contains a mapping for the specified key.

-   */

-  boolean containsKey(AttributeSource key);

-  

-  /**

-   * Removes all mappings from this map.

-   */

-  void clear();

-  

-  /**

-   * Returns true if this map contains no key-value mappings.

-   * 

-   * @return true if this map contains no key-value mappings.

-   */

-  boolean isEmpty();

 

-  /**

-   * Returns an Iterator of the keys contained in this map. The implementation must

-   * take care in order for the Iterator to have predictable order of the returned

-   * keys.

-   *

-   * @return an iterator of the keys contained in this map

-   */

-  Iterator<AttributeSource> keyIterator();

+	/**

+	 * Returns the object associated the the given key.

+	 * 

+	 * @param key

+	 *            with which the specified value is to be associated.

+	 * 

+	 * @return The object associated the the given key.

+	 */

+	IPersonalAttributeList get(AttributeSource key);

+

+	/**

+	 * Associates a key to a value, and inserts them in the session object.

+	 * 

+	 * @param key

+	 *            with which the specified value is to be associated.

+	 * @param value

+	 *            to be associated with the specified key.

+	 * 

+	 * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null with the specified key.

+	 */

+	Object put(AttributeSource key, IPersonalAttributeList value);

+

+	/**

+	 * Removes the mapping for this key.

+	 * 

+	 * @param key

+	 *            with which the specified value is to be associated.

+	 * 

+	 * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null with the specified key.

+	 */

+	IPersonalAttributeList remove(AttributeSource key);

+

+	/**

+	 * Returns the number of key-value mappings in this map.

+	 * 

+	 * @return the number of key-value mappings in this map.

+	 */

+	int size();

+

+	/**

+	 * Returns true if this map contains a mapping for the specified key.

+	 * 

+	 * @param key

+	 *            with which the specified value is to be associated.

+	 * 

+	 * @return true if this map contains a mapping for the specified key.

+	 */

+	boolean containsKey(AttributeSource key);

+

+	/**

+	 * Removes all mappings from this map.

+	 */

+	void clear();

+

+	/**

+	 * Returns true if this map contains no key-value mappings.

+	 * 

+	 * @return true if this map contains no key-value mappings.

+	 */

+	boolean isEmpty();

+

+	/**

+	 * Returns an Iterator of the keys contained in this map. The implementation must take care in order for the Iterator to have predictable order of the returned keys.

+	 *

+	 * @return an iterator of the keys contained in this map

+	 */

+	Iterator<AttributeSource> keyIterator();

+

+	/**

+	 * Merges this Attribute Providers Map with another providers map changes the contents of this map so it returns null

+	 *

+	 * @param aPMap

+	 */

+	void mergeWith(IAttributeProvidersMap aPMap);

 }

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java
index b24c915c0..7eb788461 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IPersonalAttributeList.java
@@ -20,175 +20,179 @@ import java.util.Set;
 /**
  * Interface for {@link PersonalAttributeList}.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.16 $, $Date: 2010-11-17 05:15:28 $
  * 
  * @see PersonalAttribute
  */
 @SuppressWarnings("PMD.CloneMethodMustImplementCloneable")
-public interface IPersonalAttributeList extends Iterable<PersonalAttribute>,
-  Cloneable {
-  
-  /**
-   * Associates the specified value with the specified key in this Personal
-   * Attribute List.
-   * 
-   * @param key with which the specified value is to be associated.
-   * @param value to be associated with the specified key.
-   * 
-   * @return the previous value associated with key, or null if there was no
-   *         mapping for key.
-   * 
-   * @see PersonalAttribute
-   */
-  PersonalAttribute put(String key, PersonalAttribute value);
-  
-  /**
-   * Returns the value to which the specified key is mapped, or null if this map
-   * contains no mapping for the key.
-   * 
-   * @param key whose associated value is to be returned.
-   * 
-   * @return The value to which the specified key is mapped, or null if this map
-   *         contains no mapping for the key.
-   * 
-   * @see PersonalAttribute
-   */
-  PersonalAttribute get(Object key);
-  
-  /**
-   * Adds to the PersonalAttributeList the given PersonalAttribute. It sets the
-   * attribute name as the key to the attribute value.
-   * 
-   * @param value PersonalAttribute to add to the PersonalAttributeList
-   */
-  void add(PersonalAttribute value);
-  
-  /**
-   * Get the size of the Personal Attribute List.
-   * 
-   * @return size of the Personal Attribute List.
-   */
-  int size();
-  
-  /**
-   * Checks if the Personal Attribute List contains the given key.
-   * 
-   * @param key with which the specified value is to be associated.
-   * 
-   * @return true if the Personal Attribute List contains the given key, false
-   *         otherwise.
-   */
-  boolean containsKey(Object key);
-  
-  /**
-   * Getter for the iterator of the Personal Attribute List values.
-   * 
-   * @return The iterator for the Personal Attribute List values.
-   * 
-   * @see PersonalAttribute
-   */
-  Iterator<PersonalAttribute> iterator();
-  
-  /**
-   * Creates a Personal Attribute List from a String representing an Attribute
-   * List.
-   * 
-   * @param attrList String Object representing the attribute list.
-   */
-  void populate(String attrList);
-  
-  /**
-   * Removes the mapping for this key from this map if present.
-   * 
-   * @param key key whose mapping is to be removed from the map.
-   * @return previous value associated with specified key, or <tt>null</tt> if
-   *         there was no mapping for key. A <tt>null</tt> return can also
-   *         indicate that the map previously associated <tt>null</tt> with the
-   *         specified key.
-   */
-  PersonalAttribute remove(Object key);
-  
-  /**
-   * Returns a collection view of the values contained in this map. The
-   * collection is backed by the map, so changes to the map are reflected in the
-   * collection, and vice-versa. The collection supports element removal, which
-   * removes the corresponding mapping from this map, via the
-   * <tt>Iterator.remove</tt>, <tt>Collection.remove</tt>, <tt>removeAll</tt>,
-   * <tt>retainAll</tt>, and <tt>clear</tt> operations. It does not support the
-   * <tt>add</tt> or <tt>addAll</tt> operations.
-   * 
-   * @return a collection view of the values contained in this map.
-   */
-  Collection<PersonalAttribute> values();
-  
-  /**
-   * Returns a {@link Set} view of the keys contained in this map.
-   * The set is backed by the map, so changes to the map are
-   * reflected in the set, and vice-versa.  If the map is modified
-   * while an iteration over the set is in progress (except through
-   * the iterator's own <tt>remove</tt> operation), the results of
-   * the iteration are undefined.  The set supports element removal,
-   * which removes the corresponding mapping from the map, via the
-   * <tt>Iterator.remove</tt>, <tt>Set.remove</tt>,
-   * <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt>
-   * operations.  It does not support the <tt>add</tt> or <tt>addAll</tt>
-   * operations.
-   *
-   * @return a set view of the keys contained in this map
-   */
-  Set<String> keySet();
-  
-  
-  /**
-   * Returns a IPersonalAttributeList of the complex attributes.
-   * 
-   * @return an IPersonalAttributeList of the complex attributes.
-   */
-  IPersonalAttributeList getComplexAttributes();
-  
-  /**
-   * Returns a IPersonalAttributeList of the simple value attributes.
-   * 
-   * @return an IPersonalAttributeList of the simple value attributes.
-   */
-  IPersonalAttributeList getSimpleValueAttributes();
-  
-  /**
-   * Returns a IPersonalAttributeList of the mandatory attributes in this map.
-   * 
-   * @return an IPersonalAttributeList of the mandatory attributes contained in this map.
-   */
-  IPersonalAttributeList getMandatoryAttributes();
-  
-  /**
-   * Returns a IPersonalAttributeList of the optional attributes in this map.
-   * 
-   * @return an IPersonalAttributeList of the optional attributes contained in this map.
-   */
-  IPersonalAttributeList getOptionalAttributes();
-  
-  /**
-   * Returns <tt>true</tt> if this map contains no key-value mappings.
-   * 
-   * @return <tt>true</tt> if this map contains no key-value mappings.
-   */
-  boolean isEmpty();
-  
-  /**
-   * Returns <tt>true</tt> if this map contains at least one element that doesn't have value.
-   * 
-   * @return <tt>true</tt> if this map contains at least one element that doesn't have value.
-   */
-  boolean hasMissingValues();
-
-  /**
-   * Returns a copy of this <tt>IPersonalAttributeList</tt> instance.
-   *
-   * @return The copy of this IPersonalAttributeList.
-   */
-  Object clone() throws CloneNotSupportedException;
-  
+public interface IPersonalAttributeList extends Iterable<PersonalAttribute>, Cloneable {
+
+	/**
+	 * Associates the specified value with the specified key in this Personal Attribute List.
+	 * 
+	 * @param key
+	 *            with which the specified value is to be associated.
+	 * @param value
+	 *            to be associated with the specified key.
+	 * 
+	 * @return the previous value associated with key, or null if there was no mapping for key.
+	 * 
+	 * @see PersonalAttribute
+	 */
+	PersonalAttribute put(String key, PersonalAttribute value);
+
+	/**
+	 * Replaces the specified value with the specified key in this Personal Attribute List.
+	 *
+	 * @param key
+	 *            with which the specified value is to be replaced.
+	 * @param value
+	 *            to be associated with the specified key.
+	 *
+	 * @return the previous value associated with key, or null if there was no mapping for key.
+	 *
+	 * @see PersonalAttribute
+	 */
+	PersonalAttribute replace(String key, PersonalAttribute value);
+
+	/**
+	 * Returns the value to which the specified key is mapped, or null if this map contains no mapping for the key.
+	 * 
+	 * @param key
+	 *            whose associated value is to be returned.
+	 * 
+	 * @return The value to which the specified key is mapped, or null if this map contains no mapping for the key.
+	 * 
+	 * @see PersonalAttribute
+	 */
+	PersonalAttribute get(Object key);
+
+	/**
+	 * Adds to the PersonalAttributeList the given PersonalAttribute. It sets the attribute name as the key to the attribute value.
+	 * 
+	 * @param value
+	 *            PersonalAttribute to add to the PersonalAttributeList
+	 */
+	void add(PersonalAttribute value);
+
+	/**
+	 * Get the size of the Personal Attribute List.
+	 * 
+	 * @return size of the Personal Attribute List.
+	 */
+	int size();
+
+	/**
+	 * Checks if the Personal Attribute List contains the given key.
+	 * 
+	 * @param key
+	 *            with which the specified value is to be associated.
+	 * 
+	 * @return true if the Personal Attribute List contains the given key, false otherwise.
+	 */
+	boolean containsKey(Object key);
+
+	/**
+	 * Getter for the iterator of the Personal Attribute List values.
+	 * 
+	 * @return The iterator for the Personal Attribute List values.
+	 * 
+	 * @see PersonalAttribute
+	 */
+	Iterator<PersonalAttribute> iterator();
+
+	/**
+	 * Creates a Personal Attribute List from a String representing an Attribute List.
+	 * 
+	 * @param attrList
+	 *            String Object representing the attribute list.
+	 */
+	void populate(String attrList);
+
+	/**
+	 * Removes the mapping for this key from this map if present.
+	 * 
+	 * @param key
+	 *            key whose mapping is to be removed from the map.
+	 * @return previous value associated with specified key, or <tt>null</tt> if there was no mapping for key. A <tt>null</tt> return can also indicate that the map previously associated <tt>null</tt>
+	 *         with the specified key.
+	 */
+	PersonalAttribute remove(Object key);
+
+	/**
+	 * Returns a collection view of the values contained in this map. The collection is backed by the map, so changes to the map are reflected in the collection, and vice-versa. The collection
+	 * supports element removal, which removes the corresponding mapping from this map, via the <tt>Iterator.remove</tt>, <tt>Collection.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and
+	 * <tt>clear</tt> operations. It does not support the <tt>add</tt> or <tt>addAll</tt> operations.
+	 * 
+	 * @return a collection view of the values contained in this map.
+	 */
+	Collection<PersonalAttribute> values();
+
+	/**
+	 * Returns a {@link Set} view of the keys contained in this map. The set is backed by the map, so changes to the map are reflected in the set, and vice-versa. If the map is modified while an
+	 * iteration over the set is in progress (except through the iterator's own <tt>remove</tt> operation), the results of the iteration are undefined. The set supports element removal, which removes
+	 * the corresponding mapping from the map, via the <tt>Iterator.remove</tt>, <tt>Set.remove</tt>, <tt>removeAll</tt>, <tt>retainAll</tt>, and <tt>clear</tt> operations. It does not support the
+	 * <tt>add</tt> or <tt>addAll</tt> operations.
+	 *
+	 * @return a set view of the keys contained in this map
+	 */
+	Set<String> keySet();
+
+	/**
+	 * Returns a IPersonalAttributeList of the complex attributes.
+	 * 
+	 * @return an IPersonalAttributeList of the complex attributes.
+	 */
+	IPersonalAttributeList getComplexAttributes();
+
+	/**
+	 * Returns a IPersonalAttributeList of the simple value attributes.
+	 * 
+	 * @return an IPersonalAttributeList of the simple value attributes.
+	 */
+	IPersonalAttributeList getSimpleValueAttributes();
+
+	/**
+	 * Returns a IPersonalAttributeList of the mandatory attributes in this map.
+	 * 
+	 * @return an IPersonalAttributeList of the mandatory attributes contained in this map.
+	 */
+	IPersonalAttributeList getMandatoryAttributes();
+
+	/**
+	 * Returns a IPersonalAttributeList merged with provided one.
+	 *
+	 * @return an IPersonalAttributeList the attribute list to merge with.
+	 */
+	IPersonalAttributeList merge(IPersonalAttributeList attrList);
+
+	/**
+	 * Returns a IPersonalAttributeList of the optional attributes in this map.
+	 * 
+	 * @return an IPersonalAttributeList of the optional attributes contained in this map.
+	 */
+	IPersonalAttributeList getOptionalAttributes();
+
+	/**
+	 * Returns <tt>true</tt> if this map contains no key-value mappings.
+	 * 
+	 * @return <tt>true</tt> if this map contains no key-value mappings.
+	 */
+	boolean isEmpty();
+
+	/**
+	 * Returns <tt>true</tt> if this map contains at least one element that doesn't have value.
+	 * 
+	 * @return <tt>true</tt> if this map contains at least one element that doesn't have value.
+	 */
+	boolean hasMissingValues();
+
+	/**
+	 * Returns a copy of this <tt>IPersonalAttributeList</tt> instance.
+	 *
+	 * @return The copy of this IPersonalAttributeList.
+	 */
+	Object clone();
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkLogger.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkLogger.java
index 33eb618f0..1bb8cffa8 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkLogger.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkLogger.java
@@ -16,224 +16,234 @@ package eu.stork.peps.auth.commons;
 /**
  * Interface for stork logging.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.10 $, $Date: 2011-02-17 22:44:34 $
  */
 public interface IStorkLogger {
-  
-  /**
-   * Getter for SpApplication.
-   * 
-   * @return The SpApplication value.
-   */
-  String getSpApplication();
-  
-  /**
-   * Setter for SpApplication.
-   * 
-   * @param spApplication The SP Application.
-   */
-  void setSpApplication(String spApplication);
-  
-  /**
-   * Getter for ProviderName.
-   * 
-   * @return The ProviderName value.
-   */
-  String getProviderName();
-  
-  /**
-   * Setter for ProviderName.
-   * 
-   * @param providerName The provider name.
-   */
-  void setProviderName(String providerName);
-  
-  /**
-   * 
-   * Getter for Origin.
-   * 
-   * @return The Origin value.
-   * 
-   */
-  String getOrigin();
-  
-  /**
-   * Setter for Origin.
-   * 
-   * @param origin The origin.
-   */
-  void setOrigin(String origin);
-  
-  /**
-   * 
-   * Getter for QAA Level.
-   * 
-   * @return The QAA Level value.
-   * 
-   */
-  int getQaaLevel();
-  
-  /**
-   * Setter for QAA Level.
-   * 
-   * @param qaaLevel The qaa level.
-   */
-  void setQaaLevel(int qaaLevel);
-  
-  /**
-   * 
-   * Getter for timestamp.
-   * 
-   * @return The timestamp value.
-   * 
-   */
-  String getTimestamp();
-  
-  /**
-   * Setter for timestamp.
-   * 
-   * @param timestamp The request's timestamp.
-   */
-  void setTimestamp(String timestamp);
-  
-  /**
-   * Getter for InResponseTo.
-   * 
-   * @return The InResponseTo value.
-   */
-  String getInResponseTo();
-  
-  /**
-   * Setter for InResponseTo.
-   * 
-   * @param inResponseTo The Saml's response id.
-   */
-  void setInResponseTo(String inResponseTo);
-  
-  /**
-   * Getter for InResponseToSPReq.
-   * 
-   * @return The InResponseToSPReq value.
-   */
-  String getInResponseToSPReq();
-  
-  /**
-   * Setter for InResponseToSPRequ.
-   * 
-   * @param inResponseToSPReq The Saml's response id.
-   */
-  void setInResponseToSPReq(String inResponseToSPReq);
-  
-  /**
-   * Getter for opType.
-   * 
-   * @return The opType value.
-   */
-  String getOpType();
-  
-  /**
-   * Setter for opType.
-   * 
-   * @param opType The operation type.
-   */
-  void setOpType(String opType);
-  
-  /**
-   * Getter for destination.
-   * 
-   * @return The destination value.
-   */
-  String getDestination();
-  
-  /**
-   * Setter for destinationIp.
-   * 
-   * @param destination The remote IP.
-   */
-  void setDestination(String destination);
-  
-  /**
-   * Getter for message or assertion consumer.
-   * 
-   * @return The message or assertion consumer.
-   */
-  String getMessage();
-  
-  /**
-   * Setter for message or assertion consumer.
-   * 
-   * @param message or assertion consumer.
-   */
-  void setMessage(String message);
-  
-  /**
-   * Getter for country.
-   * 
-   * @return The country value.
-   */
-  String getCountry();
-  
-  /**
-   * Setter for country.
-   * 
-   * @param country The country.
-   */
-  void setCountry(String country);
-  
-  /**
-   * Getter for samlHash.
-   * 
-   * @return The samlHash value.
-   */
-  byte[] getSamlHash();
-  
-  /**
-   * Setter for samlHash.
-   * 
-   * @param samlHash the encrypted SAML token
-   */
-  void setSamlHash(byte[] samlHash);
-  
-  /**
-   * Getter for msgId.
-   * 
-   * @return the msgId
-   */
-  String getMsgId();
-  
-  /**
-   * Setter for msgId.
-   * 
-   * @param msgId the ID of the originator of this message
-   */
-  void setMsgId(String msgId);
-  
-  /**
-   * Getter for sPMsgId.
-   * 
-   * @return the sPMsgId
-   */
-  String getSPMsgId();
-  
-  /**
-   * Setter for sPMsgId.
-   * 
-   * @param sPMsgId the ID of the originator of this message
-   */
-  void setSPMsgId(String sPMsgId);
-  
-  /**
-   * The format of the returned String must be the following:
-   * "requestCounter#ddMMMyyyykk:mm:ss#opType#originIp#originName
-   * #destinationIp#destinationName#samlHash#[originatorName#msgId#]"
-   * 
-   * The values enclosed in '[]' only apply when logging responses.
-   * 
-   * @return {@inheritDoc}
-   */
-  @Override
-  String toString();
+
+	/**
+	 * Getter for SpApplication.
+	 * 
+	 * @return The SpApplication value.
+	 */
+	String getSpApplication();
+
+	/**
+	 * Setter for SpApplication.
+	 * 
+	 * @param spApplication
+	 *            The SP Application.
+	 */
+	void setSpApplication(String spApplication);
+
+	/**
+	 * Getter for ProviderName.
+	 * 
+	 * @return The ProviderName value.
+	 */
+	String getProviderName();
+
+	/**
+	 * Setter for ProviderName.
+	 * 
+	 * @param providerName
+	 *            The provider name.
+	 */
+	void setProviderName(String providerName);
+
+	/**
+	 * 
+	 * Getter for Origin.
+	 * 
+	 * @return The Origin value.
+	 * 
+	 */
+	String getOrigin();
+
+	/**
+	 * Setter for Origin.
+	 * 
+	 * @param origin
+	 *            The origin.
+	 */
+	void setOrigin(String origin);
+
+	/**
+	 * 
+	 * Getter for QAA Level.
+	 * 
+	 * @return The QAA Level value.
+	 * 
+	 */
+	int getQaaLevel();
+
+	/**
+	 * Setter for QAA Level.
+	 * 
+	 * @param qaaLevel
+	 *            The qaa level.
+	 */
+	void setQaaLevel(int qaaLevel);
+
+	/**
+	 * 
+	 * Getter for timestamp.
+	 * 
+	 * @return The timestamp value.
+	 * 
+	 */
+	String getTimestamp();
+
+	/**
+	 * Setter for timestamp.
+	 * 
+	 * @param timestamp
+	 *            The request's timestamp.
+	 */
+	void setTimestamp(String timestamp);
+
+	/**
+	 * Getter for InResponseTo.
+	 * 
+	 * @return The InResponseTo value.
+	 */
+	String getInResponseTo();
+
+	/**
+	 * Setter for InResponseTo.
+	 * 
+	 * @param inResponseTo
+	 *            The Saml's response id.
+	 */
+	void setInResponseTo(String inResponseTo);
+
+	/**
+	 * Getter for InResponseToSPReq.
+	 * 
+	 * @return The InResponseToSPReq value.
+	 */
+	String getInResponseToSPReq();
+
+	/**
+	 * Setter for InResponseToSPRequ.
+	 * 
+	 * @param inResponseToSPReq
+	 *            The Saml's response id.
+	 */
+	void setInResponseToSPReq(String inResponseToSPReq);
+
+	/**
+	 * Getter for opType.
+	 * 
+	 * @return The opType value.
+	 */
+	String getOpType();
+
+	/**
+	 * Setter for opType.
+	 * 
+	 * @param opType
+	 *            The operation type.
+	 */
+	void setOpType(String opType);
+
+	/**
+	 * Getter for destination.
+	 * 
+	 * @return The destination value.
+	 */
+	String getDestination();
+
+	/**
+	 * Setter for destinationIp.
+	 * 
+	 * @param destination
+	 *            The remote IP.
+	 */
+	void setDestination(String destination);
+
+	/**
+	 * Getter for message or assertion consumer.
+	 * 
+	 * @return The message or assertion consumer.
+	 */
+	String getMessage();
+
+	/**
+	 * Setter for message or assertion consumer.
+	 * 
+	 * @param message
+	 *            or assertion consumer.
+	 */
+	void setMessage(String message);
+
+	/**
+	 * Getter for country.
+	 * 
+	 * @return The country value.
+	 */
+	String getCountry();
+
+	/**
+	 * Setter for country.
+	 * 
+	 * @param country
+	 *            The country.
+	 */
+	void setCountry(String country);
+
+	/**
+	 * Getter for samlHash.
+	 * 
+	 * @return The samlHash value.
+	 */
+	byte[] getSamlHash();
+
+	/**
+	 * Setter for samlHash.
+	 * 
+	 * @param samlHash
+	 *            the encrypted SAML token
+	 */
+	void setSamlHash(byte[] samlHash);
+
+	/**
+	 * Getter for msgId.
+	 * 
+	 * @return the msgId
+	 */
+	String getMsgId();
+
+	/**
+	 * Setter for msgId.
+	 * 
+	 * @param msgId
+	 *            the ID of the originator of this message
+	 */
+	void setMsgId(String msgId);
+
+	/**
+	 * Getter for sPMsgId.
+	 * 
+	 * @return the sPMsgId
+	 */
+	String getSPMsgId();
+
+	/**
+	 * Setter for sPMsgId.
+	 * 
+	 * @param sPMsgId
+	 *            the ID of the originator of this message
+	 */
+	void setSPMsgId(String sPMsgId);
+
+	/**
+	 * The format of the returned String must be the following: "requestCounter#ddMMMyyyykk:mm:ss#opType#originIp#originName #destinationIp#destinationName#samlHash#[originatorName#msgId#]"
+	 * 
+	 * The values enclosed in '[]' only apply when logging responses.
+	 * 
+	 * @return {@inheritDoc}
+	 */
+	@Override
+	String toString();
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java
index f38b41838..33105c58f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/IStorkSession.java
@@ -16,70 +16,69 @@ package eu.stork.peps.auth.commons;
 /**
  * Interface for stork session.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.9 $, $Date: 2010-11-17 05:15:28 $
  */
 public interface IStorkSession {
-  
-  /**
-   * Returns the object associated the the given key.
-   * 
-   * @param key with which the specified value is to be associated.
-   * 
-   * @return The object associated the the given key.
-   */
-  Object get(Object key);
-  
-  /**
-   * Associates a key to a value, and inserts them in the session object.
-   * 
-   * @param key with which the specified value is to be associated.
-   * @param value to be associated with the specified key.
-   * 
-   * @return previous value associated with specified key, or null if there was
-   *         no mapping for key. A null return can also indicate that the map
-   *         previously associated null with the specified key.
-   */
-  Object put(String key, Object value);
-  
-  /**
-   * Removes the mapping for this key.
-   * 
-   * @param key with which the specified value is to be associated.
-   * 
-   * @return previous value associated with specified key, or null if there was
-   *         no mapping for key. A null return can also indicate that the map
-   *         previously associated null with the specified key.
-   */
-  Object remove(Object key);
-  
-  /**
-   * Returns the number of key-value mappings in this map.
-   * 
-   * @return the number of key-value mappings in this map.
-   */
-  int size();
-  
-  /**
-   * Returns true if this map contains a mapping for the specified key.
-   * 
-   * @param key with which the specified value is to be associated.
-   * 
-   * @return true if this map contains a mapping for the specified key.
-   */
-  boolean containsKey(Object key);
-  
-  /**
-   * Removes all mappings from this map.
-   */
-  void clear();
-  
-  /**
-   * Returns true if this map contains no key-value mappings.
-   * 
-   * @return true if this map contains no key-value mappings.
-   */
-  boolean isEmpty();
+
+	/**
+	 * Returns the object associated the the given key.
+	 * 
+	 * @param key
+	 *            with which the specified value is to be associated.
+	 * 
+	 * @return The object associated the the given key.
+	 */
+	Object get(Object key);
+
+	/**
+	 * Associates a key to a value, and inserts them in the session object.
+	 * 
+	 * @param key
+	 *            with which the specified value is to be associated.
+	 * @param value
+	 *            to be associated with the specified key.
+	 * 
+	 * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null with the specified key.
+	 */
+	Object put(String key, Object value);
+
+	/**
+	 * Removes the mapping for this key.
+	 * 
+	 * @param key
+	 *            with which the specified value is to be associated.
+	 * 
+	 * @return previous value associated with specified key, or null if there was no mapping for key. A null return can also indicate that the map previously associated null with the specified key.
+	 */
+	Object remove(Object key);
+
+	/**
+	 * Returns the number of key-value mappings in this map.
+	 * 
+	 * @return the number of key-value mappings in this map.
+	 */
+	int size();
+
+	/**
+	 * Returns true if this map contains a mapping for the specified key.
+	 * 
+	 * @param key
+	 *            with which the specified value is to be associated.
+	 * 
+	 * @return true if this map contains a mapping for the specified key.
+	 */
+	boolean containsKey(Object key);
+
+	/**
+	 * Removes all mappings from this map.
+	 */
+	void clear();
+
+	/**
+	 * Returns true if this map contains no key-value mappings.
+	 * 
+	 * @return true if this map contains no key-value mappings.
+	 */
+	boolean isEmpty();
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
index 94882de77..f326ccfe9 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
@@ -5,15 +5,14 @@ import java.util.ArrayList;
 import java.util.Iterator;

 import java.util.LinkedHashMap;

 import java.util.List;

+import java.util.Map;

 

 import org.apache.log4j.Logger;

 

 /**

- * This class is a bean used to store the information of Attribute Providers, the Attribute

- * List to be requested, the Assertions returned by the Attribute Providers and the values

- * that each Attribute has. This information along with the current status of the Linker (the

- * attribute providers that were queried and the remaining providers) is used by the PEPS

- * actions in order to complete the Attribute gathering.

+ * This class is a bean used to store the information of Attribute Providers, the Attribute List to be requested, the Assertions returned by the Attribute Providers and the values that each Attribute

+ * has. This information along with the current status of the Linker (the attribute providers that were queried and the remaining providers) is used by the PEPS actions in order to complete the

+ * Attribute gathering.

  * 

  * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)

  *

@@ -38,7 +37,7 @@ public final class Linker implements Serializable {
 	/**

 	 * Assertion map.

 	 */

-	private LinkedHashMap<AttributeSource, STORKAttrQueryResponse> assertions;

+	private Map<AttributeSource, List<STORKAttrQueryResponse>> assertions;

 

 	/**

 	 * The current index of local (domestic) Attribute Providers.

@@ -56,8 +55,8 @@ public final class Linker implements Serializable {
 	public Linker() {

 		localIndex = 0;

 		remoteIndex = 0;

-		

-		assertions = new LinkedHashMap<AttributeSource, STORKAttrQueryResponse>();

+

+		assertions = new LinkedHashMap<AttributeSource, List<STORKAttrQueryResponse>>();

 	}

 

 	/**

@@ -74,13 +73,13 @@ public final class Linker implements Serializable {
 

 		found = null;

 

-		if ( attributeProvidersMap!=null && !attributeProvidersMap.isEmpty() ) {

+		if (attributeProvidersMap != null && !attributeProvidersMap.isEmpty()) {

 			iterator = attributeProvidersMap.keyIterator();

 			while (iterator.hasNext()) {

 				source = iterator.next();

 

-				if ( source.getSourceType()==AttributeSource.SOURCE_LOCAL_APROVIDER ) {

-					if ( curIndex>=localIndex ) {

+				if (source.getSourceType() == AttributeSource.SOURCE_LOCAL_APROVIDER) {

+					if (curIndex >= localIndex) {

 						found = source;

 

 						break;

@@ -108,13 +107,13 @@ public final class Linker implements Serializable {
 

 		found = null;

 

-		if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) {

+		if (attributeProvidersMap != null && !attributeProvidersMap.isEmpty()) {

 			iterator = attributeProvidersMap.keyIterator();

 			while (iterator.hasNext()) {

 				source = iterator.next();

 

-				if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY ) {

-					if ( curIndex>=remoteIndex ) {

+				if (source.getSourceType() == AttributeSource.SOURCE_REMOTE_COUNTRY) {

+					if (curIndex >= remoteIndex) {

 						found = source;

 

 						break;

@@ -129,28 +128,35 @@ public final class Linker implements Serializable {
 	}

 

 	/**

-	 * It updates the Linker with the values returned by the Attribute Source. It also advances

-	 * to the next index in order to mark this attribute source as completed.

+	 * It updates the Linker with the values returned by the Attribute Source. It also advances to the next index in order to mark this attribute source as completed.

 	 * 

-	 * @param source The Attribute Source that was queried for attribute values.

-	 * @param attrResponse The attrResponse returned by the Attribute Source that contains the attribute values.

+	 * @param source

+	 *            The Attribute Source that was queried for attribute values.

+	 * @param attrResponse

+	 *            The attrResponse returned by the Attribute Source that contains the attribute values.

 	 *

 	 * @see AttributeSource, STORKAttrQueryResponse

 	 */

 	public void setProviderReponse(AttributeSource source, STORKAttrQueryResponse attrResponse) {

-		if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY )

+		if (source.getSourceType() == AttributeSource.SOURCE_REMOTE_COUNTRY)

 			remoteIndex++;

 		else

 			localIndex++;

 

-		//Assertion storage

-		this.assertions.put(source, attrResponse);

-        // previously: getTotalPersonalAttributeList() in both cases

-		if ( source.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY )

+		// Assertion storage

+		if (this.assertions.containsKey(source)) {

+			this.assertions.get(source).add(attrResponse);

+		} else {

+			List<STORKAttrQueryResponse> temp = new ArrayList<STORKAttrQueryResponse>();

+			temp.add(attrResponse);

+			this.assertions.put(source, temp);

+		}

+

+		if (source.getSourceType() == AttributeSource.SOURCE_REMOTE_COUNTRY) {

 			this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList());

-		else

-		this.attributeProvidersMap.put(source, attrResponse.getPersonalAttributeList());

-		//this.attributeProvidersMap.put(source, attrResponse.getTotalPersonalAttributeList());

+		} else {

+			this.attributeProvidersMap.put(source, attrResponse.getPersonalAttributeList());

+		}

 	}

 

 	/**

@@ -170,7 +176,8 @@ public final class Linker implements Serializable {
 	/**

 	 * Setter for attributeProvidersMap.

 	 * 

-	 * @param attributeProvidersMap The attributeProvidersMap to set.

+	 * @param attributeProvidersMap

+	 *            The attributeProvidersMap to set.

 	 */

 	public void setAttributeProvidersMap(IAttributeProvidersMap attributeProvidersMap) {

 		this.attributeProvidersMap = attributeProvidersMap;

@@ -188,14 +195,15 @@ public final class Linker implements Serializable {
 	/**

 	 * Returns the Personal Attribute list of the provided Attribute Source.

 	 *

-	 * @param source The attributeSource in reference

+	 * @param source

+	 *            The attributeSource in reference

 	 * 

 	 * @return The IPersonalAttributeList assosiated with this source or null if empty

 	 *

 	 * @see IPersonalAttributeList

 	 */

 	public IPersonalAttributeList getProviderAttributes(AttributeSource source) {

-		if ( attributeProvidersMap.containsKey(source) )

+		if (attributeProvidersMap.containsKey(source))

 			return attributeProvidersMap.get(source);

 		else

 			return null;

@@ -215,7 +223,7 @@ public final class Linker implements Serializable {
 

 		merged = null;

 

-		if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) {

+		if (attributeProvidersMap != null && !attributeProvidersMap.isEmpty()) {

 			iterator = attributeProvidersMap.keyIterator();

 

 			merged = new PersonalAttributeList();

@@ -233,29 +241,25 @@ public final class Linker implements Serializable {
 	}

 

 	/**

-	 * Returns a List with all the assertions gathered by the AAS-PEPS module

-	 * returned both by local APs or remote A-PEPS.

+	 * Returns a List with all the assertions gathered by the AAS-PEPS module returned both by local APs or remote A-PEPS.

 	 * 

 	 * @return The assertions returned from the APs and A-PEPS

 	 */

 	public List<STORKAttrQueryResponse> getAttrQueryResponseList() {

 		List<STORKAttrQueryResponse> originalAssertions;

-		

-		originalAssertions = new ArrayList<STORKAttrQueryResponse>();

 

-		//Gather all assertions

-	    for (STORKAttrQueryResponse element : this.assertions.values()) {

-			originalAssertions.add(element);

-	    }

+		originalAssertions = new ArrayList<STORKAttrQueryResponse>();

 

+		// Gather all assertions

+		for (List<STORKAttrQueryResponse> element : this.assertions.values()) {

+			originalAssertions.addAll(element);

+		}

 		return originalAssertions;

 	}

 

 	/**

-	 * Checks the internal state of the Linker and if all Attribute Sources where visited

-	 * returns true, otherwise it returns false. So if you go directly from AtPLinkerAction

-	 * to MoreAttributesAction the call will have, since the method setProviderReponse

-	 * was not executed from every Attribute Source.

+	 * Checks the internal state of the Linker and if all Attribute Sources where visited returns true, otherwise it returns false. So if you go directly from AtPLinkerAction to MoreAttributesAction

+	 * the call will have, since the method setProviderReponse was not executed from every Attribute Source.

 	 * 

 	 * @return true if everything is OK, false otherwise

 	 */

@@ -263,11 +267,10 @@ public final class Linker implements Serializable {
 		boolean outcome = false;

 

 		LOG.debug("Check if linkder is complete: R[" + remoteIndex + "], L[" + localIndex + "], S[" + attributeProvidersMap.size() + "]");

-		if ( attributeProvidersMap !=null && !attributeProvidersMap.isEmpty() ) {

-			if ( (remoteIndex + localIndex)==attributeProvidersMap.size() )

+		if (attributeProvidersMap != null && !attributeProvidersMap.isEmpty()) {

+			if ((remoteIndex + localIndex) == attributeProvidersMap.size())

 				outcome = true;

-		}

-		else {

+		} else {

 			outcome = true;

 		}

 

@@ -275,33 +278,33 @@ public final class Linker implements Serializable {
 	}

 

 	/**

-	 * Merge the two Linker objects. 

+	 * Merge the two Linker objects.

 	 * 

-	 * @param previous The other Linker object to merge with this one.

+	 * @param previous

+	 *            The other Linker object to merge with this one.

 	 */

 	public void mergeWith(Linker previous) {

-		//BEFORE

-		if ( LOG.isDebugEnabled() ) {

+		// BEFORE

+		if (LOG.isDebugEnabled()) {

 			LOG.debug("The attributeProvidersMap from the current object.");

-			((AttributeProvidersMap)this.attributeProvidersMap).trace();

+			((AttributeProvidersMap) this.attributeProvidersMap).trace();

 			LOG.debug("The attributeProvidersMap from the provided object.");

-			((AttributeProvidersMap)previous.getAttributeProvidersMap()).trace();

+			((AttributeProvidersMap) previous.getAttributeProvidersMap()).trace();

 		}

 

 		IAttributeProvidersMap map = previous.getAttributeProvidersMap();

 		Iterator<AttributeSource> items = map.keyIterator();

-		while( items.hasNext() ) {

+		while (items.hasNext()) {

 			AttributeSource item = items.next();

 			IPersonalAttributeList pal = map.get(item);

 

-			if ( this.attributeProvidersMap.containsKey(item) ) {

+			if (this.attributeProvidersMap.containsKey(item)) {

 				IPersonalAttributeList new_pal = this.attributeProvidersMap.get(item);

 

-				for(PersonalAttribute pa : pal)

+				for (PersonalAttribute pa : pal)

 					new_pal.add(pa);

-			}

-			else {

-				if ( item.getSourceType()==AttributeSource.SOURCE_REMOTE_COUNTRY )

+			} else {

+				if (item.getSourceType() == AttributeSource.SOURCE_REMOTE_COUNTRY)

 					remoteIndex++;

 				else

 					localIndex++;

@@ -310,10 +313,18 @@ public final class Linker implements Serializable {
 			}

 		}

 

-		//AFTER

-		if ( LOG.isDebugEnabled() ) {

+		// AFTER

+		if (LOG.isDebugEnabled()) {

 			LOG.debug("The attributeProvidersMap after the merge.");

-			((AttributeProvidersMap)this.attributeProvidersMap).trace();

+			((AttributeProvidersMap) this.attributeProvidersMap).trace();

+		}

+

+		for (AttributeSource as : previous.assertions.keySet()) {

+			if (!assertions.containsKey(as)) {

+				assertions.put(as, previous.assertions.get(as));

+			} else {

+				assertions.get(as).addAll(previous.assertions.get(as));

+			}

 		}

 	}

-}
\ No newline at end of file
+}

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
index f2493db4e..7d758d754 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSErrors.java
@@ -14,384 +14,381 @@
 package eu.stork.peps.auth.commons;
 
 /**
- * This enum class contains all the STORK PEPS, Commons and Specific errors
- * constant identifiers.
+ * This enum class contains all the STORK PEPS, Commons and Specific errors constant identifiers.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.10 $, $Date: 2011-02-17 22:44:34 $
  */
 public enum PEPSErrors {
-  
-  /**
-   * Represents the 'authenticationFailed' constant error identifier.
-   */
-  AUTHENTICATION_FAILED_ERROR("authenticationFailed"),
-  /**
-   * Represents the 'spCountrySelector.errorCreatingSAML' constant error
-   * identifier.
-   */
-  SP_COUNTRY_SELECTOR_ERROR_CREATE_SAML("spCountrySelector.errorCreatingSAML"),
-  /**
-   * Represents the 'spCountrySelector.destNull' constant error identifier.
-   */
-  SP_COUNTRY_SELECTOR_DESTNULL("spCountrySelector.destNull"),
-  /**
-   * Represents the 'spCountrySelector.invalidAttr' constant error identifier.
-   */
-  SP_COUNTRY_SELECTOR_INVALID_ATTR("spCountrySelector.invalidAttr"),
-  /**
-   * Represents the 'spCountrySelector.invalidProviderName' constant error
-   * identifier.
-   */
-  SP_COUNTRY_SELECTOR_INVALID_PROVIDER_NAME(
-    "spCountrySelector.invalidProviderName"),
-  /**
-   * Represents the 'spCountrySelector.invalidQaaSPid' constant error
-   * identifier.
-   */
-  SP_COUNTRY_SELECTOR_INVALID_QAASPID("spCountrySelector.invalidQaaSPid"),
-  /**
-   * Represents the 'spCountrySelector.invalidSpId' constant error identifier.
-   */
-  SP_COUNTRY_SELECTOR_INVALID_SPID("spCountrySelector.invalidSpId"),
-  /**
-   * Represents the 'spCountrySelector.invalidSPQAA' constant error identifier.
-   */
-  SP_COUNTRY_SELECTOR_INVALID_SPQAA("spCountrySelector.invalidSPQAA"),
-  /**
-   * Represents the 'spCountrySelector.invalidSpURL' constant error identifier.
-   */
-  SP_COUNTRY_SELECTOR_INVALID_SPURL("spCountrySelector.invalidSpURL"),
-  /**
-   * Represents the 'spCountrySelector.spNotAllowed' constant error identifier.
-   */
-  SP_COUNTRY_SELECTOR_SPNOTALLOWED("spCountrySelector.spNotAllowed"),
-  
-  /**
-   * Represents the 'sProviderAction.errorCreatingSAML' constant error
-   * identifier.
-   */
-  SPROVIDER_SELECTOR_ERROR_CREATE_SAML("sProviderAction.errorCreatingSAML"),
-  /**
-   * Represents the 'sProviderAction.attr' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_ATTR("sProviderAction.invalidAttr"),
-  /**
-   * Represents the 'sProviderAction.country' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_COUNTRY("sProviderAction.invalidCountry"),
-  /**
-   * Represents the 'sProviderAction.relayState' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_RELAY_STATE("sProviderAction.invalidRelayState"),
-  /**
-   * Represents the 'sProviderAction.saml' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_SAML("sProviderAction.invalidSaml"),
-  /**
-   * Represents the 'sProviderAction.spAlias' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_SPALIAS("sProviderAction.invalidSPAlias"),
-  /**
-   * Represents the 'sProviderAction.spDomain' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_SPDOMAIN("sProviderAction.invalidSPDomain"),
-  /**
-   * Represents the 'sProviderAction.spId' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_SPID("sProviderAction.invalidSPId"),
-  /**
-   * Represents the 'sProviderAction.spQAA' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_SPQAA("sProviderAction.invalidSPQAA"),
-  /**
-   * Represents the 'sProviderAction.spQAAId' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_SPQAAID("sProviderAction.invalidSPQAAId"),
-  /**
-   * Represents the 'sProviderAction.spRedirect' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_SPREDIRECT("sProviderAction.invalidSPRedirect"),
-  /**
-   * Represents the 'sPPowerValidationAction.invalidSPPVAttrList' constant error identifier.
-   */
-  SPPOWERVALIDATION_SELECTOR_INVALID_SP_PV_ATTR_LIST("sPPowerValidationAction.invalidSPPVAttrList"),
-  
-  /**
-   * Represents the 'sProviderAction.invalidSPProviderName' constant error
-   * identifier.
-   */
-  SPROVIDER_SELECTOR_INVALID_SP_PROVIDERNAME(
-    "sProviderAction.invalidSPProviderName"),
-  /**
-   * Represents the 'sProviderAction.spNotAllowed' constant error identifier.
-   */
-  SPROVIDER_SELECTOR_SPNOTALLOWED("sProviderAction.spNotAllowed"),
-  
 
-  /**
-   * Represents the 'internalError' constant error identifier.
-   */
-  INTERNAL_ERROR("internalError"),
-  
-  /**
-   * Represents the 'colleagueRequest.attrNull' constant error identifier.
-   */
-  COLLEAGUE_REQ_ATTR_NULL("colleagueRequest.attrNull"),
-  /**
-   * Represents the 'colleagueRequest.errorCreatingSAML' constant error
-   * identifier.
-   */
-  COLLEAGUE_REQ_ERROR_CREATE_SAML("colleagueRequest.errorCreatingSAML"),
-  /**
-   * Represents the 'colleagueRequest.invalidCountryCode' constant error
-   * identifier.
-   */
-  COLLEAGUE_REQ_INVALID_COUNTRYCODE("colleagueRequest.invalidCountryCode"),
-  /**
-   * Represents the 'colleagueRequest.invalidDestUrl' constant error identifier.
-   */
-  COLLEAGUE_REQ_INVALID_DEST_URL("colleagueRequest.invalidDestUrl"),
-  /**
-   * Represents the 'colleagueRequest.invalidQaa' constant error identifier.
-   */
-  COLLEAGUE_REQ_INVALID_QAA("colleagueRequest.invalidQaa"),
-  /**
-   * Represents the 'colleagueRequest.invalidRedirect' constant error
-   * identifier.
-   */
-  COLLEAGUE_REQ_INVALID_REDIRECT("colleagueRequest.invalidRedirect"),
-  /**
-   * Represents the 'colleagueRequest.invalidSAML' constant error identifier.
-   */
-  COLLEAGUE_REQ_INVALID_SAML("colleagueRequest.invalidSAML"),
-  
-  /**
-   * Represents the 'colleaguePVRequest.invalidPVAttrList' constant error identifier.
-   */
-  COLLEAGUE_PV_REQ_INVALID_PV_ATTR_LIST("colleaguePVRequest.invalidPVAttrList"),
-  
-  
-  /**
-   * Represents the 'cpepsRedirectUrl' constant error identifier.
-   */
-  CPEPS_REDIRECT_URL("cpepsRedirectUrl"),
-  /**
-   * Represents the 'spepsRedirectUrl' constant error identifier.
-   */
-  SPEPS_REDIRECT_URL("spepsRedirectUrl"),
-  /**
-   * Represents the 'sProviderAction.invCountry' constant error identifier.
-   */
-  SP_ACTION_INV_COUNTRY("sProviderAction.invCountry"),
-  
-  /**
-   * Represents the 'providernameAlias.invalid' constant error identifier.
-   */
-  PROVIDER_ALIAS_INVALID("providernameAlias.invalid"),
-  
-  
-  /**
-   * Represents the 'cPeps.attrNull' constant error identifier.
-   */
-  CPEPS_ATTR_NULL("cPeps.attrNull"),
-  
-  /**
-   * Represents the 'colleagueResponse.invalidSAML' constant error identifier.
-   */
-  COLLEAGUE_RESP_INVALID_SAML("colleagueResponse.invalidSAML"),
-  
-  /**
-   * Represents the 'citizenNoConsent.mandatory' constant error identifier.
-   */
-  CITIZEN_NO_CONSENT_MANDATORY("citizenNoConsent.mandatory"),
-  /**
-   * Represents the 'citizenResponse.mandatory' constant error identifier.
-   */
-  CITIZEN_RESPONSE_MANDATORY("citizenResponse.mandatory"),
-  /**
-   * Represents the 'attVerification.mandatory' constant error identifier.
-   */
-  ATT_VERIFICATION_MANDATORY("attVerification.mandatory"),
-  /**
-   * Represents the 'attrValue.verification' constant error identifier.
-   */
-  ATTR_VALUE_VERIFICATION("attrValue.verification"),
-  
-  /**
-   * Represents the 'audienceRestrictionError' constant error identifier.
-   */
-  AUDIENCE_RESTRICTION("audienceRestrictionError"),
-  /**
-   * Represents the 'auRequestIdError' constant error identifier.
-   */
-  AU_REQUEST_ID("auRequestIdError"),
-  /**
-   * Represents the 'domain' constant error identifier.
-   */
-  DOMAIN("domain"),
-  /**
-   * Represents the 'hash.error' constant error identifier.
-   */
-  HASH_ERROR("hash.error"),
-  /**
-   * Represents the 'invalidAttributeList' constant error identifier.
-   */
-  INVALID_ATTRIBUTE_LIST("invalidAttributeList"),
-  /**
-   * Represents the 'invalidAttributeValue' constant error identifier.
-   */
-  INVALID_ATTRIBUTE_VALUE("invalidAttributeValue"),
-  /**
-   * Represents the 'qaaLevel' constant error identifier.
-   */
-  QAALEVEL("qaaLevel"),
-  /**
-   * Represents the 'requests' constant error identifier.
-   */
-  REQUESTS("requests"),
-  /**
-   * Represents the 'SPSAMLRequest' constant error identifier.
-   */
-  SP_SAML_REQUEST("SPSAMLRequest"),
-  /**
-   * Represents the 'spepsSAMLRequest' constant error identifier.
-   */
-  SPEPS_SAML_REQUEST("spepsSAMLRequest"),
-  /**
-   * Represents the 'IdPSAMLResponse' constant error identifier.
-   */
-  IDP_SAML_RESPONSE("IdPSAMLResponse"),
-  /**
-   * Represents the 'cpepsSAMLResponse' constant error identifier.
-   */
-  CPEPS_SAML_RESPONSE("cpepsSAMLResponse"),
-  /**
-   * Represents the 'cpepsSAMLResponse' constant error identifier.
-   */
-  SPEPS_SAML_RESPONSE("spepsSAMLResponse"),
-  /**
-   * Represents the 'session' constant error identifier.
-   */
-  SESSION("session"),
-  /**
-   * Represents the 'invalid.session' constant error identifier.
-   */
-  INVALID_SESSION("invalid.session"),
-  /**
-   * Represents the 'invalid.sessionId' constant error identifier.
-   */
-  INVALID_SESSION_ID("invalid.sessionId"),
-  /**
-   * Represents the 'missing.sessionId' constant error identifier.
-   */
-  MISSING_SESSION_ID("sessionError"),
-  /**
-   * Represents the 'missing.mandate' constant error identifier.
-   */
-  MISSING_MANDATE("missing.mandate"),
-  /**
-   * Represents the 'AtPSAMLResponse' constant error identifier.
-   */
-  ATP_SAML_RESPONSE("AtPSAMLResponse"),
-  
-  /**
-   * Represents the 'AtPSAMLResponse' constant error identifier.
-   */
-  ATP_RESPONSE_ERROR("atp.response.error"),
-  
-  /**
-   * Represents the 'apepsSAMLRequest' constant error identifier.
-   */
-  APEPS_SAML_REQUEST("apepsSAMLRequest"),
-  
-  /**
-   * Represents the 'apepsSAMLResponse' constant error identifier.
-   */
-  APEPS_SAML_RESPONSE("apepsSAMLResponse"),
-  
-  /**
-   * Represents the 'invalid.apepsRedirectUrl' constant error identifier.
-   */  
-  INVALID_APEPS_REDIRECT_URL("invalid.apepsRedirectUrl"),
-  
-  /**
-   * Represents the 'invalid.apepsCallbackUrl' constant error identifier.
-   */  
-  INVALID_APEPS_CALLBACK_URL("invalid.apepsCallbackUrl"),
-  
-  /**
-   * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier.
-   */
-  COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML"),
+	/**
+	 * Represents the 'authenticationFailed' constant error identifier.
+	 */
+	AUTHENTICATION_FAILED_ERROR("authenticationFailed"),
+	/**
+	 * Represents the 'spCountrySelector.errorCreatingSAML' constant error identifier.
+	 */
+	SP_COUNTRY_SELECTOR_ERROR_CREATE_SAML("spCountrySelector.errorCreatingSAML"),
+	/**
+	 * Represents the 'spCountrySelector.destNull' constant error identifier.
+	 */
+	SP_COUNTRY_SELECTOR_DESTNULL("spCountrySelector.destNull"),
+	/**
+	 * Represents the 'spCountrySelector.invalidAttr' constant error identifier.
+	 */
+	SP_COUNTRY_SELECTOR_INVALID_ATTR("spCountrySelector.invalidAttr"),
+	/**
+	 * Represents the 'spCountrySelector.invalidProviderName' constant error identifier.
+	 */
+	SP_COUNTRY_SELECTOR_INVALID_PROVIDER_NAME("spCountrySelector.invalidProviderName"),
+	/**
+	 * Represents the 'spCountrySelector.invalidQaaSPid' constant error identifier.
+	 */
+	SP_COUNTRY_SELECTOR_INVALID_QAASPID("spCountrySelector.invalidQaaSPid"),
+	/**
+	 * Represents the 'spCountrySelector.invalidSpId' constant error identifier.
+	 */
+	SP_COUNTRY_SELECTOR_INVALID_SPID("spCountrySelector.invalidSpId"),
+	/**
+	 * Represents the 'spCountrySelector.invalidSPQAA' constant error identifier.
+	 */
+	SP_COUNTRY_SELECTOR_INVALID_SPQAA("spCountrySelector.invalidSPQAA"),
+	/**
+	 * Represents the 'spCountrySelector.invalidSpURL' constant error identifier.
+	 */
+	SP_COUNTRY_SELECTOR_INVALID_SPURL("spCountrySelector.invalidSpURL"),
+	/**
+	 * Represents the 'spCountrySelector.spNotAllowed' constant error identifier.
+	 */
+	SP_COUNTRY_SELECTOR_SPNOTALLOWED("spCountrySelector.spNotAllowed"),
 
-  /**
-   * Represents the 'invalid.attr.country.code' constant error identifier.
-   */
-  INVALID_COUNTRY_CODE("invalid.attr.country.code");
+	/**
+	 * Represents the 'sProviderAction.errorCreatingSAML' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_ERROR_CREATE_SAML("sProviderAction.errorCreatingSAML"),
+	/**
+	 * Represents the 'sProviderAction.attr' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_ATTR("sProviderAction.invalidAttr"),
+	/**
+	 * Represents the 'sProviderAction.country' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_COUNTRY("sProviderAction.invalidCountry"),
+	/**
+	 * Represents the 'sProviderAction.relayState' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_RELAY_STATE("sProviderAction.invalidRelayState"),
+	/**
+	 * Represents the 'sProviderAction.saml' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_SAML("sProviderAction.invalidSaml"),
+	/**
+	 * Represents the 'sProviderAction.spAlias' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_SPALIAS("sProviderAction.invalidSPAlias"),
+	/**
+	 * Represents the 'sProviderAction.spDomain' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_SPDOMAIN("sProviderAction.invalidSPDomain"),
+	/**
+	 * Represents the 'sProviderAction.spId' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_SPID("sProviderAction.invalidSPId"),
+	/**
+	 * Represents the 'sProviderAction.spQAA' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_SPQAA("sProviderAction.invalidSPQAA"),
+	/**
+	 * Represents the 'sProviderAction.spQAAId' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_SPQAAID("sProviderAction.invalidSPQAAId"),
+	/**
+	 * Represents the 'sProviderAction.spRedirect' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_SPREDIRECT("sProviderAction.invalidSPRedirect"),
+	/**
+	 * Represents the 'sPPowerValidationAction.invalidSPPVAttrList' constant error identifier.
+	 */
+	SPPOWERVALIDATION_SELECTOR_INVALID_SP_PV_ATTR_LIST("sPPowerValidationAction.invalidSPPVAttrList"),
 
-  /**
-   * Represents the constant's value.
-   */
-  private String error;
-  
-  /**
-   * Solo Constructor.
-   * 
-   * @param nError The Constant error value.
-   */
-  PEPSErrors(final String nError) {
-    this.error = nError;
-  }
-  
-  /**
-   * Construct the errorCode Constant value.
-   * 
-   * @return The errorCode Constant.
-   */
-  public String errorCode() {
-    return error + ".code";
-  }
-  
-  /**
-   * Construct the errorCode Constant value with the given code text.
-   * 
-   * @param text the code text to append to the constant.
-   * 
-   * @return The errorCode Constant for the given code text.
-   */
-  public String errorCode(final String text) {
-    return error + "." + text + ".code";
-  }
-  
-  /**
-   * Construct the errorMessage constant value.
-   * 
-   * @return The errorMessage constant.
-   */
-  public String errorMessage() {
-    return error + ".message";
-  }
-  
-  /**
-   * Construct the errorMessage Constant value with the given message text.
-   * 
-   * @param text the message text to append to the constant.
-   * 
-   * @return The errorMessage Constant for the given text.
-   */
-  public String errorMessage(final String text) {
-    return error + "." + text + ".message";
-  }
-  
-  /**
-   * Return the Constant Value.
-   * 
-   * @return The constant value.
-   */
-  public String toString() {
-    return error;
-  }
+	/**
+	 * Represents the 'sProviderAction.invalidSPProviderName' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_INVALID_SP_PROVIDERNAME("sProviderAction.invalidSPProviderName"),
+	/**
+	 * Represents the 'sProviderAction.spNotAllowed' constant error identifier.
+	 */
+	SPROVIDER_SELECTOR_SPNOTALLOWED("sProviderAction.spNotAllowed"),
+
+	/**
+	 * Represents the 'internalError' constant error identifier.
+	 */
+	INTERNAL_ERROR("internalError"),
+
+	/**
+	 * Represents the 'colleagueRequest.attrNull' constant error identifier.
+	 */
+	COLLEAGUE_REQ_ATTR_NULL("colleagueRequest.attrNull"),
+	/**
+	 * Represents the 'colleagueRequest.errorCreatingSAML' constant error identifier.
+	 */
+	COLLEAGUE_REQ_ERROR_CREATE_SAML("colleagueRequest.errorCreatingSAML"),
+	/**
+	 * Represents the 'colleagueRequest.invalidCountryCode' constant error identifier.
+	 */
+	COLLEAGUE_REQ_INVALID_COUNTRYCODE("colleagueRequest.invalidCountryCode"),
+	/**
+	 * Represents the 'colleagueRequest.invalidDestUrl' constant error identifier.
+	 */
+	COLLEAGUE_REQ_INVALID_DEST_URL("colleagueRequest.invalidDestUrl"),
+	/**
+	 * Represents the 'colleagueRequest.invalidQaa' constant error identifier.
+	 */
+	COLLEAGUE_REQ_INVALID_QAA("colleagueRequest.invalidQaa"),
+	/**
+	 * Represents the 'colleagueRequest.invalidRedirect' constant error identifier.
+	 */
+	COLLEAGUE_REQ_INVALID_REDIRECT("colleagueRequest.invalidRedirect"),
+	/**
+	 * Represents the 'colleagueRequest.invalidSAML' constant error identifier.
+	 */
+	COLLEAGUE_REQ_INVALID_SAML("colleagueRequest.invalidSAML"),
+
+	/**
+	 * Represents the 'colleaguePVRequest.invalidPVAttrList' constant error identifier.
+	 */
+	COLLEAGUE_PV_REQ_INVALID_PV_ATTR_LIST("colleaguePVRequest.invalidPVAttrList"),
+
+	/**
+	 * Represents the 'cpepsRedirectUrl' constant error identifier.
+	 */
+	CPEPS_REDIRECT_URL("cpepsRedirectUrl"),
+	/**
+	 * Represents the 'spepsRedirectUrl' constant error identifier.
+	 */
+	SPEPS_REDIRECT_URL("spepsRedirectUrl"),
+	/**
+	 * Represents the 'sProviderAction.invCountry' constant error identifier.
+	 */
+	SP_ACTION_INV_COUNTRY("sProviderAction.invCountry"),
+
+	/**
+	 * Represents the 'providernameAlias.invalid' constant error identifier.
+	 */
+	PROVIDER_ALIAS_INVALID("providernameAlias.invalid"),
+
+	/**
+	 * Represents the 'cPeps.attrNull' constant error identifier.
+	 */
+	CPEPS_ATTR_NULL("cPeps.attrNull"),
+
+	/**
+	 * Represents the 'colleagueResponse.invalidSAML' constant error identifier.
+	 */
+	COLLEAGUE_RESP_INVALID_SAML("colleagueResponse.invalidSAML"),
+
+	/**
+	 * Represents the 'citizenNoConsent.mandatory' constant error identifier.
+	 */
+	CITIZEN_NO_CONSENT_MANDATORY("citizenNoConsent.mandatory"),
+	/**
+	 * Represents the 'citizenResponse.mandatory' constant error identifier.
+	 */
+	CITIZEN_RESPONSE_MANDATORY("citizenResponse.mandatory"),
+	/**
+	 * Represents the 'attVerification.mandatory' constant error identifier.
+	 */
+	ATT_VERIFICATION_MANDATORY("attVerification.mandatory"),
+	/**
+	 * Represents the 'attrValue.verification' constant error identifier.
+	 */
+	ATTR_VALUE_VERIFICATION("attrValue.verification"),
+
+	/**
+	 * Represents the 'audienceRestrictionError' constant error identifier.
+	 */
+	AUDIENCE_RESTRICTION("audienceRestrictionError"),
+	/**
+	 * Represents the 'auRequestIdError' constant error identifier.
+	 */
+	AU_REQUEST_ID("auRequestIdError"),
+	/**
+	 * Represents the 'domain' constant error identifier.
+	 */
+	DOMAIN("domain"),
+	/**
+	 * Represents the 'hash.error' constant error identifier.
+	 */
+	HASH_ERROR("hash.error"),
+	/**
+	 * Represents the 'invalidAttributeList' constant error identifier.
+	 */
+	INVALID_ATTRIBUTE_LIST("invalidAttributeList"),
+	/**
+	 * Represents the 'invalidAttributeValue' constant error identifier.
+	 */
+	INVALID_ATTRIBUTE_VALUE("invalidAttributeValue"),
+	/**
+	 * Represents the 'qaaLevel' constant error identifier.
+	 */
+	QAALEVEL("qaaLevel"),
+	/**
+	 * Represents the 'requests' constant error identifier.
+	 */
+	REQUESTS("requests"),
+	/**
+	 * Represents the 'SPSAMLRequest' constant error identifier.
+	 */
+	SP_SAML_REQUEST("SPSAMLRequest"),
+	/**
+	 * Represents the 'spepsSAMLRequest' constant error identifier.
+	 */
+	SPEPS_SAML_REQUEST("spepsSAMLRequest"),
+	/**
+	 * Represents the 'IdPSAMLResponse' constant error identifier.
+	 */
+	IDP_SAML_RESPONSE("IdPSAMLResponse"),
+	/**
+	 * Represents the 'cpepsSAMLResponse' constant error identifier.
+	 */
+	CPEPS_SAML_RESPONSE("cpepsSAMLResponse"),
+	/**
+	 * Represents the 'cpepsSAMLResponse' constant error identifier.
+	 */
+	SPEPS_SAML_RESPONSE("spepsSAMLResponse"),
+	/**
+	 * Represents the 'session' constant error identifier.
+	 */
+	SESSION("session"),
+	/**
+	 * Represents the 'invalid.session' constant error identifier.
+	 */
+	INVALID_SESSION("invalid.session"),
+	/**
+	 * Represents the 'invalid.sessionId' constant error identifier.
+	 */
+	INVALID_SESSION_ID("invalid.sessionId"),
+	/**
+	 * Represents the 'missing.sessionId' constant error identifier.
+	 */
+	MISSING_SESSION_ID("sessionError"),
+	/**
+	 * Represents the 'missing.mandate' constant error identifier.
+	 */
+	MISSING_MANDATE("missing.mandate"),
+	/**
+	 * Represents the 'AtPSAMLResponse' constant error identifier.
+	 */
+	ATP_SAML_RESPONSE("AtPSAMLResponse"),
+
+	/**
+	 * Represents the 'AtPSAMLResponse' constant error identifier.
+	 */
+	ATP_RESPONSE_ERROR("atp.response.error"),
+
+	/**
+	 * Represents the 'apepsSAMLRequest' constant error identifier.
+	 */
+	APEPS_SAML_REQUEST("apepsSAMLRequest"),
+
+	/**
+	 * Represents the 'apepsSAMLResponse' constant error identifier.
+	 */
+	APEPS_SAML_RESPONSE("apepsSAMLResponse"),
+
+	/**
+	 * Represents the 'invalid.apepsRedirectUrl' constant error identifier.
+	 */
+	INVALID_APEPS_REDIRECT_URL("invalid.apepsRedirectUrl"),
+
+	/**
+	 * Represents the 'invalid.apepsCallbackUrl' constant error identifier.
+	 */
+	INVALID_APEPS_CALLBACK_URL("invalid.apepsCallbackUrl"),
+
+	/**
+	 * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier.
+	 */
+	COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML"),
+
+	/**
+	 * Represents the 'invalid.attr.country.code' constant error identifier.
+	 */
+	INVALID_COUNTRY_CODE("invalid.attr.country.code"),
+	/**
+	 * DTL error codes.
+	 */
+	DTL_ERROR_ADD("dtl.error.adding.doc"), DTL_ERROR_GET("dtl.error.getting.doc"), DTL_ERROR_REQUEST("dtl.error.request.attribute"), DTL_INVALID_XML("dtl.invalid.xml"), DTL_EMPTY_REQUEST(
+			"dtl.empty.request"), DTL_ERROR_DOCUMENT_URL("dtl.error.no.document.url"), DTL_ERROR_NO_DOCUMENT("dtl.error.no.document"), DTL_ERROR_MARSHALL_SIGNREQUEST("dtl.error.marshall.signrequest"), DTL_ERROR_MARSHALL_SIGNRESPONSE(
+			"dtl.error.marshall.signresponse"),
+	/**
+	 * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier.
+	 */
+	COLLEAGUE_LOGOUT_INVALID_SAML("colleagueLogoutRequest.invalidSAML");
+
+	/**
+	 * Represents the constant's value.
+	 */
+	private String error;
+
+	/**
+	 * Solo Constructor.
+	 * 
+	 * @param nError
+	 *            The Constant error value.
+	 */
+	PEPSErrors(final String nError) {
+		this.error = nError;
+	}
+
+	/**
+	 * Construct the errorCode Constant value.
+	 * 
+	 * @return The errorCode Constant.
+	 */
+	public String errorCode() {
+		return error + ".code";
+	}
+
+	/**
+	 * Construct the errorCode Constant value with the given code text.
+	 * 
+	 * @param text
+	 *            the code text to append to the constant.
+	 * 
+	 * @return The errorCode Constant for the given code text.
+	 */
+	public String errorCode(final String text) {
+		return error + "." + text + ".code";
+	}
+
+	/**
+	 * Construct the errorMessage constant value.
+	 * 
+	 * @return The errorMessage constant.
+	 */
+	public String errorMessage() {
+		return error + ".message";
+	}
+
+	/**
+	 * Construct the errorMessage Constant value with the given message text.
+	 * 
+	 * @param text
+	 *            the message text to append to the constant.
+	 * 
+	 * @return The errorMessage Constant for the given text.
+	 */
+	public String errorMessage(final String text) {
+		return error + "." + text + ".message";
+	}
+
+	/**
+	 * Return the Constant Value.
+	 * 
+	 * @return The constant value.
+	 */
+	public String toString() {
+		return error;
+	}
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
index dd534499d..6b876b680 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSParameters.java
@@ -16,622 +16,636 @@ package eu.stork.peps.auth.commons;
 /**
  * This enum class contains all the STORK PEPS, Commons and Specific Parameters.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.13 $, $Date: 2011-07-07 20:48:45 $
  */
 public enum PEPSParameters {
-  
-  /**
-   * Represents the 'apId' parameter constant.
-   */
-  AP_ID("apId"),
-  /**
-   * Represents the 'apUrl' parameter constant.
-   */
-  AP_URL("apUrl"),
-  /**
-   * Represents the 'ap.number' parameter constant.
-   */
-  AP_NUMBER("ap.number"),
-  
-  /**
-   * Represents the 'assertionConsumerServiceURL' parameter constant.
-   */
-  ASSERTION_CONSUMER_S_URL("assertionConsumerServiceURL"),
-  
-  /**
-   * Represents the 'auth' parameter constant.
-   */
-  AUTHENTICATION("auth"),
-  
-  /**
-   * Represents the 'attr' parameter constant.
-   */
-  ATTRIBUTE("attr"),
-  /**
-   * Represents the 'attrName' parameter constant.
-   */
-  ATTRIBUTE_NAME("attrName"),
-  /**
-   * Represents the 'attrStatus' parameter constant.
-   */
-  ATTRIBUTE_STATUS("attrStatus"),
-  /**
-   * Represents the 'attrType' parameter constant.
-   */
-  ATTRIBUTE_TYPE("attrType"),
-  /**
-   * Represents the 'attrValue' parameter constant.
-   */
-  ATTRIBUTE_VALUE("attrValue"),
-  /**
-   * Represents the 'attrList' parameter constant.
-   */
-  ATTRIBUTE_LIST("attrList"),
-  /**
-   * Represents the 'apMandAttrList' parameter constant.
-   */
-  AP_MANDATORY_ATTRIBUTE_LIST("apMandAttrList"),
-  /**
-   * Represents the 'attrTuple' parameter constant.
-   */
-  ATTRIBUTE_TUPLE("attrTuple"),
-  /**
-   * Represents the 'attribute-missing' parameter constant.
-   */
-  ATTRIBUTE_MISSING("attribute-missing"),
-  /**
-   * Represents the 'attributesNotAllowed' parameter constant.
-   */
-  ATTRIBUTES_NOT_ALLOWED("attributesNotAllowed"),
-  /**
-   * Represents the 'authnRequest' parameter constant.
-   */
-  AUTH_REQUEST("authnRequest"),
-  
-  /**
-   * Represents the 'attrValue.number' parameter constant.
-   */
-  ATTR_VALUE_NUMBER("attrValue.number"),
-  
-  /**
-   * Represents the 'derivation.date.format' parameter constant.
-   */
-  DERIVATION_DATE_FORMAT("derivation.date.format"),
-  /**
-   * Represents the 'deriveAttr.number' parameter constant.
-   */
-  DERIVE_ATTRIBUTE_NUMBER("deriveAttr.number"),
-  
-  /**
-   * Represents the complex attributes parameter constant.
-   */
-  COMPLEX_ADDRESS_VALUE("canonicalResidenceAddress"),
-  COMPLEX_NEWATTRIBUTE_VALUE("newAttribute2"),
-  COMPLEX_HASDEGREE_VALUE("hasDegree"),
-  COMPLEX_MANDATECONTENT_VALUE("mandateContent"),
-  /**
-   * Represents the 'consent-type' parameter constant.
-   */
-  CONSENT_TYPE("consent-type"),
-  /**
-   * Represents the 'consent-value' parameter constant.
-   */
-  CONSENT_VALUE("consent-value"),
-  /**
-   * Represents the 'country' parameter constant.
-   */
-  COUNTRY("country"),
-  /**
-   * Represents the 'countryOrigin' parameter constant.
-   */
-  COUNTRY_ORIGIN("countryOrigin"),
-  
-  /**
-   * Represents the 'cpepsURL' parameter constant.
-   */
-  CPEPS_URL("cpepsURL"),
-  /**
-   * Represents the 'callback' parameter constant.
-   */
-  CPEPS_CALLBACK("callback"),
-  /**
-   * Represents the 'peps.specificidpredirect.url' parameter constant.
-   */
-  CPEPS_IDP_CALLBACK_VALUE("peps.specificidpredirect.url"),
-  /**
-   * Represents the 'peps.specificapredirect.url' parameter constant.
-   */
-  CPEPS_AP_CALLBACK_VALUE("peps.specificapredirect.url"),
-  
-  /**
-   * Represents the 'errorCode' parameter constant.
-   */
-  ERROR_CODE("errorCode"),
-  /**
-   * Represents the 'subCode' parameter constant.
-   */
-  ERROR_SUBCODE("subCode"),
-  /**
-   * Represents the 'errorMessage' parameter constant.
-   */
-  ERROR_MESSAGE("errorMessage"),
-  /**
-   * Represents the 'errorRedirectUrl' parameter constant.
-   */
-  ERROR_REDIRECT_URL("errorRedirectUrl"),
-  
-  /**
-   * errorRedirectUrl Represents the 'external-authentication' parameter
-   * constant.
-   */
-  EXTERNAL_AUTH("external-authentication"),
-  /**
-   * Represents the 'external-ap' parameter constant.
-   */
-  EXTERNAL_AP("external-ap"),
-  /**
-   * Represents the 'external-pv' parameter constant.
-   */
-  EXTERNAL_PV("external-pv"),
-  /**
-   * Represents the 'external-sig-module' parameter constant.
-   */
-  EXT_SIG_CREATOR_MOD("external-sig-module"),
-  
-  /**
-   * Represents the 'http-x-forwarded-for' parameter constant.
-   */
-  HTTP_X_FORWARDED_FOR("http-x-forwarded-for"),
-  
-  /**
-   * Represents the 'idp.url' parameter constant.
-   */
-  IDP_URL("idp.url"),
-  /**
-   * Represents the 'internal-authentication' parameter constant.
-   */
-  INTERNAL_AUTH("internal-authentication"),
-  /**
-   * Represents the 'internal-ap' parameter constant.
-   */
-  INTERNAL_AP("internal-ap"),
-  /**
-   * Represents the 'internal-pv' parameter constant.
-   */
-  INTERNAL_PV("internal-pv"),
-  
-  /**
-   * Represents the 'samlIssuer' parameter constant.
-   */
-  ISSUER("samlIssuer"),
-  /**
-   * Represents the 'samlIssuer.idp' parameter constant.
-   */
-  ISSUER_IDP("samlIssuer.idp"),
-  /**
-   * Represents the 'samlIssuer.atp' parameter constant.
-   */
-  ISSUER_ATP("samlIssuer.atp"),
-  
-  /**
-   * Represents the 'mandatory' parameter constant.
-   */
-  MANDATORY("mandatory"),
-  /**
-   * Represents the 'mandatoryAttributeMissing' parameter constant.
-   */
-  MANDATORY_ATTR_MISSING("mandatoryAttributeMissing"),
-  /**
-   * Represents the 'mandatoryConsentAttrMissing' parameter constant.
-   */
-  MANDATORY_CONSENT_MISSING("mandatoryConsentAttrMissing"),
-  /**
-   * Represents the 'missing-attrs' parameter constant.
-   */
-  MISSING_ATTRS("missing-attrs"),
-  /**
-   * Represents the 'no-more-attrs' parameter constant.
-   */
-  NO_MORE_ATTRS("no-more-attrs"),
-  
-  /**
-   * Represents the 'optional' parameter constant.
-   */
-  OPTIONAL("optional"),
-  
-  /**
-   * Represents the 'no-consent-type' parameter constant.
-   */
-  NO_CONSENT_TYPE("no-consent-type"),
-  /**
-   * Represents the 'no-consent-value' parameter constant.
-   */
-  NO_CONSENT_VALUE("no-consent-value"),
-  
-  /**
-   * Represents the 'provider.name' parameter constant.
-   */
-  PROVIDER_NAME_VALUE("providerName"),
-  /**
-   * Represents the 'cpeps.askconsent' parameter constant.
-   */
-  PEPS_ASK_CONSENT("cpeps.askconsent"),
-  /**
-   * Represents the 'cpeps.askconsentvalue' parameter constant.
-   */
-  PEPS_ASK_CONSENT_VALUE("cpeps.askconsentvalue"),
-  /**
-   * Represents the 'pepsAuth' parameter constant.
-   */
-  PEPS_AUTH_CONSENT("pepsAuth"),
-  /**
-   * Represents the 'validation.bypass' parameter constant.
-   */
-  PEPS_BYPASS("validation.bypass"),
-  /**
-   * Represents the 'cpeps.number' parameter constant.
-   */
-  PEPS_NUMBER("cpeps.number"),
-  /**
-   * Represents the 'cpeps.specificapredirect.url' parameter constant.
-   */
-  PEPS_SPECIFIC_URL("cpeps.specificapredirect.url"),
-  /**
-   * Represents the 'pv.url' parameter constant.
-   */
-  PV_URL("pv.url"),
-  
-  /**
-   * Represents the 'qaaLevel' parameter constant.
-   */
-  QAALEVEL("qaaLevel"),
-  
-  /**
-   * Represents the 'speps.redirectUrl' parameter constant.
-   */
-  SPEPS_REDIRECT_URL("speps.redirectUrl"),
-  
-  /**
-   * Represents the 'sp.redirectUrl' parameter constant.
-   */
-  SP_REDIRECT_URL("sp.redirectUrl"),
-  /**
-   * Represents the 'cpeps.redirectUrl' parameter constant.
-   */
-  CPEPS_REDIRECT_URL("cpeps.redirectUrl"),
-  /**
-   * Represents the 'RelayState' parameter constant.
-   */
-  RELAY_STATE("RelayState"),
-  /**
-   * Represents the 'remoteAddr' parameter constant.
-   */
-  REMOTE_ADDR("remoteAddr"),
-  /**
-   * Represents the 'remoteUser' parameter constant.
-   */
-  REMOTE_USER("remoteUser"),
-  
-  /**
-   * Represents the 'SAMLRequest' parameter constant.
-   */
-  SAML_REQUEST("SAMLRequest"),
-  /**
-   * Represents the 'SAMLResponse' parameter constant.
-   */
-  SAML_RESPONSE("SAMLResponse"),
-  /**
-   * Represents the 'SAMLFail' parameter constant.
-   */
-  SAML_TOKEN_FAIL("SAMLFail"),
-  /**
-   * Represents the 'TokenId' parameter constant.
-   */
-  SAML_TOKEN_ID("TokenId"),
-  /**
-   * Represents the 'inResponseTo' parameter constant.
-   */
-  SAML_IN_RESPONSE_TO("inResponseTo"),
-  /**
-   * Represents the 'inResponseTo.idp' parameter constant.
-   */
-  SAML_IN_RESPONSE_TO_IDP("inResponseTo.idp"),
-  /**
-   * Represents the 'inResponseTo.atp' parameter constant.
-   */
-  SAML_IN_RESPONSE_TO_ATP("inResponseTo.atp"),
-  /**
-   * Represents the 'SignatureResponse' parameter constant.
-   */
-  SIGNATURE_RESPONSE("SignatureResponse"),
-  
-  /**
-   * Represents the 'cPepsSession' parameter constant.
-   */
-  SESSION_ID_URL("cPepsSession"),
-  /**
-   * Represents the 'spId' parameter constant.
-   */
-  SP_ID("spId"),
-  /**
-   * Represents the 'spQaaLevel' parameter constant.
-   */
-  SP_QAALEVEL("spQaaLevel"),
-  /**
-   * Represents the 'spUrl' parameter constant.
-   */
-  SP_URL("spUrl"),
-  
-  /**
-   * Represents the 'allow.derivation.all' parameter constant.
-   */
-  SPECIFIC_ALLOW_DERIVATION_ALL("allow.derivation.all"),
-  /**
-   * Represents the ''allow.unknowns parameter constant.
-   */
-  SPECIFIC_ALLOW_UNKNOWNS("allow.unknowns"),
-  /**
-   * Represents the 'derivation.date.separator' parameter constant.
-   */
-  SPECIFIC_DERIVATION_DATE_SEP("derivation.date.separator"),
-  /**
-   * Represents the 'derivation.month.position' parameter constant.
-   */
-  SPECIFIC_DERIVATION_MONTH_POS("derivation.month.position"),
-  /**
-   * Represents the 'derivation.day.position' parameter constant.
-   */
-  SPECIFIC_DERIVATION_DAY_POS("derivation.day.position"),
-  /**
-   * Represents the 'derivation.year.position' parameter constant.
-   */
-  SPECIFIC_DERIVATION_YEAR_POS("derivation.year.position"),
-  
-  /**
-   * sp.authorized.parameters Represents the '' parameter constant.
-   */
-  SPEPS_AUTHORIZED("sp.authorized.parameters"),
-  
-  /**
-   * Represents the 'spSector' constant value.
-   */
-  SPSECTOR("spSector"),
-  /**
-   * Represents the 'spApplication' constant value.
-   */
-  SPAPPLICATION("spApplication"),
-  /**
-   * Represents the 'spCountry' constant value.
-   */
-  SPCOUNTRY("spCountry"),
-
-  /**
-   * Represents the 'spInstitution' constant value.
-   */
-  SPINSTITUTION("spInstitution"),
-
-  /**
-   * Represents the 'spCountryCode' constant value.
-   */
-  SP_COUNTRY_CODE("spCountryCode"),
-
-  /**
-   * Represents the 'storkAttribute.number' parameter constant.
-   */
-  STORK_ATTRIBUTE_NUMBER("storkAttribute.number"),
-  /**
-   * Represents the 'storkAttributeValue.number' parameter constant.
-   */
-  STORK_ATTRIBUTE_VALUE_NUMBER("storkAttributeValue.number"),
-  
-  /**
-   * Represents the 'username' parameter constant.
-   */
-  USERNAME("username"),
-  
-  /**
-   * Represents the 'tooManyParameters' parameter constant.
-   */
-  TOO_MANY_PARAMETERS("tooManyParameters"),
-  /**
-   * Represents the 'validation.active' parameter constant.
-   */
-  VALIDATION_ACTIVE("validation.active"),
-  
-  /**
-   * Represents the 'x-forwarded-for' parameter constant.
-   */
-  X_FORWARDED_FOR("x-forwarded-for"),
-  /**
-   * Represents the 'x-forwarded-host' parameter constant.
-   */
-  X_FORWARDED_HOST("x-forwarded-host"),
-  /**
-   * Represents the 'XMLResponse' parameter constant.
-   */
-  XML_RESPONSE("XMLResponse"),
-
-  /**
-   * Represents the 'ap-cpeps.number' parameter constant.
-   */
-  AP_PEPS_NUMBER("ap-cpeps.number"),
-
-  /**
-   * Represents the 'atp.number' parameter constant.
-   */
-  ATTRIBUTE_PROVIDER_NUMBER("atp.number"),
-
-  /**
-   * Represents the 'atn.number' parameter constant.
-   */
-  ATTRIBUTE_NAME_NUMBER("atn.number"),
-
-  /**
-   * Represents the 'apLinker' parameter constant.
-   */
-  AP_LINKER("apLinker"),
-
-  /**
-   * Represents the 'prevApLinker' parameter constant.
-   */
-  PREV_AP_LINKER("prevApLinker"),
-
-  /**
-   * Represents the 'NOSEL' parameter constant (no attribute provider selected).
-   */
-  AP_NO_SELECTION("NOSEL"),
-
-  /**
-   * Represents the 'OCSEL' parameter constant (attribute provider in another country).
-   */
-  AP_OTHER_COUNTRY("OCSEL"),
-
-  /**
-   * Represents the '_provider' suffix parameter constant.
-   */
-  AP_PROVIDER_SELECT_SUFFIX("_provider"),
-
-  /**
-   * Represents the '_country' suffix parameter constant.
-   */
-  AP_COUNTRY_SELECT_SUFFIX("_country"),
-
-  /**
-   * Represents the '_name' suffix parameter constant.
-   */
-  AP_NAME_SELECT_SUFFIX("_name"),
-
-  /**
-   * Represents the 'next-ap' parameter constant.
-   */
-  NEXT_AP("next-ap"),
-
-  /**
-   * Represents the 'next-apeps' parameter constant.
-   */
-  NEXT_APEPS("next-apeps"),
-
-  /**
-   * Represents the 'back-to-apeps' parameter constant.
-   */
-  BACK_TO_APEPS("back-to-apeps"),
-
-  /**
-   * Represents the 'is-remote-apeps' parameter constant.
-   */
-  IS_REMOTE_APEPS("is-remote-apeps"),
-
-  /**
-   * Represents the 'more-attributes' parameter constant.
-   */
-  MORE_ATTRIBUTES("more-attributes"),
-
-  /**
-   * Represents the 'attr-filter.number' parameter constant.
-   */
-  ATTRIBUTES_FILTER_NUMBER("attr-filter.number"),
-
-  /**
-   * Represents the 'attr-group' parameter constant.
-   */
-  ATTRIBUTE_GROUPS("attr-group"),
-
-  /**
-   * Represents the 'all' parameter constant for attribute groups.
-   */
-  ATTRIBUTE_GROUPS_ALL("all"),
-
-  /**
-   * Represents the 'none' parameter constant for attribute groups.
-   */
-  ATTRIBUTE_GROUPS_NONE("none"),
-
-  /**
-   * Represents the 'atp.url' parameter constant.
-   */
-  ATP_URL("atp.url"), 
-   /**
-   * Represents the 'apepsURL' parameter constant.
-   */
-  APEPS_URL("apepsUrl"),
-  
-  /**
-   * Represents the 'apepsCountry' parameter constant.
-   */
-  APEPS_COUNTRY("apepsCountry"),
-  
-  /**
-   * Represents the 'apepsAuthRequest' parameter constant.
-   */
-  APEPS_ATTR_REQUEST("apepsAttrRequest"),
-  
-  /**
-   * Represents the 'isApepsRequest' parameter constant.
-   */
-  APEPS_REQUEST_COMPLETE("apeps-request-complete"),
-  
-  /**
-   * Represents the 'apeps.callbackUrl' parameter constant.
-   */  
-  APEPS_CALLBACK_URL("apeps.callbackUrl"),
-  /**
-   * Represents the 'attrListMand' parameter constant.
-   */
-  ATTR_LIST_MAND("attrListMand"),
-  
-  /**
-   * Represents the 'attrListOpt' parameter constant.
-   */
-  ATTR_LIST_OPT("attrListOpt"),
-  
-  /**
-   * Represents the 'simpleAttrListMand' parameter constant.
-   */
-  SIMPLE_ATTR_LIST_MAND("simpleAttrListMand"), 
-  
-  /**
-   * Represents the 'simpleAttrListOpt' parameter constant.
-   */
-  SIMPLE_ATTR_LIST_OPT("simpleAttrListOpt"), 
-  
-  /**
-   * Represents the 'complexAttrListMand' parameter constant.
-   */
-  COMPLEX_ATTR_LIST_MAND("complexAttrListMand"), 
-  
-  /**
-   * Represents the 'complexAttrListOpt' parameter constant.
-   */
-  COMPLEX_ATTR_LIST_OPT("complexAttrListOpt"),
-  /**
-   * Represents the 'idPDerivedAttrList' parameter constant.
-   */
-
-  IDP_DERIVED_ATTR_LIST("idPDerivedAttrList");
-
-  /**
-   * Represents the constant's value.
-   */
-  private String value;
-  
-  /**
-   * Solo Constructor.
-   * 
-   * @param nValue The Constant value.
-   */
-  PEPSParameters(final String nValue) {
-    this.value = nValue;
-  }
-  
-  /**
-   * Return the Constant Value.
-   * 
-   * @return The constant value.
-   */
-  public String toString() {
-    return value;
-  }
+
+	/**
+	 * Represents the 'apId' parameter constant.
+	 */
+	AP_ID("apId"),
+	/**
+	 * Represents the 'apUrl' parameter constant.
+	 */
+	AP_URL("apUrl"),
+	/**
+	 * Represents the 'ap.number' parameter constant.
+	 */
+	AP_NUMBER("ap.number"),
+
+	/**
+	 * Represents the 'assertionConsumerServiceURL' parameter constant.
+	 */
+	ASSERTION_CONSUMER_S_URL("assertionConsumerServiceURL"),
+
+	/**
+	 * Represents the 'auth' parameter constant.
+	 */
+	AUTHENTICATION("auth"),
+
+	/**
+	 * Represents the 'attr' parameter constant.
+	 */
+	ATTRIBUTE("attr"),
+	/**
+	 * Represents the 'attrName' parameter constant.
+	 */
+	ATTRIBUTE_NAME("attrName"),
+	/**
+	 * Represents the 'attrStatus' parameter constant.
+	 */
+	ATTRIBUTE_STATUS("attrStatus"),
+	/**
+	 * Represents the 'attrType' parameter constant.
+	 */
+	ATTRIBUTE_TYPE("attrType"),
+	/**
+	 * Represents the 'attrValue' parameter constant.
+	 */
+	ATTRIBUTE_VALUE("attrValue"),
+	/**
+	 * Represents the 'attrList' parameter constant.
+	 */
+	ATTRIBUTE_LIST("attrList"),
+	/**
+	 * Represents the 'allAttrList' parameter constant.
+	 */
+	ALL_ATTRIBUTE_LIST("allAttrList"),
+	/**
+	 * Represents the 'apMandAttrList' parameter constant.
+	 */
+	AP_MANDATORY_ATTRIBUTE_LIST("apMandAttrList"),
+	/**
+	 * Represents the 'attrTuple' parameter constant.
+	 */
+	ATTRIBUTE_TUPLE("attrTuple"),
+	/**
+	 * Represents the 'attribute-missing' parameter constant.
+	 */
+	ATTRIBUTE_MISSING("attribute-missing"),
+	/**
+	 * Represents the 'attributesNotAllowed' parameter constant.
+	 */
+	ATTRIBUTES_NOT_ALLOWED("attributesNotAllowed"),
+	/**
+	 * Represents the 'authnRequest' parameter constant.
+	 */
+	AUTH_REQUEST("authnRequest"),
+
+	/**
+	 * Represents the 'attrValue.number' parameter constant.
+	 */
+	ATTR_VALUE_NUMBER("attrValue.number"),
+
+	/**
+	 * Represents the 'derivation.date.format' parameter constant.
+	 */
+	DERIVATION_DATE_FORMAT("derivation.date.format"),
+	/**
+	 * Represents the 'deriveAttr.number' parameter constant.
+	 */
+	DERIVE_ATTRIBUTE_NUMBER("deriveAttr.number"),
+
+	/**
+	 * Represents the complex attributes parameter constant.
+	 */
+	COMPLEX_ADDRESS_VALUE("canonicalResidenceAddress"), COMPLEX_NEWATTRIBUTE_VALUE("newAttribute2"), COMPLEX_HASDEGREE_VALUE("hasDegree"), COMPLEX_MANDATECONTENT_VALUE("mandate"),
+	/**
+	 * Represents the 'consent-type' parameter constant.
+	 */
+	CONSENT_TYPE("consent-type"),
+	/**
+	 * Represents the 'consent-value' parameter constant.
+	 */
+	CONSENT_VALUE("consent-value"),
+	/**
+	 * Represents the 'country' parameter constant.
+	 */
+	COUNTRY("country"),
+	/**
+	 * Represents the 'countryOrigin' parameter constant.
+	 */
+	COUNTRY_ORIGIN("countryOrigin"),
+
+	/**
+	 * Represents the 'cpepsURL' parameter constant.
+	 */
+	CPEPS_URL("cpepsURL"),
+	/**
+	 * Represents the 'callback' parameter constant.
+	 */
+	CPEPS_CALLBACK("callback"),
+	/**
+	 * Represents the 'peps.specificidpredirect.url' parameter constant.
+	 */
+	CPEPS_IDP_CALLBACK_VALUE("peps.specificidpredirect.url"),
+	/**
+	 * Represents the 'peps.specificapredirect.url' parameter constant.
+	 */
+	CPEPS_AP_CALLBACK_VALUE("peps.specificapredirect.url"),
+
+	/**
+	 * Represents the 'errorCode' parameter constant.
+	 */
+	ERROR_CODE("errorCode"),
+	/**
+	 * Represents the 'subCode' parameter constant.
+	 */
+	ERROR_SUBCODE("subCode"),
+	/**
+	 * Represents the 'errorMessage' parameter constant.
+	 */
+	ERROR_MESSAGE("errorMessage"),
+	/**
+	 * Represents the 'errorRedirectUrl' parameter constant.
+	 */
+	ERROR_REDIRECT_URL("errorRedirectUrl"),
+
+	/**
+	 * errorRedirectUrl Represents the 'external-authentication' parameter constant.
+	 */
+	EXTERNAL_AUTH("external-authentication"),
+	/**
+	 * Represents the 'external-ap' parameter constant.
+	 */
+	EXTERNAL_AP("external-ap"),
+	/**
+	 * Represents the 'external-pv' parameter constant.
+	 */
+	EXTERNAL_PV("external-pv"),
+	/**
+	 * Represents the 'external-sig-module' parameter constant.
+	 */
+	EXT_SIG_CREATOR_MOD("external-sig-module"),
+
+	/**
+	 * Represents the 'http-x-forwarded-for' parameter constant.
+	 */
+	HTTP_X_FORWARDED_FOR("http-x-forwarded-for"),
+
+	/**
+	 * Represents the 'idp.url' parameter constant.
+	 */
+	IDP_URL("idp.url"),
+	/**
+	 * Represents the 'internal-authentication' parameter constant.
+	 */
+	INTERNAL_AUTH("internal-authentication"),
+	/**
+	 * Represents the 'internal-ap' parameter constant.
+	 */
+	INTERNAL_AP("internal-ap"),
+	/**
+	 * Represents the 'internal-pv' parameter constant.
+	 */
+	INTERNAL_PV("internal-pv"),
+
+	/**
+	 * Represents the 'samlIssuer' parameter constant.
+	 */
+	ISSUER("samlIssuer"),
+	/**
+	 * Represents the 'samlIssuer.idp' parameter constant.
+	 */
+	ISSUER_IDP("samlIssuer.idp"),
+	/**
+	 * Represents the 'samlIssuer.atp' parameter constant.
+	 */
+	ISSUER_ATP("samlIssuer.atp"),
+
+	/**
+	 * Represents the 'mandatory' parameter constant.
+	 */
+	MANDATORY("mandatory"),
+	/**
+	 * Represents the 'mandatoryAttributeMissing' parameter constant.
+	 */
+	MANDATORY_ATTR_MISSING("mandatoryAttributeMissing"),
+	/**
+	 * Represents the 'mandatoryConsentAttrMissing' parameter constant.
+	 */
+	MANDATORY_CONSENT_MISSING("mandatoryConsentAttrMissing"),
+	/**
+	 * Represents the 'missing-attrs' parameter constant.
+	 */
+	MISSING_ATTRS("missing-attrs"),
+	/**
+	 * Represents the 'no-more-attrs' parameter constant.
+	 */
+	NO_MORE_ATTRS("no-more-attrs"),
+
+	/**
+	 * Represents the 'optional' parameter constant.
+	 */
+	OPTIONAL("optional"),
+
+	/**
+	 * Represents the 'no-consent-type' parameter constant.
+	 */
+	NO_CONSENT_TYPE("no-consent-type"),
+	/**
+	 * Represents the 'no-consent-value' parameter constant.
+	 */
+	NO_CONSENT_VALUE("no-consent-value"),
+
+	/**
+	 * Represents the 'provider.name' parameter constant.
+	 */
+	PROVIDER_NAME_VALUE("providerName"),
+	/**
+	 * Represents the 'cpeps.askconsent' parameter constant.
+	 */
+	PEPS_ASK_CONSENT("cpeps.askconsent"),
+	/**
+	 * Represents the 'cpeps.askconsentvalue' parameter constant.
+	 */
+	PEPS_ASK_CONSENT_VALUE("cpeps.askconsentvalue"),
+	/**
+	 * Represents the 'pepsAuth' parameter constant.
+	 */
+	PEPS_AUTH_CONSENT("pepsAuth"),
+	/**
+	 * Represents the 'validation.bypass' parameter constant.
+	 */
+	PEPS_BYPASS("validation.bypass"),
+	/**
+	 * Represents the 'cpeps.number' parameter constant.
+	 */
+	PEPS_NUMBER("cpeps.number"),
+	/**
+	 * Represents the 'cpeps.specificapredirect.url' parameter constant.
+	 */
+	PEPS_SPECIFIC_URL("cpeps.specificapredirect.url"),
+	/**
+	 * Represents the 'pv.url' parameter constant.
+	 */
+	PV_URL("pv.url"),
+
+	/**
+	 * Represents the 'qaaLevel' parameter constant.
+	 */
+	QAALEVEL("qaaLevel"),
+
+	/**
+	 * Represents the 'speps.redirectUrl' parameter constant.
+	 */
+	SPEPS_REDIRECT_URL("speps.redirectUrl"),
+
+	/**
+	 * Represents the 'sp.redirectUrl' parameter constant.
+	 */
+	SP_REDIRECT_URL("sp.redirectUrl"),
+	/**
+	 * Represents the 'cpeps.redirectUrl' parameter constant.
+	 */
+	CPEPS_REDIRECT_URL("cpeps.redirectUrl"),
+	/**
+	 * Represents the 'RelayState' parameter constant.
+	 */
+	RELAY_STATE("RelayState"),
+	/**
+	 * Represents the 'remoteAddr' parameter constant.
+	 */
+	REMOTE_ADDR("remoteAddr"),
+	/**
+	 * Represents the 'remoteUser' parameter constant.
+	 */
+	REMOTE_USER("remoteUser"),
+
+	/**
+	 * Represents the 'SAMLRequest' parameter constant.
+	 */
+	SAML_REQUEST("SAMLRequest"),
+	/**
+	 * Represents the 'SAMLResponse' parameter constant.
+	 */
+	SAML_RESPONSE("SAMLResponse"),
+	/**
+	 * Represents the 'SAMLFail' parameter constant.
+	 */
+	SAML_TOKEN_FAIL("SAMLFail"),
+	/**
+	 * Represents the 'TokenId' parameter constant.
+	 */
+	SAML_TOKEN_ID("TokenId"),
+	/**
+	 * Represents the 'inResponseTo' parameter constant.
+	 */
+	SAML_IN_RESPONSE_TO("inResponseTo"),
+	/**
+	 * Represents the 'inResponseTo.idp' parameter constant.
+	 */
+	SAML_IN_RESPONSE_TO_IDP("inResponseTo.idp"),
+	/**
+	 * Represents the 'inResponseTo.atp' parameter constant.
+	 */
+	SAML_IN_RESPONSE_TO_ATP("inResponseTo.atp"),
+	/**
+	 * Represents the 'SignatureResponse' parameter constant.
+	 */
+	SIGNATURE_RESPONSE("SignatureResponse"),
+
+	/**
+	 * Represents the 'cPepsSession' parameter constant.
+	 */
+	SESSION_ID_URL("cPepsSession"),
+	/**
+	 * Represents the 'spId' parameter constant.
+	 */
+	SP_ID("spId"),
+	/**
+	 * Represents the 'spQaaLevel' parameter constant.
+	 */
+	SP_QAALEVEL("spQaaLevel"),
+	/**
+	 * Represents the 'spUrl' parameter constant.
+	 */
+	SP_URL("spUrl"),
+
+	/**
+	 * Represents the 'allow.derivation.all' parameter constant.
+	 */
+	SPECIFIC_ALLOW_DERIVATION_ALL("allow.derivation.all"),
+	/**
+	 * Represents the ''allow.unknowns parameter constant.
+	 */
+	SPECIFIC_ALLOW_UNKNOWNS("allow.unknowns"),
+	/**
+	 * Represents the 'derivation.date.separator' parameter constant.
+	 */
+	SPECIFIC_DERIVATION_DATE_SEP("derivation.date.separator"),
+	/**
+	 * Represents the 'derivation.month.position' parameter constant.
+	 */
+	SPECIFIC_DERIVATION_MONTH_POS("derivation.month.position"),
+	/**
+	 * Represents the 'derivation.day.position' parameter constant.
+	 */
+	SPECIFIC_DERIVATION_DAY_POS("derivation.day.position"),
+	/**
+	 * Represents the 'derivation.year.position' parameter constant.
+	 */
+	SPECIFIC_DERIVATION_YEAR_POS("derivation.year.position"),
+
+	/**
+	 * sp.authorized.parameters Represents the '' parameter constant.
+	 */
+	SPEPS_AUTHORIZED("sp.authorized.parameters"),
+
+	/**
+	 * Represents the 'spSector' constant value.
+	 */
+	SPSECTOR("spSector"),
+	/**
+	 * Represents the 'spApplication' constant value.
+	 */
+	SPAPPLICATION("spApplication"),
+	/**
+	 * Represents the 'spCountry' constant value.
+	 */
+	SPCOUNTRY("spCountry"),
+
+	/**
+	 * Represents the 'spInstitution' constant value.
+	 */
+	SPINSTITUTION("spInstitution"),
+
+	/**
+	 * Represents the 'spCountryCode' constant value.
+	 */
+	SP_COUNTRY_CODE("spCountryCode"),
+
+	/**
+	 * Represents the 'storkAttribute.number' parameter constant.
+	 */
+	STORK_ATTRIBUTE_NUMBER("storkAttribute.number"),
+	/**
+	 * Represents the 'storkAttributeValue.number' parameter constant.
+	 */
+	STORK_ATTRIBUTE_VALUE_NUMBER("storkAttributeValue.number"),
+
+	/**
+	 * Represents the 'username' parameter constant.
+	 */
+	USERNAME("username"),
+
+	/**
+	 * Represents the 'tooManyParameters' parameter constant.
+	 */
+	TOO_MANY_PARAMETERS("tooManyParameters"),
+	/**
+	 * Represents the 'validation.active' parameter constant.
+	 */
+	VALIDATION_ACTIVE("validation.active"),
+
+	/**
+	 * Represents the 'x-forwarded-for' parameter constant.
+	 */
+	X_FORWARDED_FOR("x-forwarded-for"),
+	/**
+	 * Represents the 'x-forwarded-host' parameter constant.
+	 */
+	X_FORWARDED_HOST("x-forwarded-host"),
+	/**
+	 * Represents the 'XMLResponse' parameter constant.
+	 */
+	XML_RESPONSE("XMLResponse"),
+
+	/**
+	 * Represents the 'ap-cpeps.number' parameter constant.
+	 */
+	AP_PEPS_NUMBER("ap-cpeps.number"),
+
+	/**
+	 * Represents the 'atp.number' parameter constant.
+	 */
+	ATTRIBUTE_PROVIDER_NUMBER("atp.number"),
+
+	/**
+	 * Represents the 'atn.number' parameter constant.
+	 */
+	ATTRIBUTE_NAME_NUMBER("atn.number"),
+
+	/**
+	 * Represents the 'apLinker' parameter constant.
+	 */
+	AP_LINKER("apLinker"),
+
+	/**
+	 * Represents the 'prevApLinker' parameter constant.
+	 */
+	PREV_AP_LINKER("prevApLinker"),
+
+	/**
+	 * Represents the 'NOSEL' parameter constant (no attribute provider selected).
+	 */
+	AP_NO_SELECTION("NOSEL"),
+
+	/**
+	 * Represents the 'OCSEL' parameter constant (attribute provider in another country).
+	 */
+	AP_OTHER_COUNTRY("OCSEL"),
+
+	/**
+	 * Represents the '_provider' suffix parameter constant.
+	 */
+	AP_PROVIDER_SELECT_SUFFIX("_provider"),
+
+	/**
+	 * Represents the '_country' suffix parameter constant.
+	 */
+	AP_COUNTRY_SELECT_SUFFIX("_country"),
+
+	/**
+	 * Represents the '_name' suffix parameter constant.
+	 */
+	AP_NAME_SELECT_SUFFIX("_name"),
+
+	/**
+	 * Represents the 'next-ap' parameter constant.
+	 */
+	NEXT_AP("next-ap"),
+
+	/**
+	 * Represents the 'next-apeps' parameter constant.
+	 */
+	NEXT_APEPS("next-apeps"),
+
+	/**
+	 * Represents the 'back-to-apeps' parameter constant.
+	 */
+	BACK_TO_APEPS("back-to-apeps"),
+
+	/**
+	 * Represents the 'is-remote-apeps' parameter constant.
+	 */
+	IS_REMOTE_APEPS("is-remote-apeps"),
+
+	/**
+	 * Represents the 'more-attributes' parameter constant.
+	 */
+	MORE_ATTRIBUTES("more-attributes"),
+
+	/**
+	 * Represents the 'attr-filter.number' parameter constant.
+	 */
+	ATTRIBUTES_FILTER_NUMBER("attr-filter.number"),
+
+	/**
+	 * Represents the 'attr-group' parameter constant.
+	 */
+	ATTRIBUTE_GROUPS("attr-group"),
+
+	/**
+	 * Represents the 'all' parameter constant for attribute groups.
+	 */
+	ATTRIBUTE_GROUPS_ALL("all"),
+
+	/**
+	 * Represents the 'none' parameter constant for attribute groups.
+	 */
+	ATTRIBUTE_GROUPS_NONE("none"),
+
+	/**
+	 * Represents the 'atp.url' parameter constant.
+	 */
+	ATP_URL("atp.url"),
+	/**
+	 * Represents the 'apepsURL' parameter constant.
+	 */
+	APEPS_URL("apepsUrl"),
+
+	/**
+	 * Represents the 'apepsCountry' parameter constant.
+	 */
+	APEPS_COUNTRY("apepsCountry"),
+
+	/**
+	 * Represents the 'apepsAuthRequest' parameter constant.
+	 */
+	APEPS_ATTR_REQUEST("apepsAttrRequest"),
+
+	/**
+	 * Represents the 'isApepsRequest' parameter constant.
+	 */
+	APEPS_REQUEST_COMPLETE("apeps-request-complete"),
+
+	/**
+	 * Represents the 'apeps.callbackUrl' parameter constant.
+	 */
+	APEPS_CALLBACK_URL("apeps.callbackUrl"),
+	/**
+	 * Represents the 'attrListMand' parameter constant.
+	 */
+	ATTR_LIST_MAND("attrListMand"),
+
+	/**
+	 * Represents the 'attrListOpt' parameter constant.
+	 */
+	ATTR_LIST_OPT("attrListOpt"),
+
+	/**
+	 * Represents the 'simpleAttrListMand' parameter constant.
+	 */
+	SIMPLE_ATTR_LIST_MAND("simpleAttrListMand"),
+
+	/**
+	 * Represents the 'simpleAttrListOpt' parameter constant.
+	 */
+	SIMPLE_ATTR_LIST_OPT("simpleAttrListOpt"),
+
+	/**
+	 * Represents the 'complexAttrListMand' parameter constant.
+	 */
+	COMPLEX_ATTR_LIST_MAND("complexAttrListMand"),
+
+	/**
+	 * Represents the 'complexAttrListOpt' parameter constant.
+	 */
+	COMPLEX_ATTR_LIST_OPT("complexAttrListOpt"),
+	/**
+	 * Represents the 'idPDerivedAttrList' parameter constant.
+	 */
+	IDP_DERIVED_ATTR_LIST("idPDerivedAttrList"),
+	/**
+	 * Represents the 'apRejectedAttrsList' parameter constant.
+	 */
+	AP_REJECTED_ATTRS_LIST("apRejectedAttrsList"),
+	/**
+	 * Represents the 'logoutRequest' parameter constant.
+	 */
+	LOGOUT_REQUEST("logoutRequest"),
+	/**
+	 * Represents the 'logoutRequest' parameter constant.
+	 */
+	LOGOUT_RESPONSE("logoutResponse"),
+	/**
+	 * Represents the 'logoutRequest' parameter constant.
+	 */
+	LOGOUT_DEST_URL("speps.logout.destination.url");
+
+	/**
+	 * Represents the constant's value.
+	 */
+	private String value;
+
+	/**
+	 * Solo Constructor.
+	 * 
+	 * @param nValue
+	 *            The Constant value.
+	 */
+	PEPSParameters(final String nValue) {
+		this.value = nValue;
+	}
+
+	/**
+	 * Return the Constant Value.
+	 * 
+	 * @return The constant value.
+	 */
+	public String toString() {
+		return value;
+	}
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSUtil.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSUtil.java
index 69729c0bb..c026ebdbe 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSUtil.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSUtil.java
@@ -30,362 +30,363 @@ import eu.stork.peps.auth.commons.exceptions.InvalidParameterPEPSException;
 /**
  * This class holds static helper methods.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.75 $, $Date: 2010-11-23 00:05:35 $
  */
 public final class PEPSUtil {
-  
-  /**
-   * Logger object.
-   */
-  private static final Logger LOG = Logger.getLogger(PEPSUtil.class.getName());
-  
-  /**
-   * Configurations object.
-   */
-  private static Properties configs;
-  
-  /**
-   * Max prefix.
-   */
-  private static final String MAX_PARAM_PREFIX = "max.";
-  
-  /**
-   * Code prefix to get error code.
-   */
-  private static final String CODE_PARAM_SUFFIX = ".code";
-  
-  /**
-   * param's size prefix to get max param size.
-   */
-  private static final String MAX_PARAM_SUFFIX = ".size";
-  
-  /**
-   * Message prefix to get error message.
-   */
-  private static final String MSG_PARAM_SUFFIX = ".message";
-  
-  /**
-   * Private constructor. Prevents the class from being instantiated.
-   */
-  private PEPSUtil() {
-    // empty constructor
-  }
-  
-  /**
-   * Creates a single instance of this class and sets the properties.
-   * 
-   * @param nConfigs The set of available configurations.
-   * 
-   * @return The created PEPSUtil's class.
-   */
-  public static PEPSUtil createInstance(final Properties nConfigs) {
-    if (nConfigs != null) {
-      PEPSUtil.configs = nConfigs;
-    }
-    return new PEPSUtil();
-  }
-  
-  /**
-   * Getter for the Properties.
-   * 
-   * @return configs The properties value.
-   */
-  public Properties getConfigs() {
-    return configs;
-  }
-  
-  /**
-   * Setter for the Properties.
-   * 
-   * @param nConfigs The new properties value.
-   */
-  public static void setConfigs(final Properties nConfigs) {
-    if (nConfigs != null) {
-      PEPSUtil.configs = nConfigs;
-    }
-  }
-  
-  /**
-   * Returns the identifier of some configuration given a set of configurations
-   * and the corresponding configuration key.
-   * 
-   * @param configKey The key that IDs some configuration.
-   * 
-   * @return The configuration String value.
-   */
-  public static String getConfig(final String configKey) {
-    return configs.getProperty(configKey);
-  }
-  
-  /**
-   * Validates the input paramValue identified by the paramName.
-   * 
-   * @param paramName The name of the parameter to validate.
-   * @param paramValue The value of the parameter to validate.
-   * 
-   * @return true if the parameter is valid.
-   */
-  public static boolean isValidParameter(final String paramName,
-    final String paramValue) {
-    
-    final String validationParam =
-      PEPSUtil.getConfig(PEPSParameters.VALIDATION_ACTIVE.toString());
-    boolean retVal = true;
-    
-    final String paramConf = MAX_PARAM_PREFIX + paramName + MAX_PARAM_SUFFIX;
-    
-    if (PEPSValues.TRUE.toString().equals(validationParam)) {
-      final String paramSizeStr = PEPSUtil.getConfig(paramConf);
-      // Checking if the parameter size exists and if it's numeric
-      if (StringUtils.isNumeric(paramSizeStr)) {
-        final int maxParamSize = Integer.valueOf(paramSizeStr);
-        if (StringUtils.isEmpty(paramValue)
-          || paramValue.length() > maxParamSize) {
-          retVal = false;
-          LOG.warn("Invalid parameter [" + paramName + "] value " + paramValue);
-        }
-      } else {
-        retVal = false;
-        LOG.error("Missing " + paramConf
-          + " configuration in the pepsUtils.properties configuration file");
-      }
-    }
-    return retVal;
-  }
-  
-  /**
-   * Validates the Parameter and throws an exception if an error occurs. Throws
-   * an InvalidParameterPEPSException runtime exception if the parameter is
-   * invalid.
-   * 
-   * @param className The Class Name that invoked the method.
-   * @param paramName The name of the parameter to validate.
-   * @param paramValue The value of the parameter to validate.
-   */
-  public static void validateParameter(final String className,
-    final String paramName, final Object paramValue) {
-    
-    if (paramValue == null) {
-      PEPSUtil.validateParameter(className, paramName, "");
-    } else {
-      PEPSUtil.validateParameter(className, paramName, paramValue.toString());
-    }
-  }
-  
-  /**
-   * Validates the Parameters and throws an exception if an error occurs.
-   * 
-   * @param className The Class Name that invoked the method.
-   * @param paramName The name of the parameter to validate.
-   * @param paramValue The value of the parameter to validate.
-   */
-  public static void validateParameter(final String className,
-    final String paramName, final String paramValue) {
-    
-    PEPSUtil.validateParameter(className, paramName, paramValue,
-      PEPSUtil.getErrorCode(paramName), PEPSUtil.getErrorMessage(paramName));
-  }
-  
-  /**
-   * Validates the Parameters and throws an exception if an error occurs.
-   * 
-   * @param className The Class Name that invoked the method.
-   * @param paramName The name of the parameter to validate.
-   * @param paramValue The value of the parameter to validate.
-   * @param error The PEPSError to get error code and messages from configs.
-   */
-  public static void validateParameter(final String className,
-    final String paramName, final String paramValue, final PEPSErrors error) {
-    
-    PEPSUtil.validateParameter(className, paramName, paramValue,
-      PEPSUtil.getConfig(error.errorCode()),
-      PEPSUtil.getConfig(error.errorMessage()));
-  }
-  
-  /**
-   * Validates the HTTP Parameter and throws an exception if an error occurs.
-   * Throws an InvalidParameterPEPSException runtime exception if the parameter
-   * is invalid.
-   * 
-   * @param className The Class Name that invoked the method.
-   * @param paramName The name of the parameter to validate.
-   * @param paramValue The value of the parameter to validate.
-   * @param errorCode The error code to include on the exception.
-   * @param errorMessage The error message to include on the exception.
-   */
-  public static void validateParameter(final String className,
-    final String paramName, final String paramValue, final String errorCode,
-    final String errorMessage) {
-    
-    if (!isValidParameter(paramName, paramValue)) {
-      LOG.warn("Invalid parameter [" + paramName + "] value found at "
-        + className);
-      throw new InvalidParameterPEPSException(errorCode, errorMessage);
-    }
-  }
-  
-  /**
-   * Getter for the error code of some given error related to the input param.
-   * 
-   * @param paramName The name of the parameter associated with the error.
-   * 
-   * @return The code of the error.
-   */
-  private static String getErrorCode(final String paramName) {
-    return getConfig(paramName + CODE_PARAM_SUFFIX);
-  }
-  
-  /**
-   * Getter for the error message of some given error related to the input
-   * parameter.
-   * 
-   * @param paramName The name of the parameter associated with the message.
-   * 
-   * @return The message for the error.
-   */
-  private static String getErrorMessage(final String paramName) {
-    return getConfig(paramName + MSG_PARAM_SUFFIX);
-  }
-  
-  /**
-   * {@link Base64} encodes the input samlToken parameter.
-   * 
-   * @param samlToken the SAML Token to be encoded.
-   * 
-   * @return The Base64 String representing the samlToken.
-   * 
-   * @see Base64#encode
-   */
-  public static String encodeSAMLToken(final byte[] samlToken) {
-      try {
-          return new String(Base64.encode(samlToken), "UTF8");
-      } catch (final UnsupportedEncodingException e) {
-          LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e);
-          return null;
-      }
-  }
-  
-  /**
-   * Encode samltoken url safe
-   * @param samlToken the saml token to encode
-   * @return the bas64 encoded string
-   */
-  public static String encodeSAMLTokenUrlSafe(final byte[] samlToken) {
-      try {
-          return new String(UrlBase64.encode(samlToken), "UTF8");
-      } catch (final UnsupportedEncodingException e) {
-          LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e);
-          return null;
-      }
-  }
-  
-  /**
-   * Decodes the {@link Base64} String input parameter representing a samlToken.
-   * 
-   * @param samlToken the SAML Token to be decoded.
-   * 
-   * @return The samlToken decoded bytes.
-   * 
-   * @see Base64#decode
-   */
-  public static byte[] decodeSAMLToken(final String samlToken) {
-    return Base64.decode(samlToken);
-  }
-  
-  /**
-   * Decode URL save base64 saml token
-   * @param samlToken the SAML toke to decode
-   * @return The decoded bytes
-   */
-  public static byte[] decodeSAMLTokenUrlSafe(final String samlToken) {
-	    return UrlBase64.decode(samlToken);
-	  }
-  
-  /**
-   * Hashes a SAML token. Throws an InternalErrorPEPSException runtime exception
-   * if the Cryptographic Engine fails.
-   * 
-   * @param samlToken the SAML Token to be hashed.
-   * 
-   * @return byte[] with the hashed SAML Token.
-   */
-  public static byte[] hashPersonalToken(final byte[] samlToken) {
-    try {
-      final String className =
-        PEPSUtil.getConfig(PEPSValues.HASH_DIGEST_CLASS.toString());
-      
-      final Digest digest =
-        (Digest) Class.forName(className).getConstructor()
-          .newInstance((Object[]) null);
-      digest.update(samlToken, 0, samlToken.length);
-      
-      final int retLength = digest.getDigestSize();
-      final byte[] ret = new byte[retLength];
-      
-      digest.doFinal(ret, 0);
-      return ret;
-      
-    } catch (final Exception e) {
-      // For all those exceptions that could be thrown, we always log it and
-      // thrown an InternalErrorPEPSException.
-      LOG.error(PEPSErrors.HASH_ERROR.errorMessage(), e);
-      throw new InternalErrorPEPSException(
-        PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorCode()),
-        PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorMessage()), e);
-    }
-  }
-  
-  /**
-   * Gets the Stork error code in the error message if exists!
-   * 
-   * @param errorMessage The message to get the error code if exists;
-   * 
-   * @return the error code if exists. Returns null otherwise.
-   */
-  public static String getStorkErrorCode(final String errorMessage) {
-    if (StringUtils.isNotBlank(errorMessage)
-      && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) {
-      final String[] msgSplitted =
-        errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString());
-      if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) {
-        return msgSplitted[0];
-      }
-    }
-    return null;
-  }
-  
-  /**
-   * Gets the Stork error message in the saml message if exists!
-   * 
-   * @param errorMessage The message to get in the saml message if exists;
-   * 
-   * @return the error message if exists. Returns the original message
-   *         otherwise.
-   */
-  public static String getStorkErrorMessage(final String errorMessage) {
-    if (StringUtils.isNotBlank(errorMessage)
-      && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) {
-      final String[] msgSplitted =
-        errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString());
-      if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) {
-        return msgSplitted[1];
-      }
-    }
-    return errorMessage;
-  }
-  
-  /**
-   * Get inputstream from string
-   * @param string the string to convert
-   * @param codePage the codepage of string
-   * @return an inputstream
-   * @throws UnsupportedEncodingException
-   */
-  public static InputStream getStream(final String string, final String codePage) throws UnsupportedEncodingException
-  {
+
+	/**
+	 * Logger object.
+	 */
+	private static final Logger LOG = Logger.getLogger(PEPSUtil.class.getName());
+
+	/**
+	 * Configurations object.
+	 */
+	private static Properties configs;
+
+	/**
+	 * Max prefix.
+	 */
+	private static final String MAX_PARAM_PREFIX = "max.";
+
+	/**
+	 * Code prefix to get error code.
+	 */
+	private static final String CODE_PARAM_SUFFIX = ".code";
+
+	/**
+	 * param's size prefix to get max param size.
+	 */
+	private static final String MAX_PARAM_SUFFIX = ".size";
+
+	/**
+	 * Message prefix to get error message.
+	 */
+	private static final String MSG_PARAM_SUFFIX = ".message";
+
+	/**
+	 * Private constructor. Prevents the class from being instantiated.
+	 */
+	private PEPSUtil() {
+		// empty constructor
+	}
+
+	/**
+	 * Creates a single instance of this class and sets the properties.
+	 * 
+	 * @param nConfigs
+	 *            The set of available configurations.
+	 * 
+	 * @return The created PEPSUtil's class.
+	 */
+	public static PEPSUtil createInstance(final Properties nConfigs) {
+		if (nConfigs != null) {
+			PEPSUtil.configs = nConfigs;
+		}
+		return new PEPSUtil();
+	}
+
+	/**
+	 * Getter for the Properties.
+	 * 
+	 * @return configs The properties value.
+	 */
+	public Properties getConfigs() {
+		return configs;
+	}
+
+	/**
+	 * Setter for the Properties.
+	 * 
+	 * @param nConfigs
+	 *            The new properties value.
+	 */
+	public static void setConfigs(final Properties nConfigs) {
+		if (nConfigs != null) {
+			PEPSUtil.configs = nConfigs;
+		}
+	}
+
+	/**
+	 * Returns the identifier of some configuration given a set of configurations and the corresponding configuration key.
+	 * 
+	 * @param configKey
+	 *            The key that IDs some configuration.
+	 * 
+	 * @return The configuration String value.
+	 */
+	public static String getConfig(final String configKey) {
+		return configs.getProperty(configKey);
+	}
+
+	/**
+	 * Validates the input paramValue identified by the paramName.
+	 * 
+	 * @param paramName
+	 *            The name of the parameter to validate.
+	 * @param paramValue
+	 *            The value of the parameter to validate.
+	 * 
+	 * @return true if the parameter is valid.
+	 */
+	public static boolean isValidParameter(final String paramName, final String paramValue) {
+
+		final String validationParam = PEPSUtil.getConfig(PEPSParameters.VALIDATION_ACTIVE.toString());
+		boolean retVal = true;
+
+		final String paramConf = MAX_PARAM_PREFIX + paramName + MAX_PARAM_SUFFIX;
+
+		if (PEPSValues.TRUE.toString().equals(validationParam)) {
+			final String paramSizeStr = PEPSUtil.getConfig(paramConf);
+			// Checking if the parameter size exists and if it's numeric
+			if (StringUtils.isNumeric(paramSizeStr)) {
+				final int maxParamSize = Integer.valueOf(paramSizeStr);
+				if (StringUtils.isEmpty(paramValue) || paramValue.length() > maxParamSize) {
+					retVal = false;
+					LOG.warn("Invalid parameter [" + paramName + "] value " + paramValue);
+				}
+			} else {
+				retVal = false;
+				LOG.error("Missing " + paramConf + " configuration in the pepsUtils.properties configuration file");
+			}
+		}
+		return retVal;
+	}
+
+	/**
+	 * Validates the Parameter and throws an exception if an error occurs. Throws an InvalidParameterPEPSException runtime exception if the parameter is invalid.
+	 * 
+	 * @param className
+	 *            The Class Name that invoked the method.
+	 * @param paramName
+	 *            The name of the parameter to validate.
+	 * @param paramValue
+	 *            The value of the parameter to validate.
+	 */
+	public static void validateParameter(final String className, final String paramName, final Object paramValue) {
+
+		if (paramValue == null) {
+			PEPSUtil.validateParameter(className, paramName, "");
+		} else {
+			PEPSUtil.validateParameter(className, paramName, paramValue.toString());
+		}
+	}
+
+	/**
+	 * Validates the Parameters and throws an exception if an error occurs.
+	 * 
+	 * @param className
+	 *            The Class Name that invoked the method.
+	 * @param paramName
+	 *            The name of the parameter to validate.
+	 * @param paramValue
+	 *            The value of the parameter to validate.
+	 */
+	public static void validateParameter(final String className, final String paramName, final String paramValue) {
+
+		PEPSUtil.validateParameter(className, paramName, paramValue, PEPSUtil.getErrorCode(paramName), PEPSUtil.getErrorMessage(paramName));
+	}
+
+	/**
+	 * Validates the Parameters and throws an exception if an error occurs.
+	 * 
+	 * @param className
+	 *            The Class Name that invoked the method.
+	 * @param paramName
+	 *            The name of the parameter to validate.
+	 * @param paramValue
+	 *            The value of the parameter to validate.
+	 * @param error
+	 *            The PEPSError to get error code and messages from configs.
+	 */
+	public static void validateParameter(final String className, final String paramName, final String paramValue, final PEPSErrors error) {
+
+		PEPSUtil.validateParameter(className, paramName, paramValue, PEPSUtil.getConfig(error.errorCode()), PEPSUtil.getConfig(error.errorMessage()));
+	}
+
+	/**
+	 * Validates the HTTP Parameter and throws an exception if an error occurs. Throws an InvalidParameterPEPSException runtime exception if the parameter is invalid.
+	 * 
+	 * @param className
+	 *            The Class Name that invoked the method.
+	 * @param paramName
+	 *            The name of the parameter to validate.
+	 * @param paramValue
+	 *            The value of the parameter to validate.
+	 * @param errorCode
+	 *            The error code to include on the exception.
+	 * @param errorMessage
+	 *            The error message to include on the exception.
+	 */
+	public static void validateParameter(final String className, final String paramName, final String paramValue, final String errorCode, final String errorMessage) {
+
+		if (!isValidParameter(paramName, paramValue)) {
+			LOG.warn("Invalid parameter [" + paramName + "] value found at " + className);
+			throw new InvalidParameterPEPSException(errorCode, errorMessage);
+		}
+	}
+
+	/**
+	 * Getter for the error code of some given error related to the input param.
+	 * 
+	 * @param paramName
+	 *            The name of the parameter associated with the error.
+	 * 
+	 * @return The code of the error.
+	 */
+	private static String getErrorCode(final String paramName) {
+		return getConfig(paramName + CODE_PARAM_SUFFIX);
+	}
+
+	/**
+	 * Getter for the error message of some given error related to the input parameter.
+	 * 
+	 * @param paramName
+	 *            The name of the parameter associated with the message.
+	 * 
+	 * @return The message for the error.
+	 */
+	private static String getErrorMessage(final String paramName) {
+		return getConfig(paramName + MSG_PARAM_SUFFIX);
+	}
+
+	/**
+	 * {@link Base64} encodes the input samlToken parameter.
+	 * 
+	 * @param samlToken
+	 *            the SAML Token to be encoded.
+	 * 
+	 * @return The Base64 String representing the samlToken.
+	 * 
+	 * @see Base64#encode
+	 */
+	public static String encodeSAMLToken(final byte[] samlToken) {
+		try {
+			return new String(Base64.encode(samlToken), "UTF8");
+		} catch (final UnsupportedEncodingException e) {
+			LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e);
+			return null;
+		}
+	}
+
+	/**
+	 * Encode samltoken url safe
+	 * 
+	 * @param samlToken
+	 *            the saml token to encode
+	 * @return the bas64 encoded string
+	 */
+	public static String encodeSAMLTokenUrlSafe(final byte[] samlToken) {
+		try {
+			return new String(UrlBase64.encode(samlToken), "UTF8");
+		} catch (final UnsupportedEncodingException e) {
+			LOG.error(PEPSErrors.INTERNAL_ERROR.errorMessage(), e);
+			return null;
+		}
+	}
+
+	/**
+	 * Decodes the {@link Base64} String input parameter representing a samlToken.
+	 * 
+	 * @param samlToken
+	 *            the SAML Token to be decoded.
+	 * 
+	 * @return The samlToken decoded bytes.
+	 * 
+	 * @see Base64#decode
+	 */
+	public static byte[] decodeSAMLToken(final String samlToken) {
+		return Base64.decode(samlToken);
+	}
+
+	/**
+	 * Decode URL save base64 saml token
+	 * 
+	 * @param samlToken
+	 *            the SAML toke to decode
+	 * @return The decoded bytes
+	 */
+	public static byte[] decodeSAMLTokenUrlSafe(final String samlToken) {
+		return UrlBase64.decode(samlToken);
+	}
+
+	/**
+	 * Hashes a SAML token. Throws an InternalErrorPEPSException runtime exception if the Cryptographic Engine fails.
+	 * 
+	 * @param samlToken
+	 *            the SAML Token to be hashed.
+	 * 
+	 * @return byte[] with the hashed SAML Token.
+	 */
+	public static byte[] hashPersonalToken(final byte[] samlToken) {
+		try {
+			final String className = PEPSUtil.getConfig(PEPSValues.HASH_DIGEST_CLASS.toString());
+
+			final Digest digest = (Digest) Class.forName(className).getConstructor().newInstance((Object[]) null);
+			digest.update(samlToken, 0, samlToken.length);
+
+			final int retLength = digest.getDigestSize();
+			final byte[] ret = new byte[retLength];
+
+			digest.doFinal(ret, 0);
+			return ret;
+
+		} catch (final Exception e) {
+			// For all those exceptions that could be thrown, we always log it and
+			// thrown an InternalErrorPEPSException.
+			LOG.error(PEPSErrors.HASH_ERROR.errorMessage(), e);
+			throw new InternalErrorPEPSException(PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorCode()), PEPSUtil.getConfig(PEPSErrors.HASH_ERROR.errorMessage()), e);
+		}
+	}
+
+	/**
+	 * Gets the Stork error code in the error message if exists!
+	 * 
+	 * @param errorMessage
+	 *            The message to get the error code if exists;
+	 * 
+	 * @return the error code if exists. Returns null otherwise.
+	 */
+	public static String getStorkErrorCode(final String errorMessage) {
+		if (StringUtils.isNotBlank(errorMessage) && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) {
+			final String[] msgSplitted = errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString());
+			if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) {
+				return msgSplitted[0];
+			}
+		}
+		return null;
+	}
+
+	/**
+	 * Gets the Stork error message in the saml message if exists!
+	 * 
+	 * @param errorMessage
+	 *            The message to get in the saml message if exists;
+	 * 
+	 * @return the error message if exists. Returns the original message otherwise.
+	 */
+	public static String getStorkErrorMessage(final String errorMessage) {
+		if (StringUtils.isNotBlank(errorMessage) && errorMessage.indexOf(PEPSValues.ERROR_MESSAGE_SEP.toString()) >= 0) {
+			final String[] msgSplitted = errorMessage.split(PEPSValues.ERROR_MESSAGE_SEP.toString());
+			if (msgSplitted.length == 2 && StringUtils.isNumeric(msgSplitted[0])) {
+				return msgSplitted[1];
+			}
+		}
+		return errorMessage;
+	}
+
+	/**
+	 * Get inputstream from string
+	 * 
+	 * @param string
+	 *            the string to convert
+	 * @param codePage
+	 *            the codepage of string
+	 * @return an inputstream
+	 * @throws UnsupportedEncodingException
+	 */
+	public static InputStream getStream(final String string, final String codePage) throws UnsupportedEncodingException {
 		return new ByteArrayInputStream(string.getBytes(codePage));
-  }
+	}
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java
index 89cf8fa9b..a63db12e1 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PEPSValues.java
@@ -16,327 +16,330 @@ package eu.stork.peps.auth.commons;
 /**
  * This enum class contains all the value constants.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.17 $, $Date: 2011-07-07 20:48:45 $
  */
 public enum PEPSValues {
-  
-  /**
-   * Represents the 'all' constant value.
-   */
-  ALL("all"),
-  /**
-   * Represents the 'none' constant value.
-   */
-  NONE("none"),
-  /**
-   * Represents the 'true' constant value.
-   */
-  TRUE("true"),
-  /**
-   * Represents the 'false' constant value.
-   */
-  FALSE("false"),
-  /**
-   * Represents the empty string constant value.
-   */
-  EMPTY_STRING(""),
-  
-  /**
-   * Represents the ',' separator constant value.
-   */
-  ATTRIBUTE_VALUE_SEP(","),
-  /**
-   * Represents the ';' separator constant value.
-   */
-  ATTRIBUTE_SEP(";"),
-  /**
-   * Represents the ':' separator constant value.
-   */
-  ATTRIBUTE_TUPLE_SEP(":"),
-  /**
-   * Represents the '/' separator constant value.
-   */
-  EID_SEPARATOR("/"),
-  /**
-   * Represents the ' - ' separator constant value.
-   */
-  ERROR_MESSAGE_SEP(" - "),
-  /**
-   * Represents the '#' parameter constant value.
-   */
-  LOGGER_SEP("#"),
-  /**
-   * Represents the 'NOT_AVAILABLE' parameter constant value.
-   */
-  NOT_AVAILABLE("NotAvailable"),
-  /**
-   * Represents the ';' parameter constant value.
-   */
-  SPEPS_AUTHORIZED_SEP(";"),
-  
-  /**
-   * Represents the 'ap' constant value.
-   */
-  AP("ap"),
-  /**
-   * Represents the 'C-PEPS' constant value.
-   */
-  CPEPS("C-PEPS"),
-  /**
-   * Represents the 'cpeps' constant value.
-   */
-  CPEPS_PREFIX("cpeps"),
-  /**
-   * Represents the 'peps' constant value.
-   */
-  PEPS("peps"),
-  /**
-   * Represents the '-PEPS' constant value.
-   */
-  PEPS_SUFFIX("-PEPS"),
-  /**
-   * Represents the 'SP' constant value.
-   */
-  SP("SP"),
-  /**
-   * Represents the 'S-PEPS' constant value.
-   */
-  SPEPS("S-PEPS"),
-  /**
-   * Represents the 'speps' constant value.
-   */
-  SPEPS_PREFIX("speps"),
-  /**
-   * Represents the 'sp.default.parameters' constant value.
-   */
-  DEFAULT("sp.default.parameters"),
-  /**
-   * Represents the default saml id constant value.
-   */
-  DEFAULT_SAML_ID("1"),
-  /**
-   * Represents the 'hashDigest.className' constant value.
-   */
-  HASH_DIGEST_CLASS("hashDigest.className"),
-  
-  /**
-   * Represents the 'eu.stork.communication.requests' constant value.
-   */
-  STORK_PACKAGE_REQUEST_LOGGER_VALUE("eu.stork.communication.requests"),
-  /**
-   * Represents the 'eu.stork.communication.responses' constant value.
-   */
-  STORK_PACKAGE_RESPONSE_LOGGER_VALUE("eu.stork.communication.responses"),
-  
-  /**
-   * Represents the 'S-PEPS receives request from SP' constant value.
-   */
-  SP_REQUEST("S-PEPS receives request from SP"),
-  /**
-   * Represents the 'Get Citizen Consent' constant value.
-   */
-  CITIZEN_CONSENT_LOG("Get Citizen Consent"),
-  /**
-   * Represents the 'C-PEPS receives request from S-PEPS' constant value.
-   */
-  CPEPS_REQUEST("C-PEPS receives request from S-PEPS"),
-  /**
-   * Represents the 'C-PEPS generates response to S-PEPS' constant value.
-   */
-  CPEPS_RESPONSE("C-PEPS generates response to S-PEPS"),
-  /**
-   * Represents the 'S-PEPS generates request to C-PEPS' constant value.
-   */
-  SPEPS_REQUEST("S-PEPS generates request to C-PEPS"),
-  /**
-   * Represents the 'S-PEPS receives response from C-PEPS' constant value.
-   */
-  SPEPS_RESPONSE("S-PEPS receives response from C-PEPS"),
-  /**
-   * Represents the 'S-PEPS generates response to SP' constant value.
-   */
-  SP_RESPONSE("S-PEPS generates response to SP"),
-  /**
-   * Represents the 'Success' constant value.
-   */
-  SUCCESS("Success"),
-  /**
-   * Represents the December's month number constant value.
-   */
-  LAST_MONTH("12"),
-  /**
-   * Represents the yyyyMM constant value.
-   */
-  NO_DAY_DATE_FORMAT("yyyyMM"),
-  
-  /**
-   * Represents the 'attrValue' constant value.
-   */
-  ATTRIBUTE("attrValue"),
-  /**
-   * Represents the 'derivedAttr' constant value.
-   */
-  DERIVE_ATTRIBUTE("deriveAttr"),
-  /**
-   * Represents the 'storkAttribute' constant value.
-   */
-  STORK_ATTRIBUTE("storkAttribute"),
-  
-  /**
-   * Represents the 'properties' constant value.
-   */
-  PROPERTIES("properties"),
-  /**
-   * Represents the 'referer' constant value.
-   */
-  REFERER("referer"),
-  /**
-   * Represents the 'host' constant value.
-   */
-  HOST("host"),
-  /**
-   * Represents the 'spid' constant value.
-   */
-  SPID("spid"),
-  /**
-   * Represents the 'domain' constant value.
-   */
-  DOMAIN("domain"),
-  /**
-   * Represents the '.validation' constant value.
-   */
-  VALIDATION_SUFFIX(".validation"),
-  /**
-   * Represents the 'jsessionid' constant value.
-   */
-  EQUAL("="),
-  /**
-   * Represents the 'HttpOnly' constant value.
-   */
-  HTTP_ONLY("HttpOnly"),
-  /**
-   * Represents the 'SET-COOKIE' constant value.
-   */
-  JSSESSION("JSESSIONID"),
-  /**
-   * Represents the '=' constant value.
-   */
-  SETCOOKIE("SET-COOKIE"),
-  /**
-   * Represents the ';' constant value.
-   */
-  SEMICOLON(";"),
-  /**
-   * Represents the ' ' constant value.
-   */
-  SPACE(" "),
-  /**
-   * Represents the 'atp' constant value.
-   */
-  APROVIDER_PREFIX("atp"),
-  /**
-   * Represents the 'atn' constant value.
-   */
-  ANAME_PREFIX("atn"),
-  /**
-   * Represents the 'ap-cpeps' constant value.
-   */
-  AP_CPEPS_PREFIX("ap-cpeps"),
-  /**
-   * Represents the 'attr-filter' constant value.
-   */
-  AP_ATTRFILTER_PREFIX("attr-filter");
-  
-  /**
-   * Represents the constant's value.
-   */
-  private String value;
-  
-  /**
-   * Solo Constructor.
-   * 
-   * @param val The Constant value.
-   */
-  PEPSValues(final String val) {
-    
-    this.value = val;
-  }
-  
-  /**
-   * Return the Constant Value.
-   * 
-   * @return The constant value.
-   */
-  public String toString() {
-    
-    return value;
-  }
-  
-  /**
-   * Construct the return value with the following structure
-   * CONSTANT_VALUE+index+".id".
-   * 
-   * @param index the number.
-   * 
-   * @return The concatenated String value.
-   */
-  public String index(final int index) {
-    
-    return value + index + ".id";
-  }
-  
-  /**
-   * Construct the return value with the following structure
-   * CONSTANT_VALUE+index+".value".
-   * 
-   * @param index the number.
-   * 
-   * @return The concatenated string value.
-   */
-  public String value(final int index) {
-    
-    return value + index + ".value";
-  }
-  
-  /**
-   * Construct the return value with the following structure
-   * CONSTANT_VALUE+index+".name".
-   * 
-   * @param index the number.
-   * 
-   * @return The concatenated String value.
-   */
-  public String name(final int index) {
-    
-    return value + index + ".name";
-  }
-  
-  /**
-   * Construct the return value with the following structure
-   * CONSTANT_VALUE+index+".url".
-   * 
-   * @param index the number.
-   * 
-   * @return The concatenated String value.
-   */
-  public String url(final int index) {
-    
-    return value + index + ".url";
-  }
 
-  /**
-   * Construct the return value with the following structure
-   * CONSTANT_VALUE+index+".allowedGroups".
-   * 
-   * @param index the number.
-   * 
-   * @return The concatenated String value.
-   */
-  public String allowedGroups(final int index) {
-    
-    return value + index + ".allowedGroups";
-  }
+	/**
+	 * Represents the 'all' constant value.
+	 */
+	ALL("all"),
+	/**
+	 * Represents the 'none' constant value.
+	 */
+	NONE("none"),
+	/**
+	 * Represents the 'true' constant value.
+	 */
+	TRUE("true"),
+	/**
+	 * Represents the 'false' constant value.
+	 */
+	FALSE("false"),
+	/**
+	 * Represents the empty string constant value.
+	 */
+	EMPTY_STRING(""),
+
+	/**
+	 * Represents the ',' separator constant value.
+	 */
+	ATTRIBUTE_VALUE_SEP(","),
+	/**
+	 * Represents the ';' separator constant value.
+	 */
+	ATTRIBUTE_SEP(";"),
+	/**
+	 * Represents the ':' separator constant value.
+	 */
+	ATTRIBUTE_TUPLE_SEP(":"),
+	/**
+	 * Represents the '/' separator constant value.
+	 */
+	EID_SEPARATOR("/"),
+	/**
+	 * Represents the ' - ' separator constant value.
+	 */
+	ERROR_MESSAGE_SEP(" - "),
+	/**
+	 * Represents the '#' parameter constant value.
+	 */
+	LOGGER_SEP("#"),
+	/**
+	 * Represents the 'NOT_AVAILABLE' parameter constant value.
+	 */
+	NOT_AVAILABLE("NotAvailable"),
+	/**
+	 * Represents the ';' parameter constant value.
+	 */
+	SPEPS_AUTHORIZED_SEP(";"),
+
+	/**
+	 * Represents the 'ap' constant value.
+	 */
+	AP("ap"),
+	/**
+	 * Represents the 'C-PEPS' constant value.
+	 */
+	CPEPS("C-PEPS"),
+	/**
+	 * Represents the 'cpeps' constant value.
+	 */
+	CPEPS_PREFIX("cpeps"),
+	/**
+	 * Represents the 'peps' constant value.
+	 */
+	PEPS("peps"),
+	/**
+	 * Represents the '-PEPS' constant value.
+	 */
+	PEPS_SUFFIX("-PEPS"),
+	/**
+	 * Represents the 'SP' constant value.
+	 */
+	SP("SP"),
+	/**
+	 * Represents the 'S-PEPS' constant value.
+	 */
+	SPEPS("S-PEPS"),
+	/**
+	 * Represents the 'speps' constant value.
+	 */
+	SPEPS_PREFIX("speps"),
+	/**
+	 * Represents the 'sp.default.parameters' constant value.
+	 */
+	DEFAULT("sp.default.parameters"),
+	/**
+	 * Represents the default saml id constant value.
+	 */
+	DEFAULT_SAML_ID("1"),
+	/**
+	 * Represents the 'hashDigest.className' constant value.
+	 */
+	HASH_DIGEST_CLASS("hashDigest.className"),
+
+	/**
+	 * Represents the 'eu.stork.communication.requests' constant value.
+	 */
+	STORK_PACKAGE_REQUEST_LOGGER_VALUE("eu.stork.communication.requests"),
+	/**
+	 * Represents the 'eu.stork.communication.responses' constant value.
+	 */
+	STORK_PACKAGE_RESPONSE_LOGGER_VALUE("eu.stork.communication.responses"),
+
+	/**
+	 * Represents the 'S-PEPS receives request from SP' constant value.
+	 */
+	SP_REQUEST("S-PEPS receives request from SP"),
+	/**
+	 * Represents the 'Get Citizen Consent' constant value.
+	 */
+	CITIZEN_CONSENT_LOG("Get Citizen Consent"),
+	/**
+	 * Represents the 'C-PEPS receives request from S-PEPS' constant value.
+	 */
+	CPEPS_REQUEST("C-PEPS receives request from S-PEPS"),
+	/**
+	 * Represents the 'C-PEPS generates response to S-PEPS' constant value.
+	 */
+	CPEPS_RESPONSE("C-PEPS generates response to S-PEPS"),
+	/**
+	 * Represents the 'S-PEPS generates request to C-PEPS' constant value.
+	 */
+	SPEPS_REQUEST("S-PEPS generates request to C-PEPS"),
+	/**
+	 * Represents the 'S-PEPS receives response from C-PEPS' constant value.
+	 */
+	SPEPS_RESPONSE("S-PEPS receives response from C-PEPS"),
+	/**
+	 * Represents the 'S-PEPS generates response to SP' constant value.
+	 */
+	SP_RESPONSE("S-PEPS generates response to SP"),
+	/**
+	 * Represents the 'Success' constant value.
+	 */
+	SUCCESS("Success"),
+	/**
+	 * Represents the December's month number constant value.
+	 */
+	LAST_MONTH("12"),
+	/**
+	 * Represents the yyyyMM constant value.
+	 */
+	NO_DAY_DATE_FORMAT("yyyyMM"),
+
+	/**
+	 * Represents the 'attrValue' constant value.
+	 */
+	ATTRIBUTE("attrValue"),
+	/**
+	 * Represents the 'derivedAttr' constant value.
+	 */
+	DERIVE_ATTRIBUTE("deriveAttr"),
+	/**
+	 * Represents the 'storkAttribute' constant value.
+	 */
+	STORK_ATTRIBUTE("storkAttribute"),
+
+	/**
+	 * Represents the 'properties' constant value.
+	 */
+	PROPERTIES("properties"),
+	/**
+	 * Represents the 'referer' constant value.
+	 */
+	REFERER("referer"),
+	/**
+	 * Represents the 'host' constant value.
+	 */
+	HOST("host"),
+	/**
+	 * Represents the 'spid' constant value.
+	 */
+	SPID("spid"),
+	/**
+	 * Represents the 'domain' constant value.
+	 */
+	DOMAIN("domain"),
+	/**
+	 * Represents the '.validation' constant value.
+	 */
+	VALIDATION_SUFFIX(".validation"),
+	/**
+	 * Represents the 'jsessionid' constant value.
+	 */
+	EQUAL("="),
+	/**
+	 * Represents the 'HttpOnly' constant value.
+	 */
+	HTTP_ONLY("HttpOnly"),
+	/**
+	 * Represents the 'SET-COOKIE' constant value.
+	 */
+	JSSESSION("JSESSIONID"),
+	/**
+	 * Represents the '=' constant value.
+	 */
+	SETCOOKIE("SET-COOKIE"),
+	/**
+	 * Represents the ';' constant value.
+	 */
+	SEMICOLON(";"),
+	/**
+	 * Represents the ' ' constant value.
+	 */
+	SPACE(" "),
+	/**
+	 * Represents the 'atp' constant value.
+	 */
+	APROVIDER_PREFIX("atp"),
+	/**
+	 * Represents the 'atn' constant value.
+	 */
+	ANAME_PREFIX("atn"),
+	/**
+	 * Represents the 'ap-cpeps' constant value.
+	 */
+	AP_CPEPS_PREFIX("ap-cpeps"),
+	/**
+	 * Represents the 'attr-filter' constant value.
+	 */
+	AP_ATTRFILTER_PREFIX("attr-filter"),
+	/**
+	 * Represents the 'save-session' constant value.
+	 */
+	SAVED_SESSION("saved-session");
+
+	/**
+	 * Represents the constant's value.
+	 */
+	private String value;
+
+	/**
+	 * Solo Constructor.
+	 * 
+	 * @param val
+	 *            The Constant value.
+	 */
+	PEPSValues(final String val) {
+
+		this.value = val;
+	}
+
+	/**
+	 * Return the Constant Value.
+	 * 
+	 * @return The constant value.
+	 */
+	public String toString() {
+
+		return value;
+	}
+
+	/**
+	 * Construct the return value with the following structure CONSTANT_VALUE+index+".id".
+	 * 
+	 * @param index
+	 *            the number.
+	 * 
+	 * @return The concatenated String value.
+	 */
+	public String index(final int index) {
+
+		return value + index + ".id";
+	}
+
+	/**
+	 * Construct the return value with the following structure CONSTANT_VALUE+index+".value".
+	 * 
+	 * @param index
+	 *            the number.
+	 * 
+	 * @return The concatenated string value.
+	 */
+	public String value(final int index) {
+
+		return value + index + ".value";
+	}
+
+	/**
+	 * Construct the return value with the following structure CONSTANT_VALUE+index+".name".
+	 * 
+	 * @param index
+	 *            the number.
+	 * 
+	 * @return The concatenated String value.
+	 */
+	public String name(final int index) {
+
+		return value + index + ".name";
+	}
+
+	/**
+	 * Construct the return value with the following structure CONSTANT_VALUE+index+".url".
+	 * 
+	 * @param index
+	 *            the number.
+	 * 
+	 * @return The concatenated String value.
+	 */
+	public String url(final int index) {
+
+		return value + index + ".url";
+	}
+
+	/**
+	 * Construct the return value with the following structure CONSTANT_VALUE+index+".allowedGroups".
+	 * 
+	 * @param index
+	 *            the number.
+	 * 
+	 * @return The concatenated String value.
+	 */
+	public String allowedGroups(final int index) {
+
+		return value + index + ".allowedGroups";
+	}
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java
index 15803fb68..8d1482f05 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttribute.java
@@ -18,331 +18,374 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.Vector;
 
 import org.apache.log4j.Logger;
 
 import eu.stork.peps.auth.commons.exceptions.InternalErrorPEPSException;
 
 /**
- * This class is a bean used to store the information relative to the
- * PersonalAttribute.
+ * This class is a bean used to store the information relative to the PersonalAttribute.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.22 $, $Date: 2010-11-17 05:15:28 $
  */
 public final class PersonalAttribute implements Serializable, Cloneable {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 2612951678412632174L;
-  
-  /**
-   * Logger object.
-   */
-  private static final Logger LOG = Logger.getLogger(PersonalAttribute.class
-    .getName());
-  
-  /**
-   * Name of the personal attribute.
-   */
-  private String name;
-  
-  /**
-   * Values of the personal attribute.
-   */
-  private List<String> value = new ArrayList<String>();
-  
-  /**
-   * Type of the personal attribute.
-   */
- private String type;
-  
-  /**
-   * Complex values of the personal attribute.
-   */
-  private Map<String, String> complexValue = new ConcurrentHashMap<String, String>();
-  
-  /**
-   * Is the personal attribute mandatory?
-   */
-  private boolean required;
-  
-  /**
-   * Returned status of the attribute from the IdP.
-   */
-  private String status;
-  
-  /**
-   * Name of the personal attribute.
-   */
-  private String friendlyName;
-  
-  /**
-   * Empty Constructor.
-   */
-  public PersonalAttribute() {
-    super();
-  }
-  
-  /**
-   * PersonalAttribute Constructor for complex values.
-   * 
-   * @param attrName The attribute name.
-   * @param attrIsRequired The attribute type value.
-   * @param attrComplexValue The attribute's value.
-   * @param attrStatus The attribute's status value.
-   */
-  public PersonalAttribute(final String attrName, final boolean attrIsRequired,
-    final List<String> attrComplexValue, final String attrStatus) {
-    this.setName(attrName);
-    this.setIsRequired(attrIsRequired);
-    this.setValue(attrComplexValue);
-    this.setStatus(attrStatus);
-  }
-  
-  /**
-   * PersonalAttribute Constructor for complex values.
-   * 
-   * @param attrName The attribute name.
-   * @param attrIsRequired The attribute type value.
-   * @param attrComplexValue The attribute's complex value.
-   * @param attrStatus The attribute's status value.
-   */
-  public PersonalAttribute(final String attrName, final boolean attrIsRequired,
-    final Map<String, String> attrComplexValue, final String attrStatus) {
-    this.setName(attrName);
-    this.setIsRequired(attrIsRequired);
-    this.setComplexValue(attrComplexValue);
-    this.setStatus(attrStatus);
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  @SuppressWarnings("unchecked")
-  public Object clone() {
-    
-    try {
-      final PersonalAttribute personalAttr = (PersonalAttribute) super.clone();
-      personalAttr.setIsRequired(this.isRequired());
-      personalAttr.setName(this.getName());
-      personalAttr.setStatus(this.getStatus());
-      if (!isEmptyValue()) {
-        final List<String> val =
-          (List<String>) ((ArrayList<String>) this.getValue()).clone();
-        personalAttr.setValue(val);
-      }
-      if (!isEmptyComplexValue()) {
-        final Map<String, String> complexVal =
-          (Map<String, String>) ((HashMap<String, String>) this
-            .getComplexValue()).clone();
-        personalAttr.setComplexValue(complexVal);
-      }
-      return personalAttr;
-    } catch (final CloneNotSupportedException e) {
-      // assert false;
-      LOG.trace("Nothing to do.");
-      throw new InternalErrorPEPSException(
-        PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorCode()),
-        PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorMessage()), e);
-    }
-  }
-  
-  /**
-   * Getter for the required value.
-   * 
-   * @return The required value.
-   */
-  public boolean isRequired() {
-    return required;
-  }
-  
-  /**
-   * Setter for the required value.
-   * 
-   * @param attrIsRequired this attribute?
-   */
-  public void setIsRequired(final boolean attrIsRequired) {
-    this.required = attrIsRequired;
-  }
-  
-  /**
-   * Getter for the name value.
-   * 
-   * @return The name value.
-   */
-  public String getName() {
-    return name;
-  }
-  
-  /**
-   * Setter for the name value.
-   * 
-   * @param attrName The personal attribute name.
-   */
-  public void setName(final String attrName) {
-    this.name = attrName;
-  }
-  
-  /**
-   * Getter for the value.
-   * 
-   * @return The list of values.
-   */
-  public List<String> getValue() {
-    return value;
-  }
-  
-  /**
-   * Setter for the list of values.
-   * 
-   * @param attrValue The personal attribute value.
-   */
-  public void setValue(final List<String> attrValue) {
-    if (attrValue != null) {
-      this.value = attrValue;
-    }
-  }
-  
-
-  /**
-   * Getter for the type value.
-   * 
-   * @return The name value.
-   */
-  public String getType() {
-    return type;
-  }
-  
-  /**
-   * Setter for the type value.
-   * 
-   * @param attrName The personal attribute type.
-   */
-  public void setType(final String attrType) {
-    this.type = attrType;
-  }
-  
-  /**
-   * Getter for the status.
-   * 
-   * @return The status value.
-   */
-  public String getStatus() {
-    return status;
-  }
-  
-  /**
-   * Setter for the status value.
-   * 
-   * @param attrStatus The personal attribute status.
-   */
-  public void setStatus(final String attrStatus) {
-    this.status = attrStatus;
-  }
-  
-  /**
-   * Getter for the complex value.
-   * 
-   * @return The complex value.
-   */
-  public Map<String, String> getComplexValue() {
-    return complexValue;
-  }
-  
-  /**
-   * Setter for the complex value.
-   * 
-   * @param complexVal The personal attribute Complex value.
-   */
-  public void setComplexValue(final Map<String, String> complexVal) {
-    if (complexVal != null) {
-      this.complexValue = complexVal;
-    }
-  }
-  
-  /**
-   * Getter for the personal's friendly name.
-   * 
-   * @return The personal's friendly name value.
-   */
-  public String getFriendlyName() {
-    return friendlyName;
-  }
-  
-  /**
-   * Setter for the personal's friendly name.
-   * 
-   * @param fName The personal's friendly name.
-   */
-  public void setFriendlyName(final String fName) {
-    this.friendlyName = fName;
-  }
-  
-  /**
-   * Return true the value is empty.
-   * 
-   * @return True if the value is empty "[]";
-   */
-  public boolean isEmptyValue() {
-    return value.isEmpty() || (value.size() == 1 && value.get(0).length() == 0);
-  }
-  
-  /**
-   * Returns true if the Complex Value is empty.
-   * 
-   * @return True if the Complex Value is empty;
-   */
-  public boolean isEmptyComplexValue() {
-    return complexValue.isEmpty();
-  }
-  
-  /**
-   * Returns true if the Status is empty.
-   * 
-   * @return True if the Status is empty;
-   */
-  public boolean isEmptyStatus() {
-    return (status == null || status.length() == 0);
-  }
-  
-  /**
-   * Prints the PersonalAttribute in the following format.
-   * name:required:[v,a,l,u,e,s]|[v=a,l=u,e=s]:status;
-   * 
-   * @return The PersonalAttribute as a string.
-   */
-  public String toString() {
-    final StringBuilder strBuild = new StringBuilder();
-    
-    AttributeUtil.appendIfNotNull(strBuild, getName());
-    strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString());
-    AttributeUtil.appendIfNotNull(strBuild, String.valueOf(isRequired()));
-    strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString());
-    strBuild.append('[');
-    
-    if (isEmptyValue()) {
-      if (!isEmptyComplexValue()) {
-        AttributeUtil.appendIfNotNull(strBuild, AttributeUtil.mapToString(
-          getComplexValue(), PEPSValues.ATTRIBUTE_VALUE_SEP.toString()));
-      }
-    } else {
-      AttributeUtil.appendIfNotNull(
-        strBuild,
-        AttributeUtil.listToString(getValue(),
-          PEPSValues.ATTRIBUTE_VALUE_SEP.toString()));
-    }
-    
-    strBuild.append(']');
-    strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString());
-    AttributeUtil.appendIfNotNull(strBuild, getStatus());
-    strBuild.append(PEPSValues.ATTRIBUTE_SEP.toString());
-    
-    return strBuild.toString();
-  }
-  
+
+	/**
+	 * Unique identifier.
+	 */
+	private static final long serialVersionUID = 2612951678412632174L;
+
+	/**
+	 * Logger object.
+	 */
+	private static final Logger LOG = Logger.getLogger(PersonalAttribute.class.getName());
+
+	/**
+	 * Name of the personal attribute.
+	 */
+	private String name;
+
+	/**
+	 * Values of the personal attribute.
+	 */
+	private List<String> value = new ArrayList<String>();
+
+	/**
+	 * Type of the personal attribute.
+	 */
+	private String type;
+
+	/**
+	 * Complex values of the personal attribute.
+	 */
+	private List<Map<String, String>> complexValue = new Vector<Map<String, String>>();
+
+	/**
+	 * Is the personal attribute mandatory?
+	 */
+	private boolean required;
+
+	/**
+	 * Returned status of the attribute from the IdP.
+	 */
+	private String status;
+
+	/**
+	 * Name of the personal attribute.
+	 */
+	private String friendlyName;
+
+	/**
+	 * Empty Constructor.
+	 */
+	public PersonalAttribute() {
+		super();
+	}
+
+	/**
+	 * PersonalAttribute Constructor for complex values.
+	 * 
+	 * @param attrName
+	 *            The attribute name.
+	 * @param attrIsRequired
+	 *            The attribute type value.
+	 * @param attrComplexValue
+	 *            The attribute's value.
+	 * @param attrStatus
+	 *            The attribute's status value.
+	 */
+	public PersonalAttribute(final String attrName, final boolean attrIsRequired, final List<String> attrComplexValue, final String attrStatus) {
+		this.setName(attrName);
+		this.setIsRequired(attrIsRequired);
+		this.setValue(attrComplexValue);
+		this.setStatus(attrStatus);
+	}
+
+	/**
+	 * PersonalAttribute Constructor for complex values.
+	 * 
+	 * @param attrName
+	 *            The attribute name.
+	 * @param attrIsRequired
+	 *            The attribute type value.
+	 * @param attrComplexValue
+	 *            The attribute's complex value.
+	 * @param attrStatus
+	 *            The attribute's status value.
+	 */
+	public PersonalAttribute(final String attrName, final boolean attrIsRequired, final Map<String, String> attrComplexValue, final String attrStatus) {
+		this.setName(attrName);
+		this.setIsRequired(attrIsRequired);
+		this.setComplexValue(attrComplexValue);
+		this.setStatus(attrStatus);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	@SuppressWarnings("unchecked")
+	public Object clone() {
+
+		try {
+			final PersonalAttribute personalAttr = (PersonalAttribute) super.clone();
+			personalAttr.setIsRequired(this.isRequired());
+			personalAttr.setName(this.getName());
+			personalAttr.setStatus(this.getStatus());
+			if (!isEmptyValue()) {
+				final List<String> val = (List<String>) ((ArrayList<String>) this.getValue()).clone();
+				personalAttr.setValue(val);
+			}
+			if (!isEmptyComplexValue()) {
+				personalAttr.addComplexValues(this.getComplexValues());
+			}
+			return personalAttr;
+		} catch (final CloneNotSupportedException e) {
+			// assert false;
+			LOG.trace("Nothing to do.");
+			throw new InternalErrorPEPSException(PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorCode()), PEPSUtil.getConfig(PEPSErrors.INTERNAL_ERROR.errorMessage()), e);
+		}
+	}
+
+	/**
+	 * Getter for the required value.
+	 * 
+	 * @return The required value.
+	 */
+	public boolean isRequired() {
+		return required;
+	}
+
+	/**
+	 * Setter for the required value.
+	 * 
+	 * @param attrIsRequired
+	 *            this attribute?
+	 */
+	public void setIsRequired(final boolean attrIsRequired) {
+		this.required = attrIsRequired;
+	}
+
+	/**
+	 * Getter for the name value.
+	 * 
+	 * @return The name value.
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Setter for the name value.
+	 * 
+	 * @param attrName
+	 *            The personal attribute name.
+	 */
+	public void setName(final String attrName) {
+		this.name = attrName;
+	}
+
+	/**
+	 * Getter for the value.
+	 * 
+	 * @return The list of values.
+	 */
+	public List<String> getValue() {
+		return value;
+	}
+
+	/**
+	 * Setter for the list of values.
+	 * 
+	 * @param attrValue
+	 *            The personal attribute value.
+	 */
+	public void setValue(final List<String> attrValue) {
+		if (attrValue != null) {
+			this.value = attrValue;
+		}
+	}
+
+	/**
+	 * Add new value to list of values.
+	 *
+	 * @param attrValue
+	 *            The personal attribute value.
+	 */
+	public void addValue(final String attrValue) {
+		if (attrValue != null) {
+			this.value.add(attrValue);
+		}
+	}
+
+	/**
+	 * Getter for the type value.
+	 * 
+	 * @return The name value.
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Setter for the type value.
+	 * 
+	 * @param attrName
+	 *            The personal attribute type.
+	 */
+	public void setType(final String attrType) {
+		this.type = attrType;
+	}
+
+	/**
+	 * Getter for the status.
+	 * 
+	 * @return The status value.
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * Setter for the status value.
+	 * 
+	 * @param attrStatus
+	 *            The personal attribute status.
+	 */
+	public void setStatus(final String attrStatus) {
+		this.status = attrStatus;
+	}
+
+	/**
+	 * Getter for the complex value.
+	 * 
+	 * @return The complex value.
+	 */
+	public Map<String, String> getComplexValue() {
+		if (complexValue.size() > 0) {
+			return complexValue.get(0);
+		} else {
+			return new HashMap<String, String>();
+		}
+	}
+
+	/**
+	 * Getter for the complex values.
+	 *
+	 * @return The complex value.
+	 */
+	public List<Map<String, String>> getComplexValues() {
+		return complexValue;
+	}
+
+	/**
+	 * Setter for the complex value.
+	 * 
+	 * @param complexVal
+	 *            The personal attribute Complex value.
+	 */
+	public void setComplexValue(final Map<String, String> complexVal) {
+		if (complexVal != null) {
+			this.complexValue.add(complexVal);
+		}
+	}
+
+	/**
+	 * Setter for the complex values.
+	 *
+	 * @param complexVal
+	 *            The personal attribute Complex values.
+	 */
+	public void addComplexValues(final List<Map<String, String>> complexVals) {
+		this.complexValue.addAll(complexVals);
+	}
+
+	/**
+	 * Getter for the personal's friendly name.
+	 * 
+	 * @return The personal's friendly name value.
+	 */
+	public String getFriendlyName() {
+		return friendlyName;
+	}
+
+	/**
+	 * Setter for the personal's friendly name.
+	 * 
+	 * @param fName
+	 *            The personal's friendly name.
+	 */
+	public void setFriendlyName(final String fName) {
+		this.friendlyName = fName;
+	}
+
+	/**
+	 * Return true the value is empty.
+	 * 
+	 * @return True if the value is empty "[]";
+	 */
+	public boolean isEmptyValue() {
+		return value.isEmpty() || (value.size() == 1 && value.get(0).length() == 0);
+	}
+
+	/**
+	 * Returns true if the Complex Value is empty.
+	 * 
+	 * @return True if the Complex Value is empty;
+	 */
+	public boolean isEmptyComplexValue() {
+		return complexValue.isEmpty() || complexValue.get(0).isEmpty();
+	}
+
+	/**
+	 * Returns true if the Status is empty.
+	 * 
+	 * @return True if the Status is empty;
+	 */
+	public boolean isEmptyStatus() {
+		return (status == null || status.length() == 0);
+	}
+
+	/**
+	 * Prints the PersonalAttribute in the following format. name:required:[v,a,l,u,e,s]|[v=a,l=u,e=s]:status;
+	 * 
+	 * @return The PersonalAttribute as a string.
+	 */
+	public String toString() {
+		final StringBuilder strBuild = new StringBuilder();
+
+		AttributeUtil.appendIfNotNull(strBuild, getName());
+		strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString());
+		AttributeUtil.appendIfNotNull(strBuild, String.valueOf(isRequired()));
+		strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString());
+		strBuild.append('[');
+
+		if (isEmptyValue()) {
+			if (!isEmptyComplexValue()) {
+				AttributeUtil.appendIfNotNull(strBuild, AttributeUtil.mapToString(getComplexValue(), PEPSValues.ATTRIBUTE_VALUE_SEP.toString()));
+			}
+		} else {
+			AttributeUtil.appendIfNotNull(strBuild, AttributeUtil.listToString(getValue(), PEPSValues.ATTRIBUTE_VALUE_SEP.toString()));
+		}
+
+		strBuild.append(']');
+		strBuild.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString());
+		AttributeUtil.appendIfNotNull(strBuild, getStatus());
+		strBuild.append(PEPSValues.ATTRIBUTE_SEP.toString());
+
+		return strBuild.toString();
+	}
+
+	/**
+	 * Empties the Value or ComplexValue field of a PersonalAttribute
+	 */
+	public void setEmptyValue() {
+		if (this.isEmptyValue()) {
+			this.complexValue = new Vector<Map<String, String>>();
+		} else {
+			this.value = new ArrayList<String>();
+		}
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
index 9a0f87488..1ddc02e15 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/PersonalAttributeList.java
@@ -13,7 +13,6 @@
  */
 package eu.stork.peps.auth.commons;
 
-import java.io.Serializable;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Iterator;
@@ -26,372 +25,430 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.log4j.Logger;
 
 /**
- * This class is a bean used to store the information relative to the
- * PersonalAttributeList.
+ * This class is a bean used to store the information relative to the PersonalAttributeList.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.27 $, $Date: 2010-11-18 22:54:56 $
  * 
  * @see PersonalAttribute
  */
 @SuppressWarnings("PMD")
-public final class PersonalAttributeList extends
-	ConcurrentHashMap<String, PersonalAttribute> implements IPersonalAttributeList, Serializable {
-  
-  /**
-   * Logger object.
-   */
-  private static final Logger LOG = Logger
-    .getLogger(PersonalAttributeList.class.getName());
-  
-  /**
-   * Serial id.
-   */
-  private static final long serialVersionUID = 7375127363889975062L;
-  
-  /**
-   * Hash with the latest fetched attribute name alias.
-   */
-  private final Map<String, Integer> latestAttrAlias =
-    new HashMap<String, Integer>();
-  
-  /**
-   * Hash with mapping number of alias or the attribute name.
-   */
-  private final Map<String, Integer> attrAliasNumber =
-    new HashMap<String, Integer>();
-  
-  /**
-   * Default constructor.
-   */
-  public PersonalAttributeList() {
-    // The best practices recommend to call the super constructor.
-    super();
-  }
-  
-  /**
-   * Constructor with initial capacity for the PersonalAttributeList size.
-   * 
-   * @param capacity The initial capacity for the PersonalAttributeList.
-   */
-  public PersonalAttributeList(final int capacity) {
-    super(capacity);
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public Iterator<PersonalAttribute> iterator() {
-    return this.values().iterator();
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public PersonalAttribute get(final Object key) {
-    String attrName = (String) key;
-    
-    if (this.latestAttrAlias.containsKey(key)) {
-      attrName = attrName + this.latestAttrAlias.get(key);
-    } else {
-      if (this.attrAliasNumber.containsKey(key)) {
-        this.latestAttrAlias.put(attrName, this.attrAliasNumber.get(key));
-      }
-    }
-    return super.get(attrName);
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public void add(final PersonalAttribute value) {
-    if (value != null) {
-      this.put(value.getName(), value);
-    }
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public PersonalAttribute put(final String key, final PersonalAttribute val) {
-    if (StringUtils.isNotEmpty(key) && val != null) {
-      // Validate if attribute name already exists!
-      String attrAlias = key;
-      if (this.containsKey(attrAlias)) {
-    	//TODO isAgeOver should not be hardcoded, a better way of handling multipe isAgeOver requests should be implemented.
-        if (!val.isEmptyValue() && StringUtils.isNumeric(val.getValue().get(0)) && "isAgeOver".equals( val.getName() ) ) {
-          final String attrValue = val.getValue().get(0);
-          attrAlias = key + attrValue;
-          this.attrAliasNumber.put(key, Integer.valueOf(attrValue));
-        } else {
-          final PersonalAttribute attr = super.get(key);
-          if (!attr.isEmptyValue()
-            && StringUtils.isNumeric(attr.getValue().get(0))) {
-            attrAlias = key + attr.getValue().get(0);
-            super.put(key, (PersonalAttribute) attr);
-            this.attrAliasNumber.put(key, null);
-          }
-        }
-      }
-      return super.put(attrAlias, val);
-    } else {
-      return null;
-    }
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public void populate(final String attrList) {
-    final StringTokenizer strToken =
-      new StringTokenizer(attrList, PEPSValues.ATTRIBUTE_SEP.toString());
-    
-    while (strToken.hasMoreTokens()) {
-      final PersonalAttribute persAttr = new PersonalAttribute();
-      String[] tuples =
-        strToken.nextToken().split(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(),
-          AttributeConstants.NUMBER_TUPLES.intValue());
-      
-      // Convert to the new format if needed!
-      tuples = convertFormat(tuples);
-      
-      if (AttributeUtil.hasValidTuples(tuples)) {
-        final int attrValueIndex =
-          AttributeConstants.ATTR_VALUE_INDEX.intValue();
-        final String tmpAttrValue =
-          tuples[attrValueIndex].substring(1,
-            tuples[attrValueIndex].length() - 1);
-        final String[] vals =
-          tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-        
-        persAttr.setName(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()]);
-        persAttr.setIsRequired(Boolean
-          .valueOf(tuples[AttributeConstants.ATTR_TYPE_INDEX.intValue()]));
-        
-        // check if it is a complex value
-        if (isComplexValue(vals)) {
-          persAttr.setComplexValue(createComplexValue(vals));
-        }
-        else 
-        {
-        	persAttr.setValue(createValues(vals));
-        }
-        
-        if (tuples.length == AttributeConstants.NUMBER_TUPLES.intValue()) {
-          persAttr.setStatus(tuples[AttributeConstants.ATTR_STATUS_INDEX
-            .intValue()]);
-        }
-        this.put(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()],
-          persAttr);
-        
-      } else {
-        LOG.warn("Invalid personal attribute list tuples");
-      }
-      
-    }
-  }
-
-  /**
-  * Returns a copy of this <tt>IPersonalAttributeList</tt> instance.
-  *
-  * @return The copy of this IPersonalAttributeList.
-  */
-  public Object clone() {
-	  try {
-	    return (PersonalAttributeList) super.clone();
-	  } catch (CloneNotSupportedException e) {
-	    return null;
-	  }
-  }
-  
-  /**
-   * Creates a string in the following format.
-   * 
-   * attrName:attrType:[attrValue1,attrValue2=attrComplexValue]:attrStatus;
-   * 
-   * @return {@inheritDoc}
-   */
-  @Override
-  public String toString() {
-    final Iterator<Entry<String, PersonalAttribute>> itAttrs =
-      this.entrySet().iterator();
-    final StringBuilder strBuilder = new StringBuilder();
-    
-    while (itAttrs.hasNext()) {
-      final Entry<String, PersonalAttribute> attrEntry = itAttrs.next();
-      final PersonalAttribute attr = attrEntry.getValue();
-      //strBuilder.append(attr.toString());
-      strBuilder.insert(0, attr.toString());
-    }
-    
-    return strBuilder.toString();
-  }
-  
-  /**
-   * Validates and creates the attribute's complex values.
-   * 
-   * @param values The complex values.
-   * 
-   * @return The {@link Map} with the complex values.
-   * 
-   * @see Map
-   */
-  private Map<String, String> createComplexValue(final String[] values) {
-    final Map<String, String> complexValue = new HashMap<String, String>();
-    for (final String val : values) {
-      final String[] tVal = val.split("=");
-      if (StringUtils.isNotEmpty(val) && tVal.length == 2) {
-        complexValue.put(tVal[0], AttributeUtil.unescape(tVal[1]));
-      }
-    }
-    return complexValue;
-  }
-  
-  /**
-   * Checks if value is complex or not
-   * @param values The values to check
-   * @return True if succesful
-   */
-  private boolean isComplexValue(final String[] values) {
-	  boolean isComplex = false;
-	  if (values.length > 0) {	  
-	      final String[] tVal = values[0].split("=");
-	      if (StringUtils.isNotEmpty(values[0]) && tVal.length == 2) {
-	        isComplex = true;
-	      }
-	    }
-	  return isComplex;
-  }
-  
-  /**
-   * Validates and creates the attribute values.
-   * 
-   * @param vals The attribute values.
-   * 
-   * @return The {@link List} with the attribute values.
-   * 
-   * @see List
-   */
-  private List<String> createValues(final String[] vals) {
-    final List<String> values = new ArrayList<String>();
-    for (final String val : vals) {
-      if (StringUtils.isNotEmpty(val)) {
-        values.add(AttributeUtil.unescape(val));
-      }
-    }
-    return values;
-  }
-  
-  /**
-   * Converts the attribute tuple (attrName:attrType...) to the new format.
-   * 
-   * @param tuples The attribute tuples to convert.
-   * 
-   * @return The attribute tuples in the new format.
-   */
-  private String[] convertFormat(final String[] tuples) {
-    final String[] newFormatTuples =
-      new String[AttributeConstants.NUMBER_TUPLES.intValue()];
-    if (tuples != null) {
-      System.arraycopy(tuples, 0, newFormatTuples, 0, tuples.length);
-      
-      for (int i = tuples.length; i < newFormatTuples.length; i++) {
-        if (i == AttributeConstants.ATTR_VALUE_INDEX.intValue()) {
-          newFormatTuples[i] = "[]";
-        } else {
-          newFormatTuples[i] = "";
-        }
-      }
-    }
-    return newFormatTuples;
-  }
-
-  /**
-   * Returns a IPersonalAttributeList of the complex attributes in this map.
-   * 
-   * @return an IPersonalAttributeList of the complex attributes contained in this map.
-   */
-  public IPersonalAttributeList getComplexAttributes() {
-	  LOG.info("get complex attributes");
-	  IPersonalAttributeList attrList = new PersonalAttributeList();
-	  for(PersonalAttribute attr: this) {
-		  if(!attr.getComplexValue().isEmpty()) {
-			  attrList.put(attr.getName(), attr);
-			  LOG.info("adding complex attribute:"+attr.getName());
-		  }
-	  }
-	  return attrList;
-  }
-  
-  /**
-   * Returns a IPersonalAttributeList of the mandatory attributes in this map.
-   * 
-   * @return an IPersonalAttributeList of the mandatory attributes contained in this map.
-   */
-  public IPersonalAttributeList getSimpleValueAttributes() {
-	  LOG.info("get simple attributes");
-	  IPersonalAttributeList attrList = new PersonalAttributeList();
-	  for(PersonalAttribute attr: this) {
-		  if(attr.getComplexValue().isEmpty()) {
-			  attrList.put(attr.getName(), attr);
-			  LOG.info("adding simple attribute:"+attr.getName());
-		  }
-	  }
-	  return attrList;
-  }
-  
-  
-  
-  /**
-   * Returns a IPersonalAttributeList of the mandatory attributes in this map.
-   * 
-   * @return an IPersonalAttributeList of the mandatory attributes contained in this map.
-   */
-  public IPersonalAttributeList getMandatoryAttributes() {
-	  return getAttributesByParam(true);
-  }
-
-  
-  /**
-   * Returns a IPersonalAttributeList of the attributes in this map by parameter value.
-   * 
-   * @param compareValue The boolean to get mandatory (true) or optional (false) attributes. 
-   * 
-   * @return an IPersonalAttributeList of the mandatory attributes contained in this map if compareValue is true or optional otherwise.
-   */
-  private IPersonalAttributeList getAttributesByParam(final boolean compareValue) {
-	  LOG.info("get attributes by param :"+compareValue);
-	  IPersonalAttributeList attrList = new PersonalAttributeList();
-	  for(PersonalAttribute attr: this) {
-		  if(attr.isRequired() == compareValue) {
-			  attrList.put(attr.getName(), attr);
-			  LOG.info("adding attribute:"+attr.getName());
-		  }
-	  }
-	  return attrList;
-  }
-  
-  
-  /**
-   * Returns a IPersonalAttributeList of the optional attributes in this map.
-   * 
-   * @return an IPersonalAttributeList of the optional attributes contained in this map.
-   */
-  public IPersonalAttributeList getOptionalAttributes() {
-	return getAttributesByParam(false);
-  }
-
-  /**
-   * {@inheritDoc}
-   */
-  public boolean hasMissingValues() {
-    for(PersonalAttribute attr: this) {
-      if(attr.isEmptyValue() && attr.isEmptyComplexValue()) {
-        return true;
-      }
-    }
-    return false;
-  }
+public final class PersonalAttributeList extends ConcurrentHashMap<String, PersonalAttribute> implements IPersonalAttributeList {
+
+	/**
+	 * Logger object.
+	 */
+	private static final Logger LOG = Logger.getLogger(PersonalAttributeList.class.getName());
+
+	/**
+	 * Serial id.
+	 */
+	private static final long serialVersionUID = 7375127363889975062L;
+
+	/**
+	 * Hash with the latest fetched attribute name alias.
+	 */
+	private final Map<String, Integer> latestAttrAlias = new HashMap<String, Integer>();
+
+	/**
+	 * Hash with mapping number of alias or the attribute name.
+	 */
+	private final Map<String, List<String>> attrAliasNumber = new HashMap<String, List<String>>();
+
+	/**
+	 * Default constructor.
+	 */
+	public PersonalAttributeList() {
+		// The best practices recommend to call the super constructor.
+		super();
+	}
+
+	/**
+	 * Constructor with initial capacity for the PersonalAttributeList size.
+	 * 
+	 * @param capacity
+	 *            The initial capacity for the PersonalAttributeList.
+	 */
+	public PersonalAttributeList(final int capacity) {
+		super(capacity);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public Iterator<PersonalAttribute> iterator() {
+		return this.values().iterator();
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public PersonalAttribute get(final Object key) {
+		String attrName = (String) key;
+
+		if (this.latestAttrAlias.containsKey(key)) {
+			int index = this.latestAttrAlias.get(key);
+			if ((index + 1) > this.attrAliasNumber.get(key).size()) {
+				index = 0;
+			}
+
+			attrName = this.attrAliasNumber.get(key).get(index);
+			this.latestAttrAlias.put((String) key, Integer.valueOf(++index));
+		} else {
+			if (this.attrAliasNumber.containsKey(key)) {
+				this.latestAttrAlias.put((String) key, Integer.valueOf(0));
+				attrName = this.attrAliasNumber.get(key).get(0);
+			}
+		}
+		return super.get(attrName);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public void add(final PersonalAttribute value) {
+		if (value != null) {
+			this.put(value.getName(), value);
+		}
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public PersonalAttribute replace(final String key, final PersonalAttribute val) {
+		return super.put(key, val);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public PersonalAttribute put(final String key, final PersonalAttribute val) {
+		PersonalAttribute attr = val;
+		if (this.containsKey(key)) {
+			attr = this.get(key);
+
+			if (!attr.isEmptyValue()) {
+				if (!attr.getValue().containsAll(val.getValue())) {
+					attr.getValue().addAll(val.getValue());
+				}
+			} else {
+
+				if (!attr.isEmptyComplexValue()) {
+					for (Map<String, String> valTemp : val.getComplexValues()) {
+						if (!attr.getComplexValues().contains(valTemp)) {
+							attr.setComplexValue(valTemp);
+						}
+					}
+				} else {
+					if (STORKStatusCode.STATUS_NOT_AVAILABLE.toString().equals(attr.getStatus())) {
+						attr = val;
+					}
+				}
+			}
+		}
+		return super.put(key, attr);
+	}
+
+	/**
+	 * Escape method for attributes with double comma
+	 *
+	 * @return escaped attribute list
+	 *
+	 */
+	private String attrListEncoder(String attrList) {
+		StringBuilder finalAttr = new StringBuilder();
+		String boolAttr = PEPSValues.TRUE.toString();
+		String reqRegex = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString() + PEPSValues.TRUE.toString() + PEPSValues.ATTRIBUTE_TUPLE_SEP.toString();
+
+		String reqRegexSeparator = PEPSValues.ATTRIBUTE_TUPLE_SEP.toString() + PEPSValues.TRUE.toString() + PEPSValues.ATTRIBUTE_TUPLE_SEP.toString() + "|" + PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()
+				+ PEPSValues.FALSE.toString() + PEPSValues.ATTRIBUTE_TUPLE_SEP.toString();
+
+		for (String s : attrList.split(PEPSValues.ATTRIBUTE_SEP.toString())) {
+			StringBuilder tempBuilder = new StringBuilder(s);
+			if (s.split(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString()).length > 4) {
+				LOG.info("Found attributes with special characters, escaping special characters");
+
+				if (s.split(reqRegex) == null) {
+					boolAttr = PEPSValues.FALSE.toString();
+				}
+
+				tempBuilder.setLength(0);
+				tempBuilder.append(AttributeUtil.escape(s.split(reqRegexSeparator)[0]));
+				tempBuilder.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString());
+				tempBuilder.append(boolAttr);
+				tempBuilder.append(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString());
+				tempBuilder.append(s.split(reqRegexSeparator)[1]);
+
+			}
+
+			finalAttr.append(tempBuilder.toString());
+			finalAttr.append(PEPSValues.ATTRIBUTE_SEP.toString());
+		}
+		return finalAttr.toString();
+	}
+
+	/**
+	 * Unescape a string
+	 *
+	 * @see PersonalAttributeList#attrListEncoder
+	 *
+	 */
+	private String attrListDecoder(String string) {
+		return AttributeUtil.unescape(string);
+	}
+
+	public void populate(final String attrList) {
+
+		final StringTokenizer strToken = new StringTokenizer(attrListEncoder(attrList), PEPSValues.ATTRIBUTE_SEP.toString());
+
+		while (strToken.hasMoreTokens()) {
+			final PersonalAttribute persAttr = new PersonalAttribute();
+			String[] tuples = strToken.nextToken().split(PEPSValues.ATTRIBUTE_TUPLE_SEP.toString(), AttributeConstants.NUMBER_TUPLES.intValue());
+
+			// Convert to the new format if needed!
+			tuples = convertFormat(tuples);
+
+			if (AttributeUtil.hasValidTuples(tuples)) {
+				final int attrValueIndex = AttributeConstants.ATTR_VALUE_INDEX.intValue();
+				final String tmpAttrValue = tuples[attrValueIndex].substring(1, tuples[attrValueIndex].length() - 1);
+				final String[] vals = tmpAttrValue.split(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+
+				persAttr.setName(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()]);
+				persAttr.setIsRequired(Boolean.valueOf(tuples[AttributeConstants.ATTR_TYPE_INDEX.intValue()]));
+
+				// check if it is a complex value
+				if (isComplexValue(vals)) {
+					persAttr.setComplexValue(createComplexValue(vals));
+				} else {
+					persAttr.setValue(createValues(vals));
+				}
+
+				if (tuples.length == AttributeConstants.NUMBER_TUPLES.intValue()) {
+					tuples[0] = attrListDecoder(tuples[0]);
+					persAttr.setName(attrListDecoder(persAttr.getName()));
+
+					persAttr.setStatus(tuples[AttributeConstants.ATTR_STATUS_INDEX.intValue()]);
+				}
+				this.put(tuples[AttributeConstants.ATTR_NAME_INDEX.intValue()], persAttr);
+
+			} else {
+				LOG.warn("Invalid personal attribute list tuples");
+			}
+
+		}
+	}
+
+	/**
+	 * Returns a copy of this <tt>IPersonalAttributeList</tt> instance.
+	 *
+	 * @return The copy of this IPersonalAttributeList.
+	 */
+	public Object clone() {
+		// This implementation may have an bug!
+		try {
+			return (PersonalAttributeList) super.clone();
+		} catch (CloneNotSupportedException e) {
+			return null;
+		}
+	}
+
+	/**
+	 * Creates a string in the following format.
+	 * 
+	 * attrName:attrType:[attrValue1,attrValue2=attrComplexValue]:attrStatus;
+	 * 
+	 * @return {@inheritDoc}
+	 */
+	@Override
+	public String toString() {
+		final Iterator<Entry<String, PersonalAttribute>> itAttrs = this.entrySet().iterator();
+		final StringBuilder strBuilder = new StringBuilder();
+
+		while (itAttrs.hasNext()) {
+			final Entry<String, PersonalAttribute> attrEntry = itAttrs.next();
+			final PersonalAttribute attr = attrEntry.getValue();
+			// strBuilder.append(attr.toString());
+			strBuilder.insert(0, attr.toString());
+		}
+
+		return strBuilder.toString();
+	}
+
+	/**
+	 * Validates and creates the attribute's complex values.
+	 * 
+	 * @param values
+	 *            The complex values.
+	 * 
+	 * @return The {@link Map} with the complex values.
+	 * 
+	 * @see Map
+	 */
+	private Map<String, String> createComplexValue(final String[] values) {
+		final Map<String, String> complexValue = new HashMap<String, String>();
+		for (final String val : values) {
+			final String[] tVal = val.split("=");
+			if (StringUtils.isNotEmpty(val) && tVal.length == 2) {
+				complexValue.put(tVal[0], AttributeUtil.unescape(tVal[1]));
+			}
+		}
+		return complexValue;
+	}
+
+	/**
+	 * Checks if value is complex or not
+	 * 
+	 * @param values
+	 *            The values to check
+	 * @return True if succesful
+	 */
+	private boolean isComplexValue(final String[] values) {
+		boolean isComplex = false;
+		if (values.length > 0) {
+			final String[] tVal = values[0].split("=");
+			if (StringUtils.isNotEmpty(values[0]) && tVal.length == 2) {
+				isComplex = true;
+			}
+		}
+		return isComplex;
+	}
+
+	/**
+	 * Validates and creates the attribute values.
+	 * 
+	 * @param vals
+	 *            The attribute values.
+	 * 
+	 * @return The {@link List} with the attribute values.
+	 * 
+	 * @see List
+	 */
+	private List<String> createValues(final String[] vals) {
+		final List<String> values = new ArrayList<String>();
+		for (final String val : vals) {
+			if (StringUtils.isNotEmpty(val)) {
+				values.add(AttributeUtil.unescape(val));
+			}
+		}
+		return values;
+	}
+
+	/**
+	 * Converts the attribute tuple (attrName:attrType...) to the new format.
+	 * 
+	 * @param tuples
+	 *            The attribute tuples to convert.
+	 * 
+	 * @return The attribute tuples in the new format.
+	 */
+	private String[] convertFormat(final String[] tuples) {
+		final String[] newFormatTuples = new String[AttributeConstants.NUMBER_TUPLES.intValue()];
+		if (tuples != null) {
+			System.arraycopy(tuples, 0, newFormatTuples, 0, tuples.length);
+
+			for (int i = tuples.length; i < newFormatTuples.length; i++) {
+				if (i == AttributeConstants.ATTR_VALUE_INDEX.intValue()) {
+					newFormatTuples[i] = "[]";
+				} else {
+					newFormatTuples[i] = "";
+				}
+			}
+		}
+		return newFormatTuples;
+	}
+
+	/**
+	 * Returns a IPersonalAttributeList of the complex attributes in this map.
+	 * 
+	 * @return an IPersonalAttributeList of the complex attributes contained in this map.
+	 */
+	public IPersonalAttributeList getComplexAttributes() {
+		LOG.info("get complex attributes");
+		IPersonalAttributeList attrList = new PersonalAttributeList();
+		for (PersonalAttribute attr : this) {
+			if (!attr.getComplexValue().isEmpty()) {
+				attrList.put(attr.getName(), attr);
+				LOG.info("adding complex attribute:" + attr.getName());
+			}
+		}
+		return attrList;
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public IPersonalAttributeList merge(IPersonalAttributeList attrList1) {
+
+		for (PersonalAttribute attr : attrList1) {
+			this.add(attr);
+		}
+		return this;
+	}
+
+	/**
+	 * Returns a IPersonalAttributeList of the mandatory attributes in this map.
+	 * 
+	 * @return an IPersonalAttributeList of the mandatory attributes contained in this map.
+	 */
+	public IPersonalAttributeList getSimpleValueAttributes() {
+		LOG.info("get simple attributes");
+		IPersonalAttributeList attrList = new PersonalAttributeList();
+		for (PersonalAttribute attr : this) {
+			if (!attr.getValue().isEmpty()) {
+				attrList.put(attr.getName(), attr);
+				LOG.info("adding simple attribute:" + attr.getName());
+			}
+		}
+		return attrList;
+	}
+
+	/**
+	 * Returns a IPersonalAttributeList of the mandatory attributes in this map.
+	 * 
+	 * @return an IPersonalAttributeList of the mandatory attributes contained in this map.
+	 */
+	public IPersonalAttributeList getMandatoryAttributes() {
+		return getAttributesByParam(true);
+	}
+
+	/**
+	 * Returns a IPersonalAttributeList of the attributes in this map by parameter value.
+	 * 
+	 * @param compareValue
+	 *            The boolean to get mandatory (true) or optional (false) attributes.
+	 * 
+	 * @return an IPersonalAttributeList of the mandatory attributes contained in this map if compareValue is true or optional otherwise.
+	 */
+	private IPersonalAttributeList getAttributesByParam(final boolean compareValue) {
+		LOG.info("get attributes by param :" + compareValue);
+		IPersonalAttributeList attrList = new PersonalAttributeList();
+		for (PersonalAttribute attr : this) {
+			if (attr.isRequired() == compareValue) {
+				attrList.put(attr.getName(), attr);
+				LOG.info("adding attribute:" + attr.getName());
+			}
+		}
+		return attrList;
+	}
+
+	/**
+	 * Returns a IPersonalAttributeList of the optional attributes in this map.
+	 * 
+	 * @return an IPersonalAttributeList of the optional attributes contained in this map.
+	 */
+	public IPersonalAttributeList getOptionalAttributes() {
+		return getAttributesByParam(false);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public boolean hasMissingValues() {
+		for (PersonalAttribute attr : this) {
+			if (attr.isEmptyValue() && attr.isEmptyComplexValue()) {
+				return true;
+			}
+		}
+		return false;
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java
index 65936f1a8..33ae4c743 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryRequest.java
@@ -2,446 +2,451 @@ package eu.stork.peps.auth.commons;
 

 import java.io.Serializable;

 

-import org.apache.log4j.Logger;

-

 public class STORKAttrQueryRequest implements Serializable, Cloneable {

-	

+

 	/** The Constant serialVersionUID. */

-	  private static final long serialVersionUID = 4778480781609392750L;

-	  

-	  /**

-	   * Logger object.

-	   */

-	  private static final Logger LOG = Logger.getLogger(STORKAttrQueryRequest.class

-	    .getName());

-	  

-	  /** The samlId. */

-	  private String samlId;

-	  	  

-	  /** The destination. */

-	  private String destination;

-	  

-	  /** The assertion consumer service url. */

-	  private String serviceURL;

-

-	  /** The distinguished name. */

-	  private String distinguishedName;

-	  

-	  /** The e id sector share. */

-	  private boolean eIDSectorShare;

-	  

-	  /** The e id cross sector share. */

-	  private boolean eIDCrossSectorShare;

-	  

-	  /** The e id cross border share. */

-	  private boolean eIDCrossBorderShare;

-	  

-	  /** The personal attribute list. */

-	  private IPersonalAttributeList attributeList = new PersonalAttributeList();

-	  

-	  /** The qaa. */

-	  private int qaa;

-	  

-	  /** The token saml. */

-	  private byte[] tokenSaml = new byte[0];

-	  

-	  /** The issuer. */

-	  private String issuer;

-	  

-	  /** The service provider sector. */

-	  private String spSector;

-	  

-	  /** The service provider institution. */

-	  private String spInstitution;

-	  

-	  /** The service provider application. */

-	  private String spApplication;

-	  

-	  /** The service provider country. */

-	  private String spCountry;

-	  

-	  /** The country. */

-	  private String country;

-	  

-	  /** The citizen country code. */

-	  private String citizenCountry;

-	  

-	  /** The Service Provider ID. */

-	  private String sPID;

-	  

-	  /** The Alias used at the keystore for saving this certificate. */

-	  private String alias;

-	  

-	  /**

-	   * Gets the SP's Certificate Alias.

-	   * 

-	   * @return alias The SP's Certificate Alias.

-	   */

-	  public String getAlias() {

-	    return alias;

-	  }

-	  

-	  /**

-	   * Sets the SP's Certificate Alias.

-	   * 

-	   * @param nAlias The SP's Certificate Alias.

-	   */

-	  public void setAlias(final String nAlias) {

-	    this.alias = nAlias;

-	  }

-	  

-	  /**

-	   * Gets the SP ID.

-	   * 

-	   * @return sPID The SP ID.

-	   */

-	  public String getSPID() {

-	    return sPID;

-	  }

-	  

-	  /**

-	   * Sets the SP ID.

-	   * 

-	   * @param sPId The new sp samlId.

-	   */

-	  public void setSPID(final String sPId) {

-	    this.sPID = sPId;

-	  }

-	  

-	  /**

-	   * Gets the citizen country code.

-	   * 

-	   * @return The citizen country code value.

-	   */

-	  public String getCitizenCountryCode() {

-	    return citizenCountry;

-	  }

-	  

-	  /**

-	   * Sets the citizen country code.

-	   * 

-	   * @param countryCode the new citizen country code value.

-	   */

-	  public void setCitizenCountryCode(final String countryCode) {

-	    this.citizenCountry = countryCode;

-	  }

-	  

-	  /**

-	   * Gets the sp country.

-	   * 

-	   * @return The sp country value.

-	   */

-	  public String getSpCountry() {

-	    return spCountry;

-	  }

-	  

-	  /**

-	   * Sets the sp country.

-	   * 

-	   * @param sPCountry the new sp country value.

-	   */

-	  public void setSpCountry(final String sPCountry) {

-	    this.spCountry = sPCountry;

-	  }

-	  

-	  /**

-	   * Gets the issuer.

-	   * 

-	   * @return The issuer value.

-	   */

-	  public String getIssuer() {

-	    return issuer;

-	  }

-	  

-	  /**

-	   * Sets the issuer.

-	   * 

-	   * @param samlIssuer the new issuer value.

-	   */

-	  public void setIssuer(final String samlIssuer) {

-	    this.issuer = samlIssuer;

-	  }

-	  

-	  /**

-	   * Gets the SAML Token.

-	   * 

-	   * @return The SAML Token value.

-	   */

-	  public byte[] getTokenSaml() {

-	    return tokenSaml.clone();

-	  }

-	  

-	  /**

-	   * Sets the SAML Token.

-	   * 

-	   * @param samlToken The new SAML Token value.

-	   */

-	  public void setTokenSaml(final byte[] samlToken) {

-	    if (samlToken != null) {

-	      this.tokenSaml = samlToken.clone();

-	    }

-	  }

-	  

-	  /**

-	   * Gets the country.

-	   * 

-	   * @return The country value.

-	   */

-	  public String getCountry() {

-	    return country;

-	  }

-	  

-	  /**

-	   * Sets the country.

-	   * 

-	   * @param nCountry the new country value.

-	   */

-	  public void setCountry(final String nCountry) {

-	    this.country = nCountry;

-	  }

-	  

-	  /**

-	   * Getter for the qaa value.

-	   * 

-	   * @return The qaa value value.

-	   */

-	  public int getQaa() {

-	    return qaa;

-	  }

-	  

-	  /**

-	   * Setter for the qaa value.

-	   * 

-	   * @param qaaLevel The new qaa value.

-	   */

-	  public void setQaa(final int qaaLevel) {

-	    this.qaa = qaaLevel;

-	  }	  

-	  

-	  /**

-	   * Getter for the serviceURL value.

-	   * 

-	   * @return The serviceURL value.

-	   */

-	  public String getAssertionConsumerServiceURL() {

-	    return serviceURL;

-	  }

-	  

-	  /**

-	   * Setter for the serviceURL value.

-	   * 

-	   * @param newServiceURL the assertion consumer service URL.

-	   */

-	  public void setAssertionConsumerServiceURL(final String newServiceURL) {

-	    this.serviceURL = newServiceURL;

-	  }

-	  

-	  /**

-	   * Getter for the destination value.

-	   * 

-	   * @return The destination value.

-	   */

-	  public String getDestination() {

-	    return destination;

-	  }

-	  

-	  /**

-	   * Setter for the destination value.

-	   * 

-	   * @param detination the new destination value.

-	   */

-	  public void setDestination(final String detination) {

-	    this.destination = detination;

-	  }

-	  

-	  /**

-	   * Getter for the samlId value.

-	   * 

-	   * @return The samlId value.

-	   */

-	  public String getSamlId() {

-	    return samlId;

-	  }

-	  

-	  /**

-	   * Setter for the samlId value.

-	   * 

-	   * @param newSamlId the new samlId value.

-	   */

-	  public void setSamlId(final String newSamlId) {

-	    this.samlId = newSamlId;

-	  }

-	  

-	  

-	  /**

-	   * Getter for the attributeList value.

-	   * 

-	   * @return The attributeList value.

-	   * 

-	   * @see IPersonalAttributeList

-	   */

-	  public IPersonalAttributeList getPersonalAttributeList() {

-	      IPersonalAttributeList personnalAttributeList = null;

-	      try {

-	          personnalAttributeList = (IPersonalAttributeList) attributeList.clone();

-	      } catch (CloneNotSupportedException e1) {

-	          LOG.trace("[PersonalAttribute] Nothing to do.");

-	      }

-	      return personnalAttributeList;

-	  }

-	  

-	  /**

-	   * Setter for the attributeList value.

-	   * 

-	   * @param attrList the personal attribute list value.

-	   * 

-	   * @see IPersonalAttributeList

-	   */

-	  public void setPersonalAttributeList(final IPersonalAttributeList attrList) {

-	    if (attrList != null) {

-	      this.attributeList = attrList;

-	    }

-	  }

-	  

-	  /**

-	   * Getter for the distinguishedName value.

-	   * 

-	   * @return The distinguishedName value.

-	   */

-	  public String getDistinguishedName() {

-	    return distinguishedName;

-	  }

-	  

-	  /**

-	   * Setter for the distinguishedName value.

-	   * 

-	   * @param certDN the distinguished name value.

-	   */

-	  public void setDistinguishedName(final String certDN) {

-	    this.distinguishedName = certDN;

-	  }

-	  

-	  /**

-	   * Gets the service provider sector.

-	   * 

-	   * @return The service provider sector value.

-	   */

-	  public String getSpSector() {

-	    return spSector;

-	  }

-	  

-	  /**

-	   * Sets the service provider sector.

-	   * 

-	   * @param samlSPSector the new service provider sector value.

-	   */

-	  public void setSpSector(final String samlSPSector) {

-	    this.spSector = samlSPSector;

-	  }

-	  

-	  /**

-	   * Gets the service provider institution.

-	   * 

-	   * @return The service provider institution value.

-	   */

-	  public String getSpInstitution() {

-	    return spInstitution;

-	  }

-	  

-	  /**

-	   * Sets the service provider institution.

-	   * 

-	   * @param samlSPInst the new service provider institution value.

-	   */

-	  public void setSpInstitution(final String samlSPInst) {

-	    this.spInstitution = samlSPInst;

-	  }

-	  

-	  /**

-	   * Gets the service provider application.

-	   * 

-	   * @return The service provider application value.

-	   */

-	  public String getSpApplication() {

-	    return spApplication;

-	  }

-	  

-	  /**

-	   * Sets the service provider application.

-	   * 

-	   * @param samlSPApp the new service provider application value.

-	   */

-	  public void setSpApplication(final String samlSPApp) {

-	    this.spApplication = samlSPApp;

-	  }

-	  

-	  /**

-	   * Checks if is eId sector share.

-	   * 

-	   * @return true, if is eId sector share.

-	   */

-	  public boolean isEIDSectorShare() {

-	    return eIDSectorShare;

-	  }

-	  

-	  /**

-	   * Sets the eId sector share.

-	   * 

-	   * @param eIdSectorShare the new eId sector share value.

-	   */

-	  public void setEIDSectorShare(final boolean eIdSectorShare) {

-	    this.eIDSectorShare = eIdSectorShare;

-	  }

-	  

-	  /**

-	   * Checks if is eId cross sector share.

-	   * 

-	   * @return true, if is eId cross sector share.

-	   */

-	  public boolean isEIDCrossSectorShare() {

-	    return eIDCrossSectorShare;

-	  }

-	  

-	  /**

-	   * Sets the eId cross sector share.

-	   * 

-	   * @param eIdCrossSectorShare the new eId cross sector share value.

-	   */

-	  public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) {

-	    this.eIDCrossSectorShare = eIdCrossSectorShare;

-	  }

-	  

-	  /**

-	   * Checks if is eId cross border share.

-	   * 

-	   * @return true, if is eId cross border share.

-	   */

-	  public boolean isEIDCrossBorderShare() {

-	    return eIDCrossBorderShare;

-	  }

-	  

-	  /**

-	   * Sets the eId cross border share.

-	   * 

-	   * @param eIdCrossBorderShare the new eId cross border share value.

-	   */

-	  public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) {

-	    this.eIDCrossBorderShare = eIdCrossBorderShare;

-	  }

-	  

-	  /**

-	   * Returns a copy of this <tt>STORKAttrQueryRequest</tt> instance.

-	   * 

-	   * @return The copy of this STORKAttrQueryRequest.

-	   * @throws CloneNotSupportedException on clone exception

-	   */

-	  @Override

-	  public Object clone() throws CloneNotSupportedException{

-		  STORKAttrQueryRequest storkAttrQueryReq = null;

-	      storkAttrQueryReq = (STORKAttrQueryRequest) super.clone();

-	      storkAttrQueryReq.setPersonalAttributeList(getPersonalAttributeList());

-	      storkAttrQueryReq.setTokenSaml(getTokenSaml());

-	    return storkAttrQueryReq;

-	  }

+	private static final long serialVersionUID = 4778480781609392750L;

+

+	/** The samlId. */

+	private String samlId;

+

+	/** The destination. */

+	private String destination;

+

+	/** The assertion consumer service url. */

+	private String serviceURL;

+

+	/** The distinguished name. */

+	private String distinguishedName;

+

+	/** The e id sector share. */

+	private boolean eIDSectorShare;

+

+	/** The e id cross sector share. */

+	private boolean eIDCrossSectorShare;

+

+	/** The e id cross border share. */

+	private boolean eIDCrossBorderShare;

+

+	/** The personal attribute list. */

+	private IPersonalAttributeList attributeList = new PersonalAttributeList();

+

+	/** The qaa. */

+	private int qaa;

+

+	/** The token saml. */

+	private byte[] tokenSaml = new byte[0];

+

+	/** The issuer. */

+	private String issuer;

+

+	/** The service provider sector. */

+	private String spSector;

+

+	/** The service provider institution. */

+	private String spInstitution;

+

+	/** The service provider application. */

+	private String spApplication;

+

+	/** The service provider country. */

+	private String spCountry;

+

+	/** The country. */

+	private String country;

+

+	/** The citizen country code. */

+	private String citizenCountry;

+

+	/** The Service Provider ID. */

+	private String sPID;

+

+	/** The Alias used at the keystore for saving this certificate. */

+	private String alias;

+

+	/**

+	 * Gets the SP's Certificate Alias.

+	 * 

+	 * @return alias The SP's Certificate Alias.

+	 */

+	public String getAlias() {

+		return alias;

+	}

+

+	/**

+	 * Sets the SP's Certificate Alias.

+	 * 

+	 * @param nAlias

+	 *            The SP's Certificate Alias.

+	 */

+	public void setAlias(final String nAlias) {

+		this.alias = nAlias;

+	}

+

+	/**

+	 * Gets the SP ID.

+	 * 

+	 * @return sPID The SP ID.

+	 */

+	public String getSPID() {

+		return sPID;

+	}

+

+	/**

+	 * Sets the SP ID.

+	 * 

+	 * @param sPId

+	 *            The new sp samlId.

+	 */

+	public void setSPID(final String sPId) {

+		this.sPID = sPId;

+	}

+

+	/**

+	 * Gets the citizen country code.

+	 * 

+	 * @return The citizen country code value.

+	 */

+	public String getCitizenCountryCode() {

+		return citizenCountry;

+	}

+

+	/**

+	 * Sets the citizen country code.

+	 * 

+	 * @param countryCode

+	 *            the new citizen country code value.

+	 */

+	public void setCitizenCountryCode(final String countryCode) {

+		this.citizenCountry = countryCode;

+	}

+

+	/**

+	 * Gets the sp country.

+	 * 

+	 * @return The sp country value.

+	 */

+	public String getSpCountry() {

+		return spCountry;

+	}

+

+	/**

+	 * Sets the sp country.

+	 * 

+	 * @param sPCountry

+	 *            the new sp country value.

+	 */

+	public void setSpCountry(final String sPCountry) {

+		this.spCountry = sPCountry;

+	}

+

+	/**

+	 * Gets the issuer.

+	 * 

+	 * @return The issuer value.

+	 */

+	public String getIssuer() {

+		return issuer;

+	}

+

+	/**

+	 * Sets the issuer.

+	 * 

+	 * @param samlIssuer

+	 *            the new issuer value.

+	 */

+	public void setIssuer(final String samlIssuer) {

+		this.issuer = samlIssuer;

+	}

+

+	/**

+	 * Gets the SAML Token.

+	 * 

+	 * @return The SAML Token value.

+	 */

+	public byte[] getTokenSaml() {

+		return tokenSaml.clone();

+	}

+

+	/**

+	 * Sets the SAML Token.

+	 * 

+	 * @param samlToken

+	 *            The new SAML Token value.

+	 */

+	public void setTokenSaml(final byte[] samlToken) {

+		if (samlToken != null) {

+			this.tokenSaml = samlToken.clone();

+		}

+	}

+

+	/**

+	 * Gets the country.

+	 * 

+	 * @return The country value.

+	 */

+	public String getCountry() {

+		return country;

+	}

+

+	/**

+	 * Sets the country.

+	 * 

+	 * @param nCountry

+	 *            the new country value.

+	 */

+	public void setCountry(final String nCountry) {

+		this.country = nCountry;

+	}

+

+	/**

+	 * Getter for the qaa value.

+	 * 

+	 * @return The qaa value value.

+	 */

+	public int getQaa() {

+		return qaa;

+	}

+

+	/**

+	 * Setter for the qaa value.

+	 * 

+	 * @param qaaLevel

+	 *            The new qaa value.

+	 */

+	public void setQaa(final int qaaLevel) {

+		this.qaa = qaaLevel;

+	}

+

+	/**

+	 * Getter for the serviceURL value.

+	 * 

+	 * @return The serviceURL value.

+	 */

+	public String getAssertionConsumerServiceURL() {

+		return serviceURL;

+	}

+

+	/**

+	 * Setter for the serviceURL value.

+	 * 

+	 * @param newServiceURL

+	 *            the assertion consumer service URL.

+	 */

+	public void setAssertionConsumerServiceURL(final String newServiceURL) {

+		this.serviceURL = newServiceURL;

+	}

+

+	/**

+	 * Getter for the destination value.

+	 * 

+	 * @return The destination value.

+	 */

+	public String getDestination() {

+		return destination;

+	}

+

+	/**

+	 * Setter for the destination value.

+	 * 

+	 * @param detination

+	 *            the new destination value.

+	 */

+	public void setDestination(final String detination) {

+		this.destination = detination;

+	}

+

+	/**

+	 * Getter for the samlId value.

+	 * 

+	 * @return The samlId value.

+	 */

+	public String getSamlId() {

+		return samlId;

+	}

+

+	/**

+	 * Setter for the samlId value.

+	 * 

+	 * @param newSamlId

+	 *            the new samlId value.

+	 */

+	public void setSamlId(final String newSamlId) {

+		this.samlId = newSamlId;

+	}

+

+	/**

+	 * Getter for the attributeList value.

+	 * 

+	 * @return The attributeList value.

+	 * 

+	 * @see IPersonalAttributeList

+	 */

+	public IPersonalAttributeList getPersonalAttributeList() {

+		return (IPersonalAttributeList) attributeList.clone();

+	}

+

+	/**

+	 * Setter for the attributeList value.

+	 * 

+	 * @param attrList

+	 *            the personal attribute list value.

+	 * 

+	 * @see IPersonalAttributeList

+	 */

+	public void setPersonalAttributeList(final IPersonalAttributeList attrList) {

+		if (attrList != null) {

+			this.attributeList = attrList;

+		}

+	}

+

+	/**

+	 * Getter for the distinguishedName value.

+	 * 

+	 * @return The distinguishedName value.

+	 */

+	public String getDistinguishedName() {

+		return distinguishedName;

+	}

+

+	/**

+	 * Setter for the distinguishedName value.

+	 * 

+	 * @param certDN

+	 *            the distinguished name value.

+	 */

+	public void setDistinguishedName(final String certDN) {

+		this.distinguishedName = certDN;

+	}

+

+	/**

+	 * Gets the service provider sector.

+	 * 

+	 * @return The service provider sector value.

+	 */

+	public String getSpSector() {

+		return spSector;

+	}

+

+	/**

+	 * Sets the service provider sector.

+	 * 

+	 * @param samlSPSector

+	 *            the new service provider sector value.

+	 */

+	public void setSpSector(final String samlSPSector) {

+		this.spSector = samlSPSector;

+	}

+

+	/**

+	 * Gets the service provider institution.

+	 * 

+	 * @return The service provider institution value.

+	 */

+	public String getSpInstitution() {

+		return spInstitution;

+	}

+

+	/**

+	 * Sets the service provider institution.

+	 * 

+	 * @param samlSPInst

+	 *            the new service provider institution value.

+	 */

+	public void setSpInstitution(final String samlSPInst) {

+		this.spInstitution = samlSPInst;

+	}

+

+	/**

+	 * Gets the service provider application.

+	 * 

+	 * @return The service provider application value.

+	 */

+	public String getSpApplication() {

+		return spApplication;

+	}

+

+	/**

+	 * Sets the service provider application.

+	 * 

+	 * @param samlSPApp

+	 *            the new service provider application value.

+	 */

+	public void setSpApplication(final String samlSPApp) {

+		this.spApplication = samlSPApp;

+	}

+

+	/**

+	 * Checks if is eId sector share.

+	 * 

+	 * @return true, if is eId sector share.

+	 */

+	public boolean isEIDSectorShare() {

+		return eIDSectorShare;

+	}

+

+	/**

+	 * Sets the eId sector share.

+	 * 

+	 * @param eIdSectorShare

+	 *            the new eId sector share value.

+	 */

+	public void setEIDSectorShare(final boolean eIdSectorShare) {

+		this.eIDSectorShare = eIdSectorShare;

+	}

+

+	/**

+	 * Checks if is eId cross sector share.

+	 * 

+	 * @return true, if is eId cross sector share.

+	 */

+	public boolean isEIDCrossSectorShare() {

+		return eIDCrossSectorShare;

+	}

+

+	/**

+	 * Sets the eId cross sector share.

+	 * 

+	 * @param eIdCrossSectorShare

+	 *            the new eId cross sector share value.

+	 */

+	public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) {

+		this.eIDCrossSectorShare = eIdCrossSectorShare;

+	}

+

+	/**

+	 * Checks if is eId cross border share.

+	 * 

+	 * @return true, if is eId cross border share.

+	 */

+	public boolean isEIDCrossBorderShare() {

+		return eIDCrossBorderShare;

+	}

+

+	/**

+	 * Sets the eId cross border share.

+	 * 

+	 * @param eIdCrossBorderShare

+	 *            the new eId cross border share value.

+	 */

+	public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) {

+		this.eIDCrossBorderShare = eIdCrossBorderShare;

+	}

+

+	/**

+	 * Returns a copy of this <tt>STORKAttrQueryRequest</tt> instance.

+	 * 

+	 * @return The copy of this STORKAttrQueryRequest.

+	 * @throws CloneNotSupportedException

+	 *             on clone exception

+	 */

+	@Override

+	public Object clone() throws CloneNotSupportedException {

+		STORKAttrQueryRequest storkAttrQueryReq = null;

+		storkAttrQueryReq = (STORKAttrQueryRequest) super.clone();

+		storkAttrQueryReq.setPersonalAttributeList(getPersonalAttributeList());

+		storkAttrQueryReq.setTokenSaml(getTokenSaml());

+		return storkAttrQueryReq;

+	}

 

 }

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
index 276b26a03..ac4663eaf 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAttrQueryResponse.java
@@ -21,372 +21,373 @@ import org.joda.time.DateTime;
 import org.opensaml.saml2.core.Assertion;

 

 public class STORKAttrQueryResponse implements Serializable {

-  

-  /** The Constant serialVersionUID. */

-  private static final long serialVersionUID = 7653893041391541235L;

-

-  /** Response Id. */

-  private String samlId;

-  

-  /** Request failed? */

-  private boolean fail;

-  

-  /** Status code. */

-  private String statusCode;

-  

-  /** Secondary status code. */

-  private String subStatusCode;

-  

-  /** Audience restriction. */

-  private String audienceRest;

-  

-  /** Error message. */

-  private String message;

-  

-  /** Id of the request that originated this response. */

-  private String inResponseTo;

-  

-  /** Expiration date. */

-  private DateTime notOnOrAfter;

-  

-  /** Creation date. */

-  private DateTime notBefore;

-  

-  /** The SAML token. */

-  private byte[] tokenSaml = new byte[0];

-  

-  /** Country. */

-  private String country;

-  

-  /** The complete assertion **/

-  private Assertion assertion;

-  

-  /** List of all assertions in response **/

-  private List<Assertion> assertions;

-  

-  /** The complete list from all assertions **/

-  private IPersonalAttributeList totalAttributeList = new PersonalAttributeList();

-  

-  /** All personal attribute lists **/

-  private List<IPersonalAttributeList> attributeLists;

-   

-  /** Citizen's personal attribute list. */

-  private IPersonalAttributeList attributeList = new PersonalAttributeList();

-

-    /**

-     * Logger object.

-     */

-    private static final Logger LOG = Logger.getLogger(STORKAttrQueryResponse.class.getName());

-  

-  /**

-   * Getter for the subStatusCode.

-   * 

-   * @return The subStatusCode value.

-   */

-  public String getSubStatusCode() {

-    return subStatusCode;

-  }

-  

-  /**

-   * Setter for the subStatusCode.

-   * 

-   * @param samlSubStatusCode the new subStatusCode value.

-   */

-  public void setSubStatusCode(final String samlSubStatusCode) {

-    this.subStatusCode = samlSubStatusCode;

-  }

-  

-  /**

-   * Getter for audienceRest.

-   * 

-   * @return The audienceRest value.

-   */

-  public String getAudienceRestriction() {

-    return audienceRest;

-  }

-  

-  /**

-   * Setter for audienceRest.

-   * 

-   * @param audRest the new audienceRest value.

-   */

-  public void setAudienceRestriction(final String audRest) {

-    this.audienceRest = audRest;

-  }

-  

-  /**

-   * Getter for the samlToken.

-   * 

-   * @return The samlToken value.

-   */

-  public byte[] getTokenSaml() {

-    return tokenSaml.clone();

-  }

-  

-  /**

-   * Setter for samlToken.

-   * 

-   * @param samlToken the new tokenSaml value.

-   */

-  public void setTokenSaml(final byte[] samlToken) {

-    if (samlToken != null) {

-      this.tokenSaml = samlToken.clone();

-    }

-  }

-  

-  /**

-   * Getter for the country name.

-   * 

-   * @return The country name value.

-   */

-  public String getCountry() {

-    return country;

-  }

-  

-  /**

-   * Setter for the country name.

-   * 

-   * @param cCountry the new country name value.

-   */

-  public void setCountry(final String cCountry) {

-    this.country = cCountry;

-  }

-  

-  /**

-   * Getter for pal value.

-   * 

-   * @return The pal value.

-   * 

-   * @see PersonalAttributeList

-   */

-  public IPersonalAttributeList getPersonalAttributeList() {

-      IPersonalAttributeList personnalAttributeList = null;

-      try {

-          personnalAttributeList = (IPersonalAttributeList) attributeList.clone();

-      } catch (CloneNotSupportedException e1) {

-          LOG.trace("[PersonalAttribute] Nothing to do.");

-      }

-      return personnalAttributeList;

-  }

-  

-  /**

-   * Setter for the Personal Attribute List value.

-   * 

-   * @param attrList the new value.

-   * 

-   * @see PersonalAttributeList

-   */

-  public void setPersonalAttributeList(final IPersonalAttributeList attrList) {

-    if (attrList != null) {

-      this.attributeList = attrList;

-    }

-  }

-  

-  /**

-   * Getter for the inResponseTo value.

-   * 

-   * @return The inResponseTo value.

-   */

-  public String getInResponseTo() {

-    return inResponseTo;

-  }

-  

-  /**

-   * Setter for the inResponseTo value.

-   * 

-   * @param samlInResponseTo the new inResponseTo value.

-   */

-  public void setInResponseTo(final String samlInResponseTo) {

-    this.inResponseTo = samlInResponseTo;

-  }

-  

-  /**

-   * Getter for the fail value.

-   * 

-   * @return The fail value.

-   */

-  public boolean isFail() {

-    return fail;

-  }

-  

-  /**

-   * Setter for the fail value.

-   * 

-   * @param failVal the new fail value.

-   */

-  public void setFail(final boolean failVal) {

-    this.fail = failVal;

-  }

-  

-  /**

-   * Getter for the message value.

-   * 

-   * @return The message value.

-   */

-  public String getMessage() {

-    return message;

-  }

-  

-  /**

-   * Setter for the message value.

-   * 

-   * @param msg the new message value.

-   */

-  public void setMessage(final String msg) {

-    this.message = msg;

-  }

-  

-  /**

-   * Getter for the statusCode value.

-   * 

-   * @return The statusCode value.

-   */

-  public String getStatusCode() {

-    return statusCode;

-  }

-  

-  /**

-   * Setter for the statusCode value.

-   * 

-   * @param status the new statusCode value.

-   */

-  public void setStatusCode(final String status) {

-    this.statusCode = status;

-  }

-  

-  /**

-   * Getter for the samlId value.

-   * 

-   * @return The samlId value.

-   */

-  public String getSamlId() {

-    return samlId;

-  }

-  

-  /**

-   * Setter for the samlId value.

-   * 

-   * @param nSamlId the new samlId value.

-   */

-  public void setSamlId(final String nSamlId) {

-    this.samlId = nSamlId;

-  }

-  

-  /**

-   * Getter for the notOnOrAfter value.

-   * 

-   * @return The notOnOrAfter value.

-   * 

-   * @see DateTime

-   */

-  public DateTime getNotOnOrAfter() {

-    return this.notOnOrAfter;

-  }

-  

-  /**

-   * Setter for the notOnOrAfter value.

-   * 

-   * @param nOnOrAfter the new notOnOrAfter value.

-   * 

-   * @see DateTime

-   */

-  public void setNotOnOrAfter(final DateTime nOnOrAfter) {

-    this.notOnOrAfter = nOnOrAfter;

-  }

-  

-  /**

-   * Getter for the notBefore value.

-   * 

-   * @return The notBefore value.

-   * 

-   * @see DateTime

-   */

-  public DateTime getNotBefore() {

-    return notBefore;

-  }

-  

-  /**

-   * Setter for the notBefore value.

-   * 

-   * @param nBefore the new notBefore value.

-   * 

-   * @see DateTime

-   */

-  public void setNotBefore(final DateTime nBefore) {

-    this.notBefore = nBefore;

-  }

-  

-  /** Get the assertion from the response **/

-  public Assertion getAssertion() {

-	  return assertion;

-  }

-  

-  /** Set the assertion in the response **/

-  public void setAssertion(final Assertion nAssertion) {

-	  this.assertion = nAssertion;

-  }

-  

-  public void setAssertions(List<Assertion> newAssert) {

-	  this.assertions = newAssert;

-  }

-  

-  public List<Assertion> getAssertions() {

-	  return assertions;

-  }

-  

-  /**

-   * Getter for the toal pal value.

-   * 

-   * @return The total pal value.

-   * 

-   * @see PersonalAttributeList

-   */

-  public IPersonalAttributeList getTotalPersonalAttributeList() {

-      IPersonalAttributeList personnalAttributeList = null;

-      try {

-          personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone();

-      } catch (CloneNotSupportedException e1) {

-          LOG.trace("[PersonalAttribute] Nothing to do.");

-      }

-      return personnalAttributeList;

-  }

-  

-  /**

-   * Setter for the total Personal Attribute List value.

-   * 

-   * @param attrList the new value.

-   * 

-   * @see PersonalAttributeList

-   */

-  public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) {

-    if (attrList != null) {

-      this.totalAttributeList = attrList;

-    }

-  }

-  

-  /**

-   * Getter for personal attribute lists

-   * 

-   * @return The lists

-   * 

-   * @see PersonalAttributeList

-   */

-  public List<IPersonalAttributeList> getPersonalAttributeLists() {

-      return attributeLists;

-  }

-  

-  /**

-   * Setter for the Personal Attribute List value.

-   * 

-   * @param attrList the new value.

-   * 

-   * @see PersonalAttributeList

-   */

-  public void setPersonalAttributeLists(final List<IPersonalAttributeList> attrLists) {

-    if (attrLists != null) {

-      this.attributeLists = attrLists;

-    }

-  }

-  

-}

 

+	/** The Constant serialVersionUID. */

+	private static final long serialVersionUID = 7653893041391541235L;

+

+	/** Response Id. */

+	private String samlId;

+

+	/** Request failed? */

+	private boolean fail;

+

+	/** Status code. */

+	private String statusCode;

+

+	/** Secondary status code. */

+	private String subStatusCode;

+

+	/** Audience restriction. */

+	private String audienceRest;

+

+	/** Error message. */

+	private String message;

+

+	/** Id of the request that originated this response. */

+	private String inResponseTo;

+

+	/** Expiration date. */

+	private DateTime notOnOrAfter;

+

+	/** Creation date. */

+	private DateTime notBefore;

+

+	/** The SAML token. */

+	private byte[] tokenSaml = new byte[0];

+

+	/** Country. */

+	private String country;

+

+	/** The complete assertion **/

+	private Assertion assertion;

+

+	/** List of all assertions in response **/

+	private List<Assertion> assertions;

+

+	/** The complete list from all assertions **/

+	private IPersonalAttributeList totalAttributeList = new PersonalAttributeList();

+

+	/** All personal attribute lists **/

+	private List<IPersonalAttributeList> attributeLists;

+

+	/** Citizen's personal attribute list. */

+	private IPersonalAttributeList attributeList = new PersonalAttributeList();

+

+	/**

+	 * Logger object.

+	 */

+	private static final Logger LOG = Logger.getLogger(STORKAttrQueryResponse.class.getName());

+

+	/**

+	 * Getter for the subStatusCode.

+	 * 

+	 * @return The subStatusCode value.

+	 */

+	public String getSubStatusCode() {

+		return subStatusCode;

+	}

+

+	/**

+	 * Setter for the subStatusCode.

+	 * 

+	 * @param samlSubStatusCode

+	 *            the new subStatusCode value.

+	 */

+	public void setSubStatusCode(final String samlSubStatusCode) {

+		this.subStatusCode = samlSubStatusCode;

+	}

+

+	/**

+	 * Getter for audienceRest.

+	 * 

+	 * @return The audienceRest value.

+	 */

+	public String getAudienceRestriction() {

+		return audienceRest;

+	}

+

+	/**

+	 * Setter for audienceRest.

+	 * 

+	 * @param audRest

+	 *            the new audienceRest value.

+	 */

+	public void setAudienceRestriction(final String audRest) {

+		this.audienceRest = audRest;

+	}

+

+	/**

+	 * Getter for the samlToken.

+	 * 

+	 * @return The samlToken value.

+	 */

+	public byte[] getTokenSaml() {

+		return tokenSaml.clone();

+	}

+

+	/**

+	 * Setter for samlToken.

+	 * 

+	 * @param samlToken

+	 *            the new tokenSaml value.

+	 */

+	public void setTokenSaml(final byte[] samlToken) {

+		if (samlToken != null) {

+			this.tokenSaml = samlToken.clone();

+		}

+	}

+

+	/**

+	 * Getter for the country name.

+	 * 

+	 * @return The country name value.

+	 */

+	public String getCountry() {

+		return country;

+	}

+

+	/**

+	 * Setter for the country name.

+	 * 

+	 * @param cCountry

+	 *            the new country name value.

+	 */

+	public void setCountry(final String cCountry) {

+		this.country = cCountry;

+	}

+

+	/**

+	 * Getter for pal value.

+	 * 

+	 * @return The pal value.

+	 * 

+	 * @see PersonalAttributeList

+	 */

+	public IPersonalAttributeList getPersonalAttributeList() {

+		return (IPersonalAttributeList) attributeList.clone();

+	}

+

+	/**

+	 * Setter for the Personal Attribute List value.

+	 * 

+	 * @param attrList

+	 *            the new value.

+	 * 

+	 * @see PersonalAttributeList

+	 */

+	public void setPersonalAttributeList(final IPersonalAttributeList attrList) {

+		if (attrList != null) {

+			this.attributeList = attrList;

+		}

+	}

+

+	/**

+	 * Getter for the inResponseTo value.

+	 * 

+	 * @return The inResponseTo value.

+	 */

+	public String getInResponseTo() {

+		return inResponseTo;

+	}

+

+	/**

+	 * Setter for the inResponseTo value.

+	 * 

+	 * @param samlInResponseTo

+	 *            the new inResponseTo value.

+	 */

+	public void setInResponseTo(final String samlInResponseTo) {

+		this.inResponseTo = samlInResponseTo;

+	}

+

+	/**

+	 * Getter for the fail value.

+	 * 

+	 * @return The fail value.

+	 */

+	public boolean isFail() {

+		return fail;

+	}

+

+	/**

+	 * Setter for the fail value.

+	 * 

+	 * @param failVal

+	 *            the new fail value.

+	 */

+	public void setFail(final boolean failVal) {

+		this.fail = failVal;

+	}

+

+	/**

+	 * Getter for the message value.

+	 * 

+	 * @return The message value.

+	 */

+	public String getMessage() {

+		return message;

+	}

+

+	/**

+	 * Setter for the message value.

+	 * 

+	 * @param msg

+	 *            the new message value.

+	 */

+	public void setMessage(final String msg) {

+		this.message = msg;

+	}

+

+	/**

+	 * Getter for the statusCode value.

+	 * 

+	 * @return The statusCode value.

+	 */

+	public String getStatusCode() {

+		return statusCode;

+	}

+

+	/**

+	 * Setter for the statusCode value.

+	 * 

+	 * @param status

+	 *            the new statusCode value.

+	 */

+	public void setStatusCode(final String status) {

+		this.statusCode = status;

+	}

+

+	/**

+	 * Getter for the samlId value.

+	 * 

+	 * @return The samlId value.

+	 */

+	public String getSamlId() {

+		return samlId;

+	}

+

+	/**

+	 * Setter for the samlId value.

+	 * 

+	 * @param nSamlId

+	 *            the new samlId value.

+	 */

+	public void setSamlId(final String nSamlId) {

+		this.samlId = nSamlId;

+	}

+

+	/**

+	 * Getter for the notOnOrAfter value.

+	 * 

+	 * @return The notOnOrAfter value.

+	 * 

+	 * @see DateTime

+	 */

+	public DateTime getNotOnOrAfter() {

+		return this.notOnOrAfter;

+	}

+

+	/**

+	 * Setter for the notOnOrAfter value.

+	 * 

+	 * @param nOnOrAfter

+	 *            the new notOnOrAfter value.

+	 * 

+	 * @see DateTime

+	 */

+	public void setNotOnOrAfter(final DateTime nOnOrAfter) {

+		this.notOnOrAfter = nOnOrAfter;

+	}

+

+	/**

+	 * Getter for the notBefore value.

+	 * 

+	 * @return The notBefore value.

+	 * 

+	 * @see DateTime

+	 */

+	public DateTime getNotBefore() {

+		return notBefore;

+	}

+

+	/**

+	 * Setter for the notBefore value.

+	 * 

+	 * @param nBefore

+	 *            the new notBefore value.

+	 * 

+	 * @see DateTime

+	 */

+	public void setNotBefore(final DateTime nBefore) {

+		this.notBefore = nBefore;

+	}

+

+	/** Get the assertion from the response **/

+	public Assertion getAssertion() {

+		return assertion;

+	}

+

+	/** Set the assertion in the response **/

+	public void setAssertion(final Assertion nAssertion) {

+		this.assertion = nAssertion;

+	}

+

+	public void setAssertions(List<Assertion> newAssert) {

+		this.assertions = newAssert;

+	}

+

+	public List<Assertion> getAssertions() {

+		return assertions;

+	}

+

+	/**

+	 * Getter for the toal pal value.

+	 * 

+	 * @return The total pal value.

+	 * 

+	 * @see PersonalAttributeList

+	 */

+	public IPersonalAttributeList getTotalPersonalAttributeList() {

+		return (IPersonalAttributeList) totalAttributeList.clone();

+	}

+

+	/**

+	 * Setter for the total Personal Attribute List value.

+	 * 

+	 * @param attrList

+	 *            the new value.

+	 * 

+	 * @see PersonalAttributeList

+	 */

+	public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) {

+		if (attrList != null) {

+			this.totalAttributeList = attrList;

+		}

+	}

+

+	/**

+	 * Getter for personal attribute lists

+	 * 

+	 * @return The lists

+	 * 

+	 * @see PersonalAttributeList

+	 */

+	public List<IPersonalAttributeList> getPersonalAttributeLists() {

+		return attributeLists;

+	}

+

+	/**

+	 * Setter for the Personal Attribute List value.

+	 * 

+	 * @param attrList

+	 *            the new value.

+	 * 

+	 * @see PersonalAttributeList

+	 */

+	public void setPersonalAttributeLists(final List<IPersonalAttributeList> attrLists) {

+		if (attrLists != null) {

+			this.attributeLists = attrLists;

+		}

+	}

+

+}

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnRequest.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnRequest.java
index ea7c0e475..c3223ec40 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnRequest.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnRequest.java
@@ -18,478 +18,489 @@ import java.io.Serializable;
 import org.apache.log4j.Logger;
 
 /**
- * This class is a bean used to store the information relative to the
- * STORKAuthnRequest (SAML Token Request).
+ * This class is a bean used to store the information relative to the STORKAuthnRequest (SAML Token Request).
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.21 $, $Date: 2011-02-17 22:44:34 $
  */
 public final class STORKAuthnRequest implements Serializable, Cloneable {
-  
-  /** The Constant serialVersionUID. */
-  private static final long serialVersionUID = 4778480781609392750L;
-  
-  /**
-   * Logger object.
-   */
-  private static final Logger LOG = Logger.getLogger(STORKAuthnRequest.class
-    .getName());
-  
-  /** The samlId. */
-  private String samlId;
-  
-  /** The assertion consumer service url. */
-  private String serviceURL;
-  
-  /** The destination. */
-  private String destination;
-  
-  /** The provider name. */
-  private String providerName;
-  
-  /** The distinguished name. */
-  private String distinguishedName;
-  
-  /** The e id sector share. */
-  private boolean eIDSectorShare;
-  
-  /** The e id cross sector share. */
-  private boolean eIDCrossSectorShare;
-  
-  /** The e id cross border share. */
-  private boolean eIDCrossBorderShare;
-  
-  /** The personal attribute list. */
-  private IPersonalAttributeList attributeList = new PersonalAttributeList();
-  
-  /** The qaa. */
-  private int qaa;
-  
-  /** The token saml. */
-  private byte[] tokenSaml = new byte[0];
-  
-  /** The issuer. */
-  private String issuer;
-  
-  /** The service provider sector. */
-  private String spSector;
-  
-  /** The service provider institution. */
-  private String spInstitution;
-  
-  /** The service provider application. */
-  private String spApplication;
-  
-  /** The service provider country. */
-  private String spCountry;
-  
-  /** The country. */
-  private String country;
-  
-  /** The citizen country code. */
-  private String citizenCountry;
-  
-  /** The Service Provider ID. */
-  private String sPID;
-  
-  /** The Alias used at the keystore for saving this certificate. */
-  private String alias;
-  
-  /**
-   * Gets the SP's Certificate Alias.
-   * 
-   * @return alias The SP's Certificate Alias.
-   */
-  public String getAlias() {
-    return alias;
-  }
-  
-  /**
-   * Sets the SP's Certificate Alias.
-   * 
-   * @param nAlias The SP's Certificate Alias.
-   */
-  public void setAlias(final String nAlias) {
-      this.alias = nAlias;
-  }
-  
-  /**
-   * Gets the SP ID.
-   * 
-   * @return sPID The SP ID.
-   */
-  public String getSPID() {
-    return sPID;
-  }
-  
-  /**
-   * Sets the SP ID.
-   * 
-   * @param sPId The new sp samlId.
-   */
-  public void setSPID(final String sPId) {
-    this.sPID = sPId;
-  }
-  
-  /**
-   * Gets the citizen country code.
-   * 
-   * @return The citizen country code value.
-   */
-  public String getCitizenCountryCode() {
-    return citizenCountry;
-  }
-  
-  /**
-   * Sets the citizen country code.
-   * 
-   * @param countryCode the new citizen country code value.
-   */
-  public void setCitizenCountryCode(final String countryCode) {
-    this.citizenCountry = countryCode;
-  }
-  
-  /**
-   * Gets the sp country.
-   * 
-   * @return The sp country value.
-   */
-  public String getSpCountry() {
-    return spCountry;
-  }
-  
-  /**
-   * Sets the sp country.
-   * 
-   * @param sPCountry the new sp country value.
-   */
-  public void setSpCountry(final String sPCountry) {
-    this.spCountry = sPCountry;
-  }
-  
-  /**
-   * Gets the issuer.
-   * 
-   * @return The issuer value.
-   */
-  public String getIssuer() {
-    return issuer;
-  }
-  
-  /**
-   * Sets the issuer.
-   * 
-   * @param samlIssuer the new issuer value.
-   */
-  public void setIssuer(final String samlIssuer) {
-    this.issuer = samlIssuer;
-  }
-  
-  /**
-   * Gets the SAML Token.
-   * 
-   * @return The SAML Token value.
-   */
-  public byte[] getTokenSaml() {
-    return tokenSaml.clone();
-  }
-  
-  /**
-   * Sets the SAML Token.
-   * 
-   * @param samlToken The new SAML Token value.
-   */
-  public void setTokenSaml(final byte[] samlToken) {
-    if (samlToken != null) {
-      this.tokenSaml = samlToken.clone();
-    }
-  }
-  
-  /**
-   * Gets the country.
-   * 
-   * @return The country value.
-   */
-  public String getCountry() {
-    return country;
-  }
-  
-  /**
-   * Sets the country.
-   * 
-   * @param nCountry the new country value.
-   */
-  public void setCountry(final String nCountry) {
-    this.country = nCountry;
-  }
-  
-  /**
-   * Getter for the qaa value.
-   * 
-   * @return The qaa value value.
-   */
-  public int getQaa() {
-    return qaa;
-  }
-  
-  /**
-   * Setter for the qaa value.
-   * 
-   * @param qaaLevel The new qaa value.
-   */
-  public void setQaa(final int qaaLevel) {
-    this.qaa = qaaLevel;
-  }
-  
-  /**
-   * Getter for the serviceURL value.
-   * 
-   * @return The serviceURL value.
-   */
-  public String getAssertionConsumerServiceURL() {
-    return serviceURL;
-  }
-  
-  /**
-   * Setter for the serviceURL value.
-   * 
-   * @param newServiceURL the assertion consumer service URL.
-   */
-  public void setAssertionConsumerServiceURL(final String newServiceURL) {
-    this.serviceURL = newServiceURL;
-  }
-  
-  /**
-   * Getter for the destination value.
-   * 
-   * @return The destination value.
-   */
-  public String getDestination() {
-    return destination;
-  }
-  
-  /**
-   * Setter for the destination value.
-   * 
-   * @param detination the new destination value.
-   */
-  public void setDestination(final String detination) {
-    this.destination = detination;
-  }
-  
-  /**
-   * Getter for the samlId value.
-   * 
-   * @return The samlId value.
-   */
-  public String getSamlId() {
-    return samlId;
-  }
-  
-  /**
-   * Setter for the samlId value.
-   * 
-   * @param newSamlId the new samlId value.
-   */
-  public void setSamlId(final String newSamlId) {
-    this.samlId = newSamlId;
-  }
-  
-  /**
-   * Getter for the providerName value.
-   * 
-   * @return The provider name value.
-   */
-  public String getProviderName() {
-    return providerName;
-  }
-  
-  /**
-   * Setter for the providerName value.
-   * 
-   * @param samlProvider the provider name value.
-   */
-  public void setProviderName(final String samlProvider) {
-    this.providerName = samlProvider;
-  }
-  
-  /**
-   * Getter for the attributeList value.
-   * 
-   * @return The attributeList value.
-   * 
-   * @see IPersonalAttributeList
-   */
-  public IPersonalAttributeList getPersonalAttributeList() {
-      IPersonalAttributeList personnalAttributeList = null;
-      try {
-          personnalAttributeList = (IPersonalAttributeList) attributeList.clone();
-      } catch (CloneNotSupportedException e1) {
-          LOG.trace("[PersonalAttribute] Nothing to do.");
-      }
-      return personnalAttributeList;
-  }
-  
-  /**
-   * Setter for the attributeList value.
-   * 
-   * @param attrList the personal attribute list value.
-   * 
-   * @see IPersonalAttributeList
-   */
-  public void setPersonalAttributeList(final IPersonalAttributeList attrList) {
-    if (attrList != null) {
-      this.attributeList = attrList;
-    }
-  }
-  
-  /**
-   * Getter for the distinguishedName value.
-   * 
-   * @return The distinguishedName value.
-   */
-  public String getDistinguishedName() {
-    return distinguishedName;
-  }
-  
-  /**
-   * Setter for the distinguishedName value.
-   * 
-   * @param certDN the distinguished name value.
-   */
-  public void setDistinguishedName(final String certDN) {
-    this.distinguishedName = certDN;
-  }
-  
-  /**
-   * Gets the service provider sector.
-   * 
-   * @return The service provider sector value.
-   */
-  public String getSpSector() {
-    return spSector;
-  }
-  
-  /**
-   * Sets the service provider sector.
-   * 
-   * @param samlSPSector the new service provider sector value.
-   */
-  public void setSpSector(final String samlSPSector) {
-    this.spSector = samlSPSector;
-  }
-  
-  /**
-   * Gets the service provider institution.
-   * 
-   * @return The service provider institution value.
-   */
-  public String getSpInstitution() {
-    return spInstitution;
-  }
-  
-  /**
-   * Sets the service provider institution.
-   * 
-   * @param samlSPInst the new service provider institution value.
-   */
-  public void setSpInstitution(final String samlSPInst) {
-    this.spInstitution = samlSPInst;
-  }
-  
-  /**
-   * Gets the service provider application.
-   * 
-   * @return The service provider application value.
-   */
-  public String getSpApplication() {
-    return spApplication;
-  }
-  
-  /**
-   * Sets the service provider application.
-   * 
-   * @param samlSPApp the new service provider application value.
-   */
-  public void setSpApplication(final String samlSPApp) {
-    this.spApplication = samlSPApp;
-  }
-  
-  /**
-   * Checks if is eId sector share.
-   * 
-   * @return true, if is eId sector share.
-   */
-  public boolean isEIDSectorShare() {
-    return eIDSectorShare;
-  }
-  
-  /**
-   * Sets the eId sector share.
-   * 
-   * @param eIdSectorShare the new eId sector share value.
-   */
-  public void setEIDSectorShare(final boolean eIdSectorShare) {
-    this.eIDSectorShare = eIdSectorShare;
-  }
-  
-  /**
-   * Checks if is eId cross sector share.
-   * 
-   * @return true, if is eId cross sector share.
-   */
-  public boolean isEIDCrossSectorShare() {
-    return eIDCrossSectorShare;
-  }
-  
-  /**
-   * Sets the eId cross sector share.
-   * 
-   * @param eIdCrossSectorShare the new eId cross sector share value.
-   */
-  public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) {
-    this.eIDCrossSectorShare = eIdCrossSectorShare;
-  }
-  
-  /**
-   * Checks if is eId cross border share.
-   * 
-   * @return true, if is eId cross border share.
-   */
-  public boolean isEIDCrossBorderShare() {
-    return eIDCrossBorderShare;
-  }
-  
-  /**
-   * Sets the eId cross border share.
-   * 
-   * @param eIdCrossBorderShare the new eId cross border share value.
-   */
-  public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) {
-    this.eIDCrossBorderShare = eIdCrossBorderShare;
-  }
-  
-  /**
-   * Returns a copy of this <tt>STORKAuthnRequest</tt> instance.
-   * 
-   * @return The copy of this STORKAuthnRequest.
-   * @throws CloneNotSupportedException on clone exception
-   */
-  @Override
-  public Object clone() throws CloneNotSupportedException{
-    STORKAuthnRequest storkAuthnReq = null;
-    try {
-      storkAuthnReq = (STORKAuthnRequest) super.clone();
-      storkAuthnReq.setPersonalAttributeList(getPersonalAttributeList());
-      storkAuthnReq.setTokenSaml(getTokenSaml());
-    } catch (final CloneNotSupportedException e) {
-      // assert false;
-      LOG.trace("[PersonalAttribute] Nothing to do.");
-    }
-    
-    return storkAuthnReq;
-  }
-  
+
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = 4778480781609392750L;
+
+	/**
+	 * Logger object.
+	 */
+	private static final Logger LOG = Logger.getLogger(STORKAuthnRequest.class.getName());
+
+	/** The samlId. */
+	private String samlId;
+
+	/** The assertion consumer service url. */
+	private String serviceURL;
+
+	/** The destination. */
+	private String destination;
+
+	/** The provider name. */
+	private String providerName;
+
+	/** The distinguished name. */
+	private String distinguishedName;
+
+	/** The e id sector share. */
+	private boolean eIDSectorShare;
+
+	/** The e id cross sector share. */
+	private boolean eIDCrossSectorShare;
+
+	/** The e id cross border share. */
+	private boolean eIDCrossBorderShare;
+
+	/** The personal attribute list. */
+	private IPersonalAttributeList attributeList = new PersonalAttributeList();
+
+	/** The qaa. */
+	private int qaa;
+
+	/** The token saml. */
+	private byte[] tokenSaml = new byte[0];
+
+	/** The issuer. */
+	private String issuer;
+
+	/** The service provider sector. */
+	private String spSector;
+
+	/** The service provider institution. */
+	private String spInstitution;
+
+	/** The service provider application. */
+	private String spApplication;
+
+	/** The service provider country. */
+	private String spCountry;
+
+	/** The country. */
+	private String country;
+
+	/** The citizen country code. */
+	private String citizenCountry;
+
+	/** The Service Provider ID. */
+	private String sPID;
+
+	/** The Alias used at the keystore for saving this certificate. */
+	private String alias;
+
+	/**
+	 * Gets the SP's Certificate Alias.
+	 * 
+	 * @return alias The SP's Certificate Alias.
+	 */
+	public String getAlias() {
+		return alias;
+	}
+
+	/**
+	 * Sets the SP's Certificate Alias.
+	 * 
+	 * @param nAlias
+	 *            The SP's Certificate Alias.
+	 */
+	public void setAlias(final String nAlias) {
+		this.alias = nAlias;
+	}
+
+	/**
+	 * Gets the SP ID.
+	 * 
+	 * @return sPID The SP ID.
+	 */
+	public String getSPID() {
+		return sPID;
+	}
+
+	/**
+	 * Sets the SP ID.
+	 * 
+	 * @param sPId
+	 *            The new sp samlId.
+	 */
+	public void setSPID(final String sPId) {
+		this.sPID = sPId;
+	}
+
+	/**
+	 * Gets the citizen country code.
+	 * 
+	 * @return The citizen country code value.
+	 */
+	public String getCitizenCountryCode() {
+		return citizenCountry;
+	}
+
+	/**
+	 * Sets the citizen country code.
+	 * 
+	 * @param countryCode
+	 *            the new citizen country code value.
+	 */
+	public void setCitizenCountryCode(final String countryCode) {
+		this.citizenCountry = countryCode;
+	}
+
+	/**
+	 * Gets the sp country.
+	 * 
+	 * @return The sp country value.
+	 */
+	public String getSpCountry() {
+		return spCountry;
+	}
+
+	/**
+	 * Sets the sp country.
+	 * 
+	 * @param sPCountry
+	 *            the new sp country value.
+	 */
+	public void setSpCountry(final String sPCountry) {
+		this.spCountry = sPCountry;
+	}
+
+	/**
+	 * Gets the issuer.
+	 * 
+	 * @return The issuer value.
+	 */
+	public String getIssuer() {
+		return issuer;
+	}
+
+	/**
+	 * Sets the issuer.
+	 * 
+	 * @param samlIssuer
+	 *            the new issuer value.
+	 */
+	public void setIssuer(final String samlIssuer) {
+		this.issuer = samlIssuer;
+	}
+
+	/**
+	 * Gets the SAML Token.
+	 * 
+	 * @return The SAML Token value.
+	 */
+	public byte[] getTokenSaml() {
+		return tokenSaml.clone();
+	}
+
+	/**
+	 * Sets the SAML Token.
+	 * 
+	 * @param samlToken
+	 *            The new SAML Token value.
+	 */
+	public void setTokenSaml(final byte[] samlToken) {
+		if (samlToken != null) {
+			this.tokenSaml = samlToken.clone();
+		}
+	}
+
+	/**
+	 * Gets the country.
+	 * 
+	 * @return The country value.
+	 */
+	public String getCountry() {
+		return country;
+	}
+
+	/**
+	 * Sets the country.
+	 * 
+	 * @param nCountry
+	 *            the new country value.
+	 */
+	public void setCountry(final String nCountry) {
+		this.country = nCountry;
+	}
+
+	/**
+	 * Getter for the qaa value.
+	 * 
+	 * @return The qaa value value.
+	 */
+	public int getQaa() {
+		return qaa;
+	}
+
+	/**
+	 * Setter for the qaa value.
+	 * 
+	 * @param qaaLevel
+	 *            The new qaa value.
+	 */
+	public void setQaa(final int qaaLevel) {
+		this.qaa = qaaLevel;
+	}
+
+	/**
+	 * Getter for the serviceURL value.
+	 * 
+	 * @return The serviceURL value.
+	 */
+	public String getAssertionConsumerServiceURL() {
+		return serviceURL;
+	}
+
+	/**
+	 * Setter for the serviceURL value.
+	 * 
+	 * @param newServiceURL
+	 *            the assertion consumer service URL.
+	 */
+	public void setAssertionConsumerServiceURL(final String newServiceURL) {
+		this.serviceURL = newServiceURL;
+	}
+
+	/**
+	 * Getter for the destination value.
+	 * 
+	 * @return The destination value.
+	 */
+	public String getDestination() {
+		return destination;
+	}
+
+	/**
+	 * Setter for the destination value.
+	 * 
+	 * @param detination
+	 *            the new destination value.
+	 */
+	public void setDestination(final String detination) {
+		this.destination = detination;
+	}
+
+	/**
+	 * Getter for the samlId value.
+	 * 
+	 * @return The samlId value.
+	 */
+	public String getSamlId() {
+		return samlId;
+	}
+
+	/**
+	 * Setter for the samlId value.
+	 * 
+	 * @param newSamlId
+	 *            the new samlId value.
+	 */
+	public void setSamlId(final String newSamlId) {
+		this.samlId = newSamlId;
+	}
+
+	/**
+	 * Getter for the providerName value.
+	 * 
+	 * @return The provider name value.
+	 */
+	public String getProviderName() {
+		return providerName;
+	}
+
+	/**
+	 * Setter for the providerName value.
+	 * 
+	 * @param samlProvider
+	 *            the provider name value.
+	 */
+	public void setProviderName(final String samlProvider) {
+		this.providerName = samlProvider;
+	}
+
+	/**
+	 * Getter for the attributeList value.
+	 * 
+	 * @return The attributeList value.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	public IPersonalAttributeList getPersonalAttributeList() {
+		return (IPersonalAttributeList) attributeList.clone();
+	}
+
+	/**
+	 * Setter for the attributeList value.
+	 * 
+	 * @param attrList
+	 *            the personal attribute list value.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	public void setPersonalAttributeList(final IPersonalAttributeList attrList) {
+		if (attrList != null) {
+			this.attributeList = attrList;
+		}
+	}
+
+	/**
+	 * Getter for the distinguishedName value.
+	 * 
+	 * @return The distinguishedName value.
+	 */
+	public String getDistinguishedName() {
+		return distinguishedName;
+	}
+
+	/**
+	 * Setter for the distinguishedName value.
+	 * 
+	 * @param certDN
+	 *            the distinguished name value.
+	 */
+	public void setDistinguishedName(final String certDN) {
+		this.distinguishedName = certDN;
+	}
+
+	/**
+	 * Gets the service provider sector.
+	 * 
+	 * @return The service provider sector value.
+	 */
+	public String getSpSector() {
+		return spSector;
+	}
+
+	/**
+	 * Sets the service provider sector.
+	 * 
+	 * @param samlSPSector
+	 *            the new service provider sector value.
+	 */
+	public void setSpSector(final String samlSPSector) {
+		this.spSector = samlSPSector;
+	}
+
+	/**
+	 * Gets the service provider institution.
+	 * 
+	 * @return The service provider institution value.
+	 */
+	public String getSpInstitution() {
+		return spInstitution;
+	}
+
+	/**
+	 * Sets the service provider institution.
+	 * 
+	 * @param samlSPInst
+	 *            the new service provider institution value.
+	 */
+	public void setSpInstitution(final String samlSPInst) {
+		this.spInstitution = samlSPInst;
+	}
+
+	/**
+	 * Gets the service provider application.
+	 * 
+	 * @return The service provider application value.
+	 */
+	public String getSpApplication() {
+		return spApplication;
+	}
+
+	/**
+	 * Sets the service provider application.
+	 * 
+	 * @param samlSPApp
+	 *            the new service provider application value.
+	 */
+	public void setSpApplication(final String samlSPApp) {
+		this.spApplication = samlSPApp;
+	}
+
+	/**
+	 * Checks if is eId sector share.
+	 * 
+	 * @return true, if is eId sector share.
+	 */
+	public boolean isEIDSectorShare() {
+		return eIDSectorShare;
+	}
+
+	/**
+	 * Sets the eId sector share.
+	 * 
+	 * @param eIdSectorShare
+	 *            the new eId sector share value.
+	 */
+	public void setEIDSectorShare(final boolean eIdSectorShare) {
+		this.eIDSectorShare = eIdSectorShare;
+	}
+
+	/**
+	 * Checks if is eId cross sector share.
+	 * 
+	 * @return true, if is eId cross sector share.
+	 */
+	public boolean isEIDCrossSectorShare() {
+		return eIDCrossSectorShare;
+	}
+
+	/**
+	 * Sets the eId cross sector share.
+	 * 
+	 * @param eIdCrossSectorShare
+	 *            the new eId cross sector share value.
+	 */
+	public void setEIDCrossSectorShare(final boolean eIdCrossSectorShare) {
+		this.eIDCrossSectorShare = eIdCrossSectorShare;
+	}
+
+	/**
+	 * Checks if is eId cross border share.
+	 * 
+	 * @return true, if is eId cross border share.
+	 */
+	public boolean isEIDCrossBorderShare() {
+		return eIDCrossBorderShare;
+	}
+
+	/**
+	 * Sets the eId cross border share.
+	 * 
+	 * @param eIdCrossBorderShare
+	 *            the new eId cross border share value.
+	 */
+	public void setEIDCrossBorderShare(final boolean eIdCrossBorderShare) {
+		this.eIDCrossBorderShare = eIdCrossBorderShare;
+	}
+
+	/**
+	 * Returns a copy of this <tt>STORKAuthnRequest</tt> instance.
+	 * 
+	 * @return The copy of this STORKAuthnRequest.
+	 * @throws CloneNotSupportedException
+	 *             on clone exception
+	 */
+	@Override
+	public Object clone() throws CloneNotSupportedException {
+		STORKAuthnRequest storkAuthnReq = null;
+		try {
+			storkAuthnReq = (STORKAuthnRequest) super.clone();
+			storkAuthnReq.setPersonalAttributeList(getPersonalAttributeList());
+			storkAuthnReq.setTokenSaml(getTokenSaml());
+		} catch (final CloneNotSupportedException e) {
+			// assert false;
+			LOG.trace("[PersonalAttribute] Nothing to do.");
+		}
+
+		return storkAuthnReq;
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
index 62a5343ec..32bfd0df0 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKAuthnResponse.java
@@ -14,6 +14,7 @@
 package eu.stork.peps.auth.commons;
 
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.List;
 
 import org.apache.log4j.Logger;
@@ -21,367 +22,384 @@ import org.joda.time.DateTime;
 import org.opensaml.saml2.core.Assertion;
 
 /**
- * This class is a bean used to store the information relative to the
- * STORKAuthnResponse.
+ * This class is a bean used to store the information relative to the STORKAuthnResponse.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $
  */
-public final class STORKAuthnResponse implements Serializable {
-  
-  /** The Constant serialVersionUID. */
-  private static final long serialVersionUID = -9100982727074068660L;
-
-  /** Response Id. */
-  private String samlId;
-  
-  /** Authentication failed? */
-  private boolean fail;
-  
-  /** Status code. */
-  private String statusCode;
-  
-  /** Secondary status code. */
-  private String subStatusCode;
-  
-  /** Audience restriction. */
-  private String audienceRest;
-  
-  /** Error message. */
-  private String message;
-  
-  /** Id of the request that originated this response. */
-  private String inResponseTo;
-  
-  /** Expiration date. */
-  private DateTime notOnOrAfter;
-  
-  /** Creation date. */
-  private DateTime notBefore;
-  
-  /** The SAML token. */
-  private byte[] tokenSaml = new byte[0];
-  
-  /** Country. */
-  private String country;
-  
-  /** Citizen's personal attribute list. */
-  private IPersonalAttributeList attributeList = new PersonalAttributeList();
-  
-  /** List of all assertions in response **/
-  private List<Assertion> assertions;
-  
-  /** The complete list from all assertions **/
-  private IPersonalAttributeList totalAttributeList = new PersonalAttributeList();
-  
-  /** All personal attribute lists **/
-  private List<IPersonalAttributeList> attributeLists;
-  
-    /**
-     * Logger object.
-     */
-    private static final Logger LOG = Logger.getLogger(STORKAuthnResponse.class.getName());
-  
-  /**
-   * Getter for the subStatusCode.
-   * 
-   * @return The subStatusCode value.
-   */
-  public String getSubStatusCode() {
-    return subStatusCode;
-  }
-  
-  /**
-   * Setter for the subStatusCode.
-   * 
-   * @param samlSubStatusCode the new subStatusCode value.
-   */
-  public void setSubStatusCode(final String samlSubStatusCode) {
-    this.subStatusCode = samlSubStatusCode;
-  }
-  
-  /**
-   * Getter for audienceRest.
-   * 
-   * @return The audienceRest value.
-   */
-  public String getAudienceRestriction() {
-    return audienceRest;
-  }
-  
-  /**
-   * Setter for audienceRest.
-   * 
-   * @param audRest the new audienceRest value.
-   */
-  public void setAudienceRestriction(final String audRest) {
-    this.audienceRest = audRest;
-  }
-  
-  /**
-   * Getter for the samlToken.
-   * 
-   * @return The samlToken value.
-   */
-  public byte[] getTokenSaml() {
-    return tokenSaml.clone();
-  }
-  
-  /**
-   * Setter for samlToken.
-   * 
-   * @param samlToken the new tokenSaml value.
-   */
-  public void setTokenSaml(final byte[] samlToken) {
-    if (samlToken != null) {
-      this.tokenSaml = samlToken.clone();
-    }
-  }
-  
-  /**
-   * Getter for the country name.
-   * 
-   * @return The country name value.
-   */
-  public String getCountry() {
-    return country;
-  }
-  
-  /**
-   * Setter for the country name.
-   * 
-   * @param cCountry the new country name value.
-   */
-  public void setCountry(final String cCountry) {
-    this.country = cCountry;
-  }
-  
-  /**
-   * Getter for pal value.
-   * 
-   * @return The pal value.
-   * 
-   * @see PersonalAttributeList
-   */
-  public IPersonalAttributeList getPersonalAttributeList() {
-      IPersonalAttributeList personnalAttributeList = null;
-      try {
-          personnalAttributeList = (IPersonalAttributeList) attributeList.clone();
-      } catch (CloneNotSupportedException e1) {
-          LOG.trace("[PersonalAttribute] Nothing to do.");
-      }
-      return personnalAttributeList;
-  }
-  
-  /**
-   * Setter for the Personal Attribute List value.
-   * 
-   * @param attrList the new value.
-   * 
-   * @see PersonalAttributeList
-   */
-  public void setPersonalAttributeList(final IPersonalAttributeList attrList) {
-    if (attrList != null) {
-      this.attributeList = attrList;
-    }
-  }
-  
-  /**
-   * Getter for the inResponseTo value.
-   * 
-   * @return The inResponseTo value.
-   */
-  public String getInResponseTo() {
-    return inResponseTo;
-  }
-  
-  /**
-   * Setter for the inResponseTo value.
-   * 
-   * @param samlInResponseTo the new inResponseTo value.
-   */
-  public void setInResponseTo(final String samlInResponseTo) {
-    this.inResponseTo = samlInResponseTo;
-  }
-  
-  /**
-   * Getter for the fail value.
-   * 
-   * @return The fail value.
-   */
-  public boolean isFail() {
-    return fail;
-  }
-  
-  /**
-   * Setter for the fail value.
-   * 
-   * @param failVal the new fail value.
-   */
-  public void setFail(final boolean failVal) {
-    this.fail = failVal;
-  }
-  
-  /**
-   * Getter for the message value.
-   * 
-   * @return The message value.
-   */
-  public String getMessage() {
-    return message;
-  }
-  
-  /**
-   * Setter for the message value.
-   * 
-   * @param msg the new message value.
-   */
-  public void setMessage(final String msg) {
-    this.message = msg;
-  }
-  
-  /**
-   * Getter for the statusCode value.
-   * 
-   * @return The statusCode value.
-   */
-  public String getStatusCode() {
-    return statusCode;
-  }
-  
-  /**
-   * Setter for the statusCode value.
-   * 
-   * @param status the new statusCode value.
-   */
-  public void setStatusCode(final String status) {
-    this.statusCode = status;
-  }
-  
-  /**
-   * Getter for the samlId value.
-   * 
-   * @return The samlId value.
-   */
-  public String getSamlId() {
-    return samlId;
-  }
-  
-  /**
-   * Setter for the samlId value.
-   * 
-   * @param nSamlId the new samlId value.
-   */
-  public void setSamlId(final String nSamlId) {
-    this.samlId = nSamlId;
-  }
-  
-  /**
-   * Getter for the notOnOrAfter value.
-   * 
-   * @return The notOnOrAfter value.
-   * 
-   * @see DateTime
-   */
-  public DateTime getNotOnOrAfter() {
-    return this.notOnOrAfter;
-  }
-  
-  /**
-   * Setter for the notOnOrAfter value.
-   * 
-   * @param nOnOrAfter the new notOnOrAfter value.
-   * 
-   * @see DateTime
-   */
-  public void setNotOnOrAfter(final DateTime nOnOrAfter) {
-    this.notOnOrAfter = nOnOrAfter;
-  }
-  
-  /**
-   * Getter for the notBefore value.
-   * 
-   * @return The notBefore value.
-   * 
-   * @see DateTime
-   */
-  public DateTime getNotBefore() {
-    return notBefore;
-  }
-  
-  /**
-   * Setter for the notBefore value.
-   * 
-   * @param nBefore the new notBefore value.
-   * 
-   * @see DateTime
-   */
-  public void setNotBefore(final DateTime nBefore) {
-    this.notBefore = nBefore;
-  }
-  
-  public void setAssertions(List<Assertion> newAssert) {
-	  this.assertions = newAssert;
-  }
-  
-  public List<Assertion> getAssertions() {
-	  return assertions;
-  }
-  
-  /**
-   * Getter for the toal pal value.
-   * 
-   * @return The total pal value.
-   * 
-   * @see PersonalAttributeList
-   */
-  public IPersonalAttributeList getTotalPersonalAttributeList() {
-      IPersonalAttributeList personnalAttributeList = null;
-      try {
-          personnalAttributeList = (IPersonalAttributeList) totalAttributeList.clone();
-      } catch (CloneNotSupportedException e1) {
-          LOG.trace("[PersonalAttribute] Nothing to do.");
-      }
-      return personnalAttributeList;
-  }
-  
-  /**
-   * Setter for the total Personal Attribute List value.
-   * 
-   * @param attrList the new value.
-   * 
-   * @see PersonalAttributeList
-   */
-  public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) {
-    if (attrList != null) {
-      this.totalAttributeList = attrList;
-    }
-  }
-  
-  /**
-   * Getter for personal attribute lists
-   * 
-   * @return The lists
-   * 
-   * @see PersonalAttributeList
-   */
-  public List<IPersonalAttributeList> getPersonalAttributeLists() {
-      return attributeLists;
-  }
-  
-  /**
-   * Setter for the Personal Attribute List value.
-   * 
-   * @param attrList the new value.
-   * 
-   * @see PersonalAttributeList
-   */
-  public void setPersonalAttributeLists(final List<IPersonalAttributeList> attrLists) {
-    if (attrLists != null) {
-      this.attributeLists = attrLists;
-    }
-  }
-  
+public final class STORKAuthnResponse implements Serializable, Cloneable {
+
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = -9100982727074068660L;
+
+	/** Response Id. */
+	private String samlId;
+
+	/** Authentication failed? */
+	private boolean fail;
+
+	/** Status code. */
+	private String statusCode;
+
+	/** Secondary status code. */
+	private String subStatusCode;
+
+	/** Audience restriction. */
+	private String audienceRest;
+
+	/** Error message. */
+	private String message;
+
+	/** Id of the request that originated this response. */
+	private String inResponseTo;
+
+	/** Expiration date. */
+	private DateTime notOnOrAfter;
+
+	/** Creation date. */
+	private DateTime notBefore;
+
+	/** The SAML token. */
+	private byte[] tokenSaml = new byte[0];
+
+	/** Country. */
+	private String country;
+
+	/** Citizen's personal attribute list. */
+	private IPersonalAttributeList attributeList = new PersonalAttributeList();
+
+	/** List of all assertions in response **/
+	private List<Assertion> assertions;
+
+	/** The complete list from all assertions **/
+	private IPersonalAttributeList totalAttributeList = new PersonalAttributeList();
+
+	/** All personal attribute lists **/
+	private List<IPersonalAttributeList> attributeLists;
+
+	/**
+	 * Logger object.
+	 */
+	private static final Logger LOG = Logger.getLogger(STORKAuthnResponse.class.getName());
+
+	/**
+	 * Getter for the subStatusCode.
+	 * 
+	 * @return The subStatusCode value.
+	 */
+	public String getSubStatusCode() {
+		return subStatusCode;
+	}
+
+	/**
+	 * Setter for the subStatusCode.
+	 * 
+	 * @param samlSubStatusCode
+	 *            the new subStatusCode value.
+	 */
+	public void setSubStatusCode(final String samlSubStatusCode) {
+		this.subStatusCode = samlSubStatusCode;
+	}
+
+	/**
+	 * Getter for audienceRest.
+	 * 
+	 * @return The audienceRest value.
+	 */
+	public String getAudienceRestriction() {
+		return audienceRest;
+	}
+
+	/**
+	 * Setter for audienceRest.
+	 * 
+	 * @param audRest
+	 *            the new audienceRest value.
+	 */
+	public void setAudienceRestriction(final String audRest) {
+		this.audienceRest = audRest;
+	}
+
+	/**
+	 * Getter for the samlToken.
+	 * 
+	 * @return The samlToken value.
+	 */
+	public byte[] getTokenSaml() {
+		return tokenSaml.clone();
+	}
+
+	/**
+	 * Setter for samlToken.
+	 * 
+	 * @param samlToken
+	 *            the new tokenSaml value.
+	 */
+	public void setTokenSaml(final byte[] samlToken) {
+		if (samlToken != null) {
+			this.tokenSaml = samlToken.clone();
+		}
+	}
+
+	/**
+	 * Getter for the country name.
+	 * 
+	 * @return The country name value.
+	 */
+	public String getCountry() {
+		return country;
+	}
+
+	/**
+	 * Setter for the country name.
+	 * 
+	 * @param cCountry
+	 *            the new country name value.
+	 */
+	public void setCountry(final String cCountry) {
+		this.country = cCountry;
+	}
+
+	/**
+	 * Getter for pal value.
+	 * 
+	 * @return The pal value.
+	 * 
+	 * @see PersonalAttributeList
+	 */
+	public IPersonalAttributeList getPersonalAttributeList() {
+		return (IPersonalAttributeList) attributeList.clone();
+	}
+
+	/**
+	 * Setter for the Personal Attribute List value.
+	 * 
+	 * @param attrList
+	 *            the new value.
+	 * 
+	 * @see PersonalAttributeList
+	 */
+	public void setPersonalAttributeList(final IPersonalAttributeList attrList) {
+		if (attrList != null) {
+			this.attributeList = attrList;
+		}
+	}
+
+	/**
+	 * Getter for the inResponseTo value.
+	 * 
+	 * @return The inResponseTo value.
+	 */
+	public String getInResponseTo() {
+		return inResponseTo;
+	}
+
+	/**
+	 * Setter for the inResponseTo value.
+	 * 
+	 * @param samlInResponseTo
+	 *            the new inResponseTo value.
+	 */
+	public void setInResponseTo(final String samlInResponseTo) {
+		this.inResponseTo = samlInResponseTo;
+	}
+
+	/**
+	 * Getter for the fail value.
+	 * 
+	 * @return The fail value.
+	 */
+	public boolean isFail() {
+		return fail;
+	}
+
+	/**
+	 * Setter for the fail value.
+	 * 
+	 * @param failVal
+	 *            the new fail value.
+	 */
+	public void setFail(final boolean failVal) {
+		this.fail = failVal;
+	}
+
+	/**
+	 * Getter for the message value.
+	 * 
+	 * @return The message value.
+	 */
+	public String getMessage() {
+		return message;
+	}
+
+	/**
+	 * Setter for the message value.
+	 * 
+	 * @param msg
+	 *            the new message value.
+	 */
+	public void setMessage(final String msg) {
+		this.message = msg;
+	}
+
+	/**
+	 * Getter for the statusCode value.
+	 * 
+	 * @return The statusCode value.
+	 */
+	public String getStatusCode() {
+		return statusCode;
+	}
+
+	/**
+	 * Setter for the statusCode value.
+	 * 
+	 * @param status
+	 *            the new statusCode value.
+	 */
+	public void setStatusCode(final String status) {
+		this.statusCode = status;
+	}
+
+	/**
+	 * Getter for the samlId value.
+	 * 
+	 * @return The samlId value.
+	 */
+	public String getSamlId() {
+		return samlId;
+	}
+
+	/**
+	 * Setter for the samlId value.
+	 * 
+	 * @param nSamlId
+	 *            the new samlId value.
+	 */
+	public void setSamlId(final String nSamlId) {
+		this.samlId = nSamlId;
+	}
+
+	/**
+	 * Getter for the notOnOrAfter value.
+	 * 
+	 * @return The notOnOrAfter value.
+	 * 
+	 * @see DateTime
+	 */
+	public DateTime getNotOnOrAfter() {
+		return this.notOnOrAfter;
+	}
+
+	/**
+	 * Setter for the notOnOrAfter value.
+	 * 
+	 * @param nOnOrAfter
+	 *            the new notOnOrAfter value.
+	 * 
+	 * @see DateTime
+	 */
+	public void setNotOnOrAfter(final DateTime nOnOrAfter) {
+		this.notOnOrAfter = nOnOrAfter;
+	}
+
+	/**
+	 * Getter for the notBefore value.
+	 * 
+	 * @return The notBefore value.
+	 * 
+	 * @see DateTime
+	 */
+	public DateTime getNotBefore() {
+		return notBefore;
+	}
+
+	/**
+	 * Setter for the notBefore value.
+	 * 
+	 * @param nBefore
+	 *            the new notBefore value.
+	 * 
+	 * @see DateTime
+	 */
+	public void setNotBefore(final DateTime nBefore) {
+		this.notBefore = nBefore;
+	}
+
+	public void setAssertions(List<Assertion> newAssert) {
+		this.assertions = newAssert;
+	}
+
+	public List<Assertion> getAssertions() {
+		return assertions;
+	}
+
+	/**
+	 * Getter for the toal pal value.
+	 * 
+	 * @return The total pal value.
+	 * 
+	 * @see PersonalAttributeList
+	 */
+	public IPersonalAttributeList getTotalPersonalAttributeList() {
+		return (IPersonalAttributeList) totalAttributeList.clone();
+	}
+
+	public List<PersonalAttribute> getNormalizedPersonalAttributeList() {
+		List<PersonalAttribute> returnAttrList = new ArrayList<PersonalAttribute>();
+
+		if (this.totalAttributeList.isEmpty()) {
+			this.totalAttributeList = this.attributeList;
+		}
+
+		for (PersonalAttribute pa : this.totalAttributeList) {
+			// Get the shortname of the attribute by removing
+			// the attached assertionId, if there is one and
+			// put the shortname as the attribute name
+			pa.setName(pa.getName().split("_")[0]);
+			// We add it to the return list.
+			returnAttrList.add(pa);
+		}
+		return returnAttrList;
+	}
+
+	/**
+	 * Setter for the total Personal Attribute List value.
+	 * 
+	 * @param attrList
+	 *            the new value.
+	 * 
+	 * @see PersonalAttributeList
+	 */
+	public void setTotalPersonalAttributeList(final IPersonalAttributeList attrList) {
+		if (attrList != null) {
+			this.totalAttributeList = attrList;
+		}
+	}
+
+	/**
+	 * Getter for personal attribute lists
+	 * 
+	 * @return The lists
+	 * 
+	 * @see PersonalAttributeList
+	 */
+	public List<IPersonalAttributeList> getPersonalAttributeLists() {
+		return attributeLists;
+	}
+
+	/**
+	 * Setter for the Personal Attribute List value.
+	 * 
+	 * @param attrList
+	 *            the new value.
+	 * 
+	 * @see PersonalAttributeList
+	 */
+	public void setPersonalAttributeLists(final List<IPersonalAttributeList> attrLists) {
+		if (attrLists != null) {
+			this.attributeLists = attrLists;
+		}
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutRequest.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutRequest.java
index 44811aee2..acb70d365 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutRequest.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutRequest.java
@@ -4,194 +4,202 @@ import java.io.Serializable;
 

 public class STORKLogoutRequest implements Serializable, Cloneable {

 	private static final long serialVersionUID = 4778480781609392750L;

-	  

-	  /** The samlId. */

-	  private String samlId;

-	  	  

-	  /** The destination. */

-	  private String destination;

-

-	  /** The distinguished name. */

-	  private String distinguishedName;

-	  	   

-	  /** The qaa. */

-	  private int qaa;

-	  

-	  /** The token saml. */

-	  private byte[] tokenSaml = new byte[0];

-	  

-	  /** The issuer. */

-	  private String issuer;	 

-	  

-	  /** The country. */

-	  private String country;

-	    

-	  /** The Alias used at the keystore for saving this certificate. */

-	  private String alias;

-	

-	  /** The ID of principal as known to SP **/

-	  private String spProvidedId;

-	  

-	  /**

-	   * Gets the SP's Certificate Alias.

-	   * 

-	   * @return alias The SP's Certificate Alias.

-	   */

-	  public String getAlias() {

-	    return alias;

-	  }

-	  

-	  /**

-	   * Sets the SP's Certificate Alias.

-	   * 

-	   * @param nAlias The SP's Certificate Alias.

-	   */

-	  public void setAlias(final String nAlias) {

-	    this.alias = nAlias;

-	  }

-	  

-	  /**

-	   * Gets the issuer.

-	   * 

-	   * @return The issuer value.

-	   */

-	  public String getIssuer() {

-	    return issuer;

-	  }

-	  

-	  /**

-	   * Sets the issuer.

-	   * 

-	   * @param samlIssuer the new issuer value.

-	   */

-	  public void setIssuer(final String samlIssuer) {

-	    this.issuer = samlIssuer;

-	  }

-	  

-	  /**

-	   * Gets the SAML Token.

-	   * 

-	   * @return The SAML Token value.

-	   */

-	  public byte[] getTokenSaml() {

-	    return tokenSaml.clone();

-	  }

-	  

-	  /**

-	   * Sets the SAML Token.

-	   * 

-	   * @param samlToken The new SAML Token value.

-	   */

-	  public void setTokenSaml(final byte[] samlToken) {

-	    if (samlToken != null) {

-	      this.tokenSaml = samlToken.clone();

-	    }

-	  }

-	  

-	  /**

-	   * Gets the country.

-	   * 

-	   * @return The country value.

-	   */

-	  public String getCountry() {

-	    return country;

-	  }

-	  

-	  /**

-	   * Sets the country.

-	   * 

-	   * @param nCountry the new country value.

-	   */

-	  public void setCountry(final String nCountry) {

-	    this.country = nCountry;

-	  }

-	  

-	  /**

-	   * Getter for the qaa value.

-	   * 

-	   * @return The qaa value value.

-	   */

-	  public int getQaa() {

-	    return qaa;

-	  }

-	  

-	  /**

-	   * Setter for the qaa value.

-	   * 

-	   * @param qaaLevel The new qaa value.

-	   */

-	  public void setQaa(final int qaaLevel) {

-	    this.qaa = qaaLevel;

-	  }	  

-	  

-	  /**

-	   * Getter for the destination value.

-	   * 

-	   * @return The destination value.

-	   */

-	  public String getDestination() {

-	    return destination;

-	  }

-	  

-	  /**

-	   * Setter for the destination value.

-	   * 

-	   * @param detination the new destination value.

-	   */

-	  public void setDestination(final String detination) {

-	    this.destination = detination;

-	  }

-	  

-	  /**

-	   * Getter for the samlId value.

-	   * 

-	   * @return The samlId value.

-	   */

-	  public String getSamlId() {

-	    return samlId;

-	  }

-	  

-	  /**

-	   * Setter for the samlId value.

-	   * 

-	   * @param newSamlId the new samlId value.

-	   */

-	  public void setSamlId(final String newSamlId) {

-	    this.samlId = newSamlId;

-	  }

-	  

-	  /**

-	   * Getter for the distinguishedName value.

-	   * 

-	   * @return The distinguishedName value.

-	   */

-	  public String getDistinguishedName() {

-	    return distinguishedName;

-	  }

-	  

-	  /**

-	   * Setter for the distinguishedName value.

-	   * 

-	   * @param certDN the distinguished name value.

-	   */

-	  public void setDistinguishedName(final String certDN) {

-	    this.distinguishedName = certDN;

-	  }

-	  

-	  /** Getter for spProvidedId **/

-	  public String getSpProvidedId() {

-		  return spProvidedId;

-	  }

-	  

-	  public void setSpProvidedId(final String nSpProvidedId) {

-		  this.spProvidedId = nSpProvidedId;

-	  }

-	  

-	  @Override

-	  public Object clone() throws CloneNotSupportedException{

-		  STORKLogoutRequest storkLogoutRequest = null;

-	      storkLogoutRequest = (STORKLogoutRequest) super.clone();

-	      storkLogoutRequest.setTokenSaml(getTokenSaml());

-	    return storkLogoutRequest;

-	  }

+

+	/** The samlId. */

+	private String samlId;

+

+	/** The destination. */

+	private String destination;

+

+	/** The distinguished name. */

+	private String distinguishedName;

+

+	/** The qaa. */

+	private int qaa;

+

+	/** The token saml. */

+	private byte[] tokenSaml = new byte[0];

+

+	/** The issuer. */

+	private String issuer;

+

+	/** The country. */

+	private String country;

+

+	/** The Alias used at the keystore for saving this certificate. */

+	private String alias;

+

+	/** The ID of principal as known to SP **/

+	private String spProvidedId;

+

+	/**

+	 * Gets the SP's Certificate Alias.

+	 * 

+	 * @return alias The SP's Certificate Alias.

+	 */

+	public String getAlias() {

+		return alias;

+	}

+

+	/**

+	 * Sets the SP's Certificate Alias.

+	 * 

+	 * @param nAlias

+	 *            The SP's Certificate Alias.

+	 */

+	public void setAlias(final String nAlias) {

+		this.alias = nAlias;

+	}

+

+	/**

+	 * Gets the issuer.

+	 * 

+	 * @return The issuer value.

+	 */

+	public String getIssuer() {

+		return issuer;

+	}

+

+	/**

+	 * Sets the issuer.

+	 * 

+	 * @param samlIssuer

+	 *            the new issuer value.

+	 */

+	public void setIssuer(final String samlIssuer) {

+		this.issuer = samlIssuer;

+	}

+

+	/**

+	 * Gets the SAML Token.

+	 * 

+	 * @return The SAML Token value.

+	 */

+	public byte[] getTokenSaml() {

+		return tokenSaml.clone();

+	}

+

+	/**

+	 * Sets the SAML Token.

+	 * 

+	 * @param samlToken

+	 *            The new SAML Token value.

+	 */

+	public void setTokenSaml(final byte[] samlToken) {

+		if (samlToken != null) {

+			this.tokenSaml = samlToken.clone();

+		}

+	}

+

+	/**

+	 * Gets the country.

+	 * 

+	 * @return The country value.

+	 */

+	public String getCountry() {

+		return country;

+	}

+

+	/**

+	 * Sets the country.

+	 * 

+	 * @param nCountry

+	 *            the new country value.

+	 */

+	public void setCountry(final String nCountry) {

+		this.country = nCountry;

+	}

+

+	/**

+	 * Getter for the qaa value.

+	 * 

+	 * @return The qaa value value.

+	 */

+	public int getQaa() {

+		return qaa;

+	}

+

+	/**

+	 * Setter for the qaa value.

+	 * 

+	 * @param qaaLevel

+	 *            The new qaa value.

+	 */

+	public void setQaa(final int qaaLevel) {

+		this.qaa = qaaLevel;

+	}

+

+	/**

+	 * Getter for the destination value.

+	 * 

+	 * @return The destination value.

+	 */

+	public String getDestination() {

+		return destination;

+	}

+

+	/**

+	 * Setter for the destination value.

+	 * 

+	 * @param detination

+	 *            the new destination value.

+	 */

+	public void setDestination(final String detination) {

+		this.destination = detination;

+	}

+

+	/**

+	 * Getter for the samlId value.

+	 * 

+	 * @return The samlId value.

+	 */

+	public String getSamlId() {

+		return samlId;

+	}

+

+	/**

+	 * Setter for the samlId value.

+	 * 

+	 * @param newSamlId

+	 *            the new samlId value.

+	 */

+	public void setSamlId(final String newSamlId) {

+		this.samlId = newSamlId;

+	}

+

+	/**

+	 * Getter for the distinguishedName value.

+	 * 

+	 * @return The distinguishedName value.

+	 */

+	public String getDistinguishedName() {

+		return distinguishedName;

+	}

+

+	/**

+	 * Setter for the distinguishedName value.

+	 * 

+	 * @param certDN

+	 *            the distinguished name value.

+	 */

+	public void setDistinguishedName(final String certDN) {

+		this.distinguishedName = certDN;

+	}

+

+	/** Getter for spProvidedId **/

+	public String getSpProvidedId() {

+		return spProvidedId;

+	}

+

+	public void setSpProvidedId(final String nSpProvidedId) {

+		this.spProvidedId = nSpProvidedId;

+	}

+

+	@Override

+	public Object clone() throws CloneNotSupportedException {

+		STORKLogoutRequest storkLogoutRequest = null;

+		storkLogoutRequest = (STORKLogoutRequest) super.clone();

+		storkLogoutRequest.setTokenSaml(getTokenSaml());

+		return storkLogoutRequest;

+	}

 }

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java
index 21b53a652..8606b6389 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKLogoutResponse.java
@@ -4,247 +4,278 @@ import java.io.Serializable;
 

 public class STORKLogoutResponse implements Serializable, Cloneable {

 	private static final long serialVersionUID = 4778480781609392750L;

-	  

-	  /** The samlId. */

-	  private String samlId;

-	  	  

-	  /** The destination. */

-	  private String destination;

-

-	  /** The distinguished name. */

-	  private String distinguishedName;

-	  

-	  /** The token saml. */

-	  private byte[] tokenSaml = new byte[0];

-	  

-	  /** The issuer. */

-	  private String issuer;	 

-	  

-	  /** The country. */

-	  private String country;

-	    

-	  /** The Alias used at the keystore for saving this certificate. */

-	  private String alias;

-	

-	  /** Status code. */

-	  private String statusCode;

-	  

-	  /** Secondary status code. */

-	  private String subStatusCode;

-	  

-	  /** Status message. */

-	  private String statusMessage;

-	  

-	  /** Logout failed? */

-	  private boolean fail;

-	  

-	  /**

-	   * Gets the SP's Certificate Alias.

-	   * 

-	   * @return alias The SP's Certificate Alias.

-	   */

-	  public String getAlias() {

-	    return alias;

-	  }

-	  

-	  /**

-	   * Sets the SP's Certificate Alias.

-	   * 

-	   * @param nAlias The SP's Certificate Alias.

-	   */

-	  public void setAlias(final String nAlias) {

-	    this.alias = nAlias;

-	  }

-	  

-	  /**

-	   * Gets the issuer.

-	   * 

-	   * @return The issuer value.

-	   */

-	  public String getIssuer() {

-	    return issuer;

-	  }

-	  

-	  /**

-	   * Sets the issuer.

-	   * 

-	   * @param samlIssuer the new issuer value.

-	   */

-	  public void setIssuer(final String samlIssuer) {

-	    this.issuer = samlIssuer;

-	  }

-	  

-	  /**

-	   * Gets the SAML Token.

-	   * 

-	   * @return The SAML Token value.

-	   */

-	  public byte[] getTokenSaml() {

-	    return tokenSaml.clone();

-	  }

-	  

-	  /**

-	   * Sets the SAML Token.

-	   * 

-	   * @param samlToken The new SAML Token value.

-	   */

-	  public void setTokenSaml(final byte[] samlToken) {

-	    if (samlToken != null) {

-	      this.tokenSaml = samlToken.clone();

-	    }

-	  }

-	  

-	  /**

-	   * Gets the country.

-	   * 

-	   * @return The country value.

-	   */

-	  public String getCountry() {

-	    return country;

-	  }

-	  

-	  /**

-	   * Sets the country.

-	   * 

-	   * @param nCountry the new country value.

-	   */

-	  public void setCountry(final String nCountry) {

-	    this.country = nCountry;

-	  }	    

-	  

-	  /**

-	   * Getter for the destination value.

-	   * 

-	   * @return The destination value.

-	   */

-	  public String getDestination() {

-	    return destination;

-	  }

-	  

-	  /**

-	   * Setter for the destination value.

-	   * 

-	   * @param detination the new destination value.

-	   */

-	  public void setDestination(final String detination) {

-	    this.destination = detination;

-	  }

-	  

-	  /**

-	   * Getter for the samlId value.

-	   * 

-	   * @return The samlId value.

-	   */

-	  public String getSamlId() {

-	    return samlId;

-	  }

-	  

-	  /**

-	   * Setter for the samlId value.

-	   * 

-	   * @param newSamlId the new samlId value.

-	   */

-	  public void setSamlId(final String newSamlId) {

-	    this.samlId = newSamlId;

-	  }

-	  

-	  /**

-	   * Getter for the distinguishedName value.

-	   * 

-	   * @return The distinguishedName value.

-	   */

-	  public String getDistinguishedName() {

-	    return distinguishedName;

-	  }

-	  

-	  /**

-	   * Setter for the distinguishedName value.

-	   * 

-	   * @param certDN the distinguished name value.

-	   */

-	  public void setDistinguishedName(final String certDN) {

-	    this.distinguishedName = certDN;

-	  }

-	  	  

-	  

-	  /**

-	   * Getter for the fail value.

-	   * 

-	   * @return The fail value.

-	   */

-	  public boolean isFail() {

-	    return fail;

-	  }

-	  

-	  /**

-	   * Setter for the fail value.

-	   * 

-	   * @param failVal the new fail value.

-	   */

-	  public void setFail(final boolean failVal) {

-	    this.fail = failVal;

-	  }

-	  

-	  /**

-	   * Getter for the statusCode value.

-	   * 

-	   * @return The statusCode value.

-	   */

-	  public String getStatusCode() {

-	    return statusCode;

-	  }

-	  

-	  /**

-	   * Getter for the subStatusCode.

-	   * 

-	   * @return The subStatusCode value.

-	   */

-	  public String getSubStatusCode() {

-	    return subStatusCode;

-	  }

-	  

-	  /**

-	   * Setter for the subStatusCode.

-	   * 

-	   * @param samlSubStatusCode the new subStatusCode value.

-	   */

-	  public void setSubStatusCode(final String samlSubStatusCode) {

-	    this.subStatusCode = samlSubStatusCode;

-	  }

-	  

-	  /**

-	   * Setter for the statusMessage value.

-	   * 

-	   * @param status the new statusMessage value.

-	   */

-	  public void setStatusMessage(final String status) {

-	    this.statusMessage = status;

-	  }

-	  

-	  /**

-	   * Getter for the statusMessage value.

-	   * 

-	   * @return The statusMessage value.

-	   */

-	  public String getStatusMessage() {

-	    return statusMessage;

-	  }

-	  

-	  /**

-	   * Setter for the statusCode value.

-	   * 

-	   * @param status the new statusCode value.

-	   */

-	  public void setStatusCode(final String status) {

-	    this.statusCode = status;

-	  }

-	  

-	  @Override

-	  public Object clone() throws CloneNotSupportedException{

-		  STORKLogoutResponse storkLogoutResponse = null;

-	      storkLogoutResponse = (STORKLogoutResponse) super.clone();

-	      storkLogoutResponse.setTokenSaml(getTokenSaml());

-	    return storkLogoutResponse;

-	  }

 

+	/** The samlId. */

+	private String samlId;

+

+	/** The destination. */

+	private String destination;

+

+	/** The distinguished name. */

+	private String distinguishedName;

+

+	/** The token saml. */

+	private byte[] tokenSaml = new byte[0];

+

+	/** The issuer. */

+	private String issuer;

+

+	/** The country. */

+	private String country;

+

+	/** The Alias used at the keystore for saving this certificate. */

+	private String alias;

+

+	/** Status code. */

+	private String statusCode;

+

+	/** Secondary status code. */

+	private String subStatusCode;

+

+	/** Status message. */

+	private String statusMessage;

+

+	/** Logout failed? */

+	private boolean fail;

+

+    /** The inResponseTo */

+    private String inResponseTo;

+

+	/**

+	 * Gets the SP's Certificate Alias.

+	 * 

+	 * @return alias The SP's Certificate Alias.

+	 */

+	public String getAlias() {

+		return alias;

+	}

+

+	/**

+	 * Sets the SP's Certificate Alias.

+	 * 

+	 * @param nAlias

+	 *            The SP's Certificate Alias.

+	 */

+	public void setAlias(final String nAlias) {

+		this.alias = nAlias;

+	}

+

+	/**

+	 * Gets the issuer.

+	 * 

+	 * @return The issuer value.

+	 */

+	public String getIssuer() {

+		return issuer;

+	}

+

+	/**

+	 * Sets the issuer.

+	 * 

+	 * @param samlIssuer

+	 *            the new issuer value.

+	 */

+	public void setIssuer(final String samlIssuer) {

+		this.issuer = samlIssuer;

+	}

+

+	/**

+	 * Gets the SAML Token.

+	 * 

+	 * @return The SAML Token value.

+	 */

+	public byte[] getTokenSaml() {

+		return tokenSaml.clone();

+	}

+

+	/**

+	 * Sets the SAML Token.

+	 * 

+	 * @param samlToken

+	 *            The new SAML Token value.

+	 */

+	public void setTokenSaml(final byte[] samlToken) {

+		if (samlToken != null) {

+			this.tokenSaml = samlToken.clone();

+		}

+	}

+

+	/**

+	 * Gets the country.

+	 * 

+	 * @return The country value.

+	 */

+	public String getCountry() {

+		return country;

+	}

+

+	/**

+	 * Sets the country.

+	 * 

+	 * @param nCountry

+	 *            the new country value.

+	 */

+	public void setCountry(final String nCountry) {

+		this.country = nCountry;

+	}

+

+	/**

+	 * Getter for the destination value.

+	 * 

+	 * @return The destination value.

+	 */

+	public String getDestination() {

+		return destination;

+	}

+

+	/**

+	 * Setter for the destination value.

+	 * 

+	 * @param detination

+	 *            the new destination value.

+	 */

+	public void setDestination(final String detination) {

+		this.destination = detination;

+	}

+

+	/**

+	 * Getter for the samlId value.

+	 * 

+	 * @return The samlId value.

+	 */

+	public String getSamlId() {

+		return samlId;

+	}

+

+	/**

+	 * Setter for the samlId value.

+	 * 

+	 * @param newSamlId

+	 *            the new samlId value.

+	 */

+	public void setSamlId(final String newSamlId) {

+		this.samlId = newSamlId;

+	}

+

+	/**

+	 * Getter for the distinguishedName value.

+	 * 

+	 * @return The distinguishedName value.

+	 */

+	public String getDistinguishedName() {

+		return distinguishedName;

+	}

+

+	/**

+	 * Setter for the distinguishedName value.

+	 * 

+	 * @param certDN

+	 *            the distinguished name value.

+	 */

+	public void setDistinguishedName(final String certDN) {

+		this.distinguishedName = certDN;

+	}

+

+	/**

+	 * Getter for the fail value.

+	 * 

+	 * @return The fail value.

+	 */

+	public boolean isFail() {

+		return fail;

+	}

+

+	/**

+	 * Setter for the fail value.

+	 * 

+	 * @param failVal

+	 *            the new fail value.

+	 */

+	public void setFail(final boolean failVal) {

+		this.fail = failVal;

+	}

+

+	/**

+	 * Getter for the statusCode value.

+	 * 

+	 * @return The statusCode value.

+	 */

+	public String getStatusCode() {

+		return statusCode;

+	}

+

+	/**

+	 * Getter for the subStatusCode.

+	 * 

+	 * @return The subStatusCode value.

+	 */

+	public String getSubStatusCode() {

+		return subStatusCode;

+	}

+

+	/**

+	 * Setter for the subStatusCode.

+	 * 

+	 * @param samlSubStatusCode

+	 *            the new subStatusCode value.

+	 */

+	public void setSubStatusCode(final String samlSubStatusCode) {

+		this.subStatusCode = samlSubStatusCode;

+	}

+

+	/**

+	 * Setter for the statusMessage value.

+	 * 

+	 * @param status

+	 *            the new statusMessage value.

+	 */

+	public void setStatusMessage(final String status) {

+		this.statusMessage = status;

+	}

+

+	/**

+	 * Getter for the statusMessage value.

+	 * 

+	 * @return The statusMessage value.

+	 */

+	public String getStatusMessage() {

+		return statusMessage;

+	}

+

+	/**

+	 * Setter for the statusCode value.

+	 * 

+	 * @param status

+	 *            the new statusCode value.

+	 */

+	public void setStatusCode(final String status) {

+		this.statusCode = status;

+	}

+

+	@Override

+	public Object clone() throws CloneNotSupportedException {

+		STORKLogoutResponse storkLogoutResponse = null;

+		storkLogoutResponse = (STORKLogoutResponse) super.clone();

+		storkLogoutResponse.setTokenSaml(getTokenSaml());

+		return storkLogoutResponse;

+	}

+

+

+    /**

+     * Getter for the inResponseTo value.

+     *

+     * @return The inResponseTo value.

+     */

+    public String getInResponseTo() {

+        return inResponseTo;

+    }

+

+    /**

+     * Setter for the inResponseTo value.

+     *

+     * @param inResponseTo the new inResponseTo value.

+     */

+    public void setInResponseTo(String inResponseTo) {

+        this.inResponseTo = inResponseTo;

+    }

 }

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java
index a9c4a156b..98781828e 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKStatusCode.java
@@ -16,53 +16,52 @@ package eu.stork.peps.auth.commons;
 /**
  * This enum class contains the SAML Token Status Code.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $
  */
 public enum STORKStatusCode {
-  
-  /** URI for Requester status code. */
-  REQUESTER_URI("urn:oasis:names:tc:SAML:2.0:status:Requester"),
-  
-  /** URI for Responder status code. */
-  RESPONDER_URI("urn:oasis:names:tc:SAML:2.0:status:Responder"),
-  
-  /** URI for Success status code. */
-  SUCCESS_URI("urn:oasis:names:tc:SAML:2.0:status:Success"),
-  
-  /** Attribute is Available. */
-  STATUS_AVAILABLE("Available"),
-  
-  /** Attribute is NotAvailable. */
-  STATUS_NOT_AVAILABLE("NotAvailable"),
-  
-  /** Attribute is Withheld. */
-  STATUS_WITHHELD("Withheld");
-  
-  /**
-   * Represents the constant's value.
-   */
-  private String value;
-  
-  /**
-   * Solo Constructor.
-   * 
-   * @param val The Constant value.
-   */
-  private STORKStatusCode(final String val) {
-    
-    this.value = val;
-  }
-  
-  /**
-   * Return the Constant Value.
-   * 
-   * @return The constant value.
-   */
-  public String toString() {
-    
-    return value;
-  }
+
+	/** URI for Requester status code. */
+	REQUESTER_URI("urn:oasis:names:tc:SAML:2.0:status:Requester"),
+
+	/** URI for Responder status code. */
+	RESPONDER_URI("urn:oasis:names:tc:SAML:2.0:status:Responder"),
+
+	/** URI for Success status code. */
+	SUCCESS_URI("urn:oasis:names:tc:SAML:2.0:status:Success"),
+
+	/** Attribute is Available. */
+	STATUS_AVAILABLE("Available"),
+
+	/** Attribute is NotAvailable. */
+	STATUS_NOT_AVAILABLE("NotAvailable"),
+
+	/** Attribute is Withheld. */
+	STATUS_WITHHELD("Withheld");
+
+	/**
+	 * Represents the constant's value.
+	 */
+	private String value;
+
+	/**
+	 * Solo Constructor.
+	 * 
+	 * @param val
+	 *            The Constant value.
+	 */
+	private STORKStatusCode(final String val) {
+
+		this.value = val;
+	}
+
+	/**
+	 * Return the Constant Value.
+	 * 
+	 * @return The constant value.
+	 */
+	public String toString() {
+
+		return value;
+	}
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKSubStatusCode.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKSubStatusCode.java
index 0a711c9b7..0d5d72a0e 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKSubStatusCode.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/STORKSubStatusCode.java
@@ -16,56 +16,52 @@ package eu.stork.peps.auth.commons;
 /**
  * This enum class contains the SAML Token Sub Status Code.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.7 $, $Date: 2010-11-17 05:15:28 $
  */
 public enum STORKSubStatusCode {
-  
-  /** URI for AuthnFailed status code. */
-  AUTHN_FAILED_URI("urn:oasis:names:tc:SAML:2.0:status:AuthnFailed"),
-  
-  /** URI for InvalidAttrNameOrValue status code. */
-  INVALID_ATTR_NAME_VALUE_URI(
-    "urn:oasis:names:tc:SAML:2.0:status:InvalidAttrNameOrValue"),
-  
-  /** URI for InvalidNameIDPolicy status code. */
-  INVALID_NAMEID_POLICY_URI(
-    "urn:oasis:names:tc:SAML:2.0:status:InvalidNameIDPolicy"),
-  
-  /** URI for VersionMismatch status code. */
-  VERSION_MISMATCH_URI("urn:oasis:names:tc:SAML:2.0:status:VersionMismatch"),
-  
-  /** URI for RequestDenied status code. */
-  REQUEST_DENIED_URI("urn:oasis:names:tc:SAML:2.0:status:RequestDenied"),
-  
-  /** URI for QaaNotSupported status code. */
-  QAA_NOT_SUPPORTED(
-    "http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported");
-  
-  /**
-   * Represents the constant's value.
-   */
-  private String value;
-  
-  /**
-   * Solo Constructor.
-   * 
-   * @param val The Constant value.
-   */
-  private STORKSubStatusCode(final String val) {
-    
-    this.value = val;
-  }
-  
-  /**
-   * Return the Constant Value.
-   * 
-   * @return The constant value.
-   */
-  public String toString() {
-    
-    return value;
-  }
+
+	/** URI for AuthnFailed status code. */
+	AUTHN_FAILED_URI("urn:oasis:names:tc:SAML:2.0:status:AuthnFailed"),
+
+	/** URI for InvalidAttrNameOrValue status code. */
+	INVALID_ATTR_NAME_VALUE_URI("urn:oasis:names:tc:SAML:2.0:status:InvalidAttrNameOrValue"),
+
+	/** URI for InvalidNameIDPolicy status code. */
+	INVALID_NAMEID_POLICY_URI("urn:oasis:names:tc:SAML:2.0:status:InvalidNameIDPolicy"),
+
+	/** URI for VersionMismatch status code. */
+	VERSION_MISMATCH_URI("urn:oasis:names:tc:SAML:2.0:status:VersionMismatch"),
+
+	/** URI for RequestDenied status code. */
+	REQUEST_DENIED_URI("urn:oasis:names:tc:SAML:2.0:status:RequestDenied"),
+
+	/** URI for QaaNotSupported status code. */
+	QAA_NOT_SUPPORTED("http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported");
+
+	/**
+	 * Represents the constant's value.
+	 */
+	private String value;
+
+	/**
+	 * Solo Constructor.
+	 * 
+	 * @param val
+	 *            The Constant value.
+	 */
+	private STORKSubStatusCode(final String val) {
+
+		this.value = val;
+	}
+
+	/**
+	 * Return the Constant Value.
+	 * 
+	 * @return The constant value.
+	 */
+	public String toString() {
+
+		return value;
+	}
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java
index e9a96d7c2..97b43cf67 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/AbstractPEPSException.java
@@ -18,156 +18,160 @@ import java.io.Serializable;
 /**
  * Abstract class to represent the various PEPS exceptions.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $
  */
-public abstract class AbstractPEPSException extends RuntimeException implements
-  Serializable {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = -1884417567740138022L;
-  
-  /**
-   * Error code.
-   */
-  private String errorCode;
-  
-  /**
-   * Error message.
-   */
-  private String errorMessage;
-  
-  /**
-   * SAML token.
-   */
-  private String samlTokenFail;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param code The error code value.
-   * @param message The error message value.
-   */
-  public AbstractPEPSException(final String code, final String message) {
-    
-    super(message);
-    this.errorCode = code;
-    this.errorMessage = message;
-  }
-  
-  /**
-   * Exception Constructor with the errorMessage as parameters and the Throwable
-   * cause.
-   * 
-   * @param message The error message value.
-   * @param cause The throwable object.
-   */
-  public AbstractPEPSException(final String message, final Throwable cause) {
-    
-    super(message, cause);
-    this.errorMessage = message;
-  }
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters and the Throwable cause.
-   * 
-   * @param code The error code value.
-   * @param message The error message value.
-   * @param cause The throwable object.
-   */
-  public AbstractPEPSException(final String code, final String message,
-    final Throwable cause) {
-    
-    super(message, cause);
-    this.errorCode = code;
-    this.errorMessage = message;
-  }
-  
-  /**
-   * Exception Constructor with three Strings representing the errorCode,
-   * errorMessage and encoded samlToken as parameters.
-   * 
-   * @param code The error code value.
-   * @param message The error message value.
-   * @param samlToken The error SAML Token.
-   */
-  public AbstractPEPSException(final String code, final String message,
-    final String samlToken) {
-    
-    super(message);
-    this.errorCode = code;
-    this.errorMessage = message;
-    this.samlTokenFail = samlToken;
-  }
-  
-  /**
-   * Constructor with SAML Token as argument. Error message and error code are
-   * embedded in the SAML.
-   * 
-   * @param samlToken The error SAML Token.
-   */
-  public AbstractPEPSException(final String samlToken) {
-    super();
-    this.samlTokenFail = samlToken;
-  }
-  
-  /**
-   * Getter for errorCode.
-   * 
-   * @return The errorCode value.
-   */
-  public final String getErrorCode() {
-    return errorCode;
-  }
-  
-  /**
-   * Setter for errorCode.
-   * 
-   * @param code The error code value.
-   */
-  public final void setErrorCode(final String code) {
-    this.errorCode = code;
-  }
-  
-  /**
-   * Getter for errorMessage.
-   * 
-   * @return The error Message value.
-   */
-  public final String getErrorMessage() {
-    return errorMessage;
-  }
-  
-  /**
-   * Setter for errorMessage.
-   * 
-   * @param message The error message value.
-   */
-  public final void setErrorMessage(final String message) {
-    this.errorMessage = message;
-  }
-  
-  /**
-   * Getter for SAMLTokenFail.
-   * 
-   * @return The error SAML Token.
-   */
-  public final String getSamlTokenFail() {
-    return samlTokenFail;
-  }
-  
-  /**
-   * Setter for SAMLTokenFail.
-   * 
-   * @param samlToken The error SAML token.
-   */
-  public final void setSamlTokenFail(final String samlToken) {
-    this.samlTokenFail = samlToken;
-  }
+public abstract class AbstractPEPSException extends RuntimeException implements Serializable {
+
+	/**
+	 * Unique identifier.
+	 */
+	private static final long serialVersionUID = -1884417567740138022L;
+
+	/**
+	 * Error code.
+	 */
+	private String errorCode;
+
+	/**
+	 * Error message.
+	 */
+	private String errorMessage;
+
+	/**
+	 * SAML token.
+	 */
+	private String samlTokenFail;
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters.
+	 * 
+	 * @param code
+	 *            The error code value.
+	 * @param message
+	 *            The error message value.
+	 */
+	public AbstractPEPSException(final String code, final String message) {
+
+		super(message);
+		this.errorCode = code;
+		this.errorMessage = message;
+	}
+
+	/**
+	 * Exception Constructor with the errorMessage as parameters and the Throwable cause.
+	 * 
+	 * @param message
+	 *            The error message value.
+	 * @param cause
+	 *            The throwable object.
+	 */
+	public AbstractPEPSException(final String message, final Throwable cause) {
+
+		super(message, cause);
+		this.errorMessage = message;
+	}
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters and the Throwable cause.
+	 * 
+	 * @param code
+	 *            The error code value.
+	 * @param message
+	 *            The error message value.
+	 * @param cause
+	 *            The throwable object.
+	 */
+	public AbstractPEPSException(final String code, final String message, final Throwable cause) {
+
+		super(message, cause);
+		this.errorCode = code;
+		this.errorMessage = message;
+	}
+
+	/**
+	 * Exception Constructor with three Strings representing the errorCode, errorMessage and encoded samlToken as parameters.
+	 * 
+	 * @param code
+	 *            The error code value.
+	 * @param message
+	 *            The error message value.
+	 * @param samlToken
+	 *            The error SAML Token.
+	 */
+	public AbstractPEPSException(final String code, final String message, final String samlToken) {
+
+		super(message);
+		this.errorCode = code;
+		this.errorMessage = message;
+		this.samlTokenFail = samlToken;
+	}
+
+	/**
+	 * Constructor with SAML Token as argument. Error message and error code are embedded in the SAML.
+	 * 
+	 * @param samlToken
+	 *            The error SAML Token.
+	 */
+	public AbstractPEPSException(final String samlToken) {
+		super();
+		this.samlTokenFail = samlToken;
+	}
+
+	/**
+	 * Getter for errorCode.
+	 * 
+	 * @return The errorCode value.
+	 */
+	public final String getErrorCode() {
+		return errorCode;
+	}
+
+	/**
+	 * Setter for errorCode.
+	 * 
+	 * @param code
+	 *            The error code value.
+	 */
+	public final void setErrorCode(final String code) {
+		this.errorCode = code;
+	}
+
+	/**
+	 * Getter for errorMessage.
+	 * 
+	 * @return The error Message value.
+	 */
+	public final String getErrorMessage() {
+		return errorMessage;
+	}
+
+	/**
+	 * Setter for errorMessage.
+	 * 
+	 * @param message
+	 *            The error message value.
+	 */
+	public final void setErrorMessage(final String message) {
+		this.errorMessage = message;
+	}
+
+	/**
+	 * Getter for SAMLTokenFail.
+	 * 
+	 * @return The error SAML Token.
+	 */
+	public final String getSamlTokenFail() {
+		return samlTokenFail;
+	}
+
+	/**
+	 * Setter for SAMLTokenFail.
+	 * 
+	 * @param samlToken
+	 *            The error SAML token.
+	 */
+	public final void setSamlTokenFail(final String samlToken) {
+		this.samlTokenFail = samlToken;
+	}
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java
index 69cb20fdd..3479a33b8 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/CPEPSException.java
@@ -14,130 +14,133 @@
 package eu.stork.peps.auth.commons.exceptions;
 
 /**
- * This exception is thrown by the C-PEPS service and holds the relative
- * information to present to the citizen.
+ * This exception is thrown by the C-PEPS service and holds the relative information to present to the citizen.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.9 $, $Date: 2010-11-17 05:15:28 $
  */
 public final class CPEPSException extends RuntimeException {
-  
-  /**
-   * Serial id.
-   */
-  private static final long serialVersionUID = -4012295047127999362L;
-  
-  /**
-   * Error code.
-   */
-  private String errorCode;
-  
-  /**
-   * Error message.
-   */
-  private String errorMessage;
-  
-  /**
-   * SAML token.
-   */
-  private String samlTokenFail;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param samlToken The SAML Token.
-   * @param code The error code value.
-   * @param message The error message value.
-   */
-  public CPEPSException(final String samlToken, final String code,
-    final String message) {
-    
-    super(message);
-    this.setErrorCode(code);
-    this.setErrorMessage(message);
-    this.setSamlTokenFail(samlToken);
-  }
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param samlToken The SAML Token.
-   * @param code The error code value.
-   * @param message The error message value.
-   * @param cause The original exception;
-   */
-  public CPEPSException(final String samlToken, final String code,
-    final String message, final Throwable cause) {
-    
-    super(message, cause);
-    this.setErrorCode(code);
-    this.setErrorMessage(message);
-    this.setSamlTokenFail(samlToken);
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public String getMessage() {
-    return this.getErrorMessage() + " (" + this.getErrorCode() + ")";
-  }
-  
-  /**
-   * Getter for the error code.
-   * 
-   * @return The errorCode value.
-   */
-  public String getErrorCode() {
-    return errorCode;
-  }
-  
-  /**
-   * Setter for the error code.
-   * 
-   * @param code The error code.
-   */
-  public void setErrorCode(final String code) {
-    this.errorCode = code;
-  }
-  
-  /**
-   * Getter for the error message.
-   * 
-   * @return The errorMessage value.
-   */
-  public String getErrorMessage() {
-    return errorMessage;
-  }
-  
-  /**
-   * Setter for the error message.
-   * 
-   * @param message The error message.
-   */
-  public void setErrorMessage(final String message) {
-    this.errorMessage = message;
-  }
-  
-  /**
-   * Getter for the samlTokenFail.
-   * 
-   * @return The samlTokenFail value.
-   */
-  public String getSamlTokenFail() {
-    return samlTokenFail;
-  }
-  
-  /**
-   * Setter for the samlTokenFail.
-   * 
-   * @param samlToken The error Saml Token.
-   */
-  public void setSamlTokenFail(final String samlToken) {
-    this.samlTokenFail = samlToken;
-  }
-  
+
+	/**
+	 * Serial id.
+	 */
+	private static final long serialVersionUID = -4012295047127999362L;
+
+	/**
+	 * Error code.
+	 */
+	private String errorCode;
+
+	/**
+	 * Error message.
+	 */
+	private String errorMessage;
+
+	/**
+	 * SAML token.
+	 */
+	private String samlTokenFail;
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters.
+	 * 
+	 * @param samlToken
+	 *            The SAML Token.
+	 * @param code
+	 *            The error code value.
+	 * @param message
+	 *            The error message value.
+	 */
+	public CPEPSException(final String samlToken, final String code, final String message) {
+
+		super(message);
+		this.setErrorCode(code);
+		this.setErrorMessage(message);
+		this.setSamlTokenFail(samlToken);
+	}
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters.
+	 * 
+	 * @param samlToken
+	 *            The SAML Token.
+	 * @param code
+	 *            The error code value.
+	 * @param message
+	 *            The error message value.
+	 * @param cause
+	 *            The original exception;
+	 */
+	public CPEPSException(final String samlToken, final String code, final String message, final Throwable cause) {
+
+		super(message, cause);
+		this.setErrorCode(code);
+		this.setErrorMessage(message);
+		this.setSamlTokenFail(samlToken);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getMessage() {
+		return this.getErrorMessage() + " (" + this.getErrorCode() + ")";
+	}
+
+	/**
+	 * Getter for the error code.
+	 * 
+	 * @return The errorCode value.
+	 */
+	public String getErrorCode() {
+		return errorCode;
+	}
+
+	/**
+	 * Setter for the error code.
+	 * 
+	 * @param code
+	 *            The error code.
+	 */
+	public void setErrorCode(final String code) {
+		this.errorCode = code;
+	}
+
+	/**
+	 * Getter for the error message.
+	 * 
+	 * @return The errorMessage value.
+	 */
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+
+	/**
+	 * Setter for the error message.
+	 * 
+	 * @param message
+	 *            The error message.
+	 */
+	public void setErrorMessage(final String message) {
+		this.errorMessage = message;
+	}
+
+	/**
+	 * Getter for the samlTokenFail.
+	 * 
+	 * @return The samlTokenFail value.
+	 */
+	public String getSamlTokenFail() {
+		return samlTokenFail;
+	}
+
+	/**
+	 * Setter for the samlTokenFail.
+	 * 
+	 * @param samlToken
+	 *            The error Saml Token.
+	 */
+	public void setSamlTokenFail(final String samlToken) {
+		this.samlTokenFail = samlToken;
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java
index 67514d4fe..f1bccb277 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InternalErrorPEPSException.java
@@ -16,59 +16,59 @@ package eu.stork.peps.auth.commons.exceptions;
 /**
  * Internal Error Exception class.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.13 $, $Date: 2010-11-17 05:15:28 $
  * 
  * @see AbstractPEPSException
  */
 public final class InternalErrorPEPSException extends AbstractPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 1193001455410319795L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters and the Throwable cause.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error message value.
-   * @param cause The throwable object.
-   */
-  public InternalErrorPEPSException(final String errorCode,
-    final String errorMessage, final Throwable cause) {
-    
-    super(errorCode, errorMessage, cause);
-  }
-  
-  /**
-   * Exception Constructor with three strings representing the errorCode,
-   * errorMessage and encoded samlToken as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error message value.
-   * @param samlTokenFail The error SAML Token.
-   */
-  public InternalErrorPEPSException(final String errorCode,
-    final String errorMessage, final String samlTokenFail) {
-    
-    super(errorCode, errorMessage, samlTokenFail);
-  }
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error message value.
-   */
-  public InternalErrorPEPSException(final String errorCode,
-    final String errorMessage) {
-    
-    super(errorCode, errorMessage);
-  }
-   
+
+	/**
+	 * Unique identifier.
+	 */
+	private static final long serialVersionUID = 1193001455410319795L;
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters and the Throwable cause.
+	 * 
+	 * @param errorCode
+	 *            The error code value.
+	 * @param errorMessage
+	 *            The error message value.
+	 * @param cause
+	 *            The throwable object.
+	 */
+	public InternalErrorPEPSException(final String errorCode, final String errorMessage, final Throwable cause) {
+
+		super(errorCode, errorMessage, cause);
+	}
+
+	/**
+	 * Exception Constructor with three strings representing the errorCode, errorMessage and encoded samlToken as parameters.
+	 * 
+	 * @param errorCode
+	 *            The error code value.
+	 * @param errorMessage
+	 *            The error message value.
+	 * @param samlTokenFail
+	 *            The error SAML Token.
+	 */
+	public InternalErrorPEPSException(final String errorCode, final String errorMessage, final String samlTokenFail) {
+
+		super(errorCode, errorMessage, samlTokenFail);
+	}
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters.
+	 * 
+	 * @param errorCode
+	 *            The error code value.
+	 * @param errorMessage
+	 *            The error message value.
+	 */
+	public InternalErrorPEPSException(final String errorCode, final String errorMessage) {
+
+		super(errorCode, errorMessage);
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java
index 12c83b589..0aca67d5b 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidParameterPEPSException.java
@@ -16,39 +16,38 @@ package eu.stork.peps.auth.commons.exceptions;
 /**
  * Invalid Parameter Exception class.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.11 $, $Date: 2010-11-17 05:15:28 $
  * 
  * @see InvalidParameterPEPSException
  */
 public class InvalidParameterPEPSException extends AbstractPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 2046282148740524875L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error code message value.
-   */
-  public InvalidParameterPEPSException(final String errorCode,
-    final String errorMessage) {
-    super(errorCode, errorMessage);
-  }
-  
-  /**
-   * Exception Constructor with one String representing the encoded samlToken.
-   * 
-   * @param samlTokenFail The error SAML Token.
-   */
-  public InvalidParameterPEPSException(final String samlTokenFail) {
-    super(samlTokenFail);
-  }
-  
+
+	/**
+	 * Unique identifier.
+	 */
+	private static final long serialVersionUID = 2046282148740524875L;
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters.
+	 * 
+	 * @param errorCode
+	 *            The error code value.
+	 * @param errorMessage
+	 *            The error code message value.
+	 */
+	public InvalidParameterPEPSException(final String errorCode, final String errorMessage) {
+		super(errorCode, errorMessage);
+	}
+
+	/**
+	 * Exception Constructor with one String representing the encoded samlToken.
+	 * 
+	 * @param samlTokenFail
+	 *            The error SAML Token.
+	 */
+	public InvalidParameterPEPSException(final String samlTokenFail) {
+		super(samlTokenFail);
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java
index 800525eee..a4389da79 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/InvalidSessionPEPSException.java
@@ -16,31 +16,29 @@ package eu.stork.peps.auth.commons.exceptions;
 /**
  * Invalid session Exception class.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.14 $, $Date: 2010-11-17 05:15:28 $
  * 
  * @see InvalidParameterPEPSException
  */
 public class InvalidSessionPEPSException extends InvalidParameterPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 7147090160978319016L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error message value.
-   */
-  public InvalidSessionPEPSException(final String errorCode,
-    final String errorMessage) {
-    
-    super(errorCode, errorMessage);
-  }
-  
+
+	/**
+	 * Unique identifier.
+	 */
+	private static final long serialVersionUID = 7147090160978319016L;
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters.
+	 * 
+	 * @param errorCode
+	 *            The error code value.
+	 * @param errorMessage
+	 *            The error message value.
+	 */
+	public InvalidSessionPEPSException(final String errorCode, final String errorMessage) {
+
+		super(errorCode, errorMessage);
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java
index fc27371d2..03e7fb72f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/SecurityPEPSException.java
@@ -16,52 +16,53 @@ package eu.stork.peps.auth.commons.exceptions;
 /**
  * Security PEPS Exception class.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.18 $, $Date: 2010-11-17 05:15:28 $
  * 
  * @see AbstractPEPSException
  */
 public final class SecurityPEPSException extends AbstractPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 5605743302478554967L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMsg The error message value.
-   */
-  public SecurityPEPSException(final String errorCode, final String errorMsg) {
-    super(errorCode, errorMsg);
-  }
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters and the Throwable cause.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMessage The error message value.
-   * @param cause The throwable object.
-   */
-  public SecurityPEPSException(final String errorCode,
-    final String errorMessage, final Throwable cause) {
-    
-    super(errorCode, errorMessage, cause);
-  }
-  
-  /**
-   * Exception Constructor with one String representing the encoded samlToken.
-   * 
-   * @param samlTokenFail The error SAML Token.
-   */
-  public SecurityPEPSException(final String samlTokenFail) {
-    super(samlTokenFail);
-  }
-  
+
+	/**
+	 * Unique identifier.
+	 */
+	private static final long serialVersionUID = 5605743302478554967L;
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters.
+	 * 
+	 * @param errorCode
+	 *            The error code value.
+	 * @param errorMsg
+	 *            The error message value.
+	 */
+	public SecurityPEPSException(final String errorCode, final String errorMsg) {
+		super(errorCode, errorMsg);
+	}
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters and the Throwable cause.
+	 * 
+	 * @param errorCode
+	 *            The error code value.
+	 * @param errorMessage
+	 *            The error message value.
+	 * @param cause
+	 *            The throwable object.
+	 */
+	public SecurityPEPSException(final String errorCode, final String errorMessage, final Throwable cause) {
+
+		super(errorCode, errorMessage, cause);
+	}
+
+	/**
+	 * Exception Constructor with one String representing the encoded samlToken.
+	 * 
+	 * @param samlTokenFail
+	 *            The error SAML Token.
+	 */
+	public SecurityPEPSException(final String samlTokenFail) {
+		super(samlTokenFail);
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java
index a2da61a02..55f4f5a01 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/exceptions/StorkPEPSException.java
@@ -16,38 +16,36 @@ package eu.stork.peps.auth.commons.exceptions;
 /**
  * Security PEPS Exception class.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com, paulo.ribeiro@multicert.com
  * @version $Revision: 1.15 $, $Date: 2010-11-17 05:15:28 $
  * 
  * @see AbstractPEPSException
  */
 public final class StorkPEPSException extends AbstractPEPSException {
-  
-  /**
-   * Unique identifier.
-   */
-  private static final long serialVersionUID = 8048033129798427574L;
-  
-  /**
-   * Exception Constructor with two Strings representing the errorCode and
-   * errorMessage as parameters.
-   * 
-   * @param errorCode The error code value.
-   * @param errorMsg The error message value.
-   */
-  public StorkPEPSException(final String errorCode, final String errorMsg) {
-    super(errorCode, errorMsg);
-  }
-  
-  /**
-   * {@inheritDoc}
-   */
-  public String getMessage() {
-    
-    return "Security Error (" + this.getErrorCode() + ") processing request : "
-      + this.getErrorMessage();
-  }
-  
+
+	/**
+	 * Unique identifier.
+	 */
+	private static final long serialVersionUID = 8048033129798427574L;
+
+	/**
+	 * Exception Constructor with two Strings representing the errorCode and errorMessage as parameters.
+	 * 
+	 * @param errorCode
+	 *            The error code value.
+	 * @param errorMsg
+	 *            The error message value.
+	 */
+	public StorkPEPSException(final String errorCode, final String errorMsg) {
+		super(errorCode, errorMsg);
+	}
+
+	/**
+	 * {@inheritDoc}
+	 */
+	public String getMessage() {
+
+		return "Security Error (" + this.getErrorCode() + ") processing request : " + this.getErrorMessage();
+	}
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/package-info.java
index 19d45aaa2..d733342d7 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/package-info.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/package-info.java
@@ -7,3 +7,4 @@
  * @since 1.0

  */

 package eu.stork.peps.auth.commons;

+

diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java
index 5c24cc5a8..d9166458f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IAUService.java
@@ -23,193 +23,213 @@ import eu.stork.peps.auth.commons.STORKAuthnResponse;
 /**
  * Interface for Specific Authentication methods.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com
  */
 public interface IAUService {
-  
-  /**
-   * Prepares the citizen to be redirected to the IdP.
-   * 
-   * @param personalList The Personal Attribute List.
-   * @param parameters The parameters.
-   * @param session The session object.
-   * @param requestAttributes The Requested attributes.
-   * 
-   * @return byte[] containing a SAML Request.
-   * 
-   * @see IPersonalAttributeList
-   * @see IStorkSession
-   */
-  byte[] prepareCitizenAuthentication(IPersonalAttributeList personalList,
-    Map<String, Object> parameters, Map<String, Object> requestAttributes,
-    IStorkSession session);
-  
-  /**
-   * Prepares the citizen to be redirected to the PV.
-   * 
-   * @param personalList The Personal Attribute List.
-   * @param parameters The parameters.
-   * @param session The session object.
-   * @param requestAttributes The Requested attributes.
-   * 
-   * @return byte[] containing a SAML Request.
-   * 
-   * @see IPersonalAttributeList
-   * @see IStorkSession
-   */
-  byte[] preparePVRequest(IPersonalAttributeList personalList,
-    Map<String, Object> parameters, Map<String, Object> requestAttributes,
-    IStorkSession session);
-  
-  /**
-   * Authenticates a citizen.
-   * 
-   * @param personalList The Personal Attribute List.
-   * @param parameters The parameters.
-   * @param requestAttributes The requested attributes.
-   * 
-   * @return The updated Personal Attribute List.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList authenticateCitizen(
-    IPersonalAttributeList personalList, Map<String, Object> parameters,
-    Map<String, Object> requestAttributes);
-  
-  /**
-   * Validates a power.
-   * 
-   * @param personalList The Personal Attribute List.
-   * @param parameters The parameters.
-   * @param requestAttributes The requested attributes.
-   * 
-   * @return The updated Personal Attribute List (power validated).
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList powerValidation(
-    IPersonalAttributeList personalList, Map<String, Object> parameters,
-    Map<String, Object> requestAttributes);
-  
-  /**
-   * Prepares the Citizen browser to be redirected to the AP.
-   * 
-   * @param personalList The Personal Attribute List.
-   * @param parameters The parameters.
-   * @param session The session object.
-   * @param requestAttributes The requested attributes.
-   * 
-   * @return true in case of no error.
-   * 
-   * @see IPersonalAttributeList
-   * @see IStorkSession
-   */
-  boolean prepareAPRedirect(IPersonalAttributeList personalList,
-    Map<String, Object> parameters, Map<String, Object> requestAttributes,
-    IStorkSession session);
-  
-  /**
-   * Returns the attributes values from the AP.
-   * 
-   * @param personalList The Personal Attribute List.
-   * @param parameters The parameters.
-   * @param requestAttributes The request attributes.
-   * 
-   * @return The updated Personal Attribute List.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList getAttributesFromAttributeProviders(
-    IPersonalAttributeList personalList, Map<String, Object> parameters,
-    Map<String, Object> requestAttributes);
-  
-  /**
-   * Get the attributes from the AP with verification.
-   * 
-   * @param personalList The Personal Attribute List.
-   * @param parameters The HTTP Parameters.
-   * @param requestAttributes The requested Attributes.
-   * @param session The session object.
-   * @param auProcessId The SAML identifier.
-   * 
-   * @return true if the attributes were correctly verified.
-   * 
-   * @see IPersonalAttributeList
-   * @see IStorkSession
-   */
-  boolean getAttributesWithVerification(IPersonalAttributeList personalList,
-    Map<String, Object> parameters, Map<String, Object> requestAttributes,
-    IStorkSession session, String auProcessId);
-  
-  /**
-   * Validates a SAML Response.
-   * 
-   * @param samlToken The SAML Token.
-   * @param session The session object.
-   * 
-   * @return the STORKAuthnResponse associated with the validated response.
-   * 
-   * @see IStorkSession
-   */
-  STORKAuthnResponse processAuthenticationResponse(byte[] samlToken,
-    IStorkSession session);
-  
-  /**
-   * Generates a SAML Response in case of error.
-   * 
-   * @param inResponseTo The SAML's identifier to response.
-   * @param issuer The issuer value.
-   * @param assertionURL The assertion URL.
-   * @param code The error code.
-   * @param subcode The sub error code.
-   * @param message The error message.
-   * @param ipUserAddress The user IP address.
-   * 
-   * @return byte[] containing the SAML Response.
-   */
-  byte[] generateErrorAuthenticationResponse(String inResponseTo,
-    String issuer, String assertionURL, String code, String subcode,
-    String message, String ipUserAddress);
-  
-  /**
-   * Compares two given personal attribute lists.
-   * 
-   * @param original The original Personal Attribute List.
-   * @param modified The modified Personal Attribute List.
-   * @return true if the original list contains the modified one. False
-   *         otherwise.
-   * 
-   * @see IPersonalAttributeList
-   */
-  boolean comparePersonalAttributeLists(IPersonalAttributeList original,
-    IPersonalAttributeList modified);
-  
-  /**
-   * Prepares the citizen to be redirected to the AtP.
-   * 
-   * @param personalList The Personal Attribute List.
-   * @param parameters The parameters.
-   * @param session The session object.
-   * 
-   * @return byte[] containing a SAML Request.
-   * 
-   * @see IPersonalAttributeList
-   * @see IStorkSession
-   */
-  byte[] prepareAttributeRequest(IPersonalAttributeList personalList,
-    Map<String, Object> parameters, IStorkSession session);
 
-  /**
-   * Validates a SAML Response.
-   * 
-   * @param samlToken The SAML Token.
-   * @param session The session object.
-   * 
-   * @return the STORKAttrQueryResponse associated with the validated response.
-   * 
-   * @see IStorkSession
-   */
-  STORKAttrQueryResponse processAttributeResponse(byte[] samlToken,
-    IStorkSession session);
+	/**
+	 * Prepares the citizen to be redirected to the IdP.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * @param parameters
+	 *            The parameters.
+	 * @param session
+	 *            The session object.
+	 * @param requestAttributes
+	 *            The Requested attributes.
+	 * 
+	 * @return byte[] containing a SAML Request.
+	 * 
+	 * @see IPersonalAttributeList
+	 * @see IStorkSession
+	 */
+	byte[] prepareCitizenAuthentication(IPersonalAttributeList personalList, Map<String, Object> parameters, Map<String, Object> requestAttributes, IStorkSession session);
+
+	/**
+	 * Prepares the citizen to be redirected to the PV.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * @param parameters
+	 *            The parameters.
+	 * @param session
+	 *            The session object.
+	 * @param requestAttributes
+	 *            The Requested attributes.
+	 * 
+	 * @return byte[] containing a SAML Request.
+	 * 
+	 * @see IPersonalAttributeList
+	 * @see IStorkSession
+	 */
+	byte[] preparePVRequest(IPersonalAttributeList personalList, Map<String, Object> parameters, Map<String, Object> requestAttributes, IStorkSession session);
+
+	/**
+	 * Authenticates a citizen.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * @param parameters
+	 *            The parameters.
+	 * @param requestAttributes
+	 *            The requested attributes.
+	 * 
+	 * @return The updated Personal Attribute List.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList authenticateCitizen(IPersonalAttributeList personalList, Map<String, Object> parameters, Map<String, Object> requestAttributes);
+
+	/**
+	 * Validates a power.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * @param parameters
+	 *            The parameters.
+	 * @param requestAttributes
+	 *            The requested attributes.
+	 * 
+	 * @return The updated Personal Attribute List (power validated).
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList powerValidation(IPersonalAttributeList personalList, Map<String, Object> parameters, Map<String, Object> requestAttributes);
+
+	/**
+	 * Prepares the Citizen browser to be redirected to the AP.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * @param parameters
+	 *            The parameters.
+	 * @param session
+	 *            The session object.
+	 * @param requestAttributes
+	 *            The requested attributes.
+	 * 
+	 * @return true in case of no error.
+	 * 
+	 * @see IPersonalAttributeList
+	 * @see IStorkSession
+	 */
+	boolean prepareAPRedirect(IPersonalAttributeList personalList, Map<String, Object> parameters, Map<String, Object> requestAttributes, IStorkSession session);
+
+	/**
+	 * Returns the attributes values from the AP.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * @param parameters
+	 *            The parameters.
+	 * @param requestAttributes
+	 *            The request attributes.
+	 * 
+	 * @return The updated Personal Attribute List.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList getAttributesFromAttributeProviders(IPersonalAttributeList personalList, Map<String, Object> parameters, Map<String, Object> requestAttributes);
+
+	/**
+	 * Get the attributes from the AP with verification.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * @param parameters
+	 *            The HTTP Parameters.
+	 * @param requestAttributes
+	 *            The requested Attributes.
+	 * @param session
+	 *            The session object.
+	 * @param auProcessId
+	 *            The SAML identifier.
+	 * 
+	 * @return true if the attributes were correctly verified.
+	 * 
+	 * @see IPersonalAttributeList
+	 * @see IStorkSession
+	 */
+	boolean getAttributesWithVerification(IPersonalAttributeList personalList, Map<String, Object> parameters, Map<String, Object> requestAttributes, IStorkSession session, String auProcessId);
+
+	/**
+	 * Validates a SAML Response.
+	 * 
+	 * @param samlToken
+	 *            The SAML Token.
+	 * @param session
+	 *            The session object.
+	 * 
+	 * @return the STORKAuthnResponse associated with the validated response.
+	 * 
+	 * @see IStorkSession
+	 */
+	STORKAuthnResponse processAuthenticationResponse(byte[] samlToken, IStorkSession session);
+
+	/**
+	 * Generates a SAML Response in case of error.
+	 * 
+	 * @param inResponseTo
+	 *            The SAML's identifier to response.
+	 * @param issuer
+	 *            The issuer value.
+	 * @param assertionURL
+	 *            The assertion URL.
+	 * @param code
+	 *            The error code.
+	 * @param subcode
+	 *            The sub error code.
+	 * @param message
+	 *            The error message.
+	 * @param ipUserAddress
+	 *            The user IP address.
+	 * 
+	 * @return byte[] containing the SAML Response.
+	 */
+	byte[] generateErrorAuthenticationResponse(String inResponseTo, String issuer, String assertionURL, String code, String subcode, String message, String ipUserAddress);
+
+	/**
+	 * Compares two given personal attribute lists.
+	 * 
+	 * @param original
+	 *            The original Personal Attribute List.
+	 * @param modified
+	 *            The modified Personal Attribute List.
+	 * @return true if the original list contains the modified one. False otherwise.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	boolean comparePersonalAttributeLists(IPersonalAttributeList original, IPersonalAttributeList modified);
+
+	/**
+	 * Prepares the citizen to be redirected to the AtP.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * @param parameters
+	 *            The parameters.
+	 * @param session
+	 *            The session object.
+	 * 
+	 * @return byte[] containing a SAML Request.
+	 * 
+	 * @see IPersonalAttributeList
+	 * @see IStorkSession
+	 */
+	byte[] prepareAttributeRequest(IPersonalAttributeList personalList, Map<String, Object> parameters, IStorkSession session);
+
+	/**
+	 * Validates a SAML Response.
+	 * 
+	 * @param samlToken
+	 *            The SAML Token.
+	 * @param session
+	 *            The session object.
+	 * 
+	 * @return the STORKAttrQueryResponse associated with the validated response.
+	 * 
+	 * @see IStorkSession
+	 */
+	STORKAttrQueryResponse processAttributeResponse(byte[] samlToken, IStorkSession session);
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java
index 31a8d78ff..ccfcebf43 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ICheckAttributeValue.java
@@ -18,20 +18,20 @@ import java.util.List;
 /**
  * Interface that defines the methods to work with the validation of attributes.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com
  */
 public interface ICheckAttributeValue {
-  
-  /**
-   * Checks if the list of values contains the expected value.
-   * 
-   * @param values The List of values.
-   * @param expectedValue The value to check if it exists on the list.
-   * 
-   * @return boolean true, if the value is present in the list. False,
-   *         otherwise.
-   */
-  boolean checkValue(List<String> values, String expectedValue);
-  
+
+	/**
+	 * Checks if the list of values contains the expected value.
+	 * 
+	 * @param values
+	 *            The List of values.
+	 * @param expectedValue
+	 *            The value to check if it exists on the list.
+	 * 
+	 * @return boolean true, if the value is present in the list. False, otherwise.
+	 */
+	boolean checkValue(List<String> values, String expectedValue);
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java
index 78eb53004..a661e731b 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/IDeriveAttribute.java
@@ -19,22 +19,21 @@ import eu.stork.peps.auth.commons.PersonalAttribute;
 /**
  * Interface that defines the methods to work with derivation of attributes.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com
  */
 public interface IDeriveAttribute {
-  
-  /**
-   * Derives the attribute value. Set the Personal Attribute value to null if
-   * the value in session or the value of age are invalid (non-numeric or null).
-   * 
-   * @param personalAttrList The Personal Attribute List.
-   * @param session The session object.
-   * 
-   * @see PersonalAttribute The personal Attribute
-   * @see IStorkSession The session object.
-   */
-  void deriveAttributeToData(PersonalAttribute personalAttrList,
-    IStorkSession session);
-  
+
+	/**
+	 * Derives the attribute value. Set the Personal Attribute value to null if the value in session or the value of age are invalid (non-numeric or null).
+	 * 
+	 * @param personalAttrList
+	 *            The Personal Attribute List.
+	 * @param session
+	 *            The session object.
+	 * 
+	 * @see PersonalAttribute The personal Attribute
+	 * @see IStorkSession The session object.
+	 */
+	void deriveAttributeToData(PersonalAttribute personalAttrList, IStorkSession session);
+
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java
index ca2114e32..eaae06481 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/INormaliseValue.java
@@ -19,17 +19,17 @@ import eu.stork.peps.auth.commons.PersonalAttribute;
  * Interface for attribute's value normalisation.
  * 
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com
  */
 public interface INormaliseValue {
-  
-  /**
-   * Translates the attribute's value from local format to STORK format.
-   * 
-   * @param personalAttribute The Personal Attribute to normalise the value.
-   * 
-   * @see PersonalAttribute
-   */
-  void normaliseAttributeValueToStork(PersonalAttribute personalAttribute);
+
+	/**
+	 * Translates the attribute's value from local format to STORK format.
+	 * 
+	 * @param personalAttribute
+	 *            The Personal Attribute to normalise the value.
+	 * 
+	 * @see PersonalAttribute
+	 */
+	void normaliseAttributeValueToStork(PersonalAttribute personalAttribute);
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java
index 8a33897d8..4769bba19 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/specific/ITranslatorService.java
@@ -20,81 +20,82 @@ import eu.stork.peps.auth.commons.STORKAuthnRequest;
 /**
  * Interface for attributes normalization.
  * 
- * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com
+ * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com, luis.felix@multicert.com, hugo.magalhaes@multicert.com
  */
 public interface ITranslatorService {
-  
-  /**
-   * Translates the attributes from local format to STORK format.
-   * 
-   * @param personalList The Personal Attribute List.
-   * 
-   * @return The Personal Attribute List with normalised attributes.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList normaliseAttributeNamesToStork(
-    IPersonalAttributeList personalList);
-  
-  /**
-   * Translates the attributes values from local format to STORK format.
-   * 
-   * @param personalList The Personal Attribute List.
-   * 
-   * @return The PersonalAttributeList with normalised values.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList normaliseAttributeValuesToStork(
-    IPersonalAttributeList personalList);
-  
-  /**
-   * Translates the attributes from STORK format to local format.
-   * 
-   * @param personalList The Personal Attribute List.
-   * 
-   * @return The PersonalAttributeList with normalised attributes.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList normaliseAttributeNamesFromStork(
-    IPersonalAttributeList personalList);
-  
-  /**
-   * Derive Attribute Names To Stork format.
-   * 
-   * @param personalList The Personal Attribute List,
-   * 
-   * @return The PersonalAttributeList with derived attributes.
-   * 
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList deriveAttributeFromStork(
-    IPersonalAttributeList personalList);
-  
-  /**
-   * Derive Attribute Names from Stork format.
-   * 
-   * @param session The session object.
-   * @param modifiedList The Personal Attribute List.
-   * 
-   * @return The PersonalAttributeList with derived attributes.
-   * 
-   * @see IStorkSession
-   * @see IPersonalAttributeList
-   */
-  IPersonalAttributeList deriveAttributeToStork(IStorkSession session,
-    IPersonalAttributeList modifiedList);
-  
-  /**
-   * Validate the values of the attributes.
-   * 
-   * @param pal The attribute list
-   * 
-   * @return True, if all the attributes have values. False, otherwise.
-   * 
-   * @see STORKAuthnRequest
-   */
-  boolean checkAttributeValues(IPersonalAttributeList pa);
+
+	/**
+	 * Translates the attributes from local format to STORK format.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * 
+	 * @return The Personal Attribute List with normalised attributes.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList normaliseAttributeNamesToStork(IPersonalAttributeList personalList);
+
+	/**
+	 * Translates the attributes values from local format to STORK format.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * 
+	 * @return The PersonalAttributeList with normalised values.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList normaliseAttributeValuesToStork(IPersonalAttributeList personalList);
+
+	/**
+	 * Translates the attributes from STORK format to local format.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List.
+	 * 
+	 * @return The PersonalAttributeList with normalised attributes.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList normaliseAttributeNamesFromStork(IPersonalAttributeList personalList);
+
+	/**
+	 * Derive Attribute Names To Stork format.
+	 * 
+	 * @param personalList
+	 *            The Personal Attribute List,
+	 * 
+	 * @return The PersonalAttributeList with derived attributes.
+	 * 
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList deriveAttributeFromStork(IPersonalAttributeList personalList);
+
+	/**
+	 * Derive Attribute Names from Stork format.
+	 * 
+	 * @param session
+	 *            The session object.
+	 * @param modifiedList
+	 *            The Personal Attribute List.
+	 * 
+	 * @return The PersonalAttributeList with derived attributes.
+	 * 
+	 * @see IStorkSession
+	 * @see IPersonalAttributeList
+	 */
+	IPersonalAttributeList deriveAttributeToStork(IStorkSession session, IPersonalAttributeList modifiedList);
+
+	/**
+	 * Validate the values of the attributes.
+	 * 
+	 * @param pal
+	 *            The attribute list
+	 * 
+	 * @return True, if all the attributes have values. False, otherwise.
+	 * 
+	 * @see STORKAuthnRequest
+	 */
+	boolean checkAttributeValues(IPersonalAttributeList pa);
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AdditionalInformationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AdditionalInformationType.java
index 21a15820b..87268f991 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AdditionalInformationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AdditionalInformationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Additional information
  * 
- * <p>Java class for AdditionalInformationType complex type.
+ * <p>
+ * Java class for AdditionalInformationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AdditionalInformationType">
@@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AdditionalInformationType", propOrder = {
-    "specificInformation",
-    "otherSources"
-})
+@XmlType(name = "AdditionalInformationType", propOrder = { "specificInformation", "otherSources" })
 public class AdditionalInformationType {
 
-    @XmlElement(name = "SpecificInformation")
-    protected RichTextTagType specificInformation;
-    @XmlElement(name = "OtherSources")
-    protected RichTextTagType otherSources;
+	@XmlElement(name = "SpecificInformation")
+	protected RichTextTagType specificInformation;
+	@XmlElement(name = "OtherSources")
+	protected RichTextTagType otherSources;
 
-    /**
-     * Gets the value of the specificInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getSpecificInformation() {
-        return specificInformation;
-    }
+	/**
+	 * Gets the value of the specificInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getSpecificInformation() {
+		return specificInformation;
+	}
 
-    /**
-     * Sets the value of the specificInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setSpecificInformation(RichTextTagType value) {
-        this.specificInformation = value;
-    }
+	/**
+	 * Sets the value of the specificInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setSpecificInformation(RichTextTagType value) {
+		this.specificInformation = value;
+	}
 
-    /**
-     * Gets the value of the otherSources property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getOtherSources() {
-        return otherSources;
-    }
+	/**
+	 * Gets the value of the otherSources property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getOtherSources() {
+		return otherSources;
+	}
 
-    /**
-     * Sets the value of the otherSources property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setOtherSources(RichTextTagType value) {
-        this.otherSources = value;
-    }
+	/**
+	 * Sets the value of the otherSources property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setOtherSources(RichTextTagType value) {
+		this.otherSources = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java
index 044801564..044fd0a04 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -17,13 +16,14 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
  * Address
  * 
- * <p>Java class for AddressType complex type.
+ * <p>
+ * Java class for AddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AddressType">
@@ -52,230 +52,203 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AddressType", propOrder = {
-    "line",
-    "city",
-    "stateOrRegion",
-    "postalCode",
-    "country"
-})
+@XmlType(name = "AddressType", propOrder = { "line", "city", "stateOrRegion", "postalCode", "country" })
 public class AddressType {
 
-    @XmlElement(name = "Line", required = true)
-    protected List<String> line;
-    @XmlElement(name = "City", required = true)
-    protected String city;
-    @XmlElement(name = "StateOrRegion", required = true)
-    protected String stateOrRegion;
-    @XmlElement(name = "PostalCode", required = true)
-    protected String postalCode;
-    @XmlElement(name = "Country", required = true)
-    protected AddressType.Country country;
-
-    /**
-     * Gets the value of the line property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the line property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getLine().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getLine() {
-        if (line == null) {
-            line = new ArrayList<String>();
-        }
-        return this.line;
-    }
-
-    /**
-     * Gets the value of the city property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCity() {
-        return city;
-    }
-
-    /**
-     * Sets the value of the city property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCity(String value) {
-        this.city = value;
-    }
-
-    /**
-     * Gets the value of the stateOrRegion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStateOrRegion() {
-        return stateOrRegion;
-    }
-
-    /**
-     * Sets the value of the stateOrRegion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStateOrRegion(String value) {
-        this.stateOrRegion = value;
-    }
-
-    /**
-     * Gets the value of the postalCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPostalCode() {
-        return postalCode;
-    }
-
-    /**
-     * Sets the value of the postalCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPostalCode(String value) {
-        this.postalCode = value;
-    }
-
-    /**
-     * Gets the value of the country property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AddressType.Country }
-     *     
-     */
-    public AddressType.Country getCountry() {
-        return country;
-    }
-
-    /**
-     * Sets the value of the country property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AddressType.Country }
-     *     
-     */
-    public void setCountry(AddressType.Country value) {
-        this.country = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Country {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "country", required = true)
-        protected CountryType country;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the country property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CountryType }
-         *     
-         */
-        public CountryType getCountry() {
-            return country;
-        }
-
-        /**
-         * Sets the value of the country property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CountryType }
-         *     
-         */
-        public void setCountry(CountryType value) {
-            this.country = value;
-        }
-
-    }
+	@XmlElement(name = "Line", required = true)
+	protected List<String> line;
+	@XmlElement(name = "City", required = true)
+	protected String city;
+	@XmlElement(name = "StateOrRegion", required = true)
+	protected String stateOrRegion;
+	@XmlElement(name = "PostalCode", required = true)
+	protected String postalCode;
+	@XmlElement(name = "Country", required = true)
+	protected AddressType.Country country;
+
+	/**
+	 * Gets the value of the line property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the line property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getLine().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getLine() {
+		if (line == null) {
+			line = new ArrayList<String>();
+		}
+		return this.line;
+	}
+
+	/**
+	 * Gets the value of the city property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCity() {
+		return city;
+	}
+
+	/**
+	 * Sets the value of the city property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCity(String value) {
+		this.city = value;
+	}
+
+	/**
+	 * Gets the value of the stateOrRegion property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getStateOrRegion() {
+		return stateOrRegion;
+	}
+
+	/**
+	 * Sets the value of the stateOrRegion property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setStateOrRegion(String value) {
+		this.stateOrRegion = value;
+	}
+
+	/**
+	 * Gets the value of the postalCode property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	/**
+	 * Sets the value of the postalCode property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setPostalCode(String value) {
+		this.postalCode = value;
+	}
+
+	/**
+	 * Gets the value of the country property.
+	 * 
+	 * @return possible object is {@link AddressType.Country }
+	 * 
+	 */
+	public AddressType.Country getCountry() {
+		return country;
+	}
+
+	/**
+	 * Sets the value of the country property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AddressType.Country }
+	 * 
+	 */
+	public void setCountry(AddressType.Country value) {
+		this.country = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Country {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "country", required = true)
+		protected CountryType country;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the country property.
+		 * 
+		 * @return possible object is {@link CountryType }
+		 * 
+		 */
+		public CountryType getCountry() {
+			return country;
+		}
+
+		/**
+		 * Sets the value of the country property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CountryType }
+		 * 
+		 */
+		public void setCountry(CountryType value) {
+			this.country = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java
index d30d97334..17212282b 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Data file
  * 
- * <p>Java class for AttachedFileDataType complex type.
+ * <p>
+ * Java class for AttachedFileDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachedFileDataType">
@@ -38,88 +38,75 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachedFileDataType", propOrder = {
-    "description",
-    "mime",
-    "data"
-})
+@XmlType(name = "AttachedFileDataType", propOrder = { "description", "mime", "data" })
 public class AttachedFileDataType {
 
-    @XmlElement(name = "Description", required = true)
-    protected String description;
-    @XmlElement(name = "Mime", required = true)
-    protected MimeType mime;
-    @XmlElement(name = "Data", required = true)
-    protected byte[] data;
+	@XmlElement(name = "Description", required = true)
+	protected String description;
+	@XmlElement(name = "Mime", required = true)
+	protected MimeType mime;
+	@XmlElement(name = "Data", required = true)
+	protected byte[] data;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+	/**
+	 * Gets the value of the description property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDescription() {
+		return description;
+	}
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+	/**
+	 * Sets the value of the description property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDescription(String value) {
+		this.description = value;
+	}
 
-    /**
-     * Gets the value of the mime property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MimeType }
-     *     
-     */
-    public MimeType getMime() {
-        return mime;
-    }
+	/**
+	 * Gets the value of the mime property.
+	 * 
+	 * @return possible object is {@link MimeType }
+	 * 
+	 */
+	public MimeType getMime() {
+		return mime;
+	}
 
-    /**
-     * Sets the value of the mime property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MimeType }
-     *     
-     */
-    public void setMime(MimeType value) {
-        this.mime = value;
-    }
+	/**
+	 * Sets the value of the mime property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MimeType }
+	 * 
+	 */
+	public void setMime(MimeType value) {
+		this.mime = value;
+	}
 
-    /**
-     * Gets the value of the data property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getData() {
-        return data;
-    }
+	/**
+	 * Gets the value of the data property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getData() {
+		return data;
+	}
 
-    /**
-     * Sets the value of the data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setData(byte[] value) {
-        this.data = value;
-    }
+	/**
+	 * Sets the value of the data property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setData(byte[] value) {
+		this.data = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileURLType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileURLType.java
index 3e49c0053..5cae1a677 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileURLType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileURLType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * URL reference to the file
  * 
- * <p>Java class for AttachedFileURLType complex type.
+ * <p>
+ * Java class for AttachedFileURLType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachedFileURLType">
@@ -38,90 +38,77 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachedFileURLType", propOrder = {
-    "description",
-    "mime",
-    "url"
-})
+@XmlType(name = "AttachedFileURLType", propOrder = { "description", "mime", "url" })
 public class AttachedFileURLType {
 
-    @XmlElement(name = "Description", required = true)
-    protected String description;
-    @XmlElement(name = "Mime", required = true)
-    protected MimeType mime;
-    @XmlElement(name = "URL", required = true)
-    protected String url;
+	@XmlElement(name = "Description", required = true)
+	protected String description;
+	@XmlElement(name = "Mime", required = true)
+	protected MimeType mime;
+	@XmlElement(name = "URL", required = true)
+	protected String url;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+	/**
+	 * Gets the value of the description property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDescription() {
+		return description;
+	}
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+	/**
+	 * Sets the value of the description property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDescription(String value) {
+		this.description = value;
+	}
 
-    /**
-     * Gets the value of the mime property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MimeType }
-     *     
-     */
-    public MimeType getMime() {
-        return mime;
-    }
+	/**
+	 * Gets the value of the mime property.
+	 * 
+	 * @return possible object is {@link MimeType }
+	 * 
+	 */
+	public MimeType getMime() {
+		return mime;
+	}
 
-    /**
-     * Sets the value of the mime property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MimeType }
-     *     
-     */
-    public void setMime(MimeType value) {
-        this.mime = value;
-    }
+	/**
+	 * Sets the value of the mime property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MimeType }
+	 * 
+	 */
+	public void setMime(MimeType value) {
+		this.mime = value;
+	}
 
-    /**
-     * Gets the value of the url property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURL() {
-        return url;
-    }
+	/**
+	 * Gets the value of the url property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getURL() {
+		return url;
+	}
 
-    /**
-     * Sets the value of the url property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURL(String value) {
-        this.url = value;
-    }
+	/**
+	 * Sets the value of the url property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setURL(String value) {
+		this.url = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageDataType.java
index 4e66627a4..24b2df121 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageDataType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageDataType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Image data file
  * 
- * <p>Java class for AttachedImageDataType complex type.
+ * <p>
+ * Java class for AttachedImageDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachedImageDataType">
@@ -38,88 +38,75 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachedImageDataType", propOrder = {
-    "description",
-    "mime",
-    "data"
-})
+@XmlType(name = "AttachedImageDataType", propOrder = { "description", "mime", "data" })
 public class AttachedImageDataType {
 
-    @XmlElement(name = "Description", required = true)
-    protected String description;
-    @XmlElement(name = "Mime", required = true)
-    protected ImageMimeType mime;
-    @XmlElement(name = "Data", required = true)
-    protected byte[] data;
+	@XmlElement(name = "Description", required = true)
+	protected String description;
+	@XmlElement(name = "Mime", required = true)
+	protected ImageMimeType mime;
+	@XmlElement(name = "Data", required = true)
+	protected byte[] data;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+	/**
+	 * Gets the value of the description property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDescription() {
+		return description;
+	}
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+	/**
+	 * Sets the value of the description property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDescription(String value) {
+		this.description = value;
+	}
 
-    /**
-     * Gets the value of the mime property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ImageMimeType }
-     *     
-     */
-    public ImageMimeType getMime() {
-        return mime;
-    }
+	/**
+	 * Gets the value of the mime property.
+	 * 
+	 * @return possible object is {@link ImageMimeType }
+	 * 
+	 */
+	public ImageMimeType getMime() {
+		return mime;
+	}
 
-    /**
-     * Sets the value of the mime property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ImageMimeType }
-     *     
-     */
-    public void setMime(ImageMimeType value) {
-        this.mime = value;
-    }
+	/**
+	 * Sets the value of the mime property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ImageMimeType }
+	 * 
+	 */
+	public void setMime(ImageMimeType value) {
+		this.mime = value;
+	}
 
-    /**
-     * Gets the value of the data property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getData() {
-        return data;
-    }
+	/**
+	 * Gets the value of the data property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getData() {
+		return data;
+	}
 
-    /**
-     * Sets the value of the data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setData(byte[] value) {
-        this.data = value;
-    }
+	/**
+	 * Sets the value of the data property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setData(byte[] value) {
+		this.data = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageURLType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageURLType.java
index 76dffaa4a..2a13c9332 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageURLType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageURLType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * URL reference to the image file
  * 
- * <p>Java class for AttachedImageURLType complex type.
+ * <p>
+ * Java class for AttachedImageURLType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachedImageURLType">
@@ -38,90 +38,77 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachedImageURLType", propOrder = {
-    "description",
-    "mime",
-    "url"
-})
+@XmlType(name = "AttachedImageURLType", propOrder = { "description", "mime", "url" })
 public class AttachedImageURLType {
 
-    @XmlElement(name = "Description", required = true)
-    protected String description;
-    @XmlElement(name = "Mime", required = true)
-    protected ImageMimeType mime;
-    @XmlElement(name = "URL", required = true)
-    protected String url;
+	@XmlElement(name = "Description", required = true)
+	protected String description;
+	@XmlElement(name = "Mime", required = true)
+	protected ImageMimeType mime;
+	@XmlElement(name = "URL", required = true)
+	protected String url;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+	/**
+	 * Gets the value of the description property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDescription() {
+		return description;
+	}
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+	/**
+	 * Sets the value of the description property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDescription(String value) {
+		this.description = value;
+	}
 
-    /**
-     * Gets the value of the mime property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ImageMimeType }
-     *     
-     */
-    public ImageMimeType getMime() {
-        return mime;
-    }
+	/**
+	 * Gets the value of the mime property.
+	 * 
+	 * @return possible object is {@link ImageMimeType }
+	 * 
+	 */
+	public ImageMimeType getMime() {
+		return mime;
+	}
 
-    /**
-     * Sets the value of the mime property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ImageMimeType }
-     *     
-     */
-    public void setMime(ImageMimeType value) {
-        this.mime = value;
-    }
+	/**
+	 * Sets the value of the mime property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ImageMimeType }
+	 * 
+	 */
+	public void setMime(ImageMimeType value) {
+		this.mime = value;
+	}
 
-    /**
-     * Gets the value of the url property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURL() {
-        return url;
-    }
+	/**
+	 * Gets the value of the url property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getURL() {
+		return url;
+	}
 
-    /**
-     * Sets the value of the url property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURL(String value) {
-        this.url = value;
-    }
+	/**
+	 * Sets the value of the url property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setURL(String value) {
+		this.url = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedType.java
index ba693c9a0..9f9cca5d7 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,13 +17,14 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 /**
  * Attachment resource
  * 
- * <p>Java class for AttachedType complex type.
+ * <p>
+ * Java class for AttachedType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachedType">
@@ -45,146 +45,126 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachedType", propOrder = {
-    "fileData",
-    "fileURI",
-    "imageData",
-    "imageURI"
-})
+@XmlType(name = "AttachedType", propOrder = { "fileData", "fileURI", "imageData", "imageURI" })
 public class AttachedType {
 
-    @XmlElement(name = "FileData")
-    protected AttachedFileDataType fileData;
-    @XmlElement(name = "FileURI")
-    protected AttachedFileURLType fileURI;
-    @XmlElement(name = "ImageData")
-    protected AttachedImageDataType imageData;
-    @XmlElement(name = "ImageURI")
-    protected AttachedImageURLType imageURI;
-    @XmlAttribute(name = "attachedID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String attachedID;
-
-    /**
-     * Gets the value of the fileData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttachedFileDataType }
-     *     
-     */
-    public AttachedFileDataType getFileData() {
-        return fileData;
-    }
-
-    /**
-     * Sets the value of the fileData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttachedFileDataType }
-     *     
-     */
-    public void setFileData(AttachedFileDataType value) {
-        this.fileData = value;
-    }
-
-    /**
-     * Gets the value of the fileURI property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttachedFileURLType }
-     *     
-     */
-    public AttachedFileURLType getFileURI() {
-        return fileURI;
-    }
-
-    /**
-     * Sets the value of the fileURI property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttachedFileURLType }
-     *     
-     */
-    public void setFileURI(AttachedFileURLType value) {
-        this.fileURI = value;
-    }
-
-    /**
-     * Gets the value of the imageData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttachedImageDataType }
-     *     
-     */
-    public AttachedImageDataType getImageData() {
-        return imageData;
-    }
-
-    /**
-     * Sets the value of the imageData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttachedImageDataType }
-     *     
-     */
-    public void setImageData(AttachedImageDataType value) {
-        this.imageData = value;
-    }
-
-    /**
-     * Gets the value of the imageURI property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttachedImageURLType }
-     *     
-     */
-    public AttachedImageURLType getImageURI() {
-        return imageURI;
-    }
-
-    /**
-     * Sets the value of the imageURI property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttachedImageURLType }
-     *     
-     */
-    public void setImageURI(AttachedImageURLType value) {
-        this.imageURI = value;
-    }
-
-    /**
-     * Gets the value of the attachedID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAttachedID() {
-        return attachedID;
-    }
-
-    /**
-     * Sets the value of the attachedID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAttachedID(String value) {
-        this.attachedID = value;
-    }
+	@XmlElement(name = "FileData")
+	protected AttachedFileDataType fileData;
+	@XmlElement(name = "FileURI")
+	protected AttachedFileURLType fileURI;
+	@XmlElement(name = "ImageData")
+	protected AttachedImageDataType imageData;
+	@XmlElement(name = "ImageURI")
+	protected AttachedImageURLType imageURI;
+	@XmlAttribute(name = "attachedID", required = true)
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String attachedID;
+
+	/**
+	 * Gets the value of the fileData property.
+	 * 
+	 * @return possible object is {@link AttachedFileDataType }
+	 * 
+	 */
+	public AttachedFileDataType getFileData() {
+		return fileData;
+	}
+
+	/**
+	 * Sets the value of the fileData property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AttachedFileDataType }
+	 * 
+	 */
+	public void setFileData(AttachedFileDataType value) {
+		this.fileData = value;
+	}
+
+	/**
+	 * Gets the value of the fileURI property.
+	 * 
+	 * @return possible object is {@link AttachedFileURLType }
+	 * 
+	 */
+	public AttachedFileURLType getFileURI() {
+		return fileURI;
+	}
+
+	/**
+	 * Sets the value of the fileURI property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AttachedFileURLType }
+	 * 
+	 */
+	public void setFileURI(AttachedFileURLType value) {
+		this.fileURI = value;
+	}
+
+	/**
+	 * Gets the value of the imageData property.
+	 * 
+	 * @return possible object is {@link AttachedImageDataType }
+	 * 
+	 */
+	public AttachedImageDataType getImageData() {
+		return imageData;
+	}
+
+	/**
+	 * Sets the value of the imageData property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AttachedImageDataType }
+	 * 
+	 */
+	public void setImageData(AttachedImageDataType value) {
+		this.imageData = value;
+	}
+
+	/**
+	 * Gets the value of the imageURI property.
+	 * 
+	 * @return possible object is {@link AttachedImageURLType }
+	 * 
+	 */
+	public AttachedImageURLType getImageURI() {
+		return imageURI;
+	}
+
+	/**
+	 * Sets the value of the imageURI property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AttachedImageURLType }
+	 * 
+	 */
+	public void setImageURI(AttachedImageURLType value) {
+		this.imageURI = value;
+	}
+
+	/**
+	 * Gets the value of the attachedID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAttachedID() {
+		return attachedID;
+	}
+
+	/**
+	 * Sets the value of the attachedID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAttachedID(String value) {
+		this.attachedID = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachmentsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachmentsType.java
index a646bd390..751482eba 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachmentsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachmentsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Attachments resources
  * 
- * <p>Java class for AttachmentsType complex type.
+ * <p>
+ * Java class for AttachmentsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachmentsType">
@@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachmentsType", propOrder = {
-    "attached"
-})
+@XmlType(name = "AttachmentsType", propOrder = { "attached" })
 public class AttachmentsType {
 
-    @XmlElement(name = "Attached", required = true)
-    protected List<AttachedType> attached;
+	@XmlElement(name = "Attached", required = true)
+	protected List<AttachedType> attached;
 
-    /**
-     * Gets the value of the attached property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attached property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttached().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttachedType }
-     * 
-     * 
-     */
-    public List<AttachedType> getAttached() {
-        if (attached == null) {
-            attached = new ArrayList<AttachedType>();
-        }
-        return this.attached;
-    }
+	/**
+	 * Gets the value of the attached property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the attached property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getAttached().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link AttachedType }
+	 * 
+	 * 
+	 */
+	public List<AttachedType> getAttached() {
+		if (attached == null) {
+			attached = new ArrayList<AttachedType>();
+		}
+		return this.attached;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CertificationOfTheSupplementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CertificationOfTheSupplementType.java
index 2d053514b..e2d0d51f7 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CertificationOfTheSupplementType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CertificationOfTheSupplementType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
  * Certification of the Supplement
  * 
- * <p>Java class for CertificationOfTheSupplementType complex type.
+ * <p>
+ * Java class for CertificationOfTheSupplementType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CertificationOfTheSupplementType">
@@ -39,90 +39,77 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CertificationOfTheSupplementType", propOrder = {
-    "certificationDate",
-    "officialsCertifying",
-    "officialStamp"
-})
+@XmlType(name = "CertificationOfTheSupplementType", propOrder = { "certificationDate", "officialsCertifying", "officialStamp" })
 public class CertificationOfTheSupplementType {
 
-    @XmlElement(name = "CertificationDate", required = true)
-    protected XMLGregorianCalendar certificationDate;
-    @XmlElement(name = "OfficialsCertifying", required = true)
-    protected OfficialsCertifyingType officialsCertifying;
-    @XmlElement(name = "OfficialStamp")
-    protected OfficialStampType officialStamp;
+	@XmlElement(name = "CertificationDate", required = true)
+	protected XMLGregorianCalendar certificationDate;
+	@XmlElement(name = "OfficialsCertifying", required = true)
+	protected OfficialsCertifyingType officialsCertifying;
+	@XmlElement(name = "OfficialStamp")
+	protected OfficialStampType officialStamp;
 
-    /**
-     * Gets the value of the certificationDate property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getCertificationDate() {
-        return certificationDate;
-    }
+	/**
+	 * Gets the value of the certificationDate property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getCertificationDate() {
+		return certificationDate;
+	}
 
-    /**
-     * Sets the value of the certificationDate property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setCertificationDate(XMLGregorianCalendar value) {
-        this.certificationDate = value;
-    }
+	/**
+	 * Sets the value of the certificationDate property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setCertificationDate(XMLGregorianCalendar value) {
+		this.certificationDate = value;
+	}
 
-    /**
-     * Gets the value of the officialsCertifying property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OfficialsCertifyingType }
-     *     
-     */
-    public OfficialsCertifyingType getOfficialsCertifying() {
-        return officialsCertifying;
-    }
+	/**
+	 * Gets the value of the officialsCertifying property.
+	 * 
+	 * @return possible object is {@link OfficialsCertifyingType }
+	 * 
+	 */
+	public OfficialsCertifyingType getOfficialsCertifying() {
+		return officialsCertifying;
+	}
 
-    /**
-     * Sets the value of the officialsCertifying property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OfficialsCertifyingType }
-     *     
-     */
-    public void setOfficialsCertifying(OfficialsCertifyingType value) {
-        this.officialsCertifying = value;
-    }
+	/**
+	 * Sets the value of the officialsCertifying property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link OfficialsCertifyingType }
+	 * 
+	 */
+	public void setOfficialsCertifying(OfficialsCertifyingType value) {
+		this.officialsCertifying = value;
+	}
 
-    /**
-     * Gets the value of the officialStamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OfficialStampType }
-     *     
-     */
-    public OfficialStampType getOfficialStamp() {
-        return officialStamp;
-    }
+	/**
+	 * Gets the value of the officialStamp property.
+	 * 
+	 * @return possible object is {@link OfficialStampType }
+	 * 
+	 */
+	public OfficialStampType getOfficialStamp() {
+		return officialStamp;
+	}
 
-    /**
-     * Sets the value of the officialStamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OfficialStampType }
-     *     
-     */
-    public void setOfficialStamp(OfficialStampType value) {
-        this.officialStamp = value;
-    }
+	/**
+	 * Sets the value of the officialStamp property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link OfficialStampType }
+	 * 
+	 */
+	public void setOfficialStamp(OfficialStampType value) {
+		this.officialStamp = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java
index 2ad8c81ec..63df83402 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Contact information
  * 
- * <p>Java class for ContactInformationType complex type.
+ * <p>
+ * Java class for ContactInformationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ContactInformationType">
@@ -41,132 +41,118 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ContactInformationType", propOrder = {
-    "address",
-    "phoneNumber",
-    "email",
-    "webSite"
-})
+@XmlType(name = "ContactInformationType", propOrder = { "address", "phoneNumber", "email", "webSite" })
 public class ContactInformationType {
 
-    @XmlElement(name = "Address", required = true)
-    protected AddressType address;
-    @XmlElement(name = "PhoneNumber")
-    protected List<String> phoneNumber;
-    @XmlElement(name = "Email")
-    protected List<String> email;
-    @XmlElement(name = "WebSite")
-    protected List<String> webSite;
+	@XmlElement(name = "Address", required = true)
+	protected AddressType address;
+	@XmlElement(name = "PhoneNumber")
+	protected List<String> phoneNumber;
+	@XmlElement(name = "Email")
+	protected List<String> email;
+	@XmlElement(name = "WebSite")
+	protected List<String> webSite;
 
-    /**
-     * Gets the value of the address property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AddressType }
-     *     
-     */
-    public AddressType getAddress() {
-        return address;
-    }
+	/**
+	 * Gets the value of the address property.
+	 * 
+	 * @return possible object is {@link AddressType }
+	 * 
+	 */
+	public AddressType getAddress() {
+		return address;
+	}
 
-    /**
-     * Sets the value of the address property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AddressType }
-     *     
-     */
-    public void setAddress(AddressType value) {
-        this.address = value;
-    }
+	/**
+	 * Sets the value of the address property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AddressType }
+	 * 
+	 */
+	public void setAddress(AddressType value) {
+		this.address = value;
+	}
 
-    /**
-     * Gets the value of the phoneNumber property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the phoneNumber property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPhoneNumber().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getPhoneNumber() {
-        if (phoneNumber == null) {
-            phoneNumber = new ArrayList<String>();
-        }
-        return this.phoneNumber;
-    }
+	/**
+	 * Gets the value of the phoneNumber property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the phoneNumber property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getPhoneNumber().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getPhoneNumber() {
+		if (phoneNumber == null) {
+			phoneNumber = new ArrayList<String>();
+		}
+		return this.phoneNumber;
+	}
 
-    /**
-     * Gets the value of the email property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the email property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEmail().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getEmail() {
-        if (email == null) {
-            email = new ArrayList<String>();
-        }
-        return this.email;
-    }
+	/**
+	 * Gets the value of the email property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the email property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getEmail().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getEmail() {
+		if (email == null) {
+			email = new ArrayList<String>();
+		}
+		return this.email;
+	}
 
-    /**
-     * Gets the value of the webSite property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the webSite property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getWebSite().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getWebSite() {
-        if (webSite == null) {
-            webSite = new ArrayList<String>();
-        }
-        return this.webSite;
-    }
+	/**
+	 * Gets the value of the webSite property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the webSite property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getWebSite().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getWebSite() {
+		if (webSite == null) {
+			webSite = new ArrayList<String>();
+		}
+		return this.webSite;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CountryType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CountryType.java
index 5ace3fcb6..5988f5ef7 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CountryType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CountryType.java
@@ -5,18 +5,19 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CountryType.
+ * <p>
+ * Java class for CountryType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="CountryType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -226,1195 +227,1194 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum CountryType {
 
-
-    /**
-     * Andorra
-     * 
-     */
-    AD,
-
-    /**
-     * United Arab Emirates
-     * 
-     */
-    AE,
-
-    /**
-     * Afghanistan
-     * 
-     */
-    AF,
-
-    /**
-     * Antigua and Barbuda
-     * 
-     */
-    AG,
-
-    /**
-     * Albania
-     * 
-     */
-    AL,
-
-    /**
-     * Armenia
-     * 
-     */
-    AM,
-
-    /**
-     * Angola
-     * 
-     */
-    AO,
-
-    /**
-     * Argentina
-     * 
-     */
-    AR,
-
-    /**
-     * Austria
-     * 
-     */
-    AT,
-
-    /**
-     * Australia
-     * 
-     */
-    AU,
-
-    /**
-     * Azerbaijan
-     * 
-     */
-    AZ,
-
-    /**
-     * Bosnia and Herzegovina
-     * 
-     */
-    BA,
-
-    /**
-     * Barbados
-     * 
-     */
-    BB,
-
-    /**
-     * Bangladesh
-     * 
-     */
-    BD,
-
-    /**
-     * Belgium
-     * 
-     */
-    BE,
-
-    /**
-     * Burkina Faso
-     * 
-     */
-    BF,
-
-    /**
-     * Bulgaria
-     * 
-     */
-    BG,
-
-    /**
-     * Bahrain
-     * 
-     */
-    BH,
-
-    /**
-     * Burundi
-     * 
-     */
-    BI,
-
-    /**
-     * Benin
-     * 
-     */
-    BJ,
-
-    /**
-     * Brunei Darussalam
-     * 
-     */
-    BN,
-
-    /**
-     * Bolivia
-     * 
-     */
-    BO,
-
-    /**
-     * Brazil
-     * 
-     */
-    BR,
-
-    /**
-     * Bahamas
-     * 
-     */
-    BS,
-
-    /**
-     * Bhutan
-     * 
-     */
-    BT,
-
-    /**
-     * Botswana
-     * 
-     */
-    BW,
-
-    /**
-     * Belarus
-     * 
-     */
-    BY,
-
-    /**
-     * Belize
-     * 
-     */
-    BZ,
-
-    /**
-     * Canada
-     * 
-     */
-    CA,
-
-    /**
-     * Congo, Democratic Republic of the
-     * 
-     */
-    CD,
-
-    /**
-     * Central African Republic
-     * 
-     */
-    CF,
-
-    /**
-     * Congo, Republic of the
-     * 
-     */
-    CG,
-
-    /**
-     * Switzerland
-     * 
-     */
-    CH,
-
-    /**
-     * Cote d/Ivoire
-     * 
-     */
-    CI,
-
-    /**
-     * Chile
-     * 
-     */
-    CL,
-
-    /**
-     * Cameroon
-     * 
-     */
-    CM,
-
-    /**
-     * China
-     * 
-     */
-    CN,
-
-    /**
-     * Colombia
-     * 
-     */
-    CO,
-
-    /**
-     * Costa Rica
-     * 
-     */
-    CR,
-
-    /**
-     * Cuba
-     * 
-     */
-    CU,
-
-    /**
-     * Cape Verde
-     * 
-     */
-    CV,
-
-    /**
-     * Cyprus
-     * 
-     */
-    CY,
-
-    /**
-     * Czech Republic
-     * 
-     */
-    CZ,
-
-    /**
-     * Germany
-     * 
-     */
-    DE,
-
-    /**
-     * Djibouti
-     * 
-     */
-    DJ,
-
-    /**
-     * Denmark
-     * 
-     */
-    DK,
-
-    /**
-     * Dominica
-     * 
-     */
-    DM,
-
-    /**
-     * Dominican Republic
-     * 
-     */
-    DO,
-
-    /**
-     * Algeria
-     * 
-     */
-    DZ,
-
-    /**
-     * Ecuador
-     * 
-     */
-    EC,
-
-    /**
-     * Estonia
-     * 
-     */
-    EE,
-
-    /**
-     * Egypt
-     * 
-     */
-    EG,
-
-    /**
-     * Eritrea
-     * 
-     */
-    ER,
-
-    /**
-     * Spain
-     * 
-     */
-    ES,
-
-    /**
-     * Ethiopia
-     * 
-     */
-    ET,
-
-    /**
-     * Finland
-     * 
-     */
-    FI,
-
-    /**
-     * Fiji
-     * 
-     */
-    FJ,
-
-    /**
-     * Federated States of Micronesia
-     * 
-     */
-    FM,
-
-    /**
-     * France
-     * 
-     */
-    FR,
-
-    /**
-     * Gabon
-     * 
-     */
-    GA,
-
-    /**
-     * United Kingdom
-     * 
-     */
-    GB,
-
-    /**
-     * Grenada
-     * 
-     */
-    GD,
-
-    /**
-     * Georgia
-     * 
-     */
-    GE,
-
-    /**
-     * Ghana
-     * 
-     */
-    GH,
-
-    /**
-     * Greenland
-     * 
-     */
-    GL,
-
-    /**
-     * Gambia
-     * 
-     */
-    GM,
-
-    /**
-     * Guinea
-     * 
-     */
-    GN,
-
-    /**
-     * Equatorial Guinea
-     * 
-     */
-    GQ,
-
-    /**
-     * Greece
-     * 
-     */
-    GR,
-
-    /**
-     * Guatemala
-     * 
-     */
-    GT,
-
-    /**
-     * Guinea-Bissau
-     * 
-     */
-    GW,
-
-    /**
-     * Guyana
-     * 
-     */
-    GY,
-
-    /**
-     * Honduras
-     * 
-     */
-    HN,
-
-    /**
-     * Croatia
-     * 
-     */
-    HR,
-
-    /**
-     * Haiti
-     * 
-     */
-    HT,
-
-    /**
-     * Hungary
-     * 
-     */
-    HU,
-
-    /**
-     * Indonesia
-     * 
-     */
-    ID,
-
-    /**
-     * Ireland
-     * 
-     */
-    IE,
-
-    /**
-     * Israel
-     * 
-     */
-    IL,
-
-    /**
-     * India
-     * 
-     */
-    IN,
-
-    /**
-     * Iraq
-     * 
-     */
-    IQ,
-
-    /**
-     * Iran
-     * 
-     */
-    IR,
-
-    /**
-     * Iceland
-     * 
-     */
-    IS,
-
-    /**
-     * Italy
-     * 
-     */
-    IT,
-
-    /**
-     * Jamaica
-     * 
-     */
-    JM,
-
-    /**
-     * Jordan
-     * 
-     */
-    JO,
-
-    /**
-     * Japan
-     * 
-     */
-    JP,
-
-    /**
-     * Kenya
-     * 
-     */
-    KE,
-
-    /**
-     * Kyrgyzstan
-     * 
-     */
-    KG,
-
-    /**
-     * Cambodia
-     * 
-     */
-    KH,
-
-    /**
-     * Kiribati
-     * 
-     */
-    KI,
-
-    /**
-     * Comoros
-     * 
-     */
-    KM,
-
-    /**
-     * Saint Kitts and Nevis
-     * 
-     */
-    KN,
-
-    /**
-     * Korea, Democratic People/s Republic
-     * 
-     */
-    KP,
-
-    /**
-     * Korea, Republic of
-     * 
-     */
-    KR,
-
-    /**
-     * Kuwait
-     * 
-     */
-    KW,
-
-    /**
-     * Kazakstan
-     * 
-     */
-    KZ,
-
-    /**
-     * Lao People/s Democratic Republic
-     * 
-     */
-    LA,
-
-    /**
-     * Lebanon
-     * 
-     */
-    LB,
-
-    /**
-     * Saint Lucia
-     * 
-     */
-    LC,
-
-    /**
-     * Liechtenstein
-     * 
-     */
-    LI,
-
-    /**
-     * Sri Lanka
-     * 
-     */
-    LK,
-
-    /**
-     * Liberia
-     * 
-     */
-    LR,
-
-    /**
-     * Lesotho
-     * 
-     */
-    LS,
-
-    /**
-     * Lithuania
-     * 
-     */
-    LT,
-
-    /**
-     * Luxembourg
-     * 
-     */
-    LU,
-
-    /**
-     * Latvia
-     * 
-     */
-    LV,
-
-    /**
-     * Libyan Arab Jamahiriya
-     * 
-     */
-    LY,
-
-    /**
-     * Morocco
-     * 
-     */
-    MA,
-
-    /**
-     * Monaco
-     * 
-     */
-    MC,
-
-    /**
-     * Moldova, Republic of
-     * 
-     */
-    MD,
-
-    /**
-     * Montenegro
-     * 
-     */
-    ME,
-
-    /**
-     * Madagascar
-     * 
-     */
-    MG,
-
-    /**
-     * Marshall Islands
-     * 
-     */
-    MH,
-
-    /**
-     * Macedonia, the former Yugoslav Republic of
-     * 
-     */
-    MK,
-
-    /**
-     * Mali
-     * 
-     */
-    ML,
-
-    /**
-     * Myanmar
-     * 
-     */
-    MM,
-
-    /**
-     * Mongolia
-     * 
-     */
-    MN,
-
-    /**
-     * Mauritania
-     * 
-     */
-    MR,
-
-    /**
-     * Malta
-     * 
-     */
-    MT,
-
-    /**
-     * Mauritius
-     * 
-     */
-    MU,
-
-    /**
-     * Maldives
-     * 
-     */
-    MV,
-
-    /**
-     * Malawi
-     * 
-     */
-    MW,
-
-    /**
-     * Mexico
-     * 
-     */
-    MX,
-
-    /**
-     * Malaysia
-     * 
-     */
-    MY,
-
-    /**
-     * Mozambique
-     * 
-     */
-    MZ,
-
-    /**
-     * Namibia
-     * 
-     */
-    NA,
-
-    /**
-     * Niger
-     * 
-     */
-    NE,
-
-    /**
-     * Nigeria
-     * 
-     */
-    NG,
-
-    /**
-     * Nicaragua
-     * 
-     */
-    NI,
-
-    /**
-     * Netherlands
-     * 
-     */
-    NL,
-
-    /**
-     * Norway
-     * 
-     */
-    NO,
-
-    /**
-     * Nepal
-     * 
-     */
-    NP,
-
-    /**
-     * Nauru
-     * 
-     */
-    NR,
-
-    /**
-     * Niue
-     * 
-     */
-    NU,
-
-    /**
-     * New Zealand
-     * 
-     */
-    NZ,
-
-    /**
-     * Oman
-     * 
-     */
-    OM,
-
-    /**
-     * Panama
-     * 
-     */
-    PA,
-
-    /**
-     * Peru
-     * 
-     */
-    PE,
-
-    /**
-     * Papua New Guinea
-     * 
-     */
-    PG,
-
-    /**
-     * Philippines
-     * 
-     */
-    PH,
-
-    /**
-     * Pakistan
-     * 
-     */
-    PK,
-
-    /**
-     * Poland
-     * 
-     */
-    PL,
-
-    /**
-     * Puerto Rico
-     * 
-     */
-    PR,
-
-    /**
-     * Palestinian Territory, Occupied
-     * 
-     */
-    PS,
-
-    /**
-     * Portugal
-     * 
-     */
-    PT,
-
-    /**
-     * Palau
-     * 
-     */
-    PW,
-
-    /**
-     * Paraguay
-     * 
-     */
-    PY,
-
-    /**
-     * Qatar
-     * 
-     */
-    QA,
-
-    /**
-     * Romania
-     * 
-     */
-    RO,
-
-    /**
-     * Serbia
-     * 
-     */
-    RS,
-
-    /**
-     * Russian Federation
-     * 
-     */
-    RU,
-
-    /**
-     * Rwanda
-     * 
-     */
-    RW,
-
-    /**
-     * Saudi Arabia
-     * 
-     */
-    SA,
-
-    /**
-     * Solomon Islands
-     * 
-     */
-    SB,
-
-    /**
-     * Seychelles
-     * 
-     */
-    SC,
-
-    /**
-     * Sudan
-     * 
-     */
-    SD,
-
-    /**
-     * Sweden
-     * 
-     */
-    SE,
-
-    /**
-     * Singapore
-     * 
-     */
-    SG,
-
-    /**
-     * Slovenia
-     * 
-     */
-    SI,
-
-    /**
-     * Slovakia
-     * 
-     */
-    SK,
-
-    /**
-     * Sierra Leone
-     * 
-     */
-    SL,
-
-    /**
-     * San Marino
-     * 
-     */
-    SM,
-
-    /**
-     * Senegal
-     * 
-     */
-    SN,
-
-    /**
-     * Somalia
-     * 
-     */
-    SO,
-
-    /**
-     * Suriname
-     * 
-     */
-    SR,
-
-    /**
-     * Sao Tome and Principe
-     * 
-     */
-    ST,
-
-    /**
-     * El Salvador
-     * 
-     */
-    SV,
-
-    /**
-     * Syrian Arab Republic
-     * 
-     */
-    SY,
-
-    /**
-     * Swaziland
-     * 
-     */
-    SZ,
-
-    /**
-     * Chad
-     * 
-     */
-    TD,
-
-    /**
-     * Togo
-     * 
-     */
-    TG,
-
-    /**
-     * Thailand
-     * 
-     */
-    TH,
-
-    /**
-     * Tajikistan
-     * 
-     */
-    TJ,
-
-    /**
-     * Timor-Leste
-     * 
-     */
-    TL,
-
-    /**
-     * Turkmenistan
-     * 
-     */
-    TM,
-
-    /**
-     * Tunisia
-     * 
-     */
-    TN,
-
-    /**
-     * Tonga
-     * 
-     */
-    TO,
-
-    /**
-     * Turkey
-     * 
-     */
-    TR,
-
-    /**
-     * Trindidad and Tobago
-     * 
-     */
-    TT,
-
-    /**
-     * Tuvalu
-     * 
-     */
-    TV,
-
-    /**
-     * Tanzania, United republic of
-     * 
-     */
-    TZ,
-
-    /**
-     * Ukraina
-     * 
-     */
-    UA,
-
-    /**
-     * Uganda
-     * 
-     */
-    UG,
-
-    /**
-     * United States
-     * 
-     */
-    US,
-
-    /**
-     * Uruguay
-     * 
-     */
-    UY,
-
-    /**
-     * Uzbekistan
-     * 
-     */
-    UZ,
-
-    /**
-     * Holy See (Vatican City State)
-     * 
-     */
-    VA,
-
-    /**
-     * Saint Vincent and the Granadines
-     * 
-     */
-    VC,
-
-    /**
-     * Venezuela
-     * 
-     */
-    VE,
-
-    /**
-     * Viet Nam
-     * 
-     */
-    VN,
-
-    /**
-     * Vanuatu
-     * 
-     */
-    VU,
-
-    /**
-     * Samoa
-     * 
-     */
-    WS,
-
-    /**
-     * Yemen
-     * 
-     */
-    YE,
-
-    /**
-     * South Africa
-     * 
-     */
-    ZA,
-
-    /**
-     * Zambia
-     * 
-     */
-    ZM,
-
-    /**
-     * Zimbabwe
-     * 
-     */
-    ZW;
-
-    public String value() {
-        return name();
-    }
-
-    public static CountryType fromValue(String v) {
-        return valueOf(v);
-    }
+	/**
+	 * Andorra
+	 * 
+	 */
+	AD,
+
+	/**
+	 * United Arab Emirates
+	 * 
+	 */
+	AE,
+
+	/**
+	 * Afghanistan
+	 * 
+	 */
+	AF,
+
+	/**
+	 * Antigua and Barbuda
+	 * 
+	 */
+	AG,
+
+	/**
+	 * Albania
+	 * 
+	 */
+	AL,
+
+	/**
+	 * Armenia
+	 * 
+	 */
+	AM,
+
+	/**
+	 * Angola
+	 * 
+	 */
+	AO,
+
+	/**
+	 * Argentina
+	 * 
+	 */
+	AR,
+
+	/**
+	 * Austria
+	 * 
+	 */
+	AT,
+
+	/**
+	 * Australia
+	 * 
+	 */
+	AU,
+
+	/**
+	 * Azerbaijan
+	 * 
+	 */
+	AZ,
+
+	/**
+	 * Bosnia and Herzegovina
+	 * 
+	 */
+	BA,
+
+	/**
+	 * Barbados
+	 * 
+	 */
+	BB,
+
+	/**
+	 * Bangladesh
+	 * 
+	 */
+	BD,
+
+	/**
+	 * Belgium
+	 * 
+	 */
+	BE,
+
+	/**
+	 * Burkina Faso
+	 * 
+	 */
+	BF,
+
+	/**
+	 * Bulgaria
+	 * 
+	 */
+	BG,
+
+	/**
+	 * Bahrain
+	 * 
+	 */
+	BH,
+
+	/**
+	 * Burundi
+	 * 
+	 */
+	BI,
+
+	/**
+	 * Benin
+	 * 
+	 */
+	BJ,
+
+	/**
+	 * Brunei Darussalam
+	 * 
+	 */
+	BN,
+
+	/**
+	 * Bolivia
+	 * 
+	 */
+	BO,
+
+	/**
+	 * Brazil
+	 * 
+	 */
+	BR,
+
+	/**
+	 * Bahamas
+	 * 
+	 */
+	BS,
+
+	/**
+	 * Bhutan
+	 * 
+	 */
+	BT,
+
+	/**
+	 * Botswana
+	 * 
+	 */
+	BW,
+
+	/**
+	 * Belarus
+	 * 
+	 */
+	BY,
+
+	/**
+	 * Belize
+	 * 
+	 */
+	BZ,
+
+	/**
+	 * Canada
+	 * 
+	 */
+	CA,
+
+	/**
+	 * Congo, Democratic Republic of the
+	 * 
+	 */
+	CD,
+
+	/**
+	 * Central African Republic
+	 * 
+	 */
+	CF,
+
+	/**
+	 * Congo, Republic of the
+	 * 
+	 */
+	CG,
+
+	/**
+	 * Switzerland
+	 * 
+	 */
+	CH,
+
+	/**
+	 * Cote d/Ivoire
+	 * 
+	 */
+	CI,
+
+	/**
+	 * Chile
+	 * 
+	 */
+	CL,
+
+	/**
+	 * Cameroon
+	 * 
+	 */
+	CM,
+
+	/**
+	 * China
+	 * 
+	 */
+	CN,
+
+	/**
+	 * Colombia
+	 * 
+	 */
+	CO,
+
+	/**
+	 * Costa Rica
+	 * 
+	 */
+	CR,
+
+	/**
+	 * Cuba
+	 * 
+	 */
+	CU,
+
+	/**
+	 * Cape Verde
+	 * 
+	 */
+	CV,
+
+	/**
+	 * Cyprus
+	 * 
+	 */
+	CY,
+
+	/**
+	 * Czech Republic
+	 * 
+	 */
+	CZ,
+
+	/**
+	 * Germany
+	 * 
+	 */
+	DE,
+
+	/**
+	 * Djibouti
+	 * 
+	 */
+	DJ,
+
+	/**
+	 * Denmark
+	 * 
+	 */
+	DK,
+
+	/**
+	 * Dominica
+	 * 
+	 */
+	DM,
+
+	/**
+	 * Dominican Republic
+	 * 
+	 */
+	DO,
+
+	/**
+	 * Algeria
+	 * 
+	 */
+	DZ,
+
+	/**
+	 * Ecuador
+	 * 
+	 */
+	EC,
+
+	/**
+	 * Estonia
+	 * 
+	 */
+	EE,
+
+	/**
+	 * Egypt
+	 * 
+	 */
+	EG,
+
+	/**
+	 * Eritrea
+	 * 
+	 */
+	ER,
+
+	/**
+	 * Spain
+	 * 
+	 */
+	ES,
+
+	/**
+	 * Ethiopia
+	 * 
+	 */
+	ET,
+
+	/**
+	 * Finland
+	 * 
+	 */
+	FI,
+
+	/**
+	 * Fiji
+	 * 
+	 */
+	FJ,
+
+	/**
+	 * Federated States of Micronesia
+	 * 
+	 */
+	FM,
+
+	/**
+	 * France
+	 * 
+	 */
+	FR,
+
+	/**
+	 * Gabon
+	 * 
+	 */
+	GA,
+
+	/**
+	 * United Kingdom
+	 * 
+	 */
+	GB,
+
+	/**
+	 * Grenada
+	 * 
+	 */
+	GD,
+
+	/**
+	 * Georgia
+	 * 
+	 */
+	GE,
+
+	/**
+	 * Ghana
+	 * 
+	 */
+	GH,
+
+	/**
+	 * Greenland
+	 * 
+	 */
+	GL,
+
+	/**
+	 * Gambia
+	 * 
+	 */
+	GM,
+
+	/**
+	 * Guinea
+	 * 
+	 */
+	GN,
+
+	/**
+	 * Equatorial Guinea
+	 * 
+	 */
+	GQ,
+
+	/**
+	 * Greece
+	 * 
+	 */
+	GR,
+
+	/**
+	 * Guatemala
+	 * 
+	 */
+	GT,
+
+	/**
+	 * Guinea-Bissau
+	 * 
+	 */
+	GW,
+
+	/**
+	 * Guyana
+	 * 
+	 */
+	GY,
+
+	/**
+	 * Honduras
+	 * 
+	 */
+	HN,
+
+	/**
+	 * Croatia
+	 * 
+	 */
+	HR,
+
+	/**
+	 * Haiti
+	 * 
+	 */
+	HT,
+
+	/**
+	 * Hungary
+	 * 
+	 */
+	HU,
+
+	/**
+	 * Indonesia
+	 * 
+	 */
+	ID,
+
+	/**
+	 * Ireland
+	 * 
+	 */
+	IE,
+
+	/**
+	 * Israel
+	 * 
+	 */
+	IL,
+
+	/**
+	 * India
+	 * 
+	 */
+	IN,
+
+	/**
+	 * Iraq
+	 * 
+	 */
+	IQ,
+
+	/**
+	 * Iran
+	 * 
+	 */
+	IR,
+
+	/**
+	 * Iceland
+	 * 
+	 */
+	IS,
+
+	/**
+	 * Italy
+	 * 
+	 */
+	IT,
+
+	/**
+	 * Jamaica
+	 * 
+	 */
+	JM,
+
+	/**
+	 * Jordan
+	 * 
+	 */
+	JO,
+
+	/**
+	 * Japan
+	 * 
+	 */
+	JP,
+
+	/**
+	 * Kenya
+	 * 
+	 */
+	KE,
+
+	/**
+	 * Kyrgyzstan
+	 * 
+	 */
+	KG,
+
+	/**
+	 * Cambodia
+	 * 
+	 */
+	KH,
+
+	/**
+	 * Kiribati
+	 * 
+	 */
+	KI,
+
+	/**
+	 * Comoros
+	 * 
+	 */
+	KM,
+
+	/**
+	 * Saint Kitts and Nevis
+	 * 
+	 */
+	KN,
+
+	/**
+	 * Korea, Democratic People/s Republic
+	 * 
+	 */
+	KP,
+
+	/**
+	 * Korea, Republic of
+	 * 
+	 */
+	KR,
+
+	/**
+	 * Kuwait
+	 * 
+	 */
+	KW,
+
+	/**
+	 * Kazakstan
+	 * 
+	 */
+	KZ,
+
+	/**
+	 * Lao People/s Democratic Republic
+	 * 
+	 */
+	LA,
+
+	/**
+	 * Lebanon
+	 * 
+	 */
+	LB,
+
+	/**
+	 * Saint Lucia
+	 * 
+	 */
+	LC,
+
+	/**
+	 * Liechtenstein
+	 * 
+	 */
+	LI,
+
+	/**
+	 * Sri Lanka
+	 * 
+	 */
+	LK,
+
+	/**
+	 * Liberia
+	 * 
+	 */
+	LR,
+
+	/**
+	 * Lesotho
+	 * 
+	 */
+	LS,
+
+	/**
+	 * Lithuania
+	 * 
+	 */
+	LT,
+
+	/**
+	 * Luxembourg
+	 * 
+	 */
+	LU,
+
+	/**
+	 * Latvia
+	 * 
+	 */
+	LV,
+
+	/**
+	 * Libyan Arab Jamahiriya
+	 * 
+	 */
+	LY,
+
+	/**
+	 * Morocco
+	 * 
+	 */
+	MA,
+
+	/**
+	 * Monaco
+	 * 
+	 */
+	MC,
+
+	/**
+	 * Moldova, Republic of
+	 * 
+	 */
+	MD,
+
+	/**
+	 * Montenegro
+	 * 
+	 */
+	ME,
+
+	/**
+	 * Madagascar
+	 * 
+	 */
+	MG,
+
+	/**
+	 * Marshall Islands
+	 * 
+	 */
+	MH,
+
+	/**
+	 * Macedonia, the former Yugoslav Republic of
+	 * 
+	 */
+	MK,
+
+	/**
+	 * Mali
+	 * 
+	 */
+	ML,
+
+	/**
+	 * Myanmar
+	 * 
+	 */
+	MM,
+
+	/**
+	 * Mongolia
+	 * 
+	 */
+	MN,
+
+	/**
+	 * Mauritania
+	 * 
+	 */
+	MR,
+
+	/**
+	 * Malta
+	 * 
+	 */
+	MT,
+
+	/**
+	 * Mauritius
+	 * 
+	 */
+	MU,
+
+	/**
+	 * Maldives
+	 * 
+	 */
+	MV,
+
+	/**
+	 * Malawi
+	 * 
+	 */
+	MW,
+
+	/**
+	 * Mexico
+	 * 
+	 */
+	MX,
+
+	/**
+	 * Malaysia
+	 * 
+	 */
+	MY,
+
+	/**
+	 * Mozambique
+	 * 
+	 */
+	MZ,
+
+	/**
+	 * Namibia
+	 * 
+	 */
+	NA,
+
+	/**
+	 * Niger
+	 * 
+	 */
+	NE,
+
+	/**
+	 * Nigeria
+	 * 
+	 */
+	NG,
+
+	/**
+	 * Nicaragua
+	 * 
+	 */
+	NI,
+
+	/**
+	 * Netherlands
+	 * 
+	 */
+	NL,
+
+	/**
+	 * Norway
+	 * 
+	 */
+	NO,
+
+	/**
+	 * Nepal
+	 * 
+	 */
+	NP,
+
+	/**
+	 * Nauru
+	 * 
+	 */
+	NR,
+
+	/**
+	 * Niue
+	 * 
+	 */
+	NU,
+
+	/**
+	 * New Zealand
+	 * 
+	 */
+	NZ,
+
+	/**
+	 * Oman
+	 * 
+	 */
+	OM,
+
+	/**
+	 * Panama
+	 * 
+	 */
+	PA,
+
+	/**
+	 * Peru
+	 * 
+	 */
+	PE,
+
+	/**
+	 * Papua New Guinea
+	 * 
+	 */
+	PG,
+
+	/**
+	 * Philippines
+	 * 
+	 */
+	PH,
+
+	/**
+	 * Pakistan
+	 * 
+	 */
+	PK,
+
+	/**
+	 * Poland
+	 * 
+	 */
+	PL,
+
+	/**
+	 * Puerto Rico
+	 * 
+	 */
+	PR,
+
+	/**
+	 * Palestinian Territory, Occupied
+	 * 
+	 */
+	PS,
+
+	/**
+	 * Portugal
+	 * 
+	 */
+	PT,
+
+	/**
+	 * Palau
+	 * 
+	 */
+	PW,
+
+	/**
+	 * Paraguay
+	 * 
+	 */
+	PY,
+
+	/**
+	 * Qatar
+	 * 
+	 */
+	QA,
+
+	/**
+	 * Romania
+	 * 
+	 */
+	RO,
+
+	/**
+	 * Serbia
+	 * 
+	 */
+	RS,
+
+	/**
+	 * Russian Federation
+	 * 
+	 */
+	RU,
+
+	/**
+	 * Rwanda
+	 * 
+	 */
+	RW,
+
+	/**
+	 * Saudi Arabia
+	 * 
+	 */
+	SA,
+
+	/**
+	 * Solomon Islands
+	 * 
+	 */
+	SB,
+
+	/**
+	 * Seychelles
+	 * 
+	 */
+	SC,
+
+	/**
+	 * Sudan
+	 * 
+	 */
+	SD,
+
+	/**
+	 * Sweden
+	 * 
+	 */
+	SE,
+
+	/**
+	 * Singapore
+	 * 
+	 */
+	SG,
+
+	/**
+	 * Slovenia
+	 * 
+	 */
+	SI,
+
+	/**
+	 * Slovakia
+	 * 
+	 */
+	SK,
+
+	/**
+	 * Sierra Leone
+	 * 
+	 */
+	SL,
+
+	/**
+	 * San Marino
+	 * 
+	 */
+	SM,
+
+	/**
+	 * Senegal
+	 * 
+	 */
+	SN,
+
+	/**
+	 * Somalia
+	 * 
+	 */
+	SO,
+
+	/**
+	 * Suriname
+	 * 
+	 */
+	SR,
+
+	/**
+	 * Sao Tome and Principe
+	 * 
+	 */
+	ST,
+
+	/**
+	 * El Salvador
+	 * 
+	 */
+	SV,
+
+	/**
+	 * Syrian Arab Republic
+	 * 
+	 */
+	SY,
+
+	/**
+	 * Swaziland
+	 * 
+	 */
+	SZ,
+
+	/**
+	 * Chad
+	 * 
+	 */
+	TD,
+
+	/**
+	 * Togo
+	 * 
+	 */
+	TG,
+
+	/**
+	 * Thailand
+	 * 
+	 */
+	TH,
+
+	/**
+	 * Tajikistan
+	 * 
+	 */
+	TJ,
+
+	/**
+	 * Timor-Leste
+	 * 
+	 */
+	TL,
+
+	/**
+	 * Turkmenistan
+	 * 
+	 */
+	TM,
+
+	/**
+	 * Tunisia
+	 * 
+	 */
+	TN,
+
+	/**
+	 * Tonga
+	 * 
+	 */
+	TO,
+
+	/**
+	 * Turkey
+	 * 
+	 */
+	TR,
+
+	/**
+	 * Trindidad and Tobago
+	 * 
+	 */
+	TT,
+
+	/**
+	 * Tuvalu
+	 * 
+	 */
+	TV,
+
+	/**
+	 * Tanzania, United republic of
+	 * 
+	 */
+	TZ,
+
+	/**
+	 * Ukraina
+	 * 
+	 */
+	UA,
+
+	/**
+	 * Uganda
+	 * 
+	 */
+	UG,
+
+	/**
+	 * United States
+	 * 
+	 */
+	US,
+
+	/**
+	 * Uruguay
+	 * 
+	 */
+	UY,
+
+	/**
+	 * Uzbekistan
+	 * 
+	 */
+	UZ,
+
+	/**
+	 * Holy See (Vatican City State)
+	 * 
+	 */
+	VA,
+
+	/**
+	 * Saint Vincent and the Granadines
+	 * 
+	 */
+	VC,
+
+	/**
+	 * Venezuela
+	 * 
+	 */
+	VE,
+
+	/**
+	 * Viet Nam
+	 * 
+	 */
+	VN,
+
+	/**
+	 * Vanuatu
+	 * 
+	 */
+	VU,
+
+	/**
+	 * Samoa
+	 * 
+	 */
+	WS,
+
+	/**
+	 * Yemen
+	 * 
+	 */
+	YE,
+
+	/**
+	 * South Africa
+	 * 
+	 */
+	ZA,
+
+	/**
+	 * Zambia
+	 * 
+	 */
+	ZM,
+
+	/**
+	 * Zimbabwe
+	 * 
+	 */
+	ZW;
+
+	public String value() {
+		return name();
+	}
+
+	public static CountryType fromValue(String v) {
+		return valueOf(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseStructureDiagramType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseStructureDiagramType.java
index 35041350c..1438d6f1e 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseStructureDiagramType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseStructureDiagramType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Course structure diagram
  * 
- * <p>Java class for CourseStructureDiagramType complex type.
+ * <p>
+ * Java class for CourseStructureDiagramType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseStructureDiagramType">
@@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseStructureDiagramType", propOrder = {
-    "coursesGroups",
-    "coursesUnits"
-})
+@XmlType(name = "CourseStructureDiagramType", propOrder = { "coursesGroups", "coursesUnits" })
 public class CourseStructureDiagramType {
 
-    @XmlElement(name = "CoursesGroups", required = true)
-    protected CoursesGroupsType coursesGroups;
-    @XmlElement(name = "CoursesUnits")
-    protected CoursesUnitsType coursesUnits;
+	@XmlElement(name = "CoursesGroups", required = true)
+	protected CoursesGroupsType coursesGroups;
+	@XmlElement(name = "CoursesUnits")
+	protected CoursesUnitsType coursesUnits;
 
-    /**
-     * Gets the value of the coursesGroups property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CoursesGroupsType }
-     *     
-     */
-    public CoursesGroupsType getCoursesGroups() {
-        return coursesGroups;
-    }
+	/**
+	 * Gets the value of the coursesGroups property.
+	 * 
+	 * @return possible object is {@link CoursesGroupsType }
+	 * 
+	 */
+	public CoursesGroupsType getCoursesGroups() {
+		return coursesGroups;
+	}
 
-    /**
-     * Sets the value of the coursesGroups property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CoursesGroupsType }
-     *     
-     */
-    public void setCoursesGroups(CoursesGroupsType value) {
-        this.coursesGroups = value;
-    }
+	/**
+	 * Sets the value of the coursesGroups property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CoursesGroupsType }
+	 * 
+	 */
+	public void setCoursesGroups(CoursesGroupsType value) {
+		this.coursesGroups = value;
+	}
 
-    /**
-     * Gets the value of the coursesUnits property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CoursesUnitsType }
-     *     
-     */
-    public CoursesUnitsType getCoursesUnits() {
-        return coursesUnits;
-    }
+	/**
+	 * Gets the value of the coursesUnits property.
+	 * 
+	 * @return possible object is {@link CoursesUnitsType }
+	 * 
+	 */
+	public CoursesUnitsType getCoursesUnits() {
+		return coursesUnits;
+	}
 
-    /**
-     * Sets the value of the coursesUnits property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CoursesUnitsType }
-     *     
-     */
-    public void setCoursesUnits(CoursesUnitsType value) {
-        this.coursesUnits = value;
-    }
+	/**
+	 * Sets the value of the coursesUnits property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CoursesUnitsType }
+	 * 
+	 */
+	public void setCoursesUnits(CoursesUnitsType value) {
+		this.coursesUnits = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java
index 4542085b6..69e63c4d3 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
  * Language of instruction
  * 
- * <p>Java class for CourseUnitLanguageOfInstructionType complex type.
+ * <p>
+ * Java class for CourseUnitLanguageOfInstructionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitLanguageOfInstructionType">
@@ -35,64 +35,56 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = {
-    "value"
-})
+@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = { "value" })
 public class CourseUnitLanguageOfInstructionType {
 
-    @XmlValue
-    protected String value;
-    @XmlAttribute(name = "language", required = true)
-    protected LanguageType language;
+	@XmlValue
+	protected String value;
+	@XmlAttribute(name = "language", required = true)
+	protected LanguageType language;
 
-    /**
-     * Plain text constraint
-     * 
-     * Non empty text
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
+	/**
+	 * Plain text constraint
+	 * 
+	 * Non empty text
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getValue() {
+		return value;
+	}
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
+	/**
+	 * Sets the value of the value property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setValue(String value) {
+		this.value = value;
+	}
 
-    /**
-     * Gets the value of the language property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LanguageType }
-     *     
-     */
-    public LanguageType getLanguage() {
-        return language;
-    }
+	/**
+	 * Gets the value of the language property.
+	 * 
+	 * @return possible object is {@link LanguageType }
+	 * 
+	 */
+	public LanguageType getLanguage() {
+		return language;
+	}
 
-    /**
-     * Sets the value of the language property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LanguageType }
-     *     
-     */
-    public void setLanguage(LanguageType value) {
-        this.language = value;
-    }
+	/**
+	 * Sets the value of the language property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LanguageType }
+	 * 
+	 */
+	public void setLanguage(LanguageType value) {
+		this.language = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java
index bfc905a75..94db5baa0 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Language of instruction
  * 
- * <p>Java class for CourseUnitLanguagesOfInstructionType complex type.
+ * <p>
+ * Java class for CourseUnitLanguagesOfInstructionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitLanguagesOfInstructionType">
@@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = {
-    "language"
-})
+@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = { "language" })
 public class CourseUnitLanguagesOfInstructionType {
 
-    @XmlElement(name = "Language", required = true)
-    protected List<CourseUnitLanguageOfInstructionType> language;
+	@XmlElement(name = "Language", required = true)
+	protected List<CourseUnitLanguageOfInstructionType> language;
 
-    /**
-     * Gets the value of the language property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the language property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getLanguage().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CourseUnitLanguageOfInstructionType }
-     * 
-     * 
-     */
-    public List<CourseUnitLanguageOfInstructionType> getLanguage() {
-        if (language == null) {
-            language = new ArrayList<CourseUnitLanguageOfInstructionType>();
-        }
-        return this.language;
-    }
+	/**
+	 * Gets the value of the language property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the language property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getLanguage().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link CourseUnitLanguageOfInstructionType }
+	 * 
+	 * 
+	 */
+	public List<CourseUnitLanguageOfInstructionType> getLanguage() {
+		if (language == null) {
+			language = new ArrayList<CourseUnitLanguageOfInstructionType>();
+		}
+		return this.language;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitStudentPerformanceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitStudentPerformanceType.java
index 344d49990..1a5562a63 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitStudentPerformanceType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitStudentPerformanceType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Student performance
  * 
- * <p>Java class for CourseUnitStudentPerformanceType complex type.
+ * <p>
+ * Java class for CourseUnitStudentPerformanceType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitStudentPerformanceType">
@@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitStudentPerformanceType", propOrder = {
-    "localGrade",
-    "ectsGrade"
-})
+@XmlType(name = "CourseUnitStudentPerformanceType", propOrder = { "localGrade", "ectsGrade" })
 public class CourseUnitStudentPerformanceType {
 
-    @XmlElement(name = "LocalGrade", required = true)
-    protected LocalGradeType localGrade;
-    @XmlElement(name = "ECTSGrade")
-    protected ECTSGradingScaleType ectsGrade;
+	@XmlElement(name = "LocalGrade", required = true)
+	protected LocalGradeType localGrade;
+	@XmlElement(name = "ECTSGrade")
+	protected ECTSGradingScaleType ectsGrade;
 
-    /**
-     * Gets the value of the localGrade property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LocalGradeType }
-     *     
-     */
-    public LocalGradeType getLocalGrade() {
-        return localGrade;
-    }
+	/**
+	 * Gets the value of the localGrade property.
+	 * 
+	 * @return possible object is {@link LocalGradeType }
+	 * 
+	 */
+	public LocalGradeType getLocalGrade() {
+		return localGrade;
+	}
 
-    /**
-     * Sets the value of the localGrade property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LocalGradeType }
-     *     
-     */
-    public void setLocalGrade(LocalGradeType value) {
-        this.localGrade = value;
-    }
+	/**
+	 * Sets the value of the localGrade property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LocalGradeType }
+	 * 
+	 */
+	public void setLocalGrade(LocalGradeType value) {
+		this.localGrade = value;
+	}
 
-    /**
-     * Gets the value of the ectsGrade property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ECTSGradingScaleType }
-     *     
-     */
-    public ECTSGradingScaleType getECTSGrade() {
-        return ectsGrade;
-    }
+	/**
+	 * Gets the value of the ectsGrade property.
+	 * 
+	 * @return possible object is {@link ECTSGradingScaleType }
+	 * 
+	 */
+	public ECTSGradingScaleType getECTSGrade() {
+		return ectsGrade;
+	}
 
-    /**
-     * Sets the value of the ectsGrade property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ECTSGradingScaleType }
-     *     
-     */
-    public void setECTSGrade(ECTSGradingScaleType value) {
-        this.ectsGrade = value;
-    }
+	/**
+	 * Sets the value of the ectsGrade property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ECTSGradingScaleType }
+	 * 
+	 */
+	public void setECTSGrade(ECTSGradingScaleType value) {
+		this.ectsGrade = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitType.java
index fe0d62b0b..8c0d96fe2 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.math.BigDecimal;
@@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
  * Course unit
  * 
- * <p>Java class for CourseUnitType complex type.
+ * <p>
+ * Java class for CourseUnitType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitType">
@@ -96,1036 +96,908 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitType", propOrder = {
-    "code",
-    "scientificArea",
-    "title",
-    "theme",
-    "type",
-    "yearOfStudy",
-    "level",
-    "ectsCredits",
-    "localCredits",
-    "hours",
-    "languagesOfInstruction",
-    "modeOfDelivery",
-    "workPlacements",
-    "studentPerformance",
-    "nameOfLecturers",
-    "learningOutcomes",
-    "prerequisitesAndCorequisites",
-    "recomendedOptionalProgrammeComponents",
-    "courseContents",
-    "recomendedOrRequiredReading",
-    "planedLearningActivitiesAndTeachingMethod",
-    "assesmentMethodsAndCriteria",
-    "observations"
-})
+@XmlType(name = "CourseUnitType", propOrder = { "code", "scientificArea", "title", "theme", "type", "yearOfStudy", "level", "ectsCredits", "localCredits", "hours", "languagesOfInstruction",
+		"modeOfDelivery", "workPlacements", "studentPerformance", "nameOfLecturers", "learningOutcomes", "prerequisitesAndCorequisites", "recomendedOptionalProgrammeComponents", "courseContents",
+		"recomendedOrRequiredReading", "planedLearningActivitiesAndTeachingMethod", "assesmentMethodsAndCriteria", "observations" })
 public class CourseUnitType {
 
-    @XmlElement(name = "Code", required = true)
-    protected String code;
-    @XmlElement(name = "ScientificArea")
-    protected String scientificArea;
-    @XmlElement(name = "Title", required = true)
-    protected String title;
-    @XmlElement(name = "Theme")
-    protected String theme;
-    @XmlElement(name = "Type", required = true)
-    protected CourseUnitType.Type type;
-    @XmlElement(name = "YearOfStudy")
-    protected CourseUnitType.YearOfStudy yearOfStudy;
-    @XmlElement(name = "Level")
-    protected CourseUnitType.Level level;
-    @XmlElement(name = "ECTSCredits")
-    protected BigDecimal ectsCredits;
-    @XmlElement(name = "LocalCredits")
-    protected BigDecimal localCredits;
-    @XmlElement(name = "Hours")
-    protected BigDecimal hours;
-    @XmlElement(name = "LanguagesOfInstruction")
-    protected CourseUnitLanguagesOfInstructionType languagesOfInstruction;
-    @XmlElement(name = "ModeOfDelivery")
-    protected CourseUnitType.ModeOfDelivery modeOfDelivery;
-    @XmlElement(name = "WorkPlacements")
-    protected CourseUnitWorkPlacementsType workPlacements;
-    @XmlElement(name = "StudentPerformance")
-    protected CourseUnitStudentPerformanceType studentPerformance;
-    @XmlElement(name = "NameOfLecturers")
-    protected RichTextTagType nameOfLecturers;
-    @XmlElement(name = "LearningOutcomes")
-    protected RichTextTagType learningOutcomes;
-    @XmlElement(name = "PrerequisitesAndCorequisites")
-    protected RichTextTagType prerequisitesAndCorequisites;
-    @XmlElement(name = "RecomendedOptionalProgrammeComponents")
-    protected RichTextTagType recomendedOptionalProgrammeComponents;
-    @XmlElement(name = "CourseContents")
-    protected RichTextTagType courseContents;
-    @XmlElement(name = "RecomendedOrRequiredReading")
-    protected RichTextTagType recomendedOrRequiredReading;
-    @XmlElement(name = "PlanedLearningActivitiesAndTeachingMethod")
-    protected RichTextTagType planedLearningActivitiesAndTeachingMethod;
-    @XmlElement(name = "AssesmentMethodsAndCriteria")
-    protected RichTextTagType assesmentMethodsAndCriteria;
-    @XmlElement(name = "Observations")
-    protected RichTextTagType observations;
-    @XmlAttribute(name = "groupID", required = true)
-    protected String groupID;
-    @XmlAttribute(name = "institutionAdministeringStudiesID", required = true)
-    protected String institutionAdministeringStudiesID;
-    @XmlAttribute(name = "isRequiredByTheProgramme")
-    protected Boolean isRequiredByTheProgramme;
-
-    /**
-     * Gets the value of the code property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCode() {
-        return code;
-    }
-
-    /**
-     * Sets the value of the code property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCode(String value) {
-        this.code = value;
-    }
-
-    /**
-     * Gets the value of the scientificArea property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getScientificArea() {
-        return scientificArea;
-    }
-
-    /**
-     * Sets the value of the scientificArea property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setScientificArea(String value) {
-        this.scientificArea = value;
-    }
-
-    /**
-     * Gets the value of the title property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * Sets the value of the title property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTitle(String value) {
-        this.title = value;
-    }
-
-    /**
-     * Gets the value of the theme property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTheme() {
-        return theme;
-    }
-
-    /**
-     * Sets the value of the theme property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTheme(String value) {
-        this.theme = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitType.Type }
-     *     
-     */
-    public CourseUnitType.Type getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitType.Type }
-     *     
-     */
-    public void setType(CourseUnitType.Type value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the yearOfStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitType.YearOfStudy }
-     *     
-     */
-    public CourseUnitType.YearOfStudy getYearOfStudy() {
-        return yearOfStudy;
-    }
-
-    /**
-     * Sets the value of the yearOfStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitType.YearOfStudy }
-     *     
-     */
-    public void setYearOfStudy(CourseUnitType.YearOfStudy value) {
-        this.yearOfStudy = value;
-    }
-
-    /**
-     * Gets the value of the level property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitType.Level }
-     *     
-     */
-    public CourseUnitType.Level getLevel() {
-        return level;
-    }
-
-    /**
-     * Sets the value of the level property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitType.Level }
-     *     
-     */
-    public void setLevel(CourseUnitType.Level value) {
-        this.level = value;
-    }
-
-    /**
-     * Gets the value of the ectsCredits property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getECTSCredits() {
-        return ectsCredits;
-    }
-
-    /**
-     * Sets the value of the ectsCredits property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setECTSCredits(BigDecimal value) {
-        this.ectsCredits = value;
-    }
-
-    /**
-     * Gets the value of the localCredits property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getLocalCredits() {
-        return localCredits;
-    }
-
-    /**
-     * Sets the value of the localCredits property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setLocalCredits(BigDecimal value) {
-        this.localCredits = value;
-    }
-
-    /**
-     * Gets the value of the hours property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getHours() {
-        return hours;
-    }
-
-    /**
-     * Sets the value of the hours property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setHours(BigDecimal value) {
-        this.hours = value;
-    }
-
-    /**
-     * Gets the value of the languagesOfInstruction property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitLanguagesOfInstructionType }
-     *     
-     */
-    public CourseUnitLanguagesOfInstructionType getLanguagesOfInstruction() {
-        return languagesOfInstruction;
-    }
-
-    /**
-     * Sets the value of the languagesOfInstruction property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitLanguagesOfInstructionType }
-     *     
-     */
-    public void setLanguagesOfInstruction(CourseUnitLanguagesOfInstructionType value) {
-        this.languagesOfInstruction = value;
-    }
-
-    /**
-     * Gets the value of the modeOfDelivery property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitType.ModeOfDelivery }
-     *     
-     */
-    public CourseUnitType.ModeOfDelivery getModeOfDelivery() {
-        return modeOfDelivery;
-    }
-
-    /**
-     * Sets the value of the modeOfDelivery property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitType.ModeOfDelivery }
-     *     
-     */
-    public void setModeOfDelivery(CourseUnitType.ModeOfDelivery value) {
-        this.modeOfDelivery = value;
-    }
-
-    /**
-     * Gets the value of the workPlacements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitWorkPlacementsType }
-     *     
-     */
-    public CourseUnitWorkPlacementsType getWorkPlacements() {
-        return workPlacements;
-    }
-
-    /**
-     * Sets the value of the workPlacements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitWorkPlacementsType }
-     *     
-     */
-    public void setWorkPlacements(CourseUnitWorkPlacementsType value) {
-        this.workPlacements = value;
-    }
-
-    /**
-     * Gets the value of the studentPerformance property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitStudentPerformanceType }
-     *     
-     */
-    public CourseUnitStudentPerformanceType getStudentPerformance() {
-        return studentPerformance;
-    }
-
-    /**
-     * Sets the value of the studentPerformance property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitStudentPerformanceType }
-     *     
-     */
-    public void setStudentPerformance(CourseUnitStudentPerformanceType value) {
-        this.studentPerformance = value;
-    }
-
-    /**
-     * Gets the value of the nameOfLecturers property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getNameOfLecturers() {
-        return nameOfLecturers;
-    }
-
-    /**
-     * Sets the value of the nameOfLecturers property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setNameOfLecturers(RichTextTagType value) {
-        this.nameOfLecturers = value;
-    }
-
-    /**
-     * Gets the value of the learningOutcomes property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getLearningOutcomes() {
-        return learningOutcomes;
-    }
-
-    /**
-     * Sets the value of the learningOutcomes property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setLearningOutcomes(RichTextTagType value) {
-        this.learningOutcomes = value;
-    }
-
-    /**
-     * Gets the value of the prerequisitesAndCorequisites property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getPrerequisitesAndCorequisites() {
-        return prerequisitesAndCorequisites;
-    }
-
-    /**
-     * Sets the value of the prerequisitesAndCorequisites property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setPrerequisitesAndCorequisites(RichTextTagType value) {
-        this.prerequisitesAndCorequisites = value;
-    }
-
-    /**
-     * Gets the value of the recomendedOptionalProgrammeComponents property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getRecomendedOptionalProgrammeComponents() {
-        return recomendedOptionalProgrammeComponents;
-    }
-
-    /**
-     * Sets the value of the recomendedOptionalProgrammeComponents property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setRecomendedOptionalProgrammeComponents(RichTextTagType value) {
-        this.recomendedOptionalProgrammeComponents = value;
-    }
-
-    /**
-     * Gets the value of the courseContents property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getCourseContents() {
-        return courseContents;
-    }
-
-    /**
-     * Sets the value of the courseContents property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setCourseContents(RichTextTagType value) {
-        this.courseContents = value;
-    }
-
-    /**
-     * Gets the value of the recomendedOrRequiredReading property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getRecomendedOrRequiredReading() {
-        return recomendedOrRequiredReading;
-    }
-
-    /**
-     * Sets the value of the recomendedOrRequiredReading property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setRecomendedOrRequiredReading(RichTextTagType value) {
-        this.recomendedOrRequiredReading = value;
-    }
-
-    /**
-     * Gets the value of the planedLearningActivitiesAndTeachingMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getPlanedLearningActivitiesAndTeachingMethod() {
-        return planedLearningActivitiesAndTeachingMethod;
-    }
-
-    /**
-     * Sets the value of the planedLearningActivitiesAndTeachingMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setPlanedLearningActivitiesAndTeachingMethod(RichTextTagType value) {
-        this.planedLearningActivitiesAndTeachingMethod = value;
-    }
-
-    /**
-     * Gets the value of the assesmentMethodsAndCriteria property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAssesmentMethodsAndCriteria() {
-        return assesmentMethodsAndCriteria;
-    }
-
-    /**
-     * Sets the value of the assesmentMethodsAndCriteria property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAssesmentMethodsAndCriteria(RichTextTagType value) {
-        this.assesmentMethodsAndCriteria = value;
-    }
-
-    /**
-     * Gets the value of the observations property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getObservations() {
-        return observations;
-    }
-
-    /**
-     * Sets the value of the observations property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setObservations(RichTextTagType value) {
-        this.observations = value;
-    }
-
-    /**
-     * Gets the value of the groupID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGroupID() {
-        return groupID;
-    }
-
-    /**
-     * Sets the value of the groupID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGroupID(String value) {
-        this.groupID = value;
-    }
-
-    /**
-     * Gets the value of the institutionAdministeringStudiesID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInstitutionAdministeringStudiesID() {
-        return institutionAdministeringStudiesID;
-    }
-
-    /**
-     * Sets the value of the institutionAdministeringStudiesID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInstitutionAdministeringStudiesID(String value) {
-        this.institutionAdministeringStudiesID = value;
-    }
-
-    /**
-     * Gets the value of the isRequiredByTheProgramme property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isIsRequiredByTheProgramme() {
-        if (isRequiredByTheProgramme == null) {
-            return true;
-        } else {
-            return isRequiredByTheProgramme;
-        }
-    }
-
-    /**
-     * Sets the value of the isRequiredByTheProgramme property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setIsRequiredByTheProgramme(Boolean value) {
-        this.isRequiredByTheProgramme = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="eheaFramework" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}EHEAFrameworkType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Level {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "eheaFramework", required = true)
-        protected EHEAFrameworkType eheaFramework;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the eheaFramework property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EHEAFrameworkType }
-         *     
-         */
-        public EHEAFrameworkType getEheaFramework() {
-            return eheaFramework;
-        }
-
-        /**
-         * Sets the value of the eheaFramework property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EHEAFrameworkType }
-         *     
-         */
-        public void setEheaFramework(EHEAFrameworkType value) {
-            this.eheaFramework = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="modeOfDelivery" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}ModeOfDeliveryType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class ModeOfDelivery {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "modeOfDelivery", required = true)
-        protected ModeOfDeliveryType modeOfDelivery;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the modeOfDelivery property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ModeOfDeliveryType }
-         *     
-         */
-        public ModeOfDeliveryType getModeOfDelivery() {
-            return modeOfDelivery;
-        }
-
-        /**
-         * Sets the value of the modeOfDelivery property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ModeOfDeliveryType }
-         *     
-         */
-        public void setModeOfDelivery(ModeOfDeliveryType value) {
-            this.modeOfDelivery = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="type" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseUnitTypeType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Type {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "type")
-        protected CourseUnitTypeType type;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CourseUnitTypeType }
-         *     
-         */
-        public CourseUnitTypeType getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CourseUnitTypeType }
-         *     
-         */
-        public void setType(CourseUnitTypeType value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="year" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class YearOfStudy {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "year", required = true)
-        protected BigDecimal year;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the year property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getYear() {
-            return year;
-        }
-
-        /**
-         * Sets the value of the year property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setYear(BigDecimal value) {
-            this.year = value;
-        }
-
-    }
+	@XmlElement(name = "Code", required = true)
+	protected String code;
+	@XmlElement(name = "ScientificArea")
+	protected String scientificArea;
+	@XmlElement(name = "Title", required = true)
+	protected String title;
+	@XmlElement(name = "Theme")
+	protected String theme;
+	@XmlElement(name = "Type", required = true)
+	protected CourseUnitType.Type type;
+	@XmlElement(name = "YearOfStudy")
+	protected CourseUnitType.YearOfStudy yearOfStudy;
+	@XmlElement(name = "Level")
+	protected CourseUnitType.Level level;
+	@XmlElement(name = "ECTSCredits")
+	protected BigDecimal ectsCredits;
+	@XmlElement(name = "LocalCredits")
+	protected BigDecimal localCredits;
+	@XmlElement(name = "Hours")
+	protected BigDecimal hours;
+	@XmlElement(name = "LanguagesOfInstruction")
+	protected CourseUnitLanguagesOfInstructionType languagesOfInstruction;
+	@XmlElement(name = "ModeOfDelivery")
+	protected CourseUnitType.ModeOfDelivery modeOfDelivery;
+	@XmlElement(name = "WorkPlacements")
+	protected CourseUnitWorkPlacementsType workPlacements;
+	@XmlElement(name = "StudentPerformance")
+	protected CourseUnitStudentPerformanceType studentPerformance;
+	@XmlElement(name = "NameOfLecturers")
+	protected RichTextTagType nameOfLecturers;
+	@XmlElement(name = "LearningOutcomes")
+	protected RichTextTagType learningOutcomes;
+	@XmlElement(name = "PrerequisitesAndCorequisites")
+	protected RichTextTagType prerequisitesAndCorequisites;
+	@XmlElement(name = "RecomendedOptionalProgrammeComponents")
+	protected RichTextTagType recomendedOptionalProgrammeComponents;
+	@XmlElement(name = "CourseContents")
+	protected RichTextTagType courseContents;
+	@XmlElement(name = "RecomendedOrRequiredReading")
+	protected RichTextTagType recomendedOrRequiredReading;
+	@XmlElement(name = "PlanedLearningActivitiesAndTeachingMethod")
+	protected RichTextTagType planedLearningActivitiesAndTeachingMethod;
+	@XmlElement(name = "AssesmentMethodsAndCriteria")
+	protected RichTextTagType assesmentMethodsAndCriteria;
+	@XmlElement(name = "Observations")
+	protected RichTextTagType observations;
+	@XmlAttribute(name = "groupID", required = true)
+	protected String groupID;
+	@XmlAttribute(name = "institutionAdministeringStudiesID", required = true)
+	protected String institutionAdministeringStudiesID;
+	@XmlAttribute(name = "isRequiredByTheProgramme")
+	protected Boolean isRequiredByTheProgramme;
+
+	/**
+	 * Gets the value of the code property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * Sets the value of the code property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCode(String value) {
+		this.code = value;
+	}
+
+	/**
+	 * Gets the value of the scientificArea property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getScientificArea() {
+		return scientificArea;
+	}
+
+	/**
+	 * Sets the value of the scientificArea property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setScientificArea(String value) {
+		this.scientificArea = value;
+	}
+
+	/**
+	 * Gets the value of the title property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTitle() {
+		return title;
+	}
+
+	/**
+	 * Sets the value of the title property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTitle(String value) {
+		this.title = value;
+	}
+
+	/**
+	 * Gets the value of the theme property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTheme() {
+		return theme;
+	}
+
+	/**
+	 * Sets the value of the theme property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTheme(String value) {
+		this.theme = value;
+	}
+
+	/**
+	 * Gets the value of the type property.
+	 * 
+	 * @return possible object is {@link CourseUnitType.Type }
+	 * 
+	 */
+	public CourseUnitType.Type getType() {
+		return type;
+	}
+
+	/**
+	 * Sets the value of the type property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitType.Type }
+	 * 
+	 */
+	public void setType(CourseUnitType.Type value) {
+		this.type = value;
+	}
+
+	/**
+	 * Gets the value of the yearOfStudy property.
+	 * 
+	 * @return possible object is {@link CourseUnitType.YearOfStudy }
+	 * 
+	 */
+	public CourseUnitType.YearOfStudy getYearOfStudy() {
+		return yearOfStudy;
+	}
+
+	/**
+	 * Sets the value of the yearOfStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitType.YearOfStudy }
+	 * 
+	 */
+	public void setYearOfStudy(CourseUnitType.YearOfStudy value) {
+		this.yearOfStudy = value;
+	}
+
+	/**
+	 * Gets the value of the level property.
+	 * 
+	 * @return possible object is {@link CourseUnitType.Level }
+	 * 
+	 */
+	public CourseUnitType.Level getLevel() {
+		return level;
+	}
+
+	/**
+	 * Sets the value of the level property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitType.Level }
+	 * 
+	 */
+	public void setLevel(CourseUnitType.Level value) {
+		this.level = value;
+	}
+
+	/**
+	 * Gets the value of the ectsCredits property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getECTSCredits() {
+		return ectsCredits;
+	}
+
+	/**
+	 * Sets the value of the ectsCredits property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setECTSCredits(BigDecimal value) {
+		this.ectsCredits = value;
+	}
+
+	/**
+	 * Gets the value of the localCredits property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getLocalCredits() {
+		return localCredits;
+	}
+
+	/**
+	 * Sets the value of the localCredits property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setLocalCredits(BigDecimal value) {
+		this.localCredits = value;
+	}
+
+	/**
+	 * Gets the value of the hours property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getHours() {
+		return hours;
+	}
+
+	/**
+	 * Sets the value of the hours property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setHours(BigDecimal value) {
+		this.hours = value;
+	}
+
+	/**
+	 * Gets the value of the languagesOfInstruction property.
+	 * 
+	 * @return possible object is {@link CourseUnitLanguagesOfInstructionType }
+	 * 
+	 */
+	public CourseUnitLanguagesOfInstructionType getLanguagesOfInstruction() {
+		return languagesOfInstruction;
+	}
+
+	/**
+	 * Sets the value of the languagesOfInstruction property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitLanguagesOfInstructionType }
+	 * 
+	 */
+	public void setLanguagesOfInstruction(CourseUnitLanguagesOfInstructionType value) {
+		this.languagesOfInstruction = value;
+	}
+
+	/**
+	 * Gets the value of the modeOfDelivery property.
+	 * 
+	 * @return possible object is {@link CourseUnitType.ModeOfDelivery }
+	 * 
+	 */
+	public CourseUnitType.ModeOfDelivery getModeOfDelivery() {
+		return modeOfDelivery;
+	}
+
+	/**
+	 * Sets the value of the modeOfDelivery property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitType.ModeOfDelivery }
+	 * 
+	 */
+	public void setModeOfDelivery(CourseUnitType.ModeOfDelivery value) {
+		this.modeOfDelivery = value;
+	}
+
+	/**
+	 * Gets the value of the workPlacements property.
+	 * 
+	 * @return possible object is {@link CourseUnitWorkPlacementsType }
+	 * 
+	 */
+	public CourseUnitWorkPlacementsType getWorkPlacements() {
+		return workPlacements;
+	}
+
+	/**
+	 * Sets the value of the workPlacements property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitWorkPlacementsType }
+	 * 
+	 */
+	public void setWorkPlacements(CourseUnitWorkPlacementsType value) {
+		this.workPlacements = value;
+	}
+
+	/**
+	 * Gets the value of the studentPerformance property.
+	 * 
+	 * @return possible object is {@link CourseUnitStudentPerformanceType }
+	 * 
+	 */
+	public CourseUnitStudentPerformanceType getStudentPerformance() {
+		return studentPerformance;
+	}
+
+	/**
+	 * Sets the value of the studentPerformance property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitStudentPerformanceType }
+	 * 
+	 */
+	public void setStudentPerformance(CourseUnitStudentPerformanceType value) {
+		this.studentPerformance = value;
+	}
+
+	/**
+	 * Gets the value of the nameOfLecturers property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getNameOfLecturers() {
+		return nameOfLecturers;
+	}
+
+	/**
+	 * Sets the value of the nameOfLecturers property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setNameOfLecturers(RichTextTagType value) {
+		this.nameOfLecturers = value;
+	}
+
+	/**
+	 * Gets the value of the learningOutcomes property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getLearningOutcomes() {
+		return learningOutcomes;
+	}
+
+	/**
+	 * Sets the value of the learningOutcomes property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setLearningOutcomes(RichTextTagType value) {
+		this.learningOutcomes = value;
+	}
+
+	/**
+	 * Gets the value of the prerequisitesAndCorequisites property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getPrerequisitesAndCorequisites() {
+		return prerequisitesAndCorequisites;
+	}
+
+	/**
+	 * Sets the value of the prerequisitesAndCorequisites property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setPrerequisitesAndCorequisites(RichTextTagType value) {
+		this.prerequisitesAndCorequisites = value;
+	}
+
+	/**
+	 * Gets the value of the recomendedOptionalProgrammeComponents property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getRecomendedOptionalProgrammeComponents() {
+		return recomendedOptionalProgrammeComponents;
+	}
+
+	/**
+	 * Sets the value of the recomendedOptionalProgrammeComponents property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setRecomendedOptionalProgrammeComponents(RichTextTagType value) {
+		this.recomendedOptionalProgrammeComponents = value;
+	}
+
+	/**
+	 * Gets the value of the courseContents property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getCourseContents() {
+		return courseContents;
+	}
+
+	/**
+	 * Sets the value of the courseContents property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setCourseContents(RichTextTagType value) {
+		this.courseContents = value;
+	}
+
+	/**
+	 * Gets the value of the recomendedOrRequiredReading property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getRecomendedOrRequiredReading() {
+		return recomendedOrRequiredReading;
+	}
+
+	/**
+	 * Sets the value of the recomendedOrRequiredReading property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setRecomendedOrRequiredReading(RichTextTagType value) {
+		this.recomendedOrRequiredReading = value;
+	}
+
+	/**
+	 * Gets the value of the planedLearningActivitiesAndTeachingMethod property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getPlanedLearningActivitiesAndTeachingMethod() {
+		return planedLearningActivitiesAndTeachingMethod;
+	}
+
+	/**
+	 * Sets the value of the planedLearningActivitiesAndTeachingMethod property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setPlanedLearningActivitiesAndTeachingMethod(RichTextTagType value) {
+		this.planedLearningActivitiesAndTeachingMethod = value;
+	}
+
+	/**
+	 * Gets the value of the assesmentMethodsAndCriteria property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAssesmentMethodsAndCriteria() {
+		return assesmentMethodsAndCriteria;
+	}
+
+	/**
+	 * Sets the value of the assesmentMethodsAndCriteria property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAssesmentMethodsAndCriteria(RichTextTagType value) {
+		this.assesmentMethodsAndCriteria = value;
+	}
+
+	/**
+	 * Gets the value of the observations property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getObservations() {
+		return observations;
+	}
+
+	/**
+	 * Sets the value of the observations property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setObservations(RichTextTagType value) {
+		this.observations = value;
+	}
+
+	/**
+	 * Gets the value of the groupID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getGroupID() {
+		return groupID;
+	}
+
+	/**
+	 * Sets the value of the groupID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setGroupID(String value) {
+		this.groupID = value;
+	}
+
+	/**
+	 * Gets the value of the institutionAdministeringStudiesID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getInstitutionAdministeringStudiesID() {
+		return institutionAdministeringStudiesID;
+	}
+
+	/**
+	 * Sets the value of the institutionAdministeringStudiesID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setInstitutionAdministeringStudiesID(String value) {
+		this.institutionAdministeringStudiesID = value;
+	}
+
+	/**
+	 * Gets the value of the isRequiredByTheProgramme property.
+	 * 
+	 * @return possible object is {@link Boolean }
+	 * 
+	 */
+	public boolean isIsRequiredByTheProgramme() {
+		if (isRequiredByTheProgramme == null) {
+			return true;
+		} else {
+			return isRequiredByTheProgramme;
+		}
+	}
+
+	/**
+	 * Sets the value of the isRequiredByTheProgramme property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link Boolean }
+	 * 
+	 */
+	public void setIsRequiredByTheProgramme(Boolean value) {
+		this.isRequiredByTheProgramme = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="eheaFramework" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}EHEAFrameworkType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Level {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "eheaFramework", required = true)
+		protected EHEAFrameworkType eheaFramework;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the eheaFramework property.
+		 * 
+		 * @return possible object is {@link EHEAFrameworkType }
+		 * 
+		 */
+		public EHEAFrameworkType getEheaFramework() {
+			return eheaFramework;
+		}
+
+		/**
+		 * Sets the value of the eheaFramework property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link EHEAFrameworkType }
+		 * 
+		 */
+		public void setEheaFramework(EHEAFrameworkType value) {
+			this.eheaFramework = value;
+		}
+
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="modeOfDelivery" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}ModeOfDeliveryType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class ModeOfDelivery {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "modeOfDelivery", required = true)
+		protected ModeOfDeliveryType modeOfDelivery;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the modeOfDelivery property.
+		 * 
+		 * @return possible object is {@link ModeOfDeliveryType }
+		 * 
+		 */
+		public ModeOfDeliveryType getModeOfDelivery() {
+			return modeOfDelivery;
+		}
+
+		/**
+		 * Sets the value of the modeOfDelivery property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link ModeOfDeliveryType }
+		 * 
+		 */
+		public void setModeOfDelivery(ModeOfDeliveryType value) {
+			this.modeOfDelivery = value;
+		}
+
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="type" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseUnitTypeType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Type {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "type")
+		protected CourseUnitTypeType type;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the type property.
+		 * 
+		 * @return possible object is {@link CourseUnitTypeType }
+		 * 
+		 */
+		public CourseUnitTypeType getType() {
+			return type;
+		}
+
+		/**
+		 * Sets the value of the type property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CourseUnitTypeType }
+		 * 
+		 */
+		public void setType(CourseUnitTypeType value) {
+			this.type = value;
+		}
+
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="year" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class YearOfStudy {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "year", required = true)
+		protected BigDecimal year;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the year property.
+		 * 
+		 * @return possible object is {@link BigDecimal }
+		 * 
+		 */
+		public BigDecimal getYear() {
+			return year;
+		}
+
+		/**
+		 * Sets the value of the year property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link BigDecimal }
+		 * 
+		 */
+		public void setYear(BigDecimal value) {
+			this.year = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitTypeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitTypeType.java
index bb2dd2e50..5978cb2c7 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitTypeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitTypeType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CourseUnitTypeType.
+ * <p>
+ * Java class for CourseUnitTypeType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="CourseUnitTypeType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -32,37 +33,36 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum CourseUnitTypeType {
 
+	/**
+	 * Compulsory
+	 * 
+	 */
+	@XmlEnumValue("Compulsory")
+	COMPULSORY("Compulsory"),
 
-    /**
-     * Compulsory
-     * 
-     */
-    @XmlEnumValue("Compulsory")
-    COMPULSORY("Compulsory"),
-
-    /**
-     * Optional
-     * 
-     */
-    @XmlEnumValue("Optional")
-    OPTIONAL("Optional");
-    private final String value;
+	/**
+	 * Optional
+	 * 
+	 */
+	@XmlEnumValue("Optional")
+	OPTIONAL("Optional");
+	private final String value;
 
-    CourseUnitTypeType(String v) {
-        value = v;
-    }
+	CourseUnitTypeType(String v) {
+		value = v;
+	}
 
-    public String value() {
-        return value;
-    }
+	public String value() {
+		return value;
+	}
 
-    public static CourseUnitTypeType fromValue(String v) {
-        for (CourseUnitTypeType c: CourseUnitTypeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	public static CourseUnitTypeType fromValue(String v) {
+		for (CourseUnitTypeType c : CourseUnitTypeType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementType.java
index eb930ec76..f2d424667 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.math.BigDecimal;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
  * Course unit work placement
  * 
- * <p>Java class for CourseUnitWorkPlacementType complex type.
+ * <p>
+ * Java class for CourseUnitWorkPlacementType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitWorkPlacementType">
@@ -41,117 +41,100 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitWorkPlacementType", propOrder = {
-    "collaboratingInstitution",
-    "dateFrom",
-    "dateTo",
-    "trainingHours"
-})
+@XmlType(name = "CourseUnitWorkPlacementType", propOrder = { "collaboratingInstitution", "dateFrom", "dateTo", "trainingHours" })
 public class CourseUnitWorkPlacementType {
 
-    @XmlElement(name = "CollaboratingInstitution", required = true)
-    protected String collaboratingInstitution;
-    @XmlElement(name = "DateFrom")
-    protected XMLGregorianCalendar dateFrom;
-    @XmlElement(name = "DateTo")
-    protected XMLGregorianCalendar dateTo;
-    @XmlElement(name = "TrainingHours")
-    protected BigDecimal trainingHours;
+	@XmlElement(name = "CollaboratingInstitution", required = true)
+	protected String collaboratingInstitution;
+	@XmlElement(name = "DateFrom")
+	protected XMLGregorianCalendar dateFrom;
+	@XmlElement(name = "DateTo")
+	protected XMLGregorianCalendar dateTo;
+	@XmlElement(name = "TrainingHours")
+	protected BigDecimal trainingHours;
 
-    /**
-     * Gets the value of the collaboratingInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCollaboratingInstitution() {
-        return collaboratingInstitution;
-    }
+	/**
+	 * Gets the value of the collaboratingInstitution property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCollaboratingInstitution() {
+		return collaboratingInstitution;
+	}
 
-    /**
-     * Sets the value of the collaboratingInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCollaboratingInstitution(String value) {
-        this.collaboratingInstitution = value;
-    }
+	/**
+	 * Sets the value of the collaboratingInstitution property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCollaboratingInstitution(String value) {
+		this.collaboratingInstitution = value;
+	}
 
-    /**
-     * Gets the value of the dateFrom property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateFrom() {
-        return dateFrom;
-    }
+	/**
+	 * Gets the value of the dateFrom property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateFrom() {
+		return dateFrom;
+	}
 
-    /**
-     * Sets the value of the dateFrom property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateFrom(XMLGregorianCalendar value) {
-        this.dateFrom = value;
-    }
+	/**
+	 * Sets the value of the dateFrom property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateFrom(XMLGregorianCalendar value) {
+		this.dateFrom = value;
+	}
 
-    /**
-     * Gets the value of the dateTo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateTo() {
-        return dateTo;
-    }
+	/**
+	 * Gets the value of the dateTo property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateTo() {
+		return dateTo;
+	}
 
-    /**
-     * Sets the value of the dateTo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateTo(XMLGregorianCalendar value) {
-        this.dateTo = value;
-    }
+	/**
+	 * Sets the value of the dateTo property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateTo(XMLGregorianCalendar value) {
+		this.dateTo = value;
+	}
 
-    /**
-     * Gets the value of the trainingHours property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getTrainingHours() {
-        return trainingHours;
-    }
+	/**
+	 * Gets the value of the trainingHours property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getTrainingHours() {
+		return trainingHours;
+	}
 
-    /**
-     * Sets the value of the trainingHours property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setTrainingHours(BigDecimal value) {
-        this.trainingHours = value;
-    }
+	/**
+	 * Sets the value of the trainingHours property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setTrainingHours(BigDecimal value) {
+		this.trainingHours = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementsType.java
index f8d62f1e9..9a894f184 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Course unit work placements
  * 
- * <p>Java class for CourseUnitWorkPlacementsType complex type.
+ * <p>
+ * Java class for CourseUnitWorkPlacementsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitWorkPlacementsType">
@@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitWorkPlacementsType", propOrder = {
-    "workPlacement"
-})
+@XmlType(name = "CourseUnitWorkPlacementsType", propOrder = { "workPlacement" })
 public class CourseUnitWorkPlacementsType {
 
-    @XmlElement(name = "WorkPlacement", required = true)
-    protected List<CourseUnitWorkPlacementType> workPlacement;
+	@XmlElement(name = "WorkPlacement", required = true)
+	protected List<CourseUnitWorkPlacementType> workPlacement;
 
-    /**
-     * Gets the value of the workPlacement property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the workPlacement property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getWorkPlacement().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CourseUnitWorkPlacementType }
-     * 
-     * 
-     */
-    public List<CourseUnitWorkPlacementType> getWorkPlacement() {
-        if (workPlacement == null) {
-            workPlacement = new ArrayList<CourseUnitWorkPlacementType>();
-        }
-        return this.workPlacement;
-    }
+	/**
+	 * Gets the value of the workPlacement property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the workPlacement property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getWorkPlacement().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link CourseUnitWorkPlacementType }
+	 * 
+	 * 
+	 */
+	public List<CourseUnitWorkPlacementType> getWorkPlacement() {
+		if (workPlacement == null) {
+			workPlacement = new ArrayList<CourseUnitWorkPlacementType>();
+		}
+		return this.workPlacement;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java
index 8d9c69b53..de5325960 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CoursesAttendedInOtherInstitutionInMobilityProgramsType complex type.
+ * <p>
+ * Java class for CoursesAttendedInOtherInstitutionInMobilityProgramsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CoursesAttendedInOtherInstitutionInMobilityProgramsType", propOrder = {
-    "mobilityProgramme"
-})
+@XmlType(name = "CoursesAttendedInOtherInstitutionInMobilityProgramsType", propOrder = { "mobilityProgramme" })
 public class CoursesAttendedInOtherInstitutionInMobilityProgramsType {
 
-    @XmlElement(name = "MobilityProgramme", required = true)
-    protected List<MobilityProgrammeType> mobilityProgramme;
+	@XmlElement(name = "MobilityProgramme", required = true)
+	protected List<MobilityProgrammeType> mobilityProgramme;
 
-    /**
-     * Gets the value of the mobilityProgramme property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the mobilityProgramme property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getMobilityProgramme().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MobilityProgrammeType }
-     * 
-     * 
-     */
-    public List<MobilityProgrammeType> getMobilityProgramme() {
-        if (mobilityProgramme == null) {
-            mobilityProgramme = new ArrayList<MobilityProgrammeType>();
-        }
-        return this.mobilityProgramme;
-    }
+	/**
+	 * Gets the value of the mobilityProgramme property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the mobilityProgramme property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getMobilityProgramme().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link MobilityProgrammeType }
+	 * 
+	 * 
+	 */
+	public List<MobilityProgrammeType> getMobilityProgramme() {
+		if (mobilityProgramme == null) {
+			mobilityProgramme = new ArrayList<MobilityProgrammeType>();
+		}
+		return this.mobilityProgramme;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupType.java
index 364fa3f85..8cafa0346 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Courses group
  * 
- * <p>Java class for CoursesGroupType complex type.
+ * <p>
+ * Java class for CoursesGroupType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CoursesGroupType">
@@ -43,148 +43,129 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CoursesGroupType", propOrder = {
-    "name",
-    "headerInformation",
-    "coursesGroup",
-    "footerInformation"
-})
+@XmlType(name = "CoursesGroupType", propOrder = { "name", "headerInformation", "coursesGroup", "footerInformation" })
 public class CoursesGroupType {
 
-    @XmlElement(name = "Name", required = true)
-    protected String name;
-    @XmlElement(name = "HeaderInformation")
-    protected RichTextTagType headerInformation;
-    @XmlElement(name = "CoursesGroup")
-    protected List<CoursesGroupType> coursesGroup;
-    @XmlElement(name = "FooterInformation")
-    protected RichTextTagType footerInformation;
-    @XmlAttribute(name = "groupID", required = true)
-    protected String groupID;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the headerInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getHeaderInformation() {
-        return headerInformation;
-    }
-
-    /**
-     * Sets the value of the headerInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setHeaderInformation(RichTextTagType value) {
-        this.headerInformation = value;
-    }
-
-    /**
-     * Gets the value of the coursesGroup property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the coursesGroup property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCoursesGroup().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CoursesGroupType }
-     * 
-     * 
-     */
-    public List<CoursesGroupType> getCoursesGroup() {
-        if (coursesGroup == null) {
-            coursesGroup = new ArrayList<CoursesGroupType>();
-        }
-        return this.coursesGroup;
-    }
-
-    /**
-     * Gets the value of the footerInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getFooterInformation() {
-        return footerInformation;
-    }
-
-    /**
-     * Sets the value of the footerInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setFooterInformation(RichTextTagType value) {
-        this.footerInformation = value;
-    }
-
-    /**
-     * Gets the value of the groupID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGroupID() {
-        return groupID;
-    }
-
-    /**
-     * Sets the value of the groupID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGroupID(String value) {
-        this.groupID = value;
-    }
+	@XmlElement(name = "Name", required = true)
+	protected String name;
+	@XmlElement(name = "HeaderInformation")
+	protected RichTextTagType headerInformation;
+	@XmlElement(name = "CoursesGroup")
+	protected List<CoursesGroupType> coursesGroup;
+	@XmlElement(name = "FooterInformation")
+	protected RichTextTagType footerInformation;
+	@XmlAttribute(name = "groupID", required = true)
+	protected String groupID;
+
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
+
+	/**
+	 * Gets the value of the headerInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getHeaderInformation() {
+		return headerInformation;
+	}
+
+	/**
+	 * Sets the value of the headerInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setHeaderInformation(RichTextTagType value) {
+		this.headerInformation = value;
+	}
+
+	/**
+	 * Gets the value of the coursesGroup property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the coursesGroup property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getCoursesGroup().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link CoursesGroupType }
+	 * 
+	 * 
+	 */
+	public List<CoursesGroupType> getCoursesGroup() {
+		if (coursesGroup == null) {
+			coursesGroup = new ArrayList<CoursesGroupType>();
+		}
+		return this.coursesGroup;
+	}
+
+	/**
+	 * Gets the value of the footerInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getFooterInformation() {
+		return footerInformation;
+	}
+
+	/**
+	 * Sets the value of the footerInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setFooterInformation(RichTextTagType value) {
+		this.footerInformation = value;
+	}
+
+	/**
+	 * Gets the value of the groupID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getGroupID() {
+		return groupID;
+	}
+
+	/**
+	 * Sets the value of the groupID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setGroupID(String value) {
+		this.groupID = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupsType.java
index 820581335..56ae13b33 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Courses groups
  * 
- * <p>Java class for CoursesGroupsType complex type.
+ * <p>
+ * Java class for CoursesGroupsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CoursesGroupsType">
@@ -41,122 +41,106 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CoursesGroupsType", propOrder = {
-    "name",
-    "headerInformation",
-    "coursesGroup",
-    "footerInformation"
-})
+@XmlType(name = "CoursesGroupsType", propOrder = { "name", "headerInformation", "coursesGroup", "footerInformation" })
 public class CoursesGroupsType {
 
-    @XmlElement(name = "Name")
-    protected String name;
-    @XmlElement(name = "HeaderInformation")
-    protected RichTextTagType headerInformation;
-    @XmlElement(name = "CoursesGroup")
-    protected List<CoursesGroupType> coursesGroup;
-    @XmlElement(name = "FooterInformation")
-    protected RichTextTagType footerInformation;
+	@XmlElement(name = "Name")
+	protected String name;
+	@XmlElement(name = "HeaderInformation")
+	protected RichTextTagType headerInformation;
+	@XmlElement(name = "CoursesGroup")
+	protected List<CoursesGroupType> coursesGroup;
+	@XmlElement(name = "FooterInformation")
+	protected RichTextTagType footerInformation;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
 
-    /**
-     * Gets the value of the headerInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getHeaderInformation() {
-        return headerInformation;
-    }
+	/**
+	 * Gets the value of the headerInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getHeaderInformation() {
+		return headerInformation;
+	}
 
-    /**
-     * Sets the value of the headerInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setHeaderInformation(RichTextTagType value) {
-        this.headerInformation = value;
-    }
+	/**
+	 * Sets the value of the headerInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setHeaderInformation(RichTextTagType value) {
+		this.headerInformation = value;
+	}
 
-    /**
-     * Gets the value of the coursesGroup property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the coursesGroup property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCoursesGroup().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CoursesGroupType }
-     * 
-     * 
-     */
-    public List<CoursesGroupType> getCoursesGroup() {
-        if (coursesGroup == null) {
-            coursesGroup = new ArrayList<CoursesGroupType>();
-        }
-        return this.coursesGroup;
-    }
+	/**
+	 * Gets the value of the coursesGroup property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the coursesGroup property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getCoursesGroup().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link CoursesGroupType }
+	 * 
+	 * 
+	 */
+	public List<CoursesGroupType> getCoursesGroup() {
+		if (coursesGroup == null) {
+			coursesGroup = new ArrayList<CoursesGroupType>();
+		}
+		return this.coursesGroup;
+	}
 
-    /**
-     * Gets the value of the footerInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getFooterInformation() {
-        return footerInformation;
-    }
+	/**
+	 * Gets the value of the footerInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getFooterInformation() {
+		return footerInformation;
+	}
 
-    /**
-     * Sets the value of the footerInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setFooterInformation(RichTextTagType value) {
-        this.footerInformation = value;
-    }
+	/**
+	 * Sets the value of the footerInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setFooterInformation(RichTextTagType value) {
+		this.footerInformation = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesUnitsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesUnitsType.java
index a2258cab0..38ccacc0b 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesUnitsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesUnitsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Course units
  * 
- * <p>Java class for CoursesUnitsType complex type.
+ * <p>
+ * Java class for CoursesUnitsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CoursesUnitsType">
@@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CoursesUnitsType", propOrder = {
-    "courseUnit"
-})
+@XmlType(name = "CoursesUnitsType", propOrder = { "courseUnit" })
 public class CoursesUnitsType {
 
-    @XmlElement(name = "CourseUnit", required = true)
-    protected List<CourseUnitType> courseUnit;
+	@XmlElement(name = "CourseUnit", required = true)
+	protected List<CourseUnitType> courseUnit;
 
-    /**
-     * Gets the value of the courseUnit property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the courseUnit property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCourseUnit().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CourseUnitType }
-     * 
-     * 
-     */
-    public List<CourseUnitType> getCourseUnit() {
-        if (courseUnit == null) {
-            courseUnit = new ArrayList<CourseUnitType>();
-        }
-        return this.courseUnit;
-    }
+	/**
+	 * Gets the value of the courseUnit property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the courseUnit property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getCourseUnit().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link CourseUnitType }
+	 * 
+	 * 
+	 */
+	public List<CourseUnitType> getCourseUnit() {
+		if (courseUnit == null) {
+			courseUnit = new ArrayList<CourseUnitType>();
+		}
+		return this.courseUnit;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/DiplomaSupplementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/DiplomaSupplementType.java
index b08a4fb72..57e9a4dfb 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/DiplomaSupplementType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/DiplomaSupplementType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -17,13 +16,14 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
 
-
 /**
  * Diploma Supplement
  * 
- * <p>Java class for DiplomaSupplementType complex type.
+ * <p>
+ * Java class for DiplomaSupplementType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="DiplomaSupplementType">
@@ -52,360 +52,316 @@ import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DiplomaSupplementType", propOrder = {
-    "informationIdentifyingTheHolderOfTheQualification",
-    "informationIdentifyingTheQualification",
-    "informationOnTheLevelOfTheQualification",
-    "informationOnTheContentsAndResultsGained",
-    "informationOnTheFunctionOfTheQualification",
-    "additionalInformation",
-    "certificationOfTheSupplement",
-    "informationOnTheNationalHigherEducationSystem",
-    "attachments",
-    "extensionContent",
-    "signature"
-})
+@XmlType(name = "DiplomaSupplementType", propOrder = { "informationIdentifyingTheHolderOfTheQualification", "informationIdentifyingTheQualification", "informationOnTheLevelOfTheQualification",
+		"informationOnTheContentsAndResultsGained", "informationOnTheFunctionOfTheQualification", "additionalInformation", "certificationOfTheSupplement",
+		"informationOnTheNationalHigherEducationSystem", "attachments", "extensionContent", "signature" })
 public class DiplomaSupplementType {
 
-    @XmlElement(name = "InformationIdentifyingTheHolderOfTheQualification", required = true)
-    protected InformationIdentifyingTheHolderOfTheQualificationType informationIdentifyingTheHolderOfTheQualification;
-    @XmlElement(name = "InformationIdentifyingTheQualification", required = true)
-    protected InformationIdentifyingTheQualificationType informationIdentifyingTheQualification;
-    @XmlElement(name = "InformationOnTheLevelOfTheQualification", required = true)
-    protected InformationOnTheLevelOfTheQualificationType informationOnTheLevelOfTheQualification;
-    @XmlElement(name = "InformationOnTheContentsAndResultsGained", required = true)
-    protected InformationOnTheContentsAndResultsGainedType informationOnTheContentsAndResultsGained;
-    @XmlElement(name = "InformationOnTheFunctionOfTheQualification", required = true)
-    protected InformationOnTheFunctionOfTheQualificationType informationOnTheFunctionOfTheQualification;
-    @XmlElement(name = "AdditionalInformation", required = true)
-    protected AdditionalInformationType additionalInformation;
-    @XmlElement(name = "CertificationOfTheSupplement", required = true)
-    protected CertificationOfTheSupplementType certificationOfTheSupplement;
-    @XmlElement(name = "InformationOnTheNationalHigherEducationSystem", required = true)
-    protected RichTextTagType informationOnTheNationalHigherEducationSystem;
-    @XmlElement(name = "Attachments")
-    protected AttachmentsType attachments;
-    @XmlElement(name = "ExtensionContent")
-    protected List<ExtensionContentType> extensionContent;
-    @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
-    protected List<SignatureType> signature;
-    @XmlAttribute(name = "language", required = true)
-    protected LanguageType language;
-    @XmlAttribute(name = "isTheOriginalLanguage", required = true)
-    protected boolean isTheOriginalLanguage;
+	@XmlElement(name = "InformationIdentifyingTheHolderOfTheQualification", required = true)
+	protected InformationIdentifyingTheHolderOfTheQualificationType informationIdentifyingTheHolderOfTheQualification;
+	@XmlElement(name = "InformationIdentifyingTheQualification", required = true)
+	protected InformationIdentifyingTheQualificationType informationIdentifyingTheQualification;
+	@XmlElement(name = "InformationOnTheLevelOfTheQualification", required = true)
+	protected InformationOnTheLevelOfTheQualificationType informationOnTheLevelOfTheQualification;
+	@XmlElement(name = "InformationOnTheContentsAndResultsGained", required = true)
+	protected InformationOnTheContentsAndResultsGainedType informationOnTheContentsAndResultsGained;
+	@XmlElement(name = "InformationOnTheFunctionOfTheQualification", required = true)
+	protected InformationOnTheFunctionOfTheQualificationType informationOnTheFunctionOfTheQualification;
+	@XmlElement(name = "AdditionalInformation", required = true)
+	protected AdditionalInformationType additionalInformation;
+	@XmlElement(name = "CertificationOfTheSupplement", required = true)
+	protected CertificationOfTheSupplementType certificationOfTheSupplement;
+	@XmlElement(name = "InformationOnTheNationalHigherEducationSystem", required = true)
+	protected RichTextTagType informationOnTheNationalHigherEducationSystem;
+	@XmlElement(name = "Attachments")
+	protected AttachmentsType attachments;
+	@XmlElement(name = "ExtensionContent")
+	protected List<ExtensionContentType> extensionContent;
+	@XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
+	protected List<SignatureType> signature;
+	@XmlAttribute(name = "language", required = true)
+	protected LanguageType language;
+	@XmlAttribute(name = "isTheOriginalLanguage", required = true)
+	protected boolean isTheOriginalLanguage;
 
-    /**
-     * Gets the value of the informationIdentifyingTheHolderOfTheQualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationIdentifyingTheHolderOfTheQualificationType }
-     *     
-     */
-    public InformationIdentifyingTheHolderOfTheQualificationType getInformationIdentifyingTheHolderOfTheQualification() {
-        return informationIdentifyingTheHolderOfTheQualification;
-    }
+	/**
+	 * Gets the value of the informationIdentifyingTheHolderOfTheQualification property.
+	 * 
+	 * @return possible object is {@link InformationIdentifyingTheHolderOfTheQualificationType }
+	 * 
+	 */
+	public InformationIdentifyingTheHolderOfTheQualificationType getInformationIdentifyingTheHolderOfTheQualification() {
+		return informationIdentifyingTheHolderOfTheQualification;
+	}
 
-    /**
-     * Sets the value of the informationIdentifyingTheHolderOfTheQualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationIdentifyingTheHolderOfTheQualificationType }
-     *     
-     */
-    public void setInformationIdentifyingTheHolderOfTheQualification(InformationIdentifyingTheHolderOfTheQualificationType value) {
-        this.informationIdentifyingTheHolderOfTheQualification = value;
-    }
+	/**
+	 * Sets the value of the informationIdentifyingTheHolderOfTheQualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationIdentifyingTheHolderOfTheQualificationType }
+	 * 
+	 */
+	public void setInformationIdentifyingTheHolderOfTheQualification(InformationIdentifyingTheHolderOfTheQualificationType value) {
+		this.informationIdentifyingTheHolderOfTheQualification = value;
+	}
 
-    /**
-     * Gets the value of the informationIdentifyingTheQualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationIdentifyingTheQualificationType }
-     *     
-     */
-    public InformationIdentifyingTheQualificationType getInformationIdentifyingTheQualification() {
-        return informationIdentifyingTheQualification;
-    }
+	/**
+	 * Gets the value of the informationIdentifyingTheQualification property.
+	 * 
+	 * @return possible object is {@link InformationIdentifyingTheQualificationType }
+	 * 
+	 */
+	public InformationIdentifyingTheQualificationType getInformationIdentifyingTheQualification() {
+		return informationIdentifyingTheQualification;
+	}
 
-    /**
-     * Sets the value of the informationIdentifyingTheQualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationIdentifyingTheQualificationType }
-     *     
-     */
-    public void setInformationIdentifyingTheQualification(InformationIdentifyingTheQualificationType value) {
-        this.informationIdentifyingTheQualification = value;
-    }
+	/**
+	 * Sets the value of the informationIdentifyingTheQualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationIdentifyingTheQualificationType }
+	 * 
+	 */
+	public void setInformationIdentifyingTheQualification(InformationIdentifyingTheQualificationType value) {
+		this.informationIdentifyingTheQualification = value;
+	}
 
-    /**
-     * Gets the value of the informationOnTheLevelOfTheQualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheLevelOfTheQualificationType }
-     *     
-     */
-    public InformationOnTheLevelOfTheQualificationType getInformationOnTheLevelOfTheQualification() {
-        return informationOnTheLevelOfTheQualification;
-    }
+	/**
+	 * Gets the value of the informationOnTheLevelOfTheQualification property.
+	 * 
+	 * @return possible object is {@link InformationOnTheLevelOfTheQualificationType }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType getInformationOnTheLevelOfTheQualification() {
+		return informationOnTheLevelOfTheQualification;
+	}
 
-    /**
-     * Sets the value of the informationOnTheLevelOfTheQualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheLevelOfTheQualificationType }
-     *     
-     */
-    public void setInformationOnTheLevelOfTheQualification(InformationOnTheLevelOfTheQualificationType value) {
-        this.informationOnTheLevelOfTheQualification = value;
-    }
+	/**
+	 * Sets the value of the informationOnTheLevelOfTheQualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheLevelOfTheQualificationType }
+	 * 
+	 */
+	public void setInformationOnTheLevelOfTheQualification(InformationOnTheLevelOfTheQualificationType value) {
+		this.informationOnTheLevelOfTheQualification = value;
+	}
 
-    /**
-     * Gets the value of the informationOnTheContentsAndResultsGained property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheContentsAndResultsGainedType }
-     *     
-     */
-    public InformationOnTheContentsAndResultsGainedType getInformationOnTheContentsAndResultsGained() {
-        return informationOnTheContentsAndResultsGained;
-    }
+	/**
+	 * Gets the value of the informationOnTheContentsAndResultsGained property.
+	 * 
+	 * @return possible object is {@link InformationOnTheContentsAndResultsGainedType }
+	 * 
+	 */
+	public InformationOnTheContentsAndResultsGainedType getInformationOnTheContentsAndResultsGained() {
+		return informationOnTheContentsAndResultsGained;
+	}
 
-    /**
-     * Sets the value of the informationOnTheContentsAndResultsGained property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheContentsAndResultsGainedType }
-     *     
-     */
-    public void setInformationOnTheContentsAndResultsGained(InformationOnTheContentsAndResultsGainedType value) {
-        this.informationOnTheContentsAndResultsGained = value;
-    }
+	/**
+	 * Sets the value of the informationOnTheContentsAndResultsGained property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheContentsAndResultsGainedType }
+	 * 
+	 */
+	public void setInformationOnTheContentsAndResultsGained(InformationOnTheContentsAndResultsGainedType value) {
+		this.informationOnTheContentsAndResultsGained = value;
+	}
 
-    /**
-     * Gets the value of the informationOnTheFunctionOfTheQualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheFunctionOfTheQualificationType }
-     *     
-     */
-    public InformationOnTheFunctionOfTheQualificationType getInformationOnTheFunctionOfTheQualification() {
-        return informationOnTheFunctionOfTheQualification;
-    }
+	/**
+	 * Gets the value of the informationOnTheFunctionOfTheQualification property.
+	 * 
+	 * @return possible object is {@link InformationOnTheFunctionOfTheQualificationType }
+	 * 
+	 */
+	public InformationOnTheFunctionOfTheQualificationType getInformationOnTheFunctionOfTheQualification() {
+		return informationOnTheFunctionOfTheQualification;
+	}
 
-    /**
-     * Sets the value of the informationOnTheFunctionOfTheQualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheFunctionOfTheQualificationType }
-     *     
-     */
-    public void setInformationOnTheFunctionOfTheQualification(InformationOnTheFunctionOfTheQualificationType value) {
-        this.informationOnTheFunctionOfTheQualification = value;
-    }
+	/**
+	 * Sets the value of the informationOnTheFunctionOfTheQualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheFunctionOfTheQualificationType }
+	 * 
+	 */
+	public void setInformationOnTheFunctionOfTheQualification(InformationOnTheFunctionOfTheQualificationType value) {
+		this.informationOnTheFunctionOfTheQualification = value;
+	}
 
-    /**
-     * Gets the value of the additionalInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AdditionalInformationType }
-     *     
-     */
-    public AdditionalInformationType getAdditionalInformation() {
-        return additionalInformation;
-    }
+	/**
+	 * Gets the value of the additionalInformation property.
+	 * 
+	 * @return possible object is {@link AdditionalInformationType }
+	 * 
+	 */
+	public AdditionalInformationType getAdditionalInformation() {
+		return additionalInformation;
+	}
 
-    /**
-     * Sets the value of the additionalInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AdditionalInformationType }
-     *     
-     */
-    public void setAdditionalInformation(AdditionalInformationType value) {
-        this.additionalInformation = value;
-    }
+	/**
+	 * Sets the value of the additionalInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AdditionalInformationType }
+	 * 
+	 */
+	public void setAdditionalInformation(AdditionalInformationType value) {
+		this.additionalInformation = value;
+	}
 
-    /**
-     * Gets the value of the certificationOfTheSupplement property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CertificationOfTheSupplementType }
-     *     
-     */
-    public CertificationOfTheSupplementType getCertificationOfTheSupplement() {
-        return certificationOfTheSupplement;
-    }
+	/**
+	 * Gets the value of the certificationOfTheSupplement property.
+	 * 
+	 * @return possible object is {@link CertificationOfTheSupplementType }
+	 * 
+	 */
+	public CertificationOfTheSupplementType getCertificationOfTheSupplement() {
+		return certificationOfTheSupplement;
+	}
 
-    /**
-     * Sets the value of the certificationOfTheSupplement property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CertificationOfTheSupplementType }
-     *     
-     */
-    public void setCertificationOfTheSupplement(CertificationOfTheSupplementType value) {
-        this.certificationOfTheSupplement = value;
-    }
+	/**
+	 * Sets the value of the certificationOfTheSupplement property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CertificationOfTheSupplementType }
+	 * 
+	 */
+	public void setCertificationOfTheSupplement(CertificationOfTheSupplementType value) {
+		this.certificationOfTheSupplement = value;
+	}
 
-    /**
-     * Gets the value of the informationOnTheNationalHigherEducationSystem property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getInformationOnTheNationalHigherEducationSystem() {
-        return informationOnTheNationalHigherEducationSystem;
-    }
+	/**
+	 * Gets the value of the informationOnTheNationalHigherEducationSystem property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getInformationOnTheNationalHigherEducationSystem() {
+		return informationOnTheNationalHigherEducationSystem;
+	}
 
-    /**
-     * Sets the value of the informationOnTheNationalHigherEducationSystem property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setInformationOnTheNationalHigherEducationSystem(RichTextTagType value) {
-        this.informationOnTheNationalHigherEducationSystem = value;
-    }
+	/**
+	 * Sets the value of the informationOnTheNationalHigherEducationSystem property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setInformationOnTheNationalHigherEducationSystem(RichTextTagType value) {
+		this.informationOnTheNationalHigherEducationSystem = value;
+	}
 
-    /**
-     * Gets the value of the attachments property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttachmentsType }
-     *     
-     */
-    public AttachmentsType getAttachments() {
-        return attachments;
-    }
+	/**
+	 * Gets the value of the attachments property.
+	 * 
+	 * @return possible object is {@link AttachmentsType }
+	 * 
+	 */
+	public AttachmentsType getAttachments() {
+		return attachments;
+	}
 
-    /**
-     * Sets the value of the attachments property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttachmentsType }
-     *     
-     */
-    public void setAttachments(AttachmentsType value) {
-        this.attachments = value;
-    }
+	/**
+	 * Sets the value of the attachments property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AttachmentsType }
+	 * 
+	 */
+	public void setAttachments(AttachmentsType value) {
+		this.attachments = value;
+	}
 
-    /**
-     * Gets the value of the extensionContent property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extensionContent property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtensionContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionContentType }
-     * 
-     * 
-     */
-    public List<ExtensionContentType> getExtensionContent() {
-        if (extensionContent == null) {
-            extensionContent = new ArrayList<ExtensionContentType>();
-        }
-        return this.extensionContent;
-    }
+	/**
+	 * Gets the value of the extensionContent property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the extensionContent property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getExtensionContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link ExtensionContentType }
+	 * 
+	 * 
+	 */
+	public List<ExtensionContentType> getExtensionContent() {
+		if (extensionContent == null) {
+			extensionContent = new ArrayList<ExtensionContentType>();
+		}
+		return this.extensionContent;
+	}
 
-    /**
-     * Digital signature Gets the value of the signature property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signature property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignature().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignatureType }
-     * 
-     * 
-     */
-    public List<SignatureType> getSignature() {
-        if (signature == null) {
-            signature = new ArrayList<SignatureType>();
-        }
-        return this.signature;
-    }
+	/**
+	 * Digital signature Gets the value of the signature property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the signature property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getSignature().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link SignatureType }
+	 * 
+	 * 
+	 */
+	public List<SignatureType> getSignature() {
+		if (signature == null) {
+			signature = new ArrayList<SignatureType>();
+		}
+		return this.signature;
+	}
 
-    /**
-     * Gets the value of the language property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LanguageType }
-     *     
-     */
-    public LanguageType getLanguage() {
-        return language;
-    }
+	/**
+	 * Gets the value of the language property.
+	 * 
+	 * @return possible object is {@link LanguageType }
+	 * 
+	 */
+	public LanguageType getLanguage() {
+		return language;
+	}
 
-    /**
-     * Sets the value of the language property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LanguageType }
-     *     
-     */
-    public void setLanguage(LanguageType value) {
-        this.language = value;
-    }
+	/**
+	 * Sets the value of the language property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LanguageType }
+	 * 
+	 */
+	public void setLanguage(LanguageType value) {
+		this.language = value;
+	}
 
-    /**
-     * Gets the value of the isTheOriginalLanguage property.
-     * 
-     */
-    public boolean isIsTheOriginalLanguage() {
-        return isTheOriginalLanguage;
-    }
+	/**
+	 * Gets the value of the isTheOriginalLanguage property.
+	 * 
+	 */
+	public boolean isIsTheOriginalLanguage() {
+		return isTheOriginalLanguage;
+	}
 
-    /**
-     * Sets the value of the isTheOriginalLanguage property.
-     * 
-     */
-    public void setIsTheOriginalLanguage(boolean value) {
-        this.isTheOriginalLanguage = value;
-    }
+	/**
+	 * Sets the value of the isTheOriginalLanguage property.
+	 * 
+	 */
+	public void setIsTheOriginalLanguage(boolean value) {
+		this.isTheOriginalLanguage = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ECTSGradingScaleType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ECTSGradingScaleType.java
index 94be08fb8..7916ead8d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ECTSGradingScaleType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ECTSGradingScaleType.java
@@ -5,18 +5,19 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ECTSGradingScaleType.
+ * <p>
+ * Java class for ECTSGradingScaleType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="ECTSGradingScaleType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -36,55 +37,54 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum ECTSGradingScaleType {
 
-
-    /**
-     * Top 10%
-     * 
-     */
-    A,
-
-    /**
-     * Next 25%
-     * 
-     */
-    B,
-
-    /**
-     * Next 30%
-     * 
-     */
-    C,
-
-    /**
-     * Next 25%
-     * 
-     */
-    D,
-
-    /**
-     * Lowest 10%
-     * 
-     */
-    E,
-
-    /**
-     * Fail
-     * 
-     */
-    FX,
-
-    /**
-     * Fail
-     * 
-     */
-    F;
-
-    public String value() {
-        return name();
-    }
-
-    public static ECTSGradingScaleType fromValue(String v) {
-        return valueOf(v);
-    }
+	/**
+	 * Top 10%
+	 * 
+	 */
+	A,
+
+	/**
+	 * Next 25%
+	 * 
+	 */
+	B,
+
+	/**
+	 * Next 30%
+	 * 
+	 */
+	C,
+
+	/**
+	 * Next 25%
+	 * 
+	 */
+	D,
+
+	/**
+	 * Lowest 10%
+	 * 
+	 */
+	E,
+
+	/**
+	 * Fail
+	 * 
+	 */
+	FX,
+
+	/**
+	 * Fail
+	 * 
+	 */
+	F;
+
+	public String value() {
+		return name();
+	}
+
+	public static ECTSGradingScaleType fromValue(String v) {
+		return valueOf(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java
index 05dbdedfe..49a5a74ee 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for EHEAFrameworkType.
+ * <p>
+ * Java class for EHEAFrameworkType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="EHEAFrameworkType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -33,44 +34,43 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum EHEAFrameworkType {
 
+	/**
+	 * First Cycle
+	 * 
+	 */
+	@XmlEnumValue("FirstCycle")
+	FIRST_CYCLE("FirstCycle"),
 
-    /**
-     * First Cycle
-     * 
-     */
-    @XmlEnumValue("FirstCycle")
-    FIRST_CYCLE("FirstCycle"),
-
-    /**
-     * Second Cycle
-     * 
-     */
-    @XmlEnumValue("SecondCycle")
-    SECOND_CYCLE("SecondCycle"),
+	/**
+	 * Second Cycle
+	 * 
+	 */
+	@XmlEnumValue("SecondCycle")
+	SECOND_CYCLE("SecondCycle"),
 
-    /**
-     * Third Cycle
-     * 
-     */
-    @XmlEnumValue("ThirdCycle")
-    THIRD_CYCLE("ThirdCycle");
-    private final String value;
+	/**
+	 * Third Cycle
+	 * 
+	 */
+	@XmlEnumValue("ThirdCycle")
+	THIRD_CYCLE("ThirdCycle");
+	private final String value;
 
-    EHEAFrameworkType(String v) {
-        value = v;
-    }
+	EHEAFrameworkType(String v) {
+		value = v;
+	}
 
-    public String value() {
-        return value;
-    }
+	public String value() {
+		return value;
+	}
 
-    public static EHEAFrameworkType fromValue(String v) {
-        for (EHEAFrameworkType c: EHEAFrameworkType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	public static EHEAFrameworkType fromValue(String v) {
+		for (EHEAFrameworkType c : EHEAFrameworkType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ExtensionContentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ExtensionContentType.java
index 5eb351cf7..588017469 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ExtensionContentType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ExtensionContentType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -18,13 +17,14 @@ import javax.xml.bind.annotation.XmlMixed;
 import javax.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
-
 /**
  * Extension content
  * 
- * <p>Java class for ExtensionContentType complex type.
+ * <p>
+ * Java class for ExtensionContentType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ExtensionContentType">
@@ -42,70 +42,61 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ExtensionContentType", propOrder = {
-    "content"
-})
+@XmlType(name = "ExtensionContentType", propOrder = { "content" })
 public class ExtensionContentType {
 
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "id")
-    protected String id;
+	@XmlMixed
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
+	@XmlAttribute(name = "id")
+	protected String id;
 
-    /**
-     * Extension content Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Extension content Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String }
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/FamilyNameType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/FamilyNameType.java
index 804dfc3e9..7efeaaf15 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/FamilyNameType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/FamilyNameType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Family name(s)
  * 
- * <p>Java class for FamilyNameType complex type.
+ * <p>
+ * Java class for FamilyNameType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="FamilyNameType">
@@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FamilyNameType", propOrder = {
-    "surname"
-})
+@XmlType(name = "FamilyNameType", propOrder = { "surname" })
 public class FamilyNameType {
 
-    @XmlElement(name = "Surname", required = true)
-    protected List<String> surname;
+	@XmlElement(name = "Surname", required = true)
+	protected List<String> surname;
 
-    /**
-     * Gets the value of the surname property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the surname property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSurname().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getSurname() {
-        if (surname == null) {
-            surname = new ArrayList<String>();
-        }
-        return this.surname;
-    }
+	/**
+	 * Gets the value of the surname property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the surname property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getSurname().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getSurname() {
+		if (surname == null) {
+			surname = new ArrayList<String>();
+		}
+		return this.surname;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GenderType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GenderType.java
index 92c9dee87..8aa5feaf0 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GenderType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GenderType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for GenderType.
+ * <p>
+ * Java class for GenderType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="GenderType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -32,37 +33,36 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum GenderType {
 
+	/**
+	 * Female
+	 * 
+	 */
+	@XmlEnumValue("Female")
+	FEMALE("Female"),
 
-    /**
-     * Female
-     * 
-     */
-    @XmlEnumValue("Female")
-    FEMALE("Female"),
-
-    /**
-     * Male
-     * 
-     */
-    @XmlEnumValue("Male")
-    MALE("Male");
-    private final String value;
+	/**
+	 * Male
+	 * 
+	 */
+	@XmlEnumValue("Male")
+	MALE("Male");
+	private final String value;
 
-    GenderType(String v) {
-        value = v;
-    }
+	GenderType(String v) {
+		value = v;
+	}
 
-    public String value() {
-        return value;
-    }
+	public String value() {
+		return value;
+	}
 
-    public static GenderType fromValue(String v) {
-        for (GenderType c: GenderType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	public static GenderType fromValue(String v) {
+		for (GenderType c : GenderType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GivenNameType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GivenNameType.java
index ac27d7149..169c94455 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GivenNameType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GivenNameType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Given name(s)
  * 
- * <p>Java class for GivenNameType complex type.
+ * <p>
+ * Java class for GivenNameType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="GivenNameType">
@@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GivenNameType", propOrder = {
-    "name"
-})
+@XmlType(name = "GivenNameType", propOrder = { "name" })
 public class GivenNameType {
 
-    @XmlElement(name = "Name", required = true)
-    protected List<String> name;
+	@XmlElement(name = "Name", required = true)
+	protected List<String> name;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the name property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getName().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getName() {
-        if (name == null) {
-            name = new ArrayList<String>();
-        }
-        return this.name;
-    }
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the name property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getName().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getName() {
+		if (name == null) {
+			name = new ArrayList<String>();
+		}
+		return this.name;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java
index ab896f7f4..a853aec65 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Grading scheme and grade distribution guidance
  * 
- * <p>Java class for GradingSchemeAndGradeDistributionGuidanceType complex type.
+ * <p>
+ * Java class for GradingSchemeAndGradeDistributionGuidanceType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="GradingSchemeAndGradeDistributionGuidanceType">
@@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = {
-    "gradingScheme",
-    "gradeDistributionGuidance"
-})
+@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = { "gradingScheme", "gradeDistributionGuidance" })
 public class GradingSchemeAndGradeDistributionGuidanceType {
 
-    @XmlElement(name = "GradingScheme", required = true)
-    protected RichTextTagType gradingScheme;
-    @XmlElement(name = "GradeDistributionGuidance")
-    protected RichTextTagType gradeDistributionGuidance;
+	@XmlElement(name = "GradingScheme", required = true)
+	protected RichTextTagType gradingScheme;
+	@XmlElement(name = "GradeDistributionGuidance")
+	protected RichTextTagType gradeDistributionGuidance;
 
-    /**
-     * Gets the value of the gradingScheme property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getGradingScheme() {
-        return gradingScheme;
-    }
+	/**
+	 * Gets the value of the gradingScheme property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getGradingScheme() {
+		return gradingScheme;
+	}
 
-    /**
-     * Sets the value of the gradingScheme property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setGradingScheme(RichTextTagType value) {
-        this.gradingScheme = value;
-    }
+	/**
+	 * Sets the value of the gradingScheme property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setGradingScheme(RichTextTagType value) {
+		this.gradingScheme = value;
+	}
 
-    /**
-     * Gets the value of the gradeDistributionGuidance property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getGradeDistributionGuidance() {
-        return gradeDistributionGuidance;
-    }
+	/**
+	 * Gets the value of the gradeDistributionGuidance property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getGradeDistributionGuidance() {
+		return gradeDistributionGuidance;
+	}
 
-    /**
-     * Sets the value of the gradeDistributionGuidance property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setGradeDistributionGuidance(RichTextTagType value) {
-        this.gradeDistributionGuidance = value;
-    }
+	/**
+	 * Sets the value of the gradeDistributionGuidance property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setGradeDistributionGuidance(RichTextTagType value) {
+		this.gradeDistributionGuidance = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ImageMimeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ImageMimeType.java
index 22383f975..4908eab0a 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ImageMimeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ImageMimeType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ImageMimeType.
+ * <p>
+ * Java class for ImageMimeType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="ImageMimeType">
  *   &lt;restriction base="{urn:crue:academic:xsd:language:diplomasupplement}MimeType">
@@ -35,58 +36,57 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum(MimeType.class)
 public enum ImageMimeType {
 
+	/**
+	 * GIF image
+	 * 
+	 */
+	@XmlEnumValue("image/gif")
+	IMAGE_GIF(MimeType.IMAGE_GIF),
 
-    /**
-     * GIF image
-     * 
-     */
-    @XmlEnumValue("image/gif")
-    IMAGE_GIF(MimeType.IMAGE_GIF),
-
-    /**
-     * JPEG JFIF image
-     * 
-     */
-    @XmlEnumValue("image/jpeg")
-    IMAGE_JPEG(MimeType.IMAGE_JPEG),
+	/**
+	 * JPEG JFIF image
+	 * 
+	 */
+	@XmlEnumValue("image/jpeg")
+	IMAGE_JPEG(MimeType.IMAGE_JPEG),
 
-    /**
-     * JPEG JFIF image
-     * 
-     */
-    @XmlEnumValue("image/pjpeg")
-    IMAGE_PJPEG(MimeType.IMAGE_PJPEG),
+	/**
+	 * JPEG JFIF image
+	 * 
+	 */
+	@XmlEnumValue("image/pjpeg")
+	IMAGE_PJPEG(MimeType.IMAGE_PJPEG),
 
-    /**
-     * Portable Network Graphics
-     * 
-     */
-    @XmlEnumValue("image/png")
-    IMAGE_PNG(MimeType.IMAGE_PNG),
+	/**
+	 * Portable Network Graphics
+	 * 
+	 */
+	@XmlEnumValue("image/png")
+	IMAGE_PNG(MimeType.IMAGE_PNG),
 
-    /**
-     * Tag Image File Format
-     * 
-     */
-    @XmlEnumValue("image/tiff")
-    IMAGE_TIFF(MimeType.IMAGE_TIFF);
-    private final MimeType value;
+	/**
+	 * Tag Image File Format
+	 * 
+	 */
+	@XmlEnumValue("image/tiff")
+	IMAGE_TIFF(MimeType.IMAGE_TIFF);
+	private final MimeType value;
 
-    ImageMimeType(MimeType v) {
-        value = v;
-    }
+	ImageMimeType(MimeType v) {
+		value = v;
+	}
 
-    public MimeType value() {
-        return value;
-    }
+	public MimeType value() {
+		return value;
+	}
 
-    public static ImageMimeType fromValue(MimeType v) {
-        for (ImageMimeType c: ImageMimeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
+	public static ImageMimeType fromValue(MimeType v) {
+		for (ImageMimeType c : ImageMimeType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v.toString());
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheHolderOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheHolderOfTheQualificationType.java
index 7f5076886..f43574139 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheHolderOfTheQualificationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheHolderOfTheQualificationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
  * Information identifying the holder of the qualification
  * 
- * <p>Java class for InformationIdentifyingTheHolderOfTheQualificationType complex type.
+ * <p>
+ * Java class for InformationIdentifyingTheHolderOfTheQualificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InformationIdentifyingTheHolderOfTheQualificationType">
@@ -61,360 +61,318 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InformationIdentifyingTheHolderOfTheQualificationType", propOrder = {
-    "familyName",
-    "givenName",
-    "dateOfBirth",
-    "studentIdentificationNumber",
-    "countryOfBirth",
-    "placeOfBirth",
-    "gender"
-})
+@XmlType(name = "InformationIdentifyingTheHolderOfTheQualificationType", propOrder = { "familyName", "givenName", "dateOfBirth", "studentIdentificationNumber", "countryOfBirth", "placeOfBirth",
+		"gender" })
 public class InformationIdentifyingTheHolderOfTheQualificationType {
 
-    @XmlElement(name = "FamilyName", required = true)
-    protected FamilyNameType familyName;
-    @XmlElement(name = "GivenName", required = true)
-    protected GivenNameType givenName;
-    @XmlElement(name = "DateOfBirth", required = true)
-    protected XMLGregorianCalendar dateOfBirth;
-    @XmlElement(name = "StudentIdentificationNumber")
-    protected String studentIdentificationNumber;
-    @XmlElement(name = "CountryOfBirth")
-    protected InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth countryOfBirth;
-    @XmlElement(name = "PlaceOfBirth")
-    protected String placeOfBirth;
-    @XmlElement(name = "Gender")
-    protected InformationIdentifyingTheHolderOfTheQualificationType.Gender gender;
-
-    /**
-     * Gets the value of the familyName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FamilyNameType }
-     *     
-     */
-    public FamilyNameType getFamilyName() {
-        return familyName;
-    }
-
-    /**
-     * Sets the value of the familyName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FamilyNameType }
-     *     
-     */
-    public void setFamilyName(FamilyNameType value) {
-        this.familyName = value;
-    }
-
-    /**
-     * Gets the value of the givenName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GivenNameType }
-     *     
-     */
-    public GivenNameType getGivenName() {
-        return givenName;
-    }
-
-    /**
-     * Sets the value of the givenName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GivenNameType }
-     *     
-     */
-    public void setGivenName(GivenNameType value) {
-        this.givenName = value;
-    }
-
-    /**
-     * Gets the value of the dateOfBirth property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateOfBirth() {
-        return dateOfBirth;
-    }
-
-    /**
-     * Sets the value of the dateOfBirth property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateOfBirth(XMLGregorianCalendar value) {
-        this.dateOfBirth = value;
-    }
-
-    /**
-     * Gets the value of the studentIdentificationNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStudentIdentificationNumber() {
-        return studentIdentificationNumber;
-    }
-
-    /**
-     * Sets the value of the studentIdentificationNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStudentIdentificationNumber(String value) {
-        this.studentIdentificationNumber = value;
-    }
-
-    /**
-     * Gets the value of the countryOfBirth property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth }
-     *     
-     */
-    public InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth getCountryOfBirth() {
-        return countryOfBirth;
-    }
-
-    /**
-     * Sets the value of the countryOfBirth property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth }
-     *     
-     */
-    public void setCountryOfBirth(InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth value) {
-        this.countryOfBirth = value;
-    }
-
-    /**
-     * Gets the value of the placeOfBirth property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPlaceOfBirth() {
-        return placeOfBirth;
-    }
-
-    /**
-     * Sets the value of the placeOfBirth property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPlaceOfBirth(String value) {
-        this.placeOfBirth = value;
-    }
-
-    /**
-     * Gets the value of the gender property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
-     *     
-     */
-    public InformationIdentifyingTheHolderOfTheQualificationType.Gender getGender() {
-        return gender;
-    }
-
-    /**
-     * Sets the value of the gender property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
-     *     
-     */
-    public void setGender(InformationIdentifyingTheHolderOfTheQualificationType.Gender value) {
-        this.gender = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="country" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class CountryOfBirth {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "country")
-        protected CountryType country;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the country property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CountryType }
-         *     
-         */
-        public CountryType getCountry() {
-            return country;
-        }
-
-        /**
-         * Sets the value of the country property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CountryType }
-         *     
-         */
-        public void setCountry(CountryType value) {
-            this.country = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="gender" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}GenderType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Gender {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "gender", required = true)
-        protected GenderType gender;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the gender property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link GenderType }
-         *     
-         */
-        public GenderType getGender() {
-            return gender;
-        }
-
-        /**
-         * Sets the value of the gender property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link GenderType }
-         *     
-         */
-        public void setGender(GenderType value) {
-            this.gender = value;
-        }
-
-    }
+	@XmlElement(name = "FamilyName", required = true)
+	protected FamilyNameType familyName;
+	@XmlElement(name = "GivenName", required = true)
+	protected GivenNameType givenName;
+	@XmlElement(name = "DateOfBirth", required = true)
+	protected XMLGregorianCalendar dateOfBirth;
+	@XmlElement(name = "StudentIdentificationNumber")
+	protected String studentIdentificationNumber;
+	@XmlElement(name = "CountryOfBirth")
+	protected InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth countryOfBirth;
+	@XmlElement(name = "PlaceOfBirth")
+	protected String placeOfBirth;
+	@XmlElement(name = "Gender")
+	protected InformationIdentifyingTheHolderOfTheQualificationType.Gender gender;
+
+	/**
+	 * Gets the value of the familyName property.
+	 * 
+	 * @return possible object is {@link FamilyNameType }
+	 * 
+	 */
+	public FamilyNameType getFamilyName() {
+		return familyName;
+	}
+
+	/**
+	 * Sets the value of the familyName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link FamilyNameType }
+	 * 
+	 */
+	public void setFamilyName(FamilyNameType value) {
+		this.familyName = value;
+	}
+
+	/**
+	 * Gets the value of the givenName property.
+	 * 
+	 * @return possible object is {@link GivenNameType }
+	 * 
+	 */
+	public GivenNameType getGivenName() {
+		return givenName;
+	}
+
+	/**
+	 * Sets the value of the givenName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link GivenNameType }
+	 * 
+	 */
+	public void setGivenName(GivenNameType value) {
+		this.givenName = value;
+	}
+
+	/**
+	 * Gets the value of the dateOfBirth property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateOfBirth() {
+		return dateOfBirth;
+	}
+
+	/**
+	 * Sets the value of the dateOfBirth property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateOfBirth(XMLGregorianCalendar value) {
+		this.dateOfBirth = value;
+	}
+
+	/**
+	 * Gets the value of the studentIdentificationNumber property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getStudentIdentificationNumber() {
+		return studentIdentificationNumber;
+	}
+
+	/**
+	 * Sets the value of the studentIdentificationNumber property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setStudentIdentificationNumber(String value) {
+		this.studentIdentificationNumber = value;
+	}
+
+	/**
+	 * Gets the value of the countryOfBirth property.
+	 * 
+	 * @return possible object is {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth }
+	 * 
+	 */
+	public InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth getCountryOfBirth() {
+		return countryOfBirth;
+	}
+
+	/**
+	 * Sets the value of the countryOfBirth property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth }
+	 * 
+	 */
+	public void setCountryOfBirth(InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth value) {
+		this.countryOfBirth = value;
+	}
+
+	/**
+	 * Gets the value of the placeOfBirth property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getPlaceOfBirth() {
+		return placeOfBirth;
+	}
+
+	/**
+	 * Sets the value of the placeOfBirth property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setPlaceOfBirth(String value) {
+		this.placeOfBirth = value;
+	}
+
+	/**
+	 * Gets the value of the gender property.
+	 * 
+	 * @return possible object is {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
+	 * 
+	 */
+	public InformationIdentifyingTheHolderOfTheQualificationType.Gender getGender() {
+		return gender;
+	}
+
+	/**
+	 * Sets the value of the gender property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
+	 * 
+	 */
+	public void setGender(InformationIdentifyingTheHolderOfTheQualificationType.Gender value) {
+		this.gender = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="country" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class CountryOfBirth {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "country")
+		protected CountryType country;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the country property.
+		 * 
+		 * @return possible object is {@link CountryType }
+		 * 
+		 */
+		public CountryType getCountry() {
+			return country;
+		}
+
+		/**
+		 * Sets the value of the country property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CountryType }
+		 * 
+		 */
+		public void setCountry(CountryType value) {
+			this.country = value;
+		}
+
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="gender" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}GenderType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Gender {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "gender", required = true)
+		protected GenderType gender;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the gender property.
+		 * 
+		 * @return possible object is {@link GenderType }
+		 * 
+		 */
+		public GenderType getGender() {
+			return gender;
+		}
+
+		/**
+		 * Sets the value of the gender property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link GenderType }
+		 * 
+		 */
+		public void setGender(GenderType value) {
+			this.gender = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheQualificationType.java
index 3820c55a3..31a38bbc4 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheQualificationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheQualificationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Information identifying the qualification
  * 
- * <p>Java class for InformationIdentifyingTheQualificationType complex type.
+ * <p>
+ * Java class for InformationIdentifyingTheQualificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InformationIdentifyingTheQualificationType">
@@ -41,171 +41,147 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InformationIdentifyingTheQualificationType", propOrder = {
-    "qualification",
-    "titleConferred",
-    "mainFieldsOfStudy",
-    "nameAndStatusOfAwardingInstitution",
-    "nameAndStatusOfInstitutionAdministeringStudies",
-    "languagesOfInstructionAndExamination"
-})
+@XmlType(name = "InformationIdentifyingTheQualificationType", propOrder = { "qualification", "titleConferred", "mainFieldsOfStudy", "nameAndStatusOfAwardingInstitution",
+		"nameAndStatusOfInstitutionAdministeringStudies", "languagesOfInstructionAndExamination" })
 public class InformationIdentifyingTheQualificationType {
 
-    @XmlElement(name = "Qualification", required = true)
-    protected QualificationType qualification;
-    @XmlElement(name = "TitleConferred")
-    protected TitleConferredType titleConferred;
-    @XmlElement(name = "MainFieldsOfStudy", required = true)
-    protected RichTextTagType mainFieldsOfStudy;
-    @XmlElement(name = "NameAndStatusOfAwardingInstitution", required = true)
-    protected NameAndStatusOfAwardingInstitutionType nameAndStatusOfAwardingInstitution;
-    @XmlElement(name = "NameAndStatusOfInstitutionAdministeringStudies", required = true)
-    protected NameAndStatusOfInstitutionAdministeringStudiesType nameAndStatusOfInstitutionAdministeringStudies;
-    @XmlElement(name = "LanguagesOfInstructionAndExamination", required = true)
-    protected LanguagesOfInstructionAndExaminationType languagesOfInstructionAndExamination;
-
-    /**
-     * Gets the value of the qualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link QualificationType }
-     *     
-     */
-    public QualificationType getQualification() {
-        return qualification;
-    }
-
-    /**
-     * Sets the value of the qualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link QualificationType }
-     *     
-     */
-    public void setQualification(QualificationType value) {
-        this.qualification = value;
-    }
-
-    /**
-     * Gets the value of the titleConferred property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TitleConferredType }
-     *     
-     */
-    public TitleConferredType getTitleConferred() {
-        return titleConferred;
-    }
-
-    /**
-     * Sets the value of the titleConferred property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TitleConferredType }
-     *     
-     */
-    public void setTitleConferred(TitleConferredType value) {
-        this.titleConferred = value;
-    }
-
-    /**
-     * Gets the value of the mainFieldsOfStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getMainFieldsOfStudy() {
-        return mainFieldsOfStudy;
-    }
-
-    /**
-     * Sets the value of the mainFieldsOfStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setMainFieldsOfStudy(RichTextTagType value) {
-        this.mainFieldsOfStudy = value;
-    }
-
-    /**
-     * Gets the value of the nameAndStatusOfAwardingInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NameAndStatusOfAwardingInstitutionType }
-     *     
-     */
-    public NameAndStatusOfAwardingInstitutionType getNameAndStatusOfAwardingInstitution() {
-        return nameAndStatusOfAwardingInstitution;
-    }
-
-    /**
-     * Sets the value of the nameAndStatusOfAwardingInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NameAndStatusOfAwardingInstitutionType }
-     *     
-     */
-    public void setNameAndStatusOfAwardingInstitution(NameAndStatusOfAwardingInstitutionType value) {
-        this.nameAndStatusOfAwardingInstitution = value;
-    }
-
-    /**
-     * Gets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NameAndStatusOfInstitutionAdministeringStudiesType }
-     *     
-     */
-    public NameAndStatusOfInstitutionAdministeringStudiesType getNameAndStatusOfInstitutionAdministeringStudies() {
-        return nameAndStatusOfInstitutionAdministeringStudies;
-    }
-
-    /**
-     * Sets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NameAndStatusOfInstitutionAdministeringStudiesType }
-     *     
-     */
-    public void setNameAndStatusOfInstitutionAdministeringStudies(NameAndStatusOfInstitutionAdministeringStudiesType value) {
-        this.nameAndStatusOfInstitutionAdministeringStudies = value;
-    }
-
-    /**
-     * Gets the value of the languagesOfInstructionAndExamination property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LanguagesOfInstructionAndExaminationType }
-     *     
-     */
-    public LanguagesOfInstructionAndExaminationType getLanguagesOfInstructionAndExamination() {
-        return languagesOfInstructionAndExamination;
-    }
-
-    /**
-     * Sets the value of the languagesOfInstructionAndExamination property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LanguagesOfInstructionAndExaminationType }
-     *     
-     */
-    public void setLanguagesOfInstructionAndExamination(LanguagesOfInstructionAndExaminationType value) {
-        this.languagesOfInstructionAndExamination = value;
-    }
+	@XmlElement(name = "Qualification", required = true)
+	protected QualificationType qualification;
+	@XmlElement(name = "TitleConferred")
+	protected TitleConferredType titleConferred;
+	@XmlElement(name = "MainFieldsOfStudy", required = true)
+	protected RichTextTagType mainFieldsOfStudy;
+	@XmlElement(name = "NameAndStatusOfAwardingInstitution", required = true)
+	protected NameAndStatusOfAwardingInstitutionType nameAndStatusOfAwardingInstitution;
+	@XmlElement(name = "NameAndStatusOfInstitutionAdministeringStudies", required = true)
+	protected NameAndStatusOfInstitutionAdministeringStudiesType nameAndStatusOfInstitutionAdministeringStudies;
+	@XmlElement(name = "LanguagesOfInstructionAndExamination", required = true)
+	protected LanguagesOfInstructionAndExaminationType languagesOfInstructionAndExamination;
+
+	/**
+	 * Gets the value of the qualification property.
+	 * 
+	 * @return possible object is {@link QualificationType }
+	 * 
+	 */
+	public QualificationType getQualification() {
+		return qualification;
+	}
+
+	/**
+	 * Sets the value of the qualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link QualificationType }
+	 * 
+	 */
+	public void setQualification(QualificationType value) {
+		this.qualification = value;
+	}
+
+	/**
+	 * Gets the value of the titleConferred property.
+	 * 
+	 * @return possible object is {@link TitleConferredType }
+	 * 
+	 */
+	public TitleConferredType getTitleConferred() {
+		return titleConferred;
+	}
+
+	/**
+	 * Sets the value of the titleConferred property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link TitleConferredType }
+	 * 
+	 */
+	public void setTitleConferred(TitleConferredType value) {
+		this.titleConferred = value;
+	}
+
+	/**
+	 * Gets the value of the mainFieldsOfStudy property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getMainFieldsOfStudy() {
+		return mainFieldsOfStudy;
+	}
+
+	/**
+	 * Sets the value of the mainFieldsOfStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setMainFieldsOfStudy(RichTextTagType value) {
+		this.mainFieldsOfStudy = value;
+	}
+
+	/**
+	 * Gets the value of the nameAndStatusOfAwardingInstitution property.
+	 * 
+	 * @return possible object is {@link NameAndStatusOfAwardingInstitutionType }
+	 * 
+	 */
+	public NameAndStatusOfAwardingInstitutionType getNameAndStatusOfAwardingInstitution() {
+		return nameAndStatusOfAwardingInstitution;
+	}
+
+	/**
+	 * Sets the value of the nameAndStatusOfAwardingInstitution property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link NameAndStatusOfAwardingInstitutionType }
+	 * 
+	 */
+	public void setNameAndStatusOfAwardingInstitution(NameAndStatusOfAwardingInstitutionType value) {
+		this.nameAndStatusOfAwardingInstitution = value;
+	}
+
+	/**
+	 * Gets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
+	 * 
+	 * @return possible object is {@link NameAndStatusOfInstitutionAdministeringStudiesType }
+	 * 
+	 */
+	public NameAndStatusOfInstitutionAdministeringStudiesType getNameAndStatusOfInstitutionAdministeringStudies() {
+		return nameAndStatusOfInstitutionAdministeringStudies;
+	}
+
+	/**
+	 * Sets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link NameAndStatusOfInstitutionAdministeringStudiesType }
+	 * 
+	 */
+	public void setNameAndStatusOfInstitutionAdministeringStudies(NameAndStatusOfInstitutionAdministeringStudiesType value) {
+		this.nameAndStatusOfInstitutionAdministeringStudies = value;
+	}
+
+	/**
+	 * Gets the value of the languagesOfInstructionAndExamination property.
+	 * 
+	 * @return possible object is {@link LanguagesOfInstructionAndExaminationType }
+	 * 
+	 */
+	public LanguagesOfInstructionAndExaminationType getLanguagesOfInstructionAndExamination() {
+		return languagesOfInstructionAndExamination;
+	}
+
+	/**
+	 * Sets the value of the languagesOfInstructionAndExamination property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LanguagesOfInstructionAndExaminationType }
+	 * 
+	 */
+	public void setLanguagesOfInstructionAndExamination(LanguagesOfInstructionAndExaminationType value) {
+		this.languagesOfInstructionAndExamination = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheContentsAndResultsGainedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheContentsAndResultsGainedType.java
index 68869c7ba..274a01e32 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheContentsAndResultsGainedType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheContentsAndResultsGainedType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Information on the contents and results gained
  * 
- * <p>Java class for InformationOnTheContentsAndResultsGainedType complex type.
+ * <p>
+ * Java class for InformationOnTheContentsAndResultsGainedType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InformationOnTheContentsAndResultsGainedType">
@@ -49,197 +49,173 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InformationOnTheContentsAndResultsGainedType", propOrder = {
-    "modeOfStudy",
-    "programmeRequirements",
-    "programmeDetails",
-    "gradingSchemeAndGradeDistributionGuidance",
-    "overallClassificationOfTheQualification"
-})
+@XmlType(name = "InformationOnTheContentsAndResultsGainedType", propOrder = { "modeOfStudy", "programmeRequirements", "programmeDetails", "gradingSchemeAndGradeDistributionGuidance",
+		"overallClassificationOfTheQualification" })
 public class InformationOnTheContentsAndResultsGainedType {
 
-    @XmlElement(name = "ModeOfStudy", required = true)
-    protected InformationOnTheContentsAndResultsGainedType.ModeOfStudy modeOfStudy;
-    @XmlElement(name = "ProgrammeRequirements", required = true)
-    protected ProgrammeRequirementsType programmeRequirements;
-    @XmlElement(name = "ProgrammeDetails", required = true)
-    protected ProgrammeDetailsType programmeDetails;
-    @XmlElement(name = "GradingSchemeAndGradeDistributionGuidance", required = true)
-    protected GradingSchemeAndGradeDistributionGuidanceType gradingSchemeAndGradeDistributionGuidance;
-    @XmlElement(name = "OverallClassificationOfTheQualification", required = true)
-    protected RichTextTagType overallClassificationOfTheQualification;
-
-    /**
-     * Gets the value of the modeOfStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
-     *     
-     */
-    public InformationOnTheContentsAndResultsGainedType.ModeOfStudy getModeOfStudy() {
-        return modeOfStudy;
-    }
-
-    /**
-     * Sets the value of the modeOfStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
-     *     
-     */
-    public void setModeOfStudy(InformationOnTheContentsAndResultsGainedType.ModeOfStudy value) {
-        this.modeOfStudy = value;
-    }
-
-    /**
-     * Gets the value of the programmeRequirements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ProgrammeRequirementsType }
-     *     
-     */
-    public ProgrammeRequirementsType getProgrammeRequirements() {
-        return programmeRequirements;
-    }
-
-    /**
-     * Sets the value of the programmeRequirements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ProgrammeRequirementsType }
-     *     
-     */
-    public void setProgrammeRequirements(ProgrammeRequirementsType value) {
-        this.programmeRequirements = value;
-    }
-
-    /**
-     * Gets the value of the programmeDetails property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ProgrammeDetailsType }
-     *     
-     */
-    public ProgrammeDetailsType getProgrammeDetails() {
-        return programmeDetails;
-    }
-
-    /**
-     * Sets the value of the programmeDetails property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ProgrammeDetailsType }
-     *     
-     */
-    public void setProgrammeDetails(ProgrammeDetailsType value) {
-        this.programmeDetails = value;
-    }
-
-    /**
-     * Gets the value of the gradingSchemeAndGradeDistributionGuidance property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GradingSchemeAndGradeDistributionGuidanceType }
-     *     
-     */
-    public GradingSchemeAndGradeDistributionGuidanceType getGradingSchemeAndGradeDistributionGuidance() {
-        return gradingSchemeAndGradeDistributionGuidance;
-    }
-
-    /**
-     * Sets the value of the gradingSchemeAndGradeDistributionGuidance property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GradingSchemeAndGradeDistributionGuidanceType }
-     *     
-     */
-    public void setGradingSchemeAndGradeDistributionGuidance(GradingSchemeAndGradeDistributionGuidanceType value) {
-        this.gradingSchemeAndGradeDistributionGuidance = value;
-    }
-
-    /**
-     * Gets the value of the overallClassificationOfTheQualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getOverallClassificationOfTheQualification() {
-        return overallClassificationOfTheQualification;
-    }
-
-    /**
-     * Sets the value of the overallClassificationOfTheQualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setOverallClassificationOfTheQualification(RichTextTagType value) {
-        this.overallClassificationOfTheQualification = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
-     *       &lt;attribute name="modeOfStudy" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}ModeOfStudyType" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class ModeOfStudy
-        extends RichTextTagType
-    {
-
-        @XmlAttribute(name = "modeOfStudy", required = true)
-        protected ModeOfStudyType modeOfStudy;
-
-        /**
-         * Gets the value of the modeOfStudy property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ModeOfStudyType }
-         *     
-         */
-        public ModeOfStudyType getModeOfStudy() {
-            return modeOfStudy;
-        }
-
-        /**
-         * Sets the value of the modeOfStudy property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ModeOfStudyType }
-         *     
-         */
-        public void setModeOfStudy(ModeOfStudyType value) {
-            this.modeOfStudy = value;
-        }
-
-    }
+	@XmlElement(name = "ModeOfStudy", required = true)
+	protected InformationOnTheContentsAndResultsGainedType.ModeOfStudy modeOfStudy;
+	@XmlElement(name = "ProgrammeRequirements", required = true)
+	protected ProgrammeRequirementsType programmeRequirements;
+	@XmlElement(name = "ProgrammeDetails", required = true)
+	protected ProgrammeDetailsType programmeDetails;
+	@XmlElement(name = "GradingSchemeAndGradeDistributionGuidance", required = true)
+	protected GradingSchemeAndGradeDistributionGuidanceType gradingSchemeAndGradeDistributionGuidance;
+	@XmlElement(name = "OverallClassificationOfTheQualification", required = true)
+	protected RichTextTagType overallClassificationOfTheQualification;
+
+	/**
+	 * Gets the value of the modeOfStudy property.
+	 * 
+	 * @return possible object is {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
+	 * 
+	 */
+	public InformationOnTheContentsAndResultsGainedType.ModeOfStudy getModeOfStudy() {
+		return modeOfStudy;
+	}
+
+	/**
+	 * Sets the value of the modeOfStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
+	 * 
+	 */
+	public void setModeOfStudy(InformationOnTheContentsAndResultsGainedType.ModeOfStudy value) {
+		this.modeOfStudy = value;
+	}
+
+	/**
+	 * Gets the value of the programmeRequirements property.
+	 * 
+	 * @return possible object is {@link ProgrammeRequirementsType }
+	 * 
+	 */
+	public ProgrammeRequirementsType getProgrammeRequirements() {
+		return programmeRequirements;
+	}
+
+	/**
+	 * Sets the value of the programmeRequirements property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ProgrammeRequirementsType }
+	 * 
+	 */
+	public void setProgrammeRequirements(ProgrammeRequirementsType value) {
+		this.programmeRequirements = value;
+	}
+
+	/**
+	 * Gets the value of the programmeDetails property.
+	 * 
+	 * @return possible object is {@link ProgrammeDetailsType }
+	 * 
+	 */
+	public ProgrammeDetailsType getProgrammeDetails() {
+		return programmeDetails;
+	}
+
+	/**
+	 * Sets the value of the programmeDetails property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ProgrammeDetailsType }
+	 * 
+	 */
+	public void setProgrammeDetails(ProgrammeDetailsType value) {
+		this.programmeDetails = value;
+	}
+
+	/**
+	 * Gets the value of the gradingSchemeAndGradeDistributionGuidance property.
+	 * 
+	 * @return possible object is {@link GradingSchemeAndGradeDistributionGuidanceType }
+	 * 
+	 */
+	public GradingSchemeAndGradeDistributionGuidanceType getGradingSchemeAndGradeDistributionGuidance() {
+		return gradingSchemeAndGradeDistributionGuidance;
+	}
+
+	/**
+	 * Sets the value of the gradingSchemeAndGradeDistributionGuidance property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link GradingSchemeAndGradeDistributionGuidanceType }
+	 * 
+	 */
+	public void setGradingSchemeAndGradeDistributionGuidance(GradingSchemeAndGradeDistributionGuidanceType value) {
+		this.gradingSchemeAndGradeDistributionGuidance = value;
+	}
+
+	/**
+	 * Gets the value of the overallClassificationOfTheQualification property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getOverallClassificationOfTheQualification() {
+		return overallClassificationOfTheQualification;
+	}
+
+	/**
+	 * Sets the value of the overallClassificationOfTheQualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setOverallClassificationOfTheQualification(RichTextTagType value) {
+		this.overallClassificationOfTheQualification = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
+	 *       &lt;attribute name="modeOfStudy" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}ModeOfStudyType" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class ModeOfStudy extends RichTextTagType {
+
+		@XmlAttribute(name = "modeOfStudy", required = true)
+		protected ModeOfStudyType modeOfStudy;
+
+		/**
+		 * Gets the value of the modeOfStudy property.
+		 * 
+		 * @return possible object is {@link ModeOfStudyType }
+		 * 
+		 */
+		public ModeOfStudyType getModeOfStudy() {
+			return modeOfStudy;
+		}
+
+		/**
+		 * Sets the value of the modeOfStudy property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link ModeOfStudyType }
+		 * 
+		 */
+		public void setModeOfStudy(ModeOfStudyType value) {
+			this.modeOfStudy = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheFunctionOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheFunctionOfTheQualificationType.java
index e16bb9b22..383caae19 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheFunctionOfTheQualificationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheFunctionOfTheQualificationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Information on the function of the qualification type
  * 
- * <p>Java class for InformationOnTheFunctionOfTheQualificationType complex type.
+ * <p>
+ * Java class for InformationOnTheFunctionOfTheQualificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InformationOnTheFunctionOfTheQualificationType">
@@ -46,116 +46,103 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InformationOnTheFunctionOfTheQualificationType", propOrder = {
-    "accessToFurtherStudy",
-    "professionalStatus"
-})
+@XmlType(name = "InformationOnTheFunctionOfTheQualificationType", propOrder = { "accessToFurtherStudy", "professionalStatus" })
 public class InformationOnTheFunctionOfTheQualificationType {
 
-    @XmlElement(name = "AccessToFurtherStudy", required = true)
-    protected RichTextTagType accessToFurtherStudy;
-    @XmlElement(name = "ProfessionalStatus")
-    protected InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus professionalStatus;
-
-    /**
-     * Gets the value of the accessToFurtherStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAccessToFurtherStudy() {
-        return accessToFurtherStudy;
-    }
-
-    /**
-     * Sets the value of the accessToFurtherStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAccessToFurtherStudy(RichTextTagType value) {
-        this.accessToFurtherStudy = value;
-    }
-
-    /**
-     * Gets the value of the professionalStatus property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
-     *     
-     */
-    public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus getProfessionalStatus() {
-        return professionalStatus;
-    }
-
-    /**
-     * Sets the value of the professionalStatus property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
-     *     
-     */
-    public void setProfessionalStatus(InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus value) {
-        this.professionalStatus = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
-     *       &lt;attribute name="isRegulatedProfession" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class ProfessionalStatus
-        extends RichTextTagType
-    {
-
-        @XmlAttribute(name = "isRegulatedProfession")
-        protected Boolean isRegulatedProfession;
-
-        /**
-         * Gets the value of the isRegulatedProfession property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIsRegulatedProfession() {
-            return isRegulatedProfession;
-        }
-
-        /**
-         * Sets the value of the isRegulatedProfession property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIsRegulatedProfession(Boolean value) {
-            this.isRegulatedProfession = value;
-        }
-
-    }
+	@XmlElement(name = "AccessToFurtherStudy", required = true)
+	protected RichTextTagType accessToFurtherStudy;
+	@XmlElement(name = "ProfessionalStatus")
+	protected InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus professionalStatus;
+
+	/**
+	 * Gets the value of the accessToFurtherStudy property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAccessToFurtherStudy() {
+		return accessToFurtherStudy;
+	}
+
+	/**
+	 * Sets the value of the accessToFurtherStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAccessToFurtherStudy(RichTextTagType value) {
+		this.accessToFurtherStudy = value;
+	}
+
+	/**
+	 * Gets the value of the professionalStatus property.
+	 * 
+	 * @return possible object is {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
+	 * 
+	 */
+	public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus getProfessionalStatus() {
+		return professionalStatus;
+	}
+
+	/**
+	 * Sets the value of the professionalStatus property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
+	 * 
+	 */
+	public void setProfessionalStatus(InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus value) {
+		this.professionalStatus = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
+	 *       &lt;attribute name="isRegulatedProfession" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class ProfessionalStatus extends RichTextTagType {
+
+		@XmlAttribute(name = "isRegulatedProfession")
+		protected Boolean isRegulatedProfession;
+
+		/**
+		 * Gets the value of the isRegulatedProfession property.
+		 * 
+		 * @return possible object is {@link Boolean }
+		 * 
+		 */
+		public Boolean isIsRegulatedProfession() {
+			return isRegulatedProfession;
+		}
+
+		/**
+		 * Sets the value of the isRegulatedProfession property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Boolean }
+		 * 
+		 */
+		public void setIsRegulatedProfession(Boolean value) {
+			this.isRegulatedProfession = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheLevelOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheLevelOfTheQualificationType.java
index 796130137..27282fe36 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheLevelOfTheQualificationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheLevelOfTheQualificationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.math.BigDecimal;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Information on the level of the qualification
  * 
- * <p>Java class for InformationOnTheLevelOfTheQualificationType complex type.
+ * <p>
+ * Java class for InformationOnTheLevelOfTheQualificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InformationOnTheLevelOfTheQualificationType">
@@ -61,331 +61,295 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InformationOnTheLevelOfTheQualificationType", propOrder = {
-    "level",
-    "officialLengthOfProgramme",
-    "accessRequirements"
-})
+@XmlType(name = "InformationOnTheLevelOfTheQualificationType", propOrder = { "level", "officialLengthOfProgramme", "accessRequirements" })
 public class InformationOnTheLevelOfTheQualificationType {
 
-    @XmlElement(name = "Level", required = true)
-    protected InformationOnTheLevelOfTheQualificationType.Level level;
-    @XmlElement(name = "OfficialLengthOfProgramme", required = true)
-    protected InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme officialLengthOfProgramme;
-    @XmlElement(name = "AccessRequirements", required = true)
-    protected RichTextTagType accessRequirements;
-
-    /**
-     * Gets the value of the level property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheLevelOfTheQualificationType.Level }
-     *     
-     */
-    public InformationOnTheLevelOfTheQualificationType.Level getLevel() {
-        return level;
-    }
-
-    /**
-     * Sets the value of the level property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheLevelOfTheQualificationType.Level }
-     *     
-     */
-    public void setLevel(InformationOnTheLevelOfTheQualificationType.Level value) {
-        this.level = value;
-    }
-
-    /**
-     * Gets the value of the officialLengthOfProgramme property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
-     *     
-     */
-    public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme getOfficialLengthOfProgramme() {
-        return officialLengthOfProgramme;
-    }
-
-    /**
-     * Sets the value of the officialLengthOfProgramme property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
-     *     
-     */
-    public void setOfficialLengthOfProgramme(InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme value) {
-        this.officialLengthOfProgramme = value;
-    }
-
-    /**
-     * Gets the value of the accessRequirements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAccessRequirements() {
-        return accessRequirements;
-    }
-
-    /**
-     * Sets the value of the accessRequirements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAccessRequirements(RichTextTagType value) {
-        this.accessRequirements = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
-     *       &lt;attribute name="isced1997" type="{urn:crue:academic:xsd:language:diplomasupplement}ISCED1997Type" />
-     *       &lt;attribute name="isced2011" type="{urn:crue:academic:xsd:language:diplomasupplement}ISCED2011Type" />
-     *       &lt;attribute name="eheaFramework" type="{urn:crue:academic:xsd:language:diplomasupplement}EHEAFrameworkType" />
-     *       &lt;attribute name="nfq" type="{urn:crue:academic:xsd:language:diplomasupplement}NFQType" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Level
-        extends RichTextTagType
-    {
-
-        @XmlAttribute(name = "isced1997")
-        protected String isced1997;
-        @XmlAttribute(name = "isced2011")
-        protected String isced2011;
-        @XmlAttribute(name = "eheaFramework")
-        protected EHEAFrameworkType eheaFramework;
-        @XmlAttribute(name = "nfq")
-        protected String nfq;
-
-        /**
-         * Gets the value of the isced1997 property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getIsced1997() {
-            return isced1997;
-        }
-
-        /**
-         * Sets the value of the isced1997 property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setIsced1997(String value) {
-            this.isced1997 = value;
-        }
-
-        /**
-         * Gets the value of the isced2011 property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getIsced2011() {
-            return isced2011;
-        }
-
-        /**
-         * Sets the value of the isced2011 property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setIsced2011(String value) {
-            this.isced2011 = value;
-        }
-
-        /**
-         * Gets the value of the eheaFramework property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EHEAFrameworkType }
-         *     
-         */
-        public EHEAFrameworkType getEheaFramework() {
-            return eheaFramework;
-        }
-
-        /**
-         * Sets the value of the eheaFramework property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EHEAFrameworkType }
-         *     
-         */
-        public void setEheaFramework(EHEAFrameworkType value) {
-            this.eheaFramework = value;
-        }
-
-        /**
-         * Gets the value of the nfq property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getNfq() {
-            return nfq;
-        }
-
-        /**
-         * Sets the value of the nfq property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setNfq(String value) {
-            this.nfq = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
-     *       &lt;attribute name="ectsCredits" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
-     *       &lt;attribute name="years" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
-     *       &lt;attribute name="semesters" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveIntegerType" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class OfficialLengthOfProgramme
-        extends RichTextTagType
-    {
-
-        @XmlAttribute(name = "ectsCredits")
-        protected BigDecimal ectsCredits;
-        @XmlAttribute(name = "years", required = true)
-        protected BigDecimal years;
-        @XmlAttribute(name = "semesters")
-        protected Integer semesters;
-
-        /**
-         * Gets the value of the ectsCredits property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getEctsCredits() {
-            return ectsCredits;
-        }
-
-        /**
-         * Sets the value of the ectsCredits property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setEctsCredits(BigDecimal value) {
-            this.ectsCredits = value;
-        }
-
-        /**
-         * Gets the value of the years property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getYears() {
-            return years;
-        }
-
-        /**
-         * Sets the value of the years property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setYears(BigDecimal value) {
-            this.years = value;
-        }
-
-        /**
-         * Gets the value of the semesters property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getSemesters() {
-            return semesters;
-        }
-
-        /**
-         * Sets the value of the semesters property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setSemesters(Integer value) {
-            this.semesters = value;
-        }
-
-    }
+	@XmlElement(name = "Level", required = true)
+	protected InformationOnTheLevelOfTheQualificationType.Level level;
+	@XmlElement(name = "OfficialLengthOfProgramme", required = true)
+	protected InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme officialLengthOfProgramme;
+	@XmlElement(name = "AccessRequirements", required = true)
+	protected RichTextTagType accessRequirements;
+
+	/**
+	 * Gets the value of the level property.
+	 * 
+	 * @return possible object is {@link InformationOnTheLevelOfTheQualificationType.Level }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType.Level getLevel() {
+		return level;
+	}
+
+	/**
+	 * Sets the value of the level property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheLevelOfTheQualificationType.Level }
+	 * 
+	 */
+	public void setLevel(InformationOnTheLevelOfTheQualificationType.Level value) {
+		this.level = value;
+	}
+
+	/**
+	 * Gets the value of the officialLengthOfProgramme property.
+	 * 
+	 * @return possible object is {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme getOfficialLengthOfProgramme() {
+		return officialLengthOfProgramme;
+	}
+
+	/**
+	 * Sets the value of the officialLengthOfProgramme property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
+	 * 
+	 */
+	public void setOfficialLengthOfProgramme(InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme value) {
+		this.officialLengthOfProgramme = value;
+	}
+
+	/**
+	 * Gets the value of the accessRequirements property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAccessRequirements() {
+		return accessRequirements;
+	}
+
+	/**
+	 * Sets the value of the accessRequirements property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAccessRequirements(RichTextTagType value) {
+		this.accessRequirements = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
+	 *       &lt;attribute name="isced1997" type="{urn:crue:academic:xsd:language:diplomasupplement}ISCED1997Type" />
+	 *       &lt;attribute name="isced2011" type="{urn:crue:academic:xsd:language:diplomasupplement}ISCED2011Type" />
+	 *       &lt;attribute name="eheaFramework" type="{urn:crue:academic:xsd:language:diplomasupplement}EHEAFrameworkType" />
+	 *       &lt;attribute name="nfq" type="{urn:crue:academic:xsd:language:diplomasupplement}NFQType" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class Level extends RichTextTagType {
+
+		@XmlAttribute(name = "isced1997")
+		protected String isced1997;
+		@XmlAttribute(name = "isced2011")
+		protected String isced2011;
+		@XmlAttribute(name = "eheaFramework")
+		protected EHEAFrameworkType eheaFramework;
+		@XmlAttribute(name = "nfq")
+		protected String nfq;
+
+		/**
+		 * Gets the value of the isced1997 property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getIsced1997() {
+			return isced1997;
+		}
+
+		/**
+		 * Sets the value of the isced1997 property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setIsced1997(String value) {
+			this.isced1997 = value;
+		}
+
+		/**
+		 * Gets the value of the isced2011 property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getIsced2011() {
+			return isced2011;
+		}
+
+		/**
+		 * Sets the value of the isced2011 property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setIsced2011(String value) {
+			this.isced2011 = value;
+		}
+
+		/**
+		 * Gets the value of the eheaFramework property.
+		 * 
+		 * @return possible object is {@link EHEAFrameworkType }
+		 * 
+		 */
+		public EHEAFrameworkType getEheaFramework() {
+			return eheaFramework;
+		}
+
+		/**
+		 * Sets the value of the eheaFramework property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link EHEAFrameworkType }
+		 * 
+		 */
+		public void setEheaFramework(EHEAFrameworkType value) {
+			this.eheaFramework = value;
+		}
+
+		/**
+		 * Gets the value of the nfq property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getNfq() {
+			return nfq;
+		}
+
+		/**
+		 * Sets the value of the nfq property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setNfq(String value) {
+			this.nfq = value;
+		}
+
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
+	 *       &lt;attribute name="ectsCredits" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
+	 *       &lt;attribute name="years" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" />
+	 *       &lt;attribute name="semesters" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveIntegerType" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class OfficialLengthOfProgramme extends RichTextTagType {
+
+		@XmlAttribute(name = "ectsCredits")
+		protected BigDecimal ectsCredits;
+		@XmlAttribute(name = "years", required = true)
+		protected BigDecimal years;
+		@XmlAttribute(name = "semesters")
+		protected Integer semesters;
+
+		/**
+		 * Gets the value of the ectsCredits property.
+		 * 
+		 * @return possible object is {@link BigDecimal }
+		 * 
+		 */
+		public BigDecimal getEctsCredits() {
+			return ectsCredits;
+		}
+
+		/**
+		 * Sets the value of the ectsCredits property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link BigDecimal }
+		 * 
+		 */
+		public void setEctsCredits(BigDecimal value) {
+			this.ectsCredits = value;
+		}
+
+		/**
+		 * Gets the value of the years property.
+		 * 
+		 * @return possible object is {@link BigDecimal }
+		 * 
+		 */
+		public BigDecimal getYears() {
+			return years;
+		}
+
+		/**
+		 * Sets the value of the years property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link BigDecimal }
+		 * 
+		 */
+		public void setYears(BigDecimal value) {
+			this.years = value;
+		}
+
+		/**
+		 * Gets the value of the semesters property.
+		 * 
+		 * @return possible object is {@link Integer }
+		 * 
+		 */
+		public Integer getSemesters() {
+			return semesters;
+		}
+
+		/**
+		 * Sets the value of the semesters property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Integer }
+		 * 
+		 */
+		public void setSemesters(Integer value) {
+			this.semesters = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InstitutionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InstitutionType.java
index c19db9312..a99aca0f7 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InstitutionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InstitutionType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,13 +17,14 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
  * Name and status of the institution
  * 
- * <p>Java class for InstitutionType complex type.
+ * <p>
+ * Java class for InstitutionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InstitutionType">
@@ -64,391 +64,344 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InstitutionType", propOrder = {
-    "name",
-    "status",
-    "country",
-    "additionalInformation",
-    "contactInformation",
-    "attachedImageRef"
-})
-@XmlSeeAlso({
-    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.NameAndStatusOfAwardingInstitutionType.AwardingInstitution.class,
-    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies.class
-})
+@XmlType(name = "InstitutionType", propOrder = { "name", "status", "country", "additionalInformation", "contactInformation", "attachedImageRef" })
+@XmlSeeAlso({ eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.NameAndStatusOfAwardingInstitutionType.AwardingInstitution.class,
+		eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies.class })
 public class InstitutionType {
 
-    @XmlElement(name = "Name", required = true)
-    protected String name;
-    @XmlElement(name = "Status", required = true)
-    protected String status;
-    @XmlElement(name = "Country", required = true)
-    protected InstitutionType.Country country;
-    @XmlElement(name = "AdditionalInformation")
-    protected RichTextTagType additionalInformation;
-    @XmlElement(name = "ContactInformation")
-    protected ContactInformationType contactInformation;
-    @XmlElement(name = "AttachedImageRef")
-    protected InstitutionType.AttachedImageRef attachedImageRef;
-    @XmlAttribute(name = "nationalID")
-    protected String nationalID;
-    @XmlAttribute(name = "erasmusID")
-    protected String erasmusID;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
-
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
-
-    /**
-     * Gets the value of the country property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InstitutionType.Country }
-     *     
-     */
-    public InstitutionType.Country getCountry() {
-        return country;
-    }
-
-    /**
-     * Sets the value of the country property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InstitutionType.Country }
-     *     
-     */
-    public void setCountry(InstitutionType.Country value) {
-        this.country = value;
-    }
-
-    /**
-     * Gets the value of the additionalInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAdditionalInformation() {
-        return additionalInformation;
-    }
-
-    /**
-     * Sets the value of the additionalInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAdditionalInformation(RichTextTagType value) {
-        this.additionalInformation = value;
-    }
-
-    /**
-     * Gets the value of the contactInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ContactInformationType }
-     *     
-     */
-    public ContactInformationType getContactInformation() {
-        return contactInformation;
-    }
-
-    /**
-     * Sets the value of the contactInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ContactInformationType }
-     *     
-     */
-    public void setContactInformation(ContactInformationType value) {
-        this.contactInformation = value;
-    }
-
-    /**
-     * Gets the value of the attachedImageRef property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InstitutionType.AttachedImageRef }
-     *     
-     */
-    public InstitutionType.AttachedImageRef getAttachedImageRef() {
-        return attachedImageRef;
-    }
-
-    /**
-     * Sets the value of the attachedImageRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InstitutionType.AttachedImageRef }
-     *     
-     */
-    public void setAttachedImageRef(InstitutionType.AttachedImageRef value) {
-        this.attachedImageRef = value;
-    }
-
-    /**
-     * Gets the value of the nationalID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNationalID() {
-        return nationalID;
-    }
-
-    /**
-     * Sets the value of the nationalID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNationalID(String value) {
-        this.nationalID = value;
-    }
-
-    /**
-     * Gets the value of the erasmusID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getErasmusID() {
-        return erasmusID;
-    }
-
-    /**
-     * Sets the value of the erasmusID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setErasmusID(String value) {
-        this.erasmusID = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AttachedImageRef {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "attachedID", required = true)
-        @XmlIDREF
-        @XmlSchemaType(name = "IDREF")
-        protected Object attachedID;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the attachedID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getAttachedID() {
-            return attachedID;
-        }
-
-        /**
-         * Sets the value of the attachedID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setAttachedID(Object value) {
-            this.attachedID = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Country {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "country", required = true)
-        protected CountryType country;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the country property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CountryType }
-         *     
-         */
-        public CountryType getCountry() {
-            return country;
-        }
-
-        /**
-         * Sets the value of the country property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CountryType }
-         *     
-         */
-        public void setCountry(CountryType value) {
-            this.country = value;
-        }
-
-    }
+	@XmlElement(name = "Name", required = true)
+	protected String name;
+	@XmlElement(name = "Status", required = true)
+	protected String status;
+	@XmlElement(name = "Country", required = true)
+	protected InstitutionType.Country country;
+	@XmlElement(name = "AdditionalInformation")
+	protected RichTextTagType additionalInformation;
+	@XmlElement(name = "ContactInformation")
+	protected ContactInformationType contactInformation;
+	@XmlElement(name = "AttachedImageRef")
+	protected InstitutionType.AttachedImageRef attachedImageRef;
+	@XmlAttribute(name = "nationalID")
+	protected String nationalID;
+	@XmlAttribute(name = "erasmusID")
+	protected String erasmusID;
+
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
+
+	/**
+	 * Gets the value of the status property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getStatus() {
+		return status;
+	}
+
+	/**
+	 * Sets the value of the status property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setStatus(String value) {
+		this.status = value;
+	}
+
+	/**
+	 * Gets the value of the country property.
+	 * 
+	 * @return possible object is {@link InstitutionType.Country }
+	 * 
+	 */
+	public InstitutionType.Country getCountry() {
+		return country;
+	}
+
+	/**
+	 * Sets the value of the country property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InstitutionType.Country }
+	 * 
+	 */
+	public void setCountry(InstitutionType.Country value) {
+		this.country = value;
+	}
+
+	/**
+	 * Gets the value of the additionalInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAdditionalInformation() {
+		return additionalInformation;
+	}
+
+	/**
+	 * Sets the value of the additionalInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAdditionalInformation(RichTextTagType value) {
+		this.additionalInformation = value;
+	}
+
+	/**
+	 * Gets the value of the contactInformation property.
+	 * 
+	 * @return possible object is {@link ContactInformationType }
+	 * 
+	 */
+	public ContactInformationType getContactInformation() {
+		return contactInformation;
+	}
+
+	/**
+	 * Sets the value of the contactInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ContactInformationType }
+	 * 
+	 */
+	public void setContactInformation(ContactInformationType value) {
+		this.contactInformation = value;
+	}
+
+	/**
+	 * Gets the value of the attachedImageRef property.
+	 * 
+	 * @return possible object is {@link InstitutionType.AttachedImageRef }
+	 * 
+	 */
+	public InstitutionType.AttachedImageRef getAttachedImageRef() {
+		return attachedImageRef;
+	}
+
+	/**
+	 * Sets the value of the attachedImageRef property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InstitutionType.AttachedImageRef }
+	 * 
+	 */
+	public void setAttachedImageRef(InstitutionType.AttachedImageRef value) {
+		this.attachedImageRef = value;
+	}
+
+	/**
+	 * Gets the value of the nationalID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNationalID() {
+		return nationalID;
+	}
+
+	/**
+	 * Sets the value of the nationalID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNationalID(String value) {
+		this.nationalID = value;
+	}
+
+	/**
+	 * Gets the value of the erasmusID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getErasmusID() {
+		return erasmusID;
+	}
+
+	/**
+	 * Sets the value of the erasmusID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setErasmusID(String value) {
+		this.erasmusID = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class AttachedImageRef {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "attachedID", required = true)
+		@XmlIDREF
+		@XmlSchemaType(name = "IDREF")
+		protected Object attachedID;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the attachedID property.
+		 * 
+		 * @return possible object is {@link Object }
+		 * 
+		 */
+		public Object getAttachedID() {
+			return attachedID;
+		}
+
+		/**
+		 * Sets the value of the attachedID property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Object }
+		 * 
+		 */
+		public void setAttachedID(Object value) {
+			this.attachedID = value;
+		}
+
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Country {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "country", required = true)
+		protected CountryType country;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the country property.
+		 * 
+		 * @return possible object is {@link CountryType }
+		 * 
+		 */
+		public CountryType getCountry() {
+			return country;
+		}
+
+		/**
+		 * Sets the value of the country property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CountryType }
+		 * 
+		 */
+		public void setCountry(CountryType value) {
+			this.country = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguageType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguageType.java
index 7cbc99872..7efdf9488 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguageType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguageType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for LanguageType.
+ * <p>
+ * Java class for LanguageType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="LanguageType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -128,709 +129,708 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum LanguageType {
 
-
-    /**
-     * Abkhazian
-     * 
-     */
-    @XmlEnumValue("ab")
-    AB("ab"),
-
-    /**
-     * Afrikaans
-     * 
-     */
-    @XmlEnumValue("af")
-    AF("af"),
-
-    /**
-     * Aragonese
-     * 
-     */
-    @XmlEnumValue("an")
-    AN("an"),
-
-    /**
-     * Arabic
-     * 
-     */
-    @XmlEnumValue("ar")
-    AR("ar"),
-
-    /**
-     * Assamese
-     * 
-     */
-    @XmlEnumValue("as")
-    AS("as"),
-
-    /**
-     * Azerbaijani
-     * 
-     */
-    @XmlEnumValue("az")
-    AZ("az"),
-
-    /**
-     * Belarusian
-     * 
-     */
-    @XmlEnumValue("be")
-    BE("be"),
-
-    /**
-     * Bulgarian
-     * 
-     */
-    @XmlEnumValue("bg")
-    BG("bg"),
-
-    /**
-     * Bengali
-     * 
-     */
-    @XmlEnumValue("bn")
-    BN("bn"),
-
-    /**
-     * Tibetan
-     * 
-     */
-    @XmlEnumValue("bo")
-    BO("bo"),
-
-    /**
-     * Breton
-     * 
-     */
-    @XmlEnumValue("br")
-    BR("br"),
-
-    /**
-     * Bosnian
-     * 
-     */
-    @XmlEnumValue("bs")
-    BS("bs"),
-
-    /**
-     * Catalan / Valencian
-     * 
-     */
-    @XmlEnumValue("ca")
-    CA("ca"),
-
-    /**
-     * Chechen
-     * 
-     */
-    @XmlEnumValue("ce")
-    CE("ce"),
-
-    /**
-     * Corsican
-     * 
-     */
-    @XmlEnumValue("co")
-    CO("co"),
-
-    /**
-     * Czech
-     * 
-     */
-    @XmlEnumValue("cs")
-    CS("cs"),
-
-    /**
-     * Welsh
-     * 
-     */
-    @XmlEnumValue("cy")
-    CY("cy"),
-
-    /**
-     * Danish
-     * 
-     */
-    @XmlEnumValue("da")
-    DA("da"),
-
-    /**
-     * German
-     * 
-     */
-    @XmlEnumValue("de")
-    DE("de"),
-
-    /**
-     * Greek
-     * 
-     */
-    @XmlEnumValue("el")
-    EL("el"),
-
-    /**
-     * English
-     * 
-     */
-    @XmlEnumValue("en")
-    EN("en"),
-
-    /**
-     * Spanish / Castilian
-     * 
-     */
-    @XmlEnumValue("es")
-    ES("es"),
-
-    /**
-     * Estonian
-     * 
-     */
-    @XmlEnumValue("et")
-    ET("et"),
-
-    /**
-     * Basque
-     * 
-     */
-    @XmlEnumValue("eu")
-    EU("eu"),
-
-    /**
-     * Persian
-     * 
-     */
-    @XmlEnumValue("fa")
-    FA("fa"),
-
-    /**
-     * Finnish
-     * 
-     */
-    @XmlEnumValue("fi")
-    FI("fi"),
-
-    /**
-     * Fijian
-     * 
-     */
-    @XmlEnumValue("fj")
-    FJ("fj"),
-
-    /**
-     * Faroese
-     * 
-     */
-    @XmlEnumValue("fo")
-    FO("fo"),
-
-    /**
-     * French
-     * 
-     */
-    @XmlEnumValue("fr")
-    FR("fr"),
-
-    /**
-     * Western Frisian
-     * 
-     */
-    @XmlEnumValue("fy")
-    FY("fy"),
-
-    /**
-     * Irish
-     * 
-     */
-    @XmlEnumValue("ga")
-    GA("ga"),
-
-    /**
-     * Gaelic / Scottish Gaelic
-     * 
-     */
-    @XmlEnumValue("gd")
-    GD("gd"),
-
-    /**
-     * Galician
-     * 
-     */
-    @XmlEnumValue("gl")
-    GL("gl"),
-
-    /**
-     * Manx
-     * 
-     */
-    @XmlEnumValue("gv")
-    GV("gv"),
-
-    /**
-     * Ancient Greek
-     * 
-     */
-    @XmlEnumValue("grc")
-    GRC("grc"),
-
-    /**
-     * Alemanic; Swiss German
-     * 
-     */
-    @XmlEnumValue("gsw")
-    GSW("gsw"),
-
-    /**
-     * Hebrew
-     * 
-     */
-    @XmlEnumValue("he")
-    HE("he"),
-
-    /**
-     * Hindi
-     * 
-     */
-    @XmlEnumValue("hi")
-    HI("hi"),
-
-    /**
-     * Croatian
-     * 
-     */
-    @XmlEnumValue("hr")
-    HR("hr"),
-
-    /**
-     * Haitian; Haitian Creole
-     * 
-     */
-    @XmlEnumValue("ht")
-    HT("ht"),
-
-    /**
-     * Hungarian
-     * 
-     */
-    @XmlEnumValue("hu")
-    HU("hu"),
-
-    /**
-     * Armenian
-     * 
-     */
-    @XmlEnumValue("hy")
-    HY("hy"),
-
-    /**
-     * Indonesian
-     * 
-     */
-    @XmlEnumValue("id")
-    ID("id"),
-
-    /**
-     * Icelandic
-     * 
-     */
-    @XmlEnumValue("is")
-    IS("is"),
-
-    /**
-     * Italian
-     * 
-     */
-    @XmlEnumValue("it")
-    IT("it"),
-
-    /**
-     * Japanese
-     * 
-     */
-    @XmlEnumValue("ja")
-    JA("ja"),
-
-    /**
-     * Javanese
-     * 
-     */
-    @XmlEnumValue("jv")
-    JV("jv"),
-
-    /**
-     * Georgian
-     * 
-     */
-    @XmlEnumValue("ka")
-    KA("ka"),
-
-    /**
-     * Kongo
-     * 
-     */
-    @XmlEnumValue("kg")
-    KG("kg"),
-
-    /**
-     * Korean
-     * 
-     */
-    @XmlEnumValue("ko")
-    KO("ko"),
-
-    /**
-     * Kurdish
-     * 
-     */
-    @XmlEnumValue("ku")
-    KU("ku"),
-
-    /**
-     * Cornish
-     * 
-     */
-    @XmlEnumValue("kw")
-    KW("kw"),
-
-    /**
-     * Kirghiz
-     * 
-     */
-    @XmlEnumValue("ky")
-    KY("ky"),
-
-    /**
-     * Luxembourgish; Letzeburgesch
-     * 
-     */
-    @XmlEnumValue("lb")
-    LB("lb"),
-
-    /**
-     * Limburgan; Limburger; Limburgish
-     * 
-     */
-    @XmlEnumValue("li")
-    LI("li"),
-
-    /**
-     * Lingala
-     * 
-     */
-    @XmlEnumValue("ln")
-    LN("ln"),
-
-    /**
-     * Lithuanian
-     * 
-     */
-    @XmlEnumValue("lt")
-    LT("lt"),
-
-    /**
-     * Latvian
-     * 
-     */
-    @XmlEnumValue("lv")
-    LV("lv"),
-
-    /**
-     * Malagasy
-     * 
-     */
-    @XmlEnumValue("mg")
-    MG("mg"),
-
-    /**
-     * Macedonian
-     * 
-     */
-    @XmlEnumValue("mk")
-    MK("mk"),
-
-    /**
-     * Mongolian
-     * 
-     */
-    @XmlEnumValue("mn")
-    MN("mn"),
-
-    /**
-     * Moldavian
-     * 
-     */
-    @XmlEnumValue("mo")
-    MO("mo"),
-
-    /**
-     * Malay
-     * 
-     */
-    @XmlEnumValue("ms")
-    MS("ms"),
-
-    /**
-     * Maltese
-     * 
-     */
-    @XmlEnumValue("mt")
-    MT("mt"),
-
-    /**
-     * Burmese
-     * 
-     */
-    @XmlEnumValue("my")
-    MY("my"),
-
-    /**
-     * Norwegian
-     * 
-     */
-    @XmlEnumValue("nb")
-    NB("nb"),
-
-    /**
-     * Nepali
-     * 
-     */
-    @XmlEnumValue("ne")
-    NE("ne"),
-
-    /**
-     * Dutch
-     * 
-     */
-    @XmlEnumValue("nl")
-    NL("nl"),
-
-    /**
-     * Norwegian (Nynorsk)
-     * 
-     */
-    @XmlEnumValue("nn")
-    NN("nn"),
-
-    /**
-     * Norwegian
-     * 
-     */
-    @XmlEnumValue("no")
-    NO("no"),
-
-    /**
-     * Polish
-     * 
-     */
-    @XmlEnumValue("pl")
-    PL("pl"),
-
-    /**
-     * Portuguese
-     * 
-     */
-    @XmlEnumValue("pt")
-    PT("pt"),
-
-    /**
-     * Raeto-Romance
-     * 
-     */
-    @XmlEnumValue("rm")
-    RM("rm"),
-
-    /**
-     * Romanian
-     * 
-     */
-    @XmlEnumValue("ro")
-    RO("ro"),
-
-    /**
-     * Russian
-     * 
-     */
-    @XmlEnumValue("ru")
-    RU("ru"),
-
-    /**
-     * Sardinian
-     * 
-     */
-    @XmlEnumValue("sc")
-    SC("sc"),
-
-    /**
-     * Northern Sami
-     * 
-     */
-    @XmlEnumValue("se")
-    SE("se"),
-
-    /**
-     * Slovak
-     * 
-     */
-    @XmlEnumValue("sk")
-    SK("sk"),
-
-    /**
-     * Slovenian
-     * 
-     */
-    @XmlEnumValue("sl")
-    SL("sl"),
-
-    /**
-     * Somali
-     * 
-     */
-    @XmlEnumValue("so")
-    SO("so"),
-
-    /**
-     * Albanian
-     * 
-     */
-    @XmlEnumValue("sq")
-    SQ("sq"),
-
-    /**
-     * Serbian
-     * 
-     */
-    @XmlEnumValue("sr")
-    SR("sr"),
-
-    /**
-     * Swedish
-     * 
-     */
-    @XmlEnumValue("sv")
-    SV("sv"),
-
-    /**
-     * Swahili
-     * 
-     */
-    @XmlEnumValue("sw")
-    SW("sw"),
-
-    /**
-     * Turkmen
-     * 
-     */
-    @XmlEnumValue("tk")
-    TK("tk"),
-
-    /**
-     * Turkish
-     * 
-     */
-    @XmlEnumValue("tr")
-    TR("tr"),
-
-    /**
-     * Tahitian
-     * 
-     */
-    @XmlEnumValue("ty")
-    TY("ty"),
-
-    /**
-     * Ukrainian
-     * 
-     */
-    @XmlEnumValue("uk")
-    UK("uk"),
-
-    /**
-     * Urdu
-     * 
-     */
-    @XmlEnumValue("ur")
-    UR("ur"),
-
-    /**
-     * Uzbek
-     * 
-     */
-    @XmlEnumValue("uz")
-    UZ("uz"),
-
-    /**
-     * Vietnamese
-     * 
-     */
-    @XmlEnumValue("vi")
-    VI("vi"),
-
-    /**
-     * Yiddish
-     * 
-     */
-    @XmlEnumValue("yi")
-    YI("yi"),
-
-    /**
-     * Chinese
-     * 
-     */
-    @XmlEnumValue("zh")
-    ZH("zh"),
-
-    /**
-     * Church Slavic
-     * 
-     */
-    @XmlEnumValue("cu")
-    CU("cu"),
-
-    /**
-     * Esperanto
-     * 
-     */
-    @XmlEnumValue("eo")
-    EO("eo"),
-
-    /**
-     * Latin
-     * 
-     */
-    @XmlEnumValue("la")
-    LA("la"),
-
-    /**
-     * Occitan (post 1500);
-     * 
-     */
-    @XmlEnumValue("oc")
-    OC("oc"),
-
-    /**
-     * VVola
-     * 
-     */
-    @XmlEnumValue("vo")
-    VO("vo");
-    private final String value;
-
-    LanguageType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static LanguageType fromValue(String v) {
-        for (LanguageType c: LanguageType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	/**
+	 * Abkhazian
+	 * 
+	 */
+	@XmlEnumValue("ab")
+	AB("ab"),
+
+	/**
+	 * Afrikaans
+	 * 
+	 */
+	@XmlEnumValue("af")
+	AF("af"),
+
+	/**
+	 * Aragonese
+	 * 
+	 */
+	@XmlEnumValue("an")
+	AN("an"),
+
+	/**
+	 * Arabic
+	 * 
+	 */
+	@XmlEnumValue("ar")
+	AR("ar"),
+
+	/**
+	 * Assamese
+	 * 
+	 */
+	@XmlEnumValue("as")
+	AS("as"),
+
+	/**
+	 * Azerbaijani
+	 * 
+	 */
+	@XmlEnumValue("az")
+	AZ("az"),
+
+	/**
+	 * Belarusian
+	 * 
+	 */
+	@XmlEnumValue("be")
+	BE("be"),
+
+	/**
+	 * Bulgarian
+	 * 
+	 */
+	@XmlEnumValue("bg")
+	BG("bg"),
+
+	/**
+	 * Bengali
+	 * 
+	 */
+	@XmlEnumValue("bn")
+	BN("bn"),
+
+	/**
+	 * Tibetan
+	 * 
+	 */
+	@XmlEnumValue("bo")
+	BO("bo"),
+
+	/**
+	 * Breton
+	 * 
+	 */
+	@XmlEnumValue("br")
+	BR("br"),
+
+	/**
+	 * Bosnian
+	 * 
+	 */
+	@XmlEnumValue("bs")
+	BS("bs"),
+
+	/**
+	 * Catalan / Valencian
+	 * 
+	 */
+	@XmlEnumValue("ca")
+	CA("ca"),
+
+	/**
+	 * Chechen
+	 * 
+	 */
+	@XmlEnumValue("ce")
+	CE("ce"),
+
+	/**
+	 * Corsican
+	 * 
+	 */
+	@XmlEnumValue("co")
+	CO("co"),
+
+	/**
+	 * Czech
+	 * 
+	 */
+	@XmlEnumValue("cs")
+	CS("cs"),
+
+	/**
+	 * Welsh
+	 * 
+	 */
+	@XmlEnumValue("cy")
+	CY("cy"),
+
+	/**
+	 * Danish
+	 * 
+	 */
+	@XmlEnumValue("da")
+	DA("da"),
+
+	/**
+	 * German
+	 * 
+	 */
+	@XmlEnumValue("de")
+	DE("de"),
+
+	/**
+	 * Greek
+	 * 
+	 */
+	@XmlEnumValue("el")
+	EL("el"),
+
+	/**
+	 * English
+	 * 
+	 */
+	@XmlEnumValue("en")
+	EN("en"),
+
+	/**
+	 * Spanish / Castilian
+	 * 
+	 */
+	@XmlEnumValue("es")
+	ES("es"),
+
+	/**
+	 * Estonian
+	 * 
+	 */
+	@XmlEnumValue("et")
+	ET("et"),
+
+	/**
+	 * Basque
+	 * 
+	 */
+	@XmlEnumValue("eu")
+	EU("eu"),
+
+	/**
+	 * Persian
+	 * 
+	 */
+	@XmlEnumValue("fa")
+	FA("fa"),
+
+	/**
+	 * Finnish
+	 * 
+	 */
+	@XmlEnumValue("fi")
+	FI("fi"),
+
+	/**
+	 * Fijian
+	 * 
+	 */
+	@XmlEnumValue("fj")
+	FJ("fj"),
+
+	/**
+	 * Faroese
+	 * 
+	 */
+	@XmlEnumValue("fo")
+	FO("fo"),
+
+	/**
+	 * French
+	 * 
+	 */
+	@XmlEnumValue("fr")
+	FR("fr"),
+
+	/**
+	 * Western Frisian
+	 * 
+	 */
+	@XmlEnumValue("fy")
+	FY("fy"),
+
+	/**
+	 * Irish
+	 * 
+	 */
+	@XmlEnumValue("ga")
+	GA("ga"),
+
+	/**
+	 * Gaelic / Scottish Gaelic
+	 * 
+	 */
+	@XmlEnumValue("gd")
+	GD("gd"),
+
+	/**
+	 * Galician
+	 * 
+	 */
+	@XmlEnumValue("gl")
+	GL("gl"),
+
+	/**
+	 * Manx
+	 * 
+	 */
+	@XmlEnumValue("gv")
+	GV("gv"),
+
+	/**
+	 * Ancient Greek
+	 * 
+	 */
+	@XmlEnumValue("grc")
+	GRC("grc"),
+
+	/**
+	 * Alemanic; Swiss German
+	 * 
+	 */
+	@XmlEnumValue("gsw")
+	GSW("gsw"),
+
+	/**
+	 * Hebrew
+	 * 
+	 */
+	@XmlEnumValue("he")
+	HE("he"),
+
+	/**
+	 * Hindi
+	 * 
+	 */
+	@XmlEnumValue("hi")
+	HI("hi"),
+
+	/**
+	 * Croatian
+	 * 
+	 */
+	@XmlEnumValue("hr")
+	HR("hr"),
+
+	/**
+	 * Haitian; Haitian Creole
+	 * 
+	 */
+	@XmlEnumValue("ht")
+	HT("ht"),
+
+	/**
+	 * Hungarian
+	 * 
+	 */
+	@XmlEnumValue("hu")
+	HU("hu"),
+
+	/**
+	 * Armenian
+	 * 
+	 */
+	@XmlEnumValue("hy")
+	HY("hy"),
+
+	/**
+	 * Indonesian
+	 * 
+	 */
+	@XmlEnumValue("id")
+	ID("id"),
+
+	/**
+	 * Icelandic
+	 * 
+	 */
+	@XmlEnumValue("is")
+	IS("is"),
+
+	/**
+	 * Italian
+	 * 
+	 */
+	@XmlEnumValue("it")
+	IT("it"),
+
+	/**
+	 * Japanese
+	 * 
+	 */
+	@XmlEnumValue("ja")
+	JA("ja"),
+
+	/**
+	 * Javanese
+	 * 
+	 */
+	@XmlEnumValue("jv")
+	JV("jv"),
+
+	/**
+	 * Georgian
+	 * 
+	 */
+	@XmlEnumValue("ka")
+	KA("ka"),
+
+	/**
+	 * Kongo
+	 * 
+	 */
+	@XmlEnumValue("kg")
+	KG("kg"),
+
+	/**
+	 * Korean
+	 * 
+	 */
+	@XmlEnumValue("ko")
+	KO("ko"),
+
+	/**
+	 * Kurdish
+	 * 
+	 */
+	@XmlEnumValue("ku")
+	KU("ku"),
+
+	/**
+	 * Cornish
+	 * 
+	 */
+	@XmlEnumValue("kw")
+	KW("kw"),
+
+	/**
+	 * Kirghiz
+	 * 
+	 */
+	@XmlEnumValue("ky")
+	KY("ky"),
+
+	/**
+	 * Luxembourgish; Letzeburgesch
+	 * 
+	 */
+	@XmlEnumValue("lb")
+	LB("lb"),
+
+	/**
+	 * Limburgan; Limburger; Limburgish
+	 * 
+	 */
+	@XmlEnumValue("li")
+	LI("li"),
+
+	/**
+	 * Lingala
+	 * 
+	 */
+	@XmlEnumValue("ln")
+	LN("ln"),
+
+	/**
+	 * Lithuanian
+	 * 
+	 */
+	@XmlEnumValue("lt")
+	LT("lt"),
+
+	/**
+	 * Latvian
+	 * 
+	 */
+	@XmlEnumValue("lv")
+	LV("lv"),
+
+	/**
+	 * Malagasy
+	 * 
+	 */
+	@XmlEnumValue("mg")
+	MG("mg"),
+
+	/**
+	 * Macedonian
+	 * 
+	 */
+	@XmlEnumValue("mk")
+	MK("mk"),
+
+	/**
+	 * Mongolian
+	 * 
+	 */
+	@XmlEnumValue("mn")
+	MN("mn"),
+
+	/**
+	 * Moldavian
+	 * 
+	 */
+	@XmlEnumValue("mo")
+	MO("mo"),
+
+	/**
+	 * Malay
+	 * 
+	 */
+	@XmlEnumValue("ms")
+	MS("ms"),
+
+	/**
+	 * Maltese
+	 * 
+	 */
+	@XmlEnumValue("mt")
+	MT("mt"),
+
+	/**
+	 * Burmese
+	 * 
+	 */
+	@XmlEnumValue("my")
+	MY("my"),
+
+	/**
+	 * Norwegian
+	 * 
+	 */
+	@XmlEnumValue("nb")
+	NB("nb"),
+
+	/**
+	 * Nepali
+	 * 
+	 */
+	@XmlEnumValue("ne")
+	NE("ne"),
+
+	/**
+	 * Dutch
+	 * 
+	 */
+	@XmlEnumValue("nl")
+	NL("nl"),
+
+	/**
+	 * Norwegian (Nynorsk)
+	 * 
+	 */
+	@XmlEnumValue("nn")
+	NN("nn"),
+
+	/**
+	 * Norwegian
+	 * 
+	 */
+	@XmlEnumValue("no")
+	NO("no"),
+
+	/**
+	 * Polish
+	 * 
+	 */
+	@XmlEnumValue("pl")
+	PL("pl"),
+
+	/**
+	 * Portuguese
+	 * 
+	 */
+	@XmlEnumValue("pt")
+	PT("pt"),
+
+	/**
+	 * Raeto-Romance
+	 * 
+	 */
+	@XmlEnumValue("rm")
+	RM("rm"),
+
+	/**
+	 * Romanian
+	 * 
+	 */
+	@XmlEnumValue("ro")
+	RO("ro"),
+
+	/**
+	 * Russian
+	 * 
+	 */
+	@XmlEnumValue("ru")
+	RU("ru"),
+
+	/**
+	 * Sardinian
+	 * 
+	 */
+	@XmlEnumValue("sc")
+	SC("sc"),
+
+	/**
+	 * Northern Sami
+	 * 
+	 */
+	@XmlEnumValue("se")
+	SE("se"),
+
+	/**
+	 * Slovak
+	 * 
+	 */
+	@XmlEnumValue("sk")
+	SK("sk"),
+
+	/**
+	 * Slovenian
+	 * 
+	 */
+	@XmlEnumValue("sl")
+	SL("sl"),
+
+	/**
+	 * Somali
+	 * 
+	 */
+	@XmlEnumValue("so")
+	SO("so"),
+
+	/**
+	 * Albanian
+	 * 
+	 */
+	@XmlEnumValue("sq")
+	SQ("sq"),
+
+	/**
+	 * Serbian
+	 * 
+	 */
+	@XmlEnumValue("sr")
+	SR("sr"),
+
+	/**
+	 * Swedish
+	 * 
+	 */
+	@XmlEnumValue("sv")
+	SV("sv"),
+
+	/**
+	 * Swahili
+	 * 
+	 */
+	@XmlEnumValue("sw")
+	SW("sw"),
+
+	/**
+	 * Turkmen
+	 * 
+	 */
+	@XmlEnumValue("tk")
+	TK("tk"),
+
+	/**
+	 * Turkish
+	 * 
+	 */
+	@XmlEnumValue("tr")
+	TR("tr"),
+
+	/**
+	 * Tahitian
+	 * 
+	 */
+	@XmlEnumValue("ty")
+	TY("ty"),
+
+	/**
+	 * Ukrainian
+	 * 
+	 */
+	@XmlEnumValue("uk")
+	UK("uk"),
+
+	/**
+	 * Urdu
+	 * 
+	 */
+	@XmlEnumValue("ur")
+	UR("ur"),
+
+	/**
+	 * Uzbek
+	 * 
+	 */
+	@XmlEnumValue("uz")
+	UZ("uz"),
+
+	/**
+	 * Vietnamese
+	 * 
+	 */
+	@XmlEnumValue("vi")
+	VI("vi"),
+
+	/**
+	 * Yiddish
+	 * 
+	 */
+	@XmlEnumValue("yi")
+	YI("yi"),
+
+	/**
+	 * Chinese
+	 * 
+	 */
+	@XmlEnumValue("zh")
+	ZH("zh"),
+
+	/**
+	 * Church Slavic
+	 * 
+	 */
+	@XmlEnumValue("cu")
+	CU("cu"),
+
+	/**
+	 * Esperanto
+	 * 
+	 */
+	@XmlEnumValue("eo")
+	EO("eo"),
+
+	/**
+	 * Latin
+	 * 
+	 */
+	@XmlEnumValue("la")
+	LA("la"),
+
+	/**
+	 * Occitan (post 1500);
+	 * 
+	 */
+	@XmlEnumValue("oc")
+	OC("oc"),
+
+	/**
+	 * VVola
+	 * 
+	 */
+	@XmlEnumValue("vo")
+	VO("vo");
+	private final String value;
+
+	LanguageType(String v) {
+		value = v;
+	}
+
+	public String value() {
+		return value;
+	}
+
+	public static LanguageType fromValue(String v) {
+		for (LanguageType c : LanguageType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguagesOfInstructionAndExaminationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguagesOfInstructionAndExaminationType.java
index 202da42b4..6920b52de 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguagesOfInstructionAndExaminationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguagesOfInstructionAndExaminationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.math.BigDecimal;
@@ -17,13 +16,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Language of instruction and examination
  * 
- * <p>Java class for LanguagesOfInstructionAndExaminationType complex type.
+ * <p>
+ * Java class for LanguagesOfInstructionAndExaminationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="LanguagesOfInstructionAndExaminationType">
@@ -49,121 +49,110 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "LanguagesOfInstructionAndExaminationType", propOrder = {
-    "language"
-})
+@XmlType(name = "LanguagesOfInstructionAndExaminationType", propOrder = { "language" })
 public class LanguagesOfInstructionAndExaminationType {
 
-    @XmlElement(name = "Language", required = true)
-    protected List<LanguagesOfInstructionAndExaminationType.Language> language;
-
-    /**
-     * Gets the value of the language property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the language property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getLanguage().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link LanguagesOfInstructionAndExaminationType.Language }
-     * 
-     * 
-     */
-    public List<LanguagesOfInstructionAndExaminationType.Language> getLanguage() {
-        if (language == null) {
-            language = new ArrayList<LanguagesOfInstructionAndExaminationType.Language>();
-        }
-        return this.language;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
-     *       &lt;attribute name="language" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguageType" />
-     *       &lt;attribute name="percent" type="{urn:crue:academic:xsd:language:diplomasupplement}PercentType" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Language
-        extends RichTextTagType
-    {
-
-        @XmlAttribute(name = "language", required = true)
-        protected LanguageType language;
-        @XmlAttribute(name = "percent")
-        protected BigDecimal percent;
-
-        /**
-         * Gets the value of the language property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link LanguageType }
-         *     
-         */
-        public LanguageType getLanguage() {
-            return language;
-        }
-
-        /**
-         * Sets the value of the language property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link LanguageType }
-         *     
-         */
-        public void setLanguage(LanguageType value) {
-            this.language = value;
-        }
-
-        /**
-         * Gets the value of the percent property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getPercent() {
-            return percent;
-        }
-
-        /**
-         * Sets the value of the percent property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setPercent(BigDecimal value) {
-            this.percent = value;
-        }
-
-    }
+	@XmlElement(name = "Language", required = true)
+	protected List<LanguagesOfInstructionAndExaminationType.Language> language;
+
+	/**
+	 * Gets the value of the language property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the language property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getLanguage().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link LanguagesOfInstructionAndExaminationType.Language }
+	 * 
+	 * 
+	 */
+	public List<LanguagesOfInstructionAndExaminationType.Language> getLanguage() {
+		if (language == null) {
+			language = new ArrayList<LanguagesOfInstructionAndExaminationType.Language>();
+		}
+		return this.language;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType">
+	 *       &lt;attribute name="language" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguageType" />
+	 *       &lt;attribute name="percent" type="{urn:crue:academic:xsd:language:diplomasupplement}PercentType" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class Language extends RichTextTagType {
+
+		@XmlAttribute(name = "language", required = true)
+		protected LanguageType language;
+		@XmlAttribute(name = "percent")
+		protected BigDecimal percent;
+
+		/**
+		 * Gets the value of the language property.
+		 * 
+		 * @return possible object is {@link LanguageType }
+		 * 
+		 */
+		public LanguageType getLanguage() {
+			return language;
+		}
+
+		/**
+		 * Sets the value of the language property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link LanguageType }
+		 * 
+		 */
+		public void setLanguage(LanguageType value) {
+			this.language = value;
+		}
+
+		/**
+		 * Gets the value of the percent property.
+		 * 
+		 * @return possible object is {@link BigDecimal }
+		 * 
+		 */
+		public BigDecimal getPercent() {
+			return percent;
+		}
+
+		/**
+		 * Sets the value of the percent property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link BigDecimal }
+		 * 
+		 */
+		public void setPercent(BigDecimal value) {
+			this.percent = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LocalGradeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LocalGradeType.java
index 96c7b66dd..49291e403 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LocalGradeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LocalGradeType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
  * Local grade
  * 
- * <p>Java class for LocalGradeType complex type.
+ * <p>
+ * Java class for LocalGradeType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="LocalGradeType">
@@ -50,198 +50,174 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "LocalGradeType", propOrder = {
-    "academicYear",
-    "dateIssued",
-    "grade",
-    "source"
-})
+@XmlType(name = "LocalGradeType", propOrder = { "academicYear", "dateIssued", "grade", "source" })
 public class LocalGradeType {
 
-    @XmlElement(name = "AcademicYear", required = true)
-    protected String academicYear;
-    @XmlElement(name = "DateIssued")
-    protected XMLGregorianCalendar dateIssued;
-    @XmlElement(name = "Grade", required = true)
-    protected String grade;
-    @XmlElement(name = "Source")
-    protected LocalGradeType.Source source;
-
-    /**
-     * Gets the value of the academicYear property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAcademicYear() {
-        return academicYear;
-    }
-
-    /**
-     * Sets the value of the academicYear property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAcademicYear(String value) {
-        this.academicYear = value;
-    }
-
-    /**
-     * Gets the value of the dateIssued property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateIssued() {
-        return dateIssued;
-    }
-
-    /**
-     * Sets the value of the dateIssued property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateIssued(XMLGregorianCalendar value) {
-        this.dateIssued = value;
-    }
-
-    /**
-     * Gets the value of the grade property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGrade() {
-        return grade;
-    }
-
-    /**
-     * Sets the value of the grade property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGrade(String value) {
-        this.grade = value;
-    }
-
-    /**
-     * Gets the value of the source property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LocalGradeType.Source }
-     *     
-     */
-    public LocalGradeType.Source getSource() {
-        return source;
-    }
-
-    /**
-     * Sets the value of the source property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LocalGradeType.Source }
-     *     
-     */
-    public void setSource(LocalGradeType.Source value) {
-        this.source = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="source" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}SourceGradeType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Source {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "source", required = true)
-        protected SourceGradeType source;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the source property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link SourceGradeType }
-         *     
-         */
-        public SourceGradeType getSource() {
-            return source;
-        }
-
-        /**
-         * Sets the value of the source property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link SourceGradeType }
-         *     
-         */
-        public void setSource(SourceGradeType value) {
-            this.source = value;
-        }
-
-    }
+	@XmlElement(name = "AcademicYear", required = true)
+	protected String academicYear;
+	@XmlElement(name = "DateIssued")
+	protected XMLGregorianCalendar dateIssued;
+	@XmlElement(name = "Grade", required = true)
+	protected String grade;
+	@XmlElement(name = "Source")
+	protected LocalGradeType.Source source;
+
+	/**
+	 * Gets the value of the academicYear property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAcademicYear() {
+		return academicYear;
+	}
+
+	/**
+	 * Sets the value of the academicYear property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAcademicYear(String value) {
+		this.academicYear = value;
+	}
+
+	/**
+	 * Gets the value of the dateIssued property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateIssued() {
+		return dateIssued;
+	}
+
+	/**
+	 * Sets the value of the dateIssued property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateIssued(XMLGregorianCalendar value) {
+		this.dateIssued = value;
+	}
+
+	/**
+	 * Gets the value of the grade property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getGrade() {
+		return grade;
+	}
+
+	/**
+	 * Sets the value of the grade property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setGrade(String value) {
+		this.grade = value;
+	}
+
+	/**
+	 * Gets the value of the source property.
+	 * 
+	 * @return possible object is {@link LocalGradeType.Source }
+	 * 
+	 */
+	public LocalGradeType.Source getSource() {
+		return source;
+	}
+
+	/**
+	 * Sets the value of the source property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LocalGradeType.Source }
+	 * 
+	 */
+	public void setSource(LocalGradeType.Source value) {
+		this.source = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="source" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}SourceGradeType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Source {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "source", required = true)
+		protected SourceGradeType source;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the source property.
+		 * 
+		 * @return possible object is {@link SourceGradeType }
+		 * 
+		 */
+		public SourceGradeType getSource() {
+			return source;
+		}
+
+		/**
+		 * Sets the value of the source property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link SourceGradeType }
+		 * 
+		 */
+		public void setSource(SourceGradeType value) {
+			this.source = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MimeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MimeType.java
index a83d3bf21..c4e131862 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MimeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MimeType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for MimeType.
+ * <p>
+ * Java class for MimeType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="MimeType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -37,72 +38,71 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum MimeType {
 
-
-    /**
-     * GIF image
-     * 
-     */
-    @XmlEnumValue("image/gif")
-    IMAGE_GIF("image/gif"),
-
-    /**
-     * JPEG JFIF image
-     * 
-     */
-    @XmlEnumValue("image/jpeg")
-    IMAGE_JPEG("image/jpeg"),
-
-    /**
-     * JPEG JFIF image
-     * 
-     */
-    @XmlEnumValue("image/pjpeg")
-    IMAGE_PJPEG("image/pjpeg"),
-
-    /**
-     * Portable Network Graphics
-     * 
-     */
-    @XmlEnumValue("image/png")
-    IMAGE_PNG("image/png"),
-
-    /**
-     * Tag Image File Format
-     * 
-     */
-    @XmlEnumValue("image/tiff")
-    IMAGE_TIFF("image/tiff"),
-
-    /**
-     * HTML
-     * 
-     */
-    @XmlEnumValue("text/html")
-    TEXT_HTML("text/html"),
-
-    /**
-     * Portable Document Format
-     * 
-     */
-    @XmlEnumValue("application/pdf")
-    APPLICATION_PDF("application/pdf");
-    private final String value;
-
-    MimeType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static MimeType fromValue(String v) {
-        for (MimeType c: MimeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	/**
+	 * GIF image
+	 * 
+	 */
+	@XmlEnumValue("image/gif")
+	IMAGE_GIF("image/gif"),
+
+	/**
+	 * JPEG JFIF image
+	 * 
+	 */
+	@XmlEnumValue("image/jpeg")
+	IMAGE_JPEG("image/jpeg"),
+
+	/**
+	 * JPEG JFIF image
+	 * 
+	 */
+	@XmlEnumValue("image/pjpeg")
+	IMAGE_PJPEG("image/pjpeg"),
+
+	/**
+	 * Portable Network Graphics
+	 * 
+	 */
+	@XmlEnumValue("image/png")
+	IMAGE_PNG("image/png"),
+
+	/**
+	 * Tag Image File Format
+	 * 
+	 */
+	@XmlEnumValue("image/tiff")
+	IMAGE_TIFF("image/tiff"),
+
+	/**
+	 * HTML
+	 * 
+	 */
+	@XmlEnumValue("text/html")
+	TEXT_HTML("text/html"),
+
+	/**
+	 * Portable Document Format
+	 * 
+	 */
+	@XmlEnumValue("application/pdf")
+	APPLICATION_PDF("application/pdf");
+	private final String value;
+
+	MimeType(String v) {
+		value = v;
+	}
+
+	public String value() {
+		return value;
+	}
+
+	public static MimeType fromValue(String v) {
+		for (MimeType c : MimeType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCourseUnitType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCourseUnitType.java
index e54f9c61a..9ed52c50d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCourseUnitType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCourseUnitType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.math.BigDecimal;
@@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
  * Mobility programme course unit
  * 
- * <p>Java class for MobilityProgrammeCourseUnitType complex type.
+ * <p>
+ * Java class for MobilityProgrammeCourseUnitType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="MobilityProgrammeCourseUnitType">
@@ -51,228 +51,201 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MobilityProgrammeCourseUnitType", propOrder = {
-    "code",
-    "title",
-    "ectsCredits",
-    "additionalInformation"
-})
+@XmlType(name = "MobilityProgrammeCourseUnitType", propOrder = { "code", "title", "ectsCredits", "additionalInformation" })
 public class MobilityProgrammeCourseUnitType {
 
-    @XmlElement(name = "Code")
-    protected String code;
-    @XmlElement(name = "Title", required = true)
-    protected MobilityProgrammeCourseUnitType.Title title;
-    @XmlElement(name = "ECTSCredits")
-    protected BigDecimal ectsCredits;
-    @XmlElement(name = "AdditionalInformation")
-    protected RichTextTagType additionalInformation;
-    @XmlAttribute(name = "isInTheLearningAgreement")
-    protected Boolean isInTheLearningAgreement;
-
-    /**
-     * Gets the value of the code property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCode() {
-        return code;
-    }
-
-    /**
-     * Sets the value of the code property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCode(String value) {
-        this.code = value;
-    }
-
-    /**
-     * Gets the value of the title property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MobilityProgrammeCourseUnitType.Title }
-     *     
-     */
-    public MobilityProgrammeCourseUnitType.Title getTitle() {
-        return title;
-    }
-
-    /**
-     * Sets the value of the title property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MobilityProgrammeCourseUnitType.Title }
-     *     
-     */
-    public void setTitle(MobilityProgrammeCourseUnitType.Title value) {
-        this.title = value;
-    }
-
-    /**
-     * Gets the value of the ectsCredits property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getECTSCredits() {
-        return ectsCredits;
-    }
-
-    /**
-     * Sets the value of the ectsCredits property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setECTSCredits(BigDecimal value) {
-        this.ectsCredits = value;
-    }
-
-    /**
-     * Gets the value of the additionalInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAdditionalInformation() {
-        return additionalInformation;
-    }
-
-    /**
-     * Sets the value of the additionalInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAdditionalInformation(RichTextTagType value) {
-        this.additionalInformation = value;
-    }
-
-    /**
-     * Gets the value of the isInTheLearningAgreement property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isIsInTheLearningAgreement() {
-        if (isInTheLearningAgreement == null) {
-            return true;
-        } else {
-            return isInTheLearningAgreement;
-        }
-    }
-
-    /**
-     * Sets the value of the isInTheLearningAgreement property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setIsInTheLearningAgreement(Boolean value) {
-        this.isInTheLearningAgreement = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="language" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguageType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Title {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "language")
-        protected LanguageType language;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the language property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link LanguageType }
-         *     
-         */
-        public LanguageType getLanguage() {
-            return language;
-        }
-
-        /**
-         * Sets the value of the language property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link LanguageType }
-         *     
-         */
-        public void setLanguage(LanguageType value) {
-            this.language = value;
-        }
-
-    }
+	@XmlElement(name = "Code")
+	protected String code;
+	@XmlElement(name = "Title", required = true)
+	protected MobilityProgrammeCourseUnitType.Title title;
+	@XmlElement(name = "ECTSCredits")
+	protected BigDecimal ectsCredits;
+	@XmlElement(name = "AdditionalInformation")
+	protected RichTextTagType additionalInformation;
+	@XmlAttribute(name = "isInTheLearningAgreement")
+	protected Boolean isInTheLearningAgreement;
+
+	/**
+	 * Gets the value of the code property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * Sets the value of the code property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCode(String value) {
+		this.code = value;
+	}
+
+	/**
+	 * Gets the value of the title property.
+	 * 
+	 * @return possible object is {@link MobilityProgrammeCourseUnitType.Title }
+	 * 
+	 */
+	public MobilityProgrammeCourseUnitType.Title getTitle() {
+		return title;
+	}
+
+	/**
+	 * Sets the value of the title property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MobilityProgrammeCourseUnitType.Title }
+	 * 
+	 */
+	public void setTitle(MobilityProgrammeCourseUnitType.Title value) {
+		this.title = value;
+	}
+
+	/**
+	 * Gets the value of the ectsCredits property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getECTSCredits() {
+		return ectsCredits;
+	}
+
+	/**
+	 * Sets the value of the ectsCredits property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setECTSCredits(BigDecimal value) {
+		this.ectsCredits = value;
+	}
+
+	/**
+	 * Gets the value of the additionalInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAdditionalInformation() {
+		return additionalInformation;
+	}
+
+	/**
+	 * Sets the value of the additionalInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAdditionalInformation(RichTextTagType value) {
+		this.additionalInformation = value;
+	}
+
+	/**
+	 * Gets the value of the isInTheLearningAgreement property.
+	 * 
+	 * @return possible object is {@link Boolean }
+	 * 
+	 */
+	public boolean isIsInTheLearningAgreement() {
+		if (isInTheLearningAgreement == null) {
+			return true;
+		} else {
+			return isInTheLearningAgreement;
+		}
+	}
+
+	/**
+	 * Sets the value of the isInTheLearningAgreement property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link Boolean }
+	 * 
+	 */
+	public void setIsInTheLearningAgreement(Boolean value) {
+		this.isInTheLearningAgreement = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="language" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguageType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Title {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "language")
+		protected LanguageType language;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the language property.
+		 * 
+		 * @return possible object is {@link LanguageType }
+		 * 
+		 */
+		public LanguageType getLanguage() {
+			return language;
+		}
+
+		/**
+		 * Sets the value of the language property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link LanguageType }
+		 * 
+		 */
+		public void setLanguage(LanguageType value) {
+			this.language = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCoursesUnitsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCoursesUnitsType.java
index 557c6610c..4ec7f4424 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCoursesUnitsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCoursesUnitsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Mobility programme courses units
  * 
- * <p>Java class for MobilityProgrammeCoursesUnitsType complex type.
+ * <p>
+ * Java class for MobilityProgrammeCoursesUnitsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="MobilityProgrammeCoursesUnitsType">
@@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MobilityProgrammeCoursesUnitsType", propOrder = {
-    "courseUnit"
-})
+@XmlType(name = "MobilityProgrammeCoursesUnitsType", propOrder = { "courseUnit" })
 public class MobilityProgrammeCoursesUnitsType {
 
-    @XmlElement(name = "CourseUnit", required = true)
-    protected List<MobilityProgrammeCourseUnitType> courseUnit;
+	@XmlElement(name = "CourseUnit", required = true)
+	protected List<MobilityProgrammeCourseUnitType> courseUnit;
 
-    /**
-     * Gets the value of the courseUnit property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the courseUnit property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCourseUnit().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MobilityProgrammeCourseUnitType }
-     * 
-     * 
-     */
-    public List<MobilityProgrammeCourseUnitType> getCourseUnit() {
-        if (courseUnit == null) {
-            courseUnit = new ArrayList<MobilityProgrammeCourseUnitType>();
-        }
-        return this.courseUnit;
-    }
+	/**
+	 * Gets the value of the courseUnit property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the courseUnit property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getCourseUnit().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link MobilityProgrammeCourseUnitType }
+	 * 
+	 * 
+	 */
+	public List<MobilityProgrammeCourseUnitType> getCourseUnit() {
+		if (courseUnit == null) {
+			courseUnit = new ArrayList<MobilityProgrammeCourseUnitType>();
+		}
+		return this.courseUnit;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeType.java
index 0c91a826c..02528aea2 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
  * Mobility programme
  * 
- * <p>Java class for MobilityProgrammeType complex type.
+ * <p>
+ * Java class for MobilityProgrammeType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="MobilityProgrammeType">
@@ -54,306 +54,266 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MobilityProgrammeType", propOrder = {
-    "type",
-    "fieldOfStudy",
-    "country",
-    "receivingInstitutionName",
-    "academicYear",
-    "dateFrom",
-    "dateTo",
-    "coursesUnits"
-})
+@XmlType(name = "MobilityProgrammeType", propOrder = { "type", "fieldOfStudy", "country", "receivingInstitutionName", "academicYear", "dateFrom", "dateTo", "coursesUnits" })
 public class MobilityProgrammeType {
 
-    @XmlElement(name = "Type", required = true)
-    protected String type;
-    @XmlElement(name = "FieldOfStudy")
-    protected String fieldOfStudy;
-    @XmlElement(name = "Country", required = true)
-    protected MobilityProgrammeType.Country country;
-    @XmlElement(name = "ReceivingInstitutionName", required = true)
-    protected String receivingInstitutionName;
-    @XmlElement(name = "AcademicYear", required = true)
-    protected String academicYear;
-    @XmlElement(name = "DateFrom")
-    protected XMLGregorianCalendar dateFrom;
-    @XmlElement(name = "DateTo")
-    protected XMLGregorianCalendar dateTo;
-    @XmlElement(name = "CoursesUnits", required = true)
-    protected MobilityProgrammeCoursesUnitsType coursesUnits;
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
+	@XmlElement(name = "Type", required = true)
+	protected String type;
+	@XmlElement(name = "FieldOfStudy")
+	protected String fieldOfStudy;
+	@XmlElement(name = "Country", required = true)
+	protected MobilityProgrammeType.Country country;
+	@XmlElement(name = "ReceivingInstitutionName", required = true)
+	protected String receivingInstitutionName;
+	@XmlElement(name = "AcademicYear", required = true)
+	protected String academicYear;
+	@XmlElement(name = "DateFrom")
+	protected XMLGregorianCalendar dateFrom;
+	@XmlElement(name = "DateTo")
+	protected XMLGregorianCalendar dateTo;
+	@XmlElement(name = "CoursesUnits", required = true)
+	protected MobilityProgrammeCoursesUnitsType coursesUnits;
 
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
+	/**
+	 * Gets the value of the type property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getType() {
+		return type;
+	}
 
-    /**
-     * Gets the value of the fieldOfStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFieldOfStudy() {
-        return fieldOfStudy;
-    }
+	/**
+	 * Sets the value of the type property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setType(String value) {
+		this.type = value;
+	}
 
-    /**
-     * Sets the value of the fieldOfStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFieldOfStudy(String value) {
-        this.fieldOfStudy = value;
-    }
+	/**
+	 * Gets the value of the fieldOfStudy property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getFieldOfStudy() {
+		return fieldOfStudy;
+	}
 
-    /**
-     * Gets the value of the country property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MobilityProgrammeType.Country }
-     *     
-     */
-    public MobilityProgrammeType.Country getCountry() {
-        return country;
-    }
+	/**
+	 * Sets the value of the fieldOfStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setFieldOfStudy(String value) {
+		this.fieldOfStudy = value;
+	}
 
-    /**
-     * Sets the value of the country property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MobilityProgrammeType.Country }
-     *     
-     */
-    public void setCountry(MobilityProgrammeType.Country value) {
-        this.country = value;
-    }
+	/**
+	 * Gets the value of the country property.
+	 * 
+	 * @return possible object is {@link MobilityProgrammeType.Country }
+	 * 
+	 */
+	public MobilityProgrammeType.Country getCountry() {
+		return country;
+	}
 
-    /**
-     * Gets the value of the receivingInstitutionName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReceivingInstitutionName() {
-        return receivingInstitutionName;
-    }
+	/**
+	 * Sets the value of the country property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MobilityProgrammeType.Country }
+	 * 
+	 */
+	public void setCountry(MobilityProgrammeType.Country value) {
+		this.country = value;
+	}
 
-    /**
-     * Sets the value of the receivingInstitutionName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReceivingInstitutionName(String value) {
-        this.receivingInstitutionName = value;
-    }
+	/**
+	 * Gets the value of the receivingInstitutionName property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getReceivingInstitutionName() {
+		return receivingInstitutionName;
+	}
 
-    /**
-     * Gets the value of the academicYear property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAcademicYear() {
-        return academicYear;
-    }
+	/**
+	 * Sets the value of the receivingInstitutionName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setReceivingInstitutionName(String value) {
+		this.receivingInstitutionName = value;
+	}
 
-    /**
-     * Sets the value of the academicYear property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAcademicYear(String value) {
-        this.academicYear = value;
-    }
+	/**
+	 * Gets the value of the academicYear property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAcademicYear() {
+		return academicYear;
+	}
 
-    /**
-     * Gets the value of the dateFrom property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateFrom() {
-        return dateFrom;
-    }
+	/**
+	 * Sets the value of the academicYear property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAcademicYear(String value) {
+		this.academicYear = value;
+	}
 
-    /**
-     * Sets the value of the dateFrom property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateFrom(XMLGregorianCalendar value) {
-        this.dateFrom = value;
-    }
+	/**
+	 * Gets the value of the dateFrom property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateFrom() {
+		return dateFrom;
+	}
 
-    /**
-     * Gets the value of the dateTo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateTo() {
-        return dateTo;
-    }
+	/**
+	 * Sets the value of the dateFrom property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateFrom(XMLGregorianCalendar value) {
+		this.dateFrom = value;
+	}
 
-    /**
-     * Sets the value of the dateTo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateTo(XMLGregorianCalendar value) {
-        this.dateTo = value;
-    }
+	/**
+	 * Gets the value of the dateTo property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateTo() {
+		return dateTo;
+	}
 
-    /**
-     * Gets the value of the coursesUnits property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MobilityProgrammeCoursesUnitsType }
-     *     
-     */
-    public MobilityProgrammeCoursesUnitsType getCoursesUnits() {
-        return coursesUnits;
-    }
+	/**
+	 * Sets the value of the dateTo property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateTo(XMLGregorianCalendar value) {
+		this.dateTo = value;
+	}
 
-    /**
-     * Sets the value of the coursesUnits property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MobilityProgrammeCoursesUnitsType }
-     *     
-     */
-    public void setCoursesUnits(MobilityProgrammeCoursesUnitsType value) {
-        this.coursesUnits = value;
-    }
+	/**
+	 * Gets the value of the coursesUnits property.
+	 * 
+	 * @return possible object is {@link MobilityProgrammeCoursesUnitsType }
+	 * 
+	 */
+	public MobilityProgrammeCoursesUnitsType getCoursesUnits() {
+		return coursesUnits;
+	}
 
+	/**
+	 * Sets the value of the coursesUnits property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MobilityProgrammeCoursesUnitsType }
+	 * 
+	 */
+	public void setCoursesUnits(MobilityProgrammeCoursesUnitsType value) {
+		this.coursesUnits = value;
+	}
 
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Country {
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="country" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}CountryType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Country {
 
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "country", required = true)
-        protected CountryType country;
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "country", required = true)
+		protected CountryType country;
 
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
 
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
 
-        /**
-         * Gets the value of the country property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CountryType }
-         *     
-         */
-        public CountryType getCountry() {
-            return country;
-        }
+		/**
+		 * Gets the value of the country property.
+		 * 
+		 * @return possible object is {@link CountryType }
+		 * 
+		 */
+		public CountryType getCountry() {
+			return country;
+		}
 
-        /**
-         * Sets the value of the country property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CountryType }
-         *     
-         */
-        public void setCountry(CountryType value) {
-            this.country = value;
-        }
+		/**
+		 * Sets the value of the country property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CountryType }
+		 * 
+		 */
+		public void setCountry(CountryType value) {
+			this.country = value;
+		}
 
-    }
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfDeliveryType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfDeliveryType.java
index 762ba0e99..23a4152de 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfDeliveryType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfDeliveryType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ModeOfDeliveryType.
+ * <p>
+ * Java class for ModeOfDeliveryType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="ModeOfDeliveryType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -32,37 +33,36 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum ModeOfDeliveryType {
 
+	/**
+	 * Face-to-face
+	 * 
+	 */
+	@XmlEnumValue("FaceToFace")
+	FACE_TO_FACE("FaceToFace"),
 
-    /**
-     * Face-to-face
-     * 
-     */
-    @XmlEnumValue("FaceToFace")
-    FACE_TO_FACE("FaceToFace"),
-
-    /**
-     * Distance learning
-     * 
-     */
-    @XmlEnumValue("DistanceLearning")
-    DISTANCE_LEARNING("DistanceLearning");
-    private final String value;
+	/**
+	 * Distance learning
+	 * 
+	 */
+	@XmlEnumValue("DistanceLearning")
+	DISTANCE_LEARNING("DistanceLearning");
+	private final String value;
 
-    ModeOfDeliveryType(String v) {
-        value = v;
-    }
+	ModeOfDeliveryType(String v) {
+		value = v;
+	}
 
-    public String value() {
-        return value;
-    }
+	public String value() {
+		return value;
+	}
 
-    public static ModeOfDeliveryType fromValue(String v) {
-        for (ModeOfDeliveryType c: ModeOfDeliveryType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	public static ModeOfDeliveryType fromValue(String v) {
+		for (ModeOfDeliveryType c : ModeOfDeliveryType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfStudyType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfStudyType.java
index c8f32a752..5cb0d2646 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfStudyType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfStudyType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ModeOfStudyType.
+ * <p>
+ * Java class for ModeOfStudyType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="ModeOfStudyType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -35,58 +36,57 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum ModeOfStudyType {
 
+	/**
+	 * Full time
+	 * 
+	 */
+	@XmlEnumValue("FullTime")
+	FULL_TIME("FullTime"),
 
-    /**
-     * Full time
-     * 
-     */
-    @XmlEnumValue("FullTime")
-    FULL_TIME("FullTime"),
-
-    /**
-     * Par time
-     * 
-     */
-    @XmlEnumValue("ParTime")
-    PAR_TIME("ParTime"),
+	/**
+	 * Par time
+	 * 
+	 */
+	@XmlEnumValue("ParTime")
+	PAR_TIME("ParTime"),
 
-    /**
-     * Distance
-     * 
-     */
-    @XmlEnumValue("Distance")
-    DISTANCE("Distance"),
+	/**
+	 * Distance
+	 * 
+	 */
+	@XmlEnumValue("Distance")
+	DISTANCE("Distance"),
 
-    /**
-     * eLearning
-     * 
-     */
-    @XmlEnumValue("eLearning")
-    E_LEARNING("eLearning"),
+	/**
+	 * eLearning
+	 * 
+	 */
+	@XmlEnumValue("eLearning")
+	E_LEARNING("eLearning"),
 
-    /**
-     * Another
-     * 
-     */
-    @XmlEnumValue("Another")
-    ANOTHER("Another");
-    private final String value;
+	/**
+	 * Another
+	 * 
+	 */
+	@XmlEnumValue("Another")
+	ANOTHER("Another");
+	private final String value;
 
-    ModeOfStudyType(String v) {
-        value = v;
-    }
+	ModeOfStudyType(String v) {
+		value = v;
+	}
 
-    public String value() {
-        return value;
-    }
+	public String value() {
+		return value;
+	}
 
-    public static ModeOfStudyType fromValue(String v) {
-        for (ModeOfStudyType c: ModeOfStudyType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	public static ModeOfStudyType fromValue(String v) {
+		for (ModeOfStudyType c : ModeOfStudyType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MultilingualDiplomaSupplementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MultilingualDiplomaSupplementType.java
index f4bd8a5d1..ab83f154e 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MultilingualDiplomaSupplementType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MultilingualDiplomaSupplementType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
 
-
 /**
  * Multilingual Diploma Supplement (DS)
  * 
- * <p>Java class for MultilingualDiplomaSupplementType complex type.
+ * <p>
+ * Java class for MultilingualDiplomaSupplementType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="MultilingualDiplomaSupplementType">
@@ -40,73 +40,66 @@ import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MultilingualDiplomaSupplementType", propOrder = {
-    "diplomaSupplement",
-    "signature"
-})
+@XmlType(name = "MultilingualDiplomaSupplementType", propOrder = { "diplomaSupplement", "signature" })
 public class MultilingualDiplomaSupplementType {
 
-    @XmlElement(name = "DiplomaSupplement", required = true)
-    protected List<DiplomaSupplementType> diplomaSupplement;
-    @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
-    protected List<SignatureType> signature;
+	@XmlElement(name = "DiplomaSupplement", required = true)
+	protected List<DiplomaSupplementType> diplomaSupplement;
+	@XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
+	protected List<SignatureType> signature;
 
-    /**
-     * Diploma Supplement Gets the value of the diplomaSupplement property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the diplomaSupplement property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getDiplomaSupplement().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link DiplomaSupplementType }
-     * 
-     * 
-     */
-    public List<DiplomaSupplementType> getDiplomaSupplement() {
-        if (diplomaSupplement == null) {
-            diplomaSupplement = new ArrayList<DiplomaSupplementType>();
-        }
-        return this.diplomaSupplement;
-    }
+	/**
+	 * Diploma Supplement Gets the value of the diplomaSupplement property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the diplomaSupplement property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getDiplomaSupplement().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link DiplomaSupplementType }
+	 * 
+	 * 
+	 */
+	public List<DiplomaSupplementType> getDiplomaSupplement() {
+		if (diplomaSupplement == null) {
+			diplomaSupplement = new ArrayList<DiplomaSupplementType>();
+		}
+		return this.diplomaSupplement;
+	}
 
-    /**
-     * Digital signature Gets the value of the signature property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signature property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignature().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignatureType }
-     * 
-     * 
-     */
-    public List<SignatureType> getSignature() {
-        if (signature == null) {
-            signature = new ArrayList<SignatureType>();
-        }
-        return this.signature;
-    }
+	/**
+	 * Digital signature Gets the value of the signature property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the signature property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getSignature().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link SignatureType }
+	 * 
+	 * 
+	 */
+	public List<SignatureType> getSignature() {
+		if (signature == null) {
+			signature = new ArrayList<SignatureType>();
+		}
+		return this.signature;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfAwardingInstitutionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfAwardingInstitutionType.java
index 063244c03..8424677c1 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfAwardingInstitutionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfAwardingInstitutionType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Name and status of awarding institution
  * 
- * <p>Java class for NameAndStatusOfAwardingInstitutionType complex type.
+ * <p>
+ * Java class for NameAndStatusOfAwardingInstitutionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="NameAndStatusOfAwardingInstitutionType">
@@ -47,94 +47,86 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "NameAndStatusOfAwardingInstitutionType", propOrder = {
-    "awardingInstitution"
-})
+@XmlType(name = "NameAndStatusOfAwardingInstitutionType", propOrder = { "awardingInstitution" })
 public class NameAndStatusOfAwardingInstitutionType {
 
-    @XmlElement(name = "AwardingInstitution", required = true)
-    protected List<NameAndStatusOfAwardingInstitutionType.AwardingInstitution> awardingInstitution;
-
-    /**
-     * Gets the value of the awardingInstitution property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the awardingInstitution property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAwardingInstitution().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution }
-     * 
-     * 
-     */
-    public List<NameAndStatusOfAwardingInstitutionType.AwardingInstitution> getAwardingInstitution() {
-        if (awardingInstitution == null) {
-            awardingInstitution = new ArrayList<NameAndStatusOfAwardingInstitutionType.AwardingInstitution>();
-        }
-        return this.awardingInstitution;
-    }
+	@XmlElement(name = "AwardingInstitution", required = true)
+	protected List<NameAndStatusOfAwardingInstitutionType.AwardingInstitution> awardingInstitution;
 
+	/**
+	 * Gets the value of the awardingInstitution property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the awardingInstitution property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getAwardingInstitution().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution }
+	 * 
+	 * 
+	 */
+	public List<NameAndStatusOfAwardingInstitutionType.AwardingInstitution> getAwardingInstitution() {
+		if (awardingInstitution == null) {
+			awardingInstitution = new ArrayList<NameAndStatusOfAwardingInstitutionType.AwardingInstitution>();
+		}
+		return this.awardingInstitution;
+	}
 
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}InstitutionType">
-     *       &lt;attribute name="awardingInstitutionID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class AwardingInstitution
-        extends InstitutionType
-    {
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}InstitutionType">
+	 *       &lt;attribute name="awardingInstitutionID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class AwardingInstitution extends InstitutionType {
 
-        @XmlAttribute(name = "awardingInstitutionID", required = true)
-        protected String awardingInstitutionID;
+		@XmlAttribute(name = "awardingInstitutionID", required = true)
+		protected String awardingInstitutionID;
 
-        /**
-         * Gets the value of the awardingInstitutionID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getAwardingInstitutionID() {
-            return awardingInstitutionID;
-        }
+		/**
+		 * Gets the value of the awardingInstitutionID property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getAwardingInstitutionID() {
+			return awardingInstitutionID;
+		}
 
-        /**
-         * Sets the value of the awardingInstitutionID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setAwardingInstitutionID(String value) {
-            this.awardingInstitutionID = value;
-        }
+		/**
+		 * Sets the value of the awardingInstitutionID property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setAwardingInstitutionID(String value) {
+			this.awardingInstitutionID = value;
+		}
 
-    }
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfInstitutionAdministeringStudiesType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfInstitutionAdministeringStudiesType.java
index 3083da620..90225c9a0 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfInstitutionAdministeringStudiesType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfInstitutionAdministeringStudiesType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -16,13 +15,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Name and status of institution administering studies
  * 
- * <p>Java class for NameAndStatusOfInstitutionAdministeringStudiesType complex type.
+ * <p>
+ * Java class for NameAndStatusOfInstitutionAdministeringStudiesType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="NameAndStatusOfInstitutionAdministeringStudiesType">
@@ -47,94 +47,86 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "NameAndStatusOfInstitutionAdministeringStudiesType", propOrder = {
-    "institutionAdministeringStudies"
-})
+@XmlType(name = "NameAndStatusOfInstitutionAdministeringStudiesType", propOrder = { "institutionAdministeringStudies" })
 public class NameAndStatusOfInstitutionAdministeringStudiesType {
 
-    @XmlElement(name = "InstitutionAdministeringStudies", required = true)
-    protected List<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies> institutionAdministeringStudies;
-
-    /**
-     * Gets the value of the institutionAdministeringStudies property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the institutionAdministeringStudies property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getInstitutionAdministeringStudies().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies }
-     * 
-     * 
-     */
-    public List<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies> getInstitutionAdministeringStudies() {
-        if (institutionAdministeringStudies == null) {
-            institutionAdministeringStudies = new ArrayList<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies>();
-        }
-        return this.institutionAdministeringStudies;
-    }
+	@XmlElement(name = "InstitutionAdministeringStudies", required = true)
+	protected List<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies> institutionAdministeringStudies;
 
+	/**
+	 * Gets the value of the institutionAdministeringStudies property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the institutionAdministeringStudies property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getInstitutionAdministeringStudies().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies }
+	 * 
+	 * 
+	 */
+	public List<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies> getInstitutionAdministeringStudies() {
+		if (institutionAdministeringStudies == null) {
+			institutionAdministeringStudies = new ArrayList<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies>();
+		}
+		return this.institutionAdministeringStudies;
+	}
 
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}InstitutionType">
-     *       &lt;attribute name="institutionAdministeringStudiesID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class InstitutionAdministeringStudies
-        extends InstitutionType
-    {
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:crue:academic:xsd:language:diplomasupplement}InstitutionType">
+	 *       &lt;attribute name="institutionAdministeringStudiesID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class InstitutionAdministeringStudies extends InstitutionType {
 
-        @XmlAttribute(name = "institutionAdministeringStudiesID", required = true)
-        protected String institutionAdministeringStudiesID;
+		@XmlAttribute(name = "institutionAdministeringStudiesID", required = true)
+		protected String institutionAdministeringStudiesID;
 
-        /**
-         * Gets the value of the institutionAdministeringStudiesID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getInstitutionAdministeringStudiesID() {
-            return institutionAdministeringStudiesID;
-        }
+		/**
+		 * Gets the value of the institutionAdministeringStudiesID property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getInstitutionAdministeringStudiesID() {
+			return institutionAdministeringStudiesID;
+		}
 
-        /**
-         * Sets the value of the institutionAdministeringStudiesID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setInstitutionAdministeringStudiesID(String value) {
-            this.institutionAdministeringStudiesID = value;
-        }
+		/**
+		 * Sets the value of the institutionAdministeringStudiesID property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setInstitutionAdministeringStudiesID(String value) {
+			this.institutionAdministeringStudiesID = value;
+		}
 
-    }
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ObjectFactory.java
index b6473551b..83b337368 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ObjectFactory.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ObjectFactory.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.JAXBElement;
@@ -13,644 +12,636 @@ import javax.xml.bind.annotation.XmlElementDecl;
 import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
-
 /**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the crue.academic.xsd.language.diplomasupplement package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
+ * This object contains factory methods for each Java content interface and Java element interface generated in the crue.academic.xsd.language.diplomasupplement package.
+ * <p>
+ * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist of schema derived interfaces
+ * and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of these are provided in this class.
  * 
  */
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _MultilingualDiplomaSupplement_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "MultilingualDiplomaSupplement");
-    private final static QName _DiplomaSupplement_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "DiplomaSupplement");
-    private final static QName _RichTextTagTypeItalic_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Italic");
-    private final static QName _RichTextTagTypeBreakLine_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "BreakLine");
-    private final static QName _RichTextTagTypeAttachedRef_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "AttachedRef");
-    private final static QName _RichTextTagTypeUnderline_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Underline");
-    private final static QName _RichTextTagTypeBold_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Bold");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: crue.academic.xsd.language.diplomasupplement
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link AddressType }
-     * 
-     */
-    public AddressType createAddressType() {
-        return new AddressType();
-    }
-
-    /**
-     * Create an instance of {@link LanguagesOfInstructionAndExaminationType }
-     * 
-     */
-    public LanguagesOfInstructionAndExaminationType createLanguagesOfInstructionAndExaminationType() {
-        return new LanguagesOfInstructionAndExaminationType();
-    }
-
-    /**
-     * Create an instance of {@link RichTextTagType }
-     * 
-     */
-    public RichTextTagType createRichTextTagType() {
-        return new RichTextTagType();
-    }
-
-    /**
-     * Create an instance of {@link MobilityProgrammeType }
-     * 
-     */
-    public MobilityProgrammeType createMobilityProgrammeType() {
-        return new MobilityProgrammeType();
-    }
-
-    /**
-     * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType }
-     * 
-     */
-    public NameAndStatusOfInstitutionAdministeringStudiesType createNameAndStatusOfInstitutionAdministeringStudiesType() {
-        return new NameAndStatusOfInstitutionAdministeringStudiesType();
-    }
-
-    /**
-     * Create an instance of {@link InstitutionType }
-     * 
-     */
-    public InstitutionType createInstitutionType() {
-        return new InstitutionType();
-    }
-
-    /**
-     * Create an instance of {@link MobilityProgrammeCourseUnitType }
-     * 
-     */
-    public MobilityProgrammeCourseUnitType createMobilityProgrammeCourseUnitType() {
-        return new MobilityProgrammeCourseUnitType();
-    }
-
-    /**
-     * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType }
-     * 
-     */
-    public InformationIdentifyingTheHolderOfTheQualificationType createInformationIdentifyingTheHolderOfTheQualificationType() {
-        return new InformationIdentifyingTheHolderOfTheQualificationType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitType }
-     * 
-     */
-    public CourseUnitType createCourseUnitType() {
-        return new CourseUnitType();
-    }
-
-    /**
-     * Create an instance of {@link LocalGradeType }
-     * 
-     */
-    public LocalGradeType createLocalGradeType() {
-        return new LocalGradeType();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheContentsAndResultsGainedType }
-     * 
-     */
-    public InformationOnTheContentsAndResultsGainedType createInformationOnTheContentsAndResultsGainedType() {
-        return new InformationOnTheContentsAndResultsGainedType();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheLevelOfTheQualificationType }
-     * 
-     */
-    public InformationOnTheLevelOfTheQualificationType createInformationOnTheLevelOfTheQualificationType() {
-        return new InformationOnTheLevelOfTheQualificationType();
-    }
-
-    /**
-     * Create an instance of {@link NameAndStatusOfAwardingInstitutionType }
-     * 
-     */
-    public NameAndStatusOfAwardingInstitutionType createNameAndStatusOfAwardingInstitutionType() {
-        return new NameAndStatusOfAwardingInstitutionType();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType }
-     * 
-     */
-    public InformationOnTheFunctionOfTheQualificationType createInformationOnTheFunctionOfTheQualificationType() {
-        return new InformationOnTheFunctionOfTheQualificationType();
-    }
-
-    /**
-     * Create an instance of {@link MultilingualDiplomaSupplementType }
-     * 
-     */
-    public MultilingualDiplomaSupplementType createMultilingualDiplomaSupplementType() {
-        return new MultilingualDiplomaSupplementType();
-    }
-
-    /**
-     * Create an instance of {@link DiplomaSupplementType }
-     * 
-     */
-    public DiplomaSupplementType createDiplomaSupplementType() {
-        return new DiplomaSupplementType();
-    }
-
-    /**
-     * Create an instance of {@link ExtensionContentType }
-     * 
-     */
-    public ExtensionContentType createExtensionContentType() {
-        return new ExtensionContentType();
-    }
-
-    /**
-     * Create an instance of {@link AttachedImageURLType }
-     * 
-     */
-    public AttachedImageURLType createAttachedImageURLType() {
-        return new AttachedImageURLType();
-    }
-
-    /**
-     * Create an instance of {@link CourseStructureDiagramType }
-     * 
-     */
-    public CourseStructureDiagramType createCourseStructureDiagramType() {
-        return new CourseStructureDiagramType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitWorkPlacementType }
-     * 
-     */
-    public CourseUnitWorkPlacementType createCourseUnitWorkPlacementType() {
-        return new CourseUnitWorkPlacementType();
-    }
-
-    /**
-     * Create an instance of {@link InformationIdentifyingTheQualificationType }
-     * 
-     */
-    public InformationIdentifyingTheQualificationType createInformationIdentifyingTheQualificationType() {
-        return new InformationIdentifyingTheQualificationType();
-    }
-
-    /**
-     * Create an instance of {@link MobilityProgrammeCoursesUnitsType }
-     * 
-     */
-    public MobilityProgrammeCoursesUnitsType createMobilityProgrammeCoursesUnitsType() {
-        return new MobilityProgrammeCoursesUnitsType();
-    }
-
-    /**
-     * Create an instance of {@link QualificationType }
-     * 
-     */
-    public QualificationType createQualificationType() {
-        return new QualificationType();
-    }
-
-    /**
-     * Create an instance of {@link CertificationOfTheSupplementType }
-     * 
-     */
-    public CertificationOfTheSupplementType createCertificationOfTheSupplementType() {
-        return new CertificationOfTheSupplementType();
-    }
-
-    /**
-     * Create an instance of {@link AttachedFileURLType }
-     * 
-     */
-    public AttachedFileURLType createAttachedFileURLType() {
-        return new AttachedFileURLType();
-    }
-
-    /**
-     * Create an instance of {@link ProgrammeRequirementsType }
-     * 
-     */
-    public ProgrammeRequirementsType createProgrammeRequirementsType() {
-        return new ProgrammeRequirementsType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitWorkPlacementsType }
-     * 
-     */
-    public CourseUnitWorkPlacementsType createCourseUnitWorkPlacementsType() {
-        return new CourseUnitWorkPlacementsType();
-    }
-
-    /**
-     * Create an instance of {@link AdditionalInformationType }
-     * 
-     */
-    public AdditionalInformationType createAdditionalInformationType() {
-        return new AdditionalInformationType();
-    }
-
-    /**
-     * Create an instance of {@link GradingSchemeAndGradeDistributionGuidanceType }
-     * 
-     */
-    public GradingSchemeAndGradeDistributionGuidanceType createGradingSchemeAndGradeDistributionGuidanceType() {
-        return new GradingSchemeAndGradeDistributionGuidanceType();
-    }
-
-    /**
-     * Create an instance of {@link AttachmentsType }
-     * 
-     */
-    public AttachmentsType createAttachmentsType() {
-        return new AttachmentsType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitLanguageOfInstructionType }
-     * 
-     */
-    public CourseUnitLanguageOfInstructionType createCourseUnitLanguageOfInstructionType() {
-        return new CourseUnitLanguageOfInstructionType();
-    }
-
-    /**
-     * Create an instance of {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
-     * 
-     */
-    public CoursesAttendedInOtherInstitutionInMobilityProgramsType createCoursesAttendedInOtherInstitutionInMobilityProgramsType() {
-        return new CoursesAttendedInOtherInstitutionInMobilityProgramsType();
-    }
-
-    /**
-     * Create an instance of {@link FamilyNameType }
-     * 
-     */
-    public FamilyNameType createFamilyNameType() {
-        return new FamilyNameType();
-    }
-
-    /**
-     * Create an instance of {@link CoursesGroupsType }
-     * 
-     */
-    public CoursesGroupsType createCoursesGroupsType() {
-        return new CoursesGroupsType();
-    }
-
-    /**
-     * Create an instance of {@link TitleConferredType }
-     * 
-     */
-    public TitleConferredType createTitleConferredType() {
-        return new TitleConferredType();
-    }
-
-    /**
-     * Create an instance of {@link OfficialStampType }
-     * 
-     */
-    public OfficialStampType createOfficialStampType() {
-        return new OfficialStampType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitStudentPerformanceType }
-     * 
-     */
-    public CourseUnitStudentPerformanceType createCourseUnitStudentPerformanceType() {
-        return new CourseUnitStudentPerformanceType();
-    }
-
-    /**
-     * Create an instance of {@link GivenNameType }
-     * 
-     */
-    public GivenNameType createGivenNameType() {
-        return new GivenNameType();
-    }
-
-    /**
-     * Create an instance of {@link CoursesUnitsType }
-     * 
-     */
-    public CoursesUnitsType createCoursesUnitsType() {
-        return new CoursesUnitsType();
-    }
-
-    /**
-     * Create an instance of {@link ProgrammeDetailsType }
-     * 
-     */
-    public ProgrammeDetailsType createProgrammeDetailsType() {
-        return new ProgrammeDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link OfficialCertifyingType }
-     * 
-     */
-    public OfficialCertifyingType createOfficialCertifyingType() {
-        return new OfficialCertifyingType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitLanguagesOfInstructionType }
-     * 
-     */
-    public CourseUnitLanguagesOfInstructionType createCourseUnitLanguagesOfInstructionType() {
-        return new CourseUnitLanguagesOfInstructionType();
-    }
-
-    /**
-     * Create an instance of {@link AttachedImageDataType }
-     * 
-     */
-    public AttachedImageDataType createAttachedImageDataType() {
-        return new AttachedImageDataType();
-    }
-
-    /**
-     * Create an instance of {@link AttachedType }
-     * 
-     */
-    public AttachedType createAttachedType() {
-        return new AttachedType();
-    }
-
-    /**
-     * Create an instance of {@link CoursesGroupType }
-     * 
-     */
-    public CoursesGroupType createCoursesGroupType() {
-        return new CoursesGroupType();
-    }
-
-    /**
-     * Create an instance of {@link AttachedFileDataType }
-     * 
-     */
-    public AttachedFileDataType createAttachedFileDataType() {
-        return new AttachedFileDataType();
-    }
-
-    /**
-     * Create an instance of {@link ContactInformationType }
-     * 
-     */
-    public ContactInformationType createContactInformationType() {
-        return new ContactInformationType();
-    }
-
-    /**
-     * Create an instance of {@link OfficialsCertifyingType }
-     * 
-     */
-    public OfficialsCertifyingType createOfficialsCertifyingType() {
-        return new OfficialsCertifyingType();
-    }
-
-    /**
-     * Create an instance of {@link AddressType.Country }
-     * 
-     */
-    public AddressType.Country createAddressTypeCountry() {
-        return new AddressType.Country();
-    }
-
-    /**
-     * Create an instance of {@link LanguagesOfInstructionAndExaminationType.Language }
-     * 
-     */
-    public LanguagesOfInstructionAndExaminationType.Language createLanguagesOfInstructionAndExaminationTypeLanguage() {
-        return new LanguagesOfInstructionAndExaminationType.Language();
-    }
-
-    /**
-     * Create an instance of {@link RichTextTagType.AttachedRef }
-     * 
-     */
-    public RichTextTagType.AttachedRef createRichTextTagTypeAttachedRef() {
-        return new RichTextTagType.AttachedRef();
-    }
-
-    /**
-     * Create an instance of {@link MobilityProgrammeType.Country }
-     * 
-     */
-    public MobilityProgrammeType.Country createMobilityProgrammeTypeCountry() {
-        return new MobilityProgrammeType.Country();
-    }
-
-    /**
-     * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies }
-     * 
-     */
-    public NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies createNameAndStatusOfInstitutionAdministeringStudiesTypeInstitutionAdministeringStudies() {
-        return new NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies();
-    }
-
-    /**
-     * Create an instance of {@link InstitutionType.Country }
-     * 
-     */
-    public InstitutionType.Country createInstitutionTypeCountry() {
-        return new InstitutionType.Country();
-    }
-
-    /**
-     * Create an instance of {@link InstitutionType.AttachedImageRef }
-     * 
-     */
-    public InstitutionType.AttachedImageRef createInstitutionTypeAttachedImageRef() {
-        return new InstitutionType.AttachedImageRef();
-    }
-
-    /**
-     * Create an instance of {@link MobilityProgrammeCourseUnitType.Title }
-     * 
-     */
-    public MobilityProgrammeCourseUnitType.Title createMobilityProgrammeCourseUnitTypeTitle() {
-        return new MobilityProgrammeCourseUnitType.Title();
-    }
-
-    /**
-     * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth }
-     * 
-     */
-    public InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth createInformationIdentifyingTheHolderOfTheQualificationTypeCountryOfBirth() {
-        return new InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth();
-    }
-
-    /**
-     * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
-     * 
-     */
-    public InformationIdentifyingTheHolderOfTheQualificationType.Gender createInformationIdentifyingTheHolderOfTheQualificationTypeGender() {
-        return new InformationIdentifyingTheHolderOfTheQualificationType.Gender();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitType.Type }
-     * 
-     */
-    public CourseUnitType.Type createCourseUnitTypeType() {
-        return new CourseUnitType.Type();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitType.YearOfStudy }
-     * 
-     */
-    public CourseUnitType.YearOfStudy createCourseUnitTypeYearOfStudy() {
-        return new CourseUnitType.YearOfStudy();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitType.Level }
-     * 
-     */
-    public CourseUnitType.Level createCourseUnitTypeLevel() {
-        return new CourseUnitType.Level();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitType.ModeOfDelivery }
-     * 
-     */
-    public CourseUnitType.ModeOfDelivery createCourseUnitTypeModeOfDelivery() {
-        return new CourseUnitType.ModeOfDelivery();
-    }
-
-    /**
-     * Create an instance of {@link LocalGradeType.Source }
-     * 
-     */
-    public LocalGradeType.Source createLocalGradeTypeSource() {
-        return new LocalGradeType.Source();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
-     * 
-     */
-    public InformationOnTheContentsAndResultsGainedType.ModeOfStudy createInformationOnTheContentsAndResultsGainedTypeModeOfStudy() {
-        return new InformationOnTheContentsAndResultsGainedType.ModeOfStudy();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.Level }
-     * 
-     */
-    public InformationOnTheLevelOfTheQualificationType.Level createInformationOnTheLevelOfTheQualificationTypeLevel() {
-        return new InformationOnTheLevelOfTheQualificationType.Level();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
-     * 
-     */
-    public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme createInformationOnTheLevelOfTheQualificationTypeOfficialLengthOfProgramme() {
-        return new InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme();
-    }
-
-    /**
-     * Create an instance of {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution }
-     * 
-     */
-    public NameAndStatusOfAwardingInstitutionType.AwardingInstitution createNameAndStatusOfAwardingInstitutionTypeAwardingInstitution() {
-        return new NameAndStatusOfAwardingInstitutionType.AwardingInstitution();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
-     * 
-     */
-    public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus createInformationOnTheFunctionOfTheQualificationTypeProfessionalStatus() {
-        return new InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MultilingualDiplomaSupplementType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "MultilingualDiplomaSupplement")
-    public JAXBElement<MultilingualDiplomaSupplementType> createMultilingualDiplomaSupplement(MultilingualDiplomaSupplementType value) {
-        return new JAXBElement<MultilingualDiplomaSupplementType>(_MultilingualDiplomaSupplement_QNAME, MultilingualDiplomaSupplementType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DiplomaSupplementType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "DiplomaSupplement")
-    public JAXBElement<DiplomaSupplementType> createDiplomaSupplement(DiplomaSupplementType value) {
-        return new JAXBElement<DiplomaSupplementType>(_DiplomaSupplement_QNAME, DiplomaSupplementType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Italic", scope = RichTextTagType.class)
-    public JAXBElement<String> createRichTextTagTypeItalic(String value) {
-        return new JAXBElement<String>(_RichTextTagTypeItalic_QNAME, String.class, RichTextTagType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "BreakLine", scope = RichTextTagType.class)
-    public JAXBElement<String> createRichTextTagTypeBreakLine(String value) {
-        return new JAXBElement<String>(_RichTextTagTypeBreakLine_QNAME, String.class, RichTextTagType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "AttachedRef", scope = RichTextTagType.class)
-    public JAXBElement<RichTextTagType.AttachedRef> createRichTextTagTypeAttachedRef(RichTextTagType.AttachedRef value) {
-        return new JAXBElement<RichTextTagType.AttachedRef>(_RichTextTagTypeAttachedRef_QNAME, RichTextTagType.AttachedRef.class, RichTextTagType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Underline", scope = RichTextTagType.class)
-    public JAXBElement<String> createRichTextTagTypeUnderline(String value) {
-        return new JAXBElement<String>(_RichTextTagTypeUnderline_QNAME, String.class, RichTextTagType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Bold", scope = RichTextTagType.class)
-    public JAXBElement<String> createRichTextTagTypeBold(String value) {
-        return new JAXBElement<String>(_RichTextTagTypeBold_QNAME, String.class, RichTextTagType.class, value);
-    }
+	private final static QName _MultilingualDiplomaSupplement_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "MultilingualDiplomaSupplement");
+	private final static QName _DiplomaSupplement_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "DiplomaSupplement");
+	private final static QName _RichTextTagTypeItalic_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Italic");
+	private final static QName _RichTextTagTypeBreakLine_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "BreakLine");
+	private final static QName _RichTextTagTypeAttachedRef_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "AttachedRef");
+	private final static QName _RichTextTagTypeUnderline_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Underline");
+	private final static QName _RichTextTagTypeBold_QNAME = new QName("urn:crue:academic:xsd:language:diplomasupplement", "Bold");
+
+	/**
+	 * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: crue.academic.xsd.language.diplomasupplement
+	 * 
+	 */
+	public ObjectFactory() {
+	}
+
+	/**
+	 * Create an instance of {@link AddressType }
+	 * 
+	 */
+	public AddressType createAddressType() {
+		return new AddressType();
+	}
+
+	/**
+	 * Create an instance of {@link LanguagesOfInstructionAndExaminationType }
+	 * 
+	 */
+	public LanguagesOfInstructionAndExaminationType createLanguagesOfInstructionAndExaminationType() {
+		return new LanguagesOfInstructionAndExaminationType();
+	}
+
+	/**
+	 * Create an instance of {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType createRichTextTagType() {
+		return new RichTextTagType();
+	}
+
+	/**
+	 * Create an instance of {@link MobilityProgrammeType }
+	 * 
+	 */
+	public MobilityProgrammeType createMobilityProgrammeType() {
+		return new MobilityProgrammeType();
+	}
+
+	/**
+	 * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType }
+	 * 
+	 */
+	public NameAndStatusOfInstitutionAdministeringStudiesType createNameAndStatusOfInstitutionAdministeringStudiesType() {
+		return new NameAndStatusOfInstitutionAdministeringStudiesType();
+	}
+
+	/**
+	 * Create an instance of {@link InstitutionType }
+	 * 
+	 */
+	public InstitutionType createInstitutionType() {
+		return new InstitutionType();
+	}
+
+	/**
+	 * Create an instance of {@link MobilityProgrammeCourseUnitType }
+	 * 
+	 */
+	public MobilityProgrammeCourseUnitType createMobilityProgrammeCourseUnitType() {
+		return new MobilityProgrammeCourseUnitType();
+	}
+
+	/**
+	 * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType }
+	 * 
+	 */
+	public InformationIdentifyingTheHolderOfTheQualificationType createInformationIdentifyingTheHolderOfTheQualificationType() {
+		return new InformationIdentifyingTheHolderOfTheQualificationType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitType }
+	 * 
+	 */
+	public CourseUnitType createCourseUnitType() {
+		return new CourseUnitType();
+	}
+
+	/**
+	 * Create an instance of {@link LocalGradeType }
+	 * 
+	 */
+	public LocalGradeType createLocalGradeType() {
+		return new LocalGradeType();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheContentsAndResultsGainedType }
+	 * 
+	 */
+	public InformationOnTheContentsAndResultsGainedType createInformationOnTheContentsAndResultsGainedType() {
+		return new InformationOnTheContentsAndResultsGainedType();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheLevelOfTheQualificationType }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType createInformationOnTheLevelOfTheQualificationType() {
+		return new InformationOnTheLevelOfTheQualificationType();
+	}
+
+	/**
+	 * Create an instance of {@link NameAndStatusOfAwardingInstitutionType }
+	 * 
+	 */
+	public NameAndStatusOfAwardingInstitutionType createNameAndStatusOfAwardingInstitutionType() {
+		return new NameAndStatusOfAwardingInstitutionType();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType }
+	 * 
+	 */
+	public InformationOnTheFunctionOfTheQualificationType createInformationOnTheFunctionOfTheQualificationType() {
+		return new InformationOnTheFunctionOfTheQualificationType();
+	}
+
+	/**
+	 * Create an instance of {@link MultilingualDiplomaSupplementType }
+	 * 
+	 */
+	public MultilingualDiplomaSupplementType createMultilingualDiplomaSupplementType() {
+		return new MultilingualDiplomaSupplementType();
+	}
+
+	/**
+	 * Create an instance of {@link DiplomaSupplementType }
+	 * 
+	 */
+	public DiplomaSupplementType createDiplomaSupplementType() {
+		return new DiplomaSupplementType();
+	}
+
+	/**
+	 * Create an instance of {@link ExtensionContentType }
+	 * 
+	 */
+	public ExtensionContentType createExtensionContentType() {
+		return new ExtensionContentType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachedImageURLType }
+	 * 
+	 */
+	public AttachedImageURLType createAttachedImageURLType() {
+		return new AttachedImageURLType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseStructureDiagramType }
+	 * 
+	 */
+	public CourseStructureDiagramType createCourseStructureDiagramType() {
+		return new CourseStructureDiagramType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitWorkPlacementType }
+	 * 
+	 */
+	public CourseUnitWorkPlacementType createCourseUnitWorkPlacementType() {
+		return new CourseUnitWorkPlacementType();
+	}
+
+	/**
+	 * Create an instance of {@link InformationIdentifyingTheQualificationType }
+	 * 
+	 */
+	public InformationIdentifyingTheQualificationType createInformationIdentifyingTheQualificationType() {
+		return new InformationIdentifyingTheQualificationType();
+	}
+
+	/**
+	 * Create an instance of {@link MobilityProgrammeCoursesUnitsType }
+	 * 
+	 */
+	public MobilityProgrammeCoursesUnitsType createMobilityProgrammeCoursesUnitsType() {
+		return new MobilityProgrammeCoursesUnitsType();
+	}
+
+	/**
+	 * Create an instance of {@link QualificationType }
+	 * 
+	 */
+	public QualificationType createQualificationType() {
+		return new QualificationType();
+	}
+
+	/**
+	 * Create an instance of {@link CertificationOfTheSupplementType }
+	 * 
+	 */
+	public CertificationOfTheSupplementType createCertificationOfTheSupplementType() {
+		return new CertificationOfTheSupplementType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachedFileURLType }
+	 * 
+	 */
+	public AttachedFileURLType createAttachedFileURLType() {
+		return new AttachedFileURLType();
+	}
+
+	/**
+	 * Create an instance of {@link ProgrammeRequirementsType }
+	 * 
+	 */
+	public ProgrammeRequirementsType createProgrammeRequirementsType() {
+		return new ProgrammeRequirementsType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitWorkPlacementsType }
+	 * 
+	 */
+	public CourseUnitWorkPlacementsType createCourseUnitWorkPlacementsType() {
+		return new CourseUnitWorkPlacementsType();
+	}
+
+	/**
+	 * Create an instance of {@link AdditionalInformationType }
+	 * 
+	 */
+	public AdditionalInformationType createAdditionalInformationType() {
+		return new AdditionalInformationType();
+	}
+
+	/**
+	 * Create an instance of {@link GradingSchemeAndGradeDistributionGuidanceType }
+	 * 
+	 */
+	public GradingSchemeAndGradeDistributionGuidanceType createGradingSchemeAndGradeDistributionGuidanceType() {
+		return new GradingSchemeAndGradeDistributionGuidanceType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachmentsType }
+	 * 
+	 */
+	public AttachmentsType createAttachmentsType() {
+		return new AttachmentsType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitLanguageOfInstructionType }
+	 * 
+	 */
+	public CourseUnitLanguageOfInstructionType createCourseUnitLanguageOfInstructionType() {
+		return new CourseUnitLanguageOfInstructionType();
+	}
+
+	/**
+	 * Create an instance of {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
+	 * 
+	 */
+	public CoursesAttendedInOtherInstitutionInMobilityProgramsType createCoursesAttendedInOtherInstitutionInMobilityProgramsType() {
+		return new CoursesAttendedInOtherInstitutionInMobilityProgramsType();
+	}
+
+	/**
+	 * Create an instance of {@link FamilyNameType }
+	 * 
+	 */
+	public FamilyNameType createFamilyNameType() {
+		return new FamilyNameType();
+	}
+
+	/**
+	 * Create an instance of {@link CoursesGroupsType }
+	 * 
+	 */
+	public CoursesGroupsType createCoursesGroupsType() {
+		return new CoursesGroupsType();
+	}
+
+	/**
+	 * Create an instance of {@link TitleConferredType }
+	 * 
+	 */
+	public TitleConferredType createTitleConferredType() {
+		return new TitleConferredType();
+	}
+
+	/**
+	 * Create an instance of {@link OfficialStampType }
+	 * 
+	 */
+	public OfficialStampType createOfficialStampType() {
+		return new OfficialStampType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitStudentPerformanceType }
+	 * 
+	 */
+	public CourseUnitStudentPerformanceType createCourseUnitStudentPerformanceType() {
+		return new CourseUnitStudentPerformanceType();
+	}
+
+	/**
+	 * Create an instance of {@link GivenNameType }
+	 * 
+	 */
+	public GivenNameType createGivenNameType() {
+		return new GivenNameType();
+	}
+
+	/**
+	 * Create an instance of {@link CoursesUnitsType }
+	 * 
+	 */
+	public CoursesUnitsType createCoursesUnitsType() {
+		return new CoursesUnitsType();
+	}
+
+	/**
+	 * Create an instance of {@link ProgrammeDetailsType }
+	 * 
+	 */
+	public ProgrammeDetailsType createProgrammeDetailsType() {
+		return new ProgrammeDetailsType();
+	}
+
+	/**
+	 * Create an instance of {@link OfficialCertifyingType }
+	 * 
+	 */
+	public OfficialCertifyingType createOfficialCertifyingType() {
+		return new OfficialCertifyingType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitLanguagesOfInstructionType }
+	 * 
+	 */
+	public CourseUnitLanguagesOfInstructionType createCourseUnitLanguagesOfInstructionType() {
+		return new CourseUnitLanguagesOfInstructionType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachedImageDataType }
+	 * 
+	 */
+	public AttachedImageDataType createAttachedImageDataType() {
+		return new AttachedImageDataType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachedType }
+	 * 
+	 */
+	public AttachedType createAttachedType() {
+		return new AttachedType();
+	}
+
+	/**
+	 * Create an instance of {@link CoursesGroupType }
+	 * 
+	 */
+	public CoursesGroupType createCoursesGroupType() {
+		return new CoursesGroupType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachedFileDataType }
+	 * 
+	 */
+	public AttachedFileDataType createAttachedFileDataType() {
+		return new AttachedFileDataType();
+	}
+
+	/**
+	 * Create an instance of {@link ContactInformationType }
+	 * 
+	 */
+	public ContactInformationType createContactInformationType() {
+		return new ContactInformationType();
+	}
+
+	/**
+	 * Create an instance of {@link OfficialsCertifyingType }
+	 * 
+	 */
+	public OfficialsCertifyingType createOfficialsCertifyingType() {
+		return new OfficialsCertifyingType();
+	}
+
+	/**
+	 * Create an instance of {@link AddressType.Country }
+	 * 
+	 */
+	public AddressType.Country createAddressTypeCountry() {
+		return new AddressType.Country();
+	}
+
+	/**
+	 * Create an instance of {@link LanguagesOfInstructionAndExaminationType.Language }
+	 * 
+	 */
+	public LanguagesOfInstructionAndExaminationType.Language createLanguagesOfInstructionAndExaminationTypeLanguage() {
+		return new LanguagesOfInstructionAndExaminationType.Language();
+	}
+
+	/**
+	 * Create an instance of {@link RichTextTagType.AttachedRef }
+	 * 
+	 */
+	public RichTextTagType.AttachedRef createRichTextTagTypeAttachedRef() {
+		return new RichTextTagType.AttachedRef();
+	}
+
+	/**
+	 * Create an instance of {@link MobilityProgrammeType.Country }
+	 * 
+	 */
+	public MobilityProgrammeType.Country createMobilityProgrammeTypeCountry() {
+		return new MobilityProgrammeType.Country();
+	}
+
+	/**
+	 * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies }
+	 * 
+	 */
+	public NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies createNameAndStatusOfInstitutionAdministeringStudiesTypeInstitutionAdministeringStudies() {
+		return new NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies();
+	}
+
+	/**
+	 * Create an instance of {@link InstitutionType.Country }
+	 * 
+	 */
+	public InstitutionType.Country createInstitutionTypeCountry() {
+		return new InstitutionType.Country();
+	}
+
+	/**
+	 * Create an instance of {@link InstitutionType.AttachedImageRef }
+	 * 
+	 */
+	public InstitutionType.AttachedImageRef createInstitutionTypeAttachedImageRef() {
+		return new InstitutionType.AttachedImageRef();
+	}
+
+	/**
+	 * Create an instance of {@link MobilityProgrammeCourseUnitType.Title }
+	 * 
+	 */
+	public MobilityProgrammeCourseUnitType.Title createMobilityProgrammeCourseUnitTypeTitle() {
+		return new MobilityProgrammeCourseUnitType.Title();
+	}
+
+	/**
+	 * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth }
+	 * 
+	 */
+	public InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth createInformationIdentifyingTheHolderOfTheQualificationTypeCountryOfBirth() {
+		return new InformationIdentifyingTheHolderOfTheQualificationType.CountryOfBirth();
+	}
+
+	/**
+	 * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
+	 * 
+	 */
+	public InformationIdentifyingTheHolderOfTheQualificationType.Gender createInformationIdentifyingTheHolderOfTheQualificationTypeGender() {
+		return new InformationIdentifyingTheHolderOfTheQualificationType.Gender();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitType.Type }
+	 * 
+	 */
+	public CourseUnitType.Type createCourseUnitTypeType() {
+		return new CourseUnitType.Type();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitType.YearOfStudy }
+	 * 
+	 */
+	public CourseUnitType.YearOfStudy createCourseUnitTypeYearOfStudy() {
+		return new CourseUnitType.YearOfStudy();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitType.Level }
+	 * 
+	 */
+	public CourseUnitType.Level createCourseUnitTypeLevel() {
+		return new CourseUnitType.Level();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitType.ModeOfDelivery }
+	 * 
+	 */
+	public CourseUnitType.ModeOfDelivery createCourseUnitTypeModeOfDelivery() {
+		return new CourseUnitType.ModeOfDelivery();
+	}
+
+	/**
+	 * Create an instance of {@link LocalGradeType.Source }
+	 * 
+	 */
+	public LocalGradeType.Source createLocalGradeTypeSource() {
+		return new LocalGradeType.Source();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
+	 * 
+	 */
+	public InformationOnTheContentsAndResultsGainedType.ModeOfStudy createInformationOnTheContentsAndResultsGainedTypeModeOfStudy() {
+		return new InformationOnTheContentsAndResultsGainedType.ModeOfStudy();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.Level }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType.Level createInformationOnTheLevelOfTheQualificationTypeLevel() {
+		return new InformationOnTheLevelOfTheQualificationType.Level();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme createInformationOnTheLevelOfTheQualificationTypeOfficialLengthOfProgramme() {
+		return new InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme();
+	}
+
+	/**
+	 * Create an instance of {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution }
+	 * 
+	 */
+	public NameAndStatusOfAwardingInstitutionType.AwardingInstitution createNameAndStatusOfAwardingInstitutionTypeAwardingInstitution() {
+		return new NameAndStatusOfAwardingInstitutionType.AwardingInstitution();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
+	 * 
+	 */
+	public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus createInformationOnTheFunctionOfTheQualificationTypeProfessionalStatus() {
+		return new InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus();
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link MultilingualDiplomaSupplementType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "MultilingualDiplomaSupplement")
+	public JAXBElement<MultilingualDiplomaSupplementType> createMultilingualDiplomaSupplement(MultilingualDiplomaSupplementType value) {
+		return new JAXBElement<MultilingualDiplomaSupplementType>(_MultilingualDiplomaSupplement_QNAME, MultilingualDiplomaSupplementType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link DiplomaSupplementType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "DiplomaSupplement")
+	public JAXBElement<DiplomaSupplementType> createDiplomaSupplement(DiplomaSupplementType value) {
+		return new JAXBElement<DiplomaSupplementType>(_DiplomaSupplement_QNAME, DiplomaSupplementType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Italic", scope = RichTextTagType.class)
+	public JAXBElement<String> createRichTextTagTypeItalic(String value) {
+		return new JAXBElement<String>(_RichTextTagTypeItalic_QNAME, String.class, RichTextTagType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "BreakLine", scope = RichTextTagType.class)
+	public JAXBElement<String> createRichTextTagTypeBreakLine(String value) {
+		return new JAXBElement<String>(_RichTextTagTypeBreakLine_QNAME, String.class, RichTextTagType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "AttachedRef", scope = RichTextTagType.class)
+	public JAXBElement<RichTextTagType.AttachedRef> createRichTextTagTypeAttachedRef(RichTextTagType.AttachedRef value) {
+		return new JAXBElement<RichTextTagType.AttachedRef>(_RichTextTagTypeAttachedRef_QNAME, RichTextTagType.AttachedRef.class, RichTextTagType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Underline", scope = RichTextTagType.class)
+	public JAXBElement<String> createRichTextTagTypeUnderline(String value) {
+		return new JAXBElement<String>(_RichTextTagTypeUnderline_QNAME, String.class, RichTextTagType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:crue:academic:xsd:language:diplomasupplement", name = "Bold", scope = RichTextTagType.class)
+	public JAXBElement<String> createRichTextTagTypeBold(String value) {
+		return new JAXBElement<String>(_RichTextTagTypeBold_QNAME, String.class, RichTextTagType.class, value);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialCertifyingType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialCertifyingType.java
index 1d2cfd97e..ddf4b7ecc 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialCertifyingType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialCertifyingType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Official certifying the DS
  * 
- * <p>Java class for OfficialCertifyingType complex type.
+ * <p>
+ * Java class for OfficialCertifyingType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="OfficialCertifyingType">
@@ -40,116 +40,100 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OfficialCertifyingType", propOrder = {
-    "familyName",
-    "givenName",
-    "capacity"
-})
+@XmlType(name = "OfficialCertifyingType", propOrder = { "familyName", "givenName", "capacity" })
 public class OfficialCertifyingType {
 
-    @XmlElement(name = "FamilyName", required = true)
-    protected FamilyNameType familyName;
-    @XmlElement(name = "GivenName", required = true)
-    protected GivenNameType givenName;
-    @XmlElement(name = "Capacity", required = true)
-    protected String capacity;
-    @XmlAttribute(name = "awardingInstitutionID", required = true)
-    protected String awardingInstitutionID;
+	@XmlElement(name = "FamilyName", required = true)
+	protected FamilyNameType familyName;
+	@XmlElement(name = "GivenName", required = true)
+	protected GivenNameType givenName;
+	@XmlElement(name = "Capacity", required = true)
+	protected String capacity;
+	@XmlAttribute(name = "awardingInstitutionID", required = true)
+	protected String awardingInstitutionID;
 
-    /**
-     * Gets the value of the familyName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FamilyNameType }
-     *     
-     */
-    public FamilyNameType getFamilyName() {
-        return familyName;
-    }
+	/**
+	 * Gets the value of the familyName property.
+	 * 
+	 * @return possible object is {@link FamilyNameType }
+	 * 
+	 */
+	public FamilyNameType getFamilyName() {
+		return familyName;
+	}
 
-    /**
-     * Sets the value of the familyName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FamilyNameType }
-     *     
-     */
-    public void setFamilyName(FamilyNameType value) {
-        this.familyName = value;
-    }
+	/**
+	 * Sets the value of the familyName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link FamilyNameType }
+	 * 
+	 */
+	public void setFamilyName(FamilyNameType value) {
+		this.familyName = value;
+	}
 
-    /**
-     * Gets the value of the givenName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GivenNameType }
-     *     
-     */
-    public GivenNameType getGivenName() {
-        return givenName;
-    }
+	/**
+	 * Gets the value of the givenName property.
+	 * 
+	 * @return possible object is {@link GivenNameType }
+	 * 
+	 */
+	public GivenNameType getGivenName() {
+		return givenName;
+	}
 
-    /**
-     * Sets the value of the givenName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GivenNameType }
-     *     
-     */
-    public void setGivenName(GivenNameType value) {
-        this.givenName = value;
-    }
+	/**
+	 * Sets the value of the givenName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link GivenNameType }
+	 * 
+	 */
+	public void setGivenName(GivenNameType value) {
+		this.givenName = value;
+	}
 
-    /**
-     * Gets the value of the capacity property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCapacity() {
-        return capacity;
-    }
+	/**
+	 * Gets the value of the capacity property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCapacity() {
+		return capacity;
+	}
 
-    /**
-     * Sets the value of the capacity property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCapacity(String value) {
-        this.capacity = value;
-    }
+	/**
+	 * Sets the value of the capacity property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCapacity(String value) {
+		this.capacity = value;
+	}
 
-    /**
-     * Gets the value of the awardingInstitutionID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAwardingInstitutionID() {
-        return awardingInstitutionID;
-    }
+	/**
+	 * Gets the value of the awardingInstitutionID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAwardingInstitutionID() {
+		return awardingInstitutionID;
+	}
 
-    /**
-     * Sets the value of the awardingInstitutionID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAwardingInstitutionID(String value) {
-        this.awardingInstitutionID = value;
-    }
+	/**
+	 * Sets the value of the awardingInstitutionID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAwardingInstitutionID(String value) {
+		this.awardingInstitutionID = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialStampType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialStampType.java
index af9007a1b..f92a005d3 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialStampType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialStampType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Official stamp or seal of the institution
  * 
- * <p>Java class for OfficialStampType complex type.
+ * <p>
+ * Java class for OfficialStampType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="OfficialStampType">
@@ -38,62 +38,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OfficialStampType", propOrder = {
-    "description"
-})
+@XmlType(name = "OfficialStampType", propOrder = { "description" })
 public class OfficialStampType {
 
-    @XmlElement(name = "Description", required = true)
-    protected String description;
-    @XmlAttribute(name = "awardingInstitutionID", required = true)
-    protected String awardingInstitutionID;
+	@XmlElement(name = "Description", required = true)
+	protected String description;
+	@XmlAttribute(name = "awardingInstitutionID", required = true)
+	protected String awardingInstitutionID;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+	/**
+	 * Gets the value of the description property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDescription() {
+		return description;
+	}
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+	/**
+	 * Sets the value of the description property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDescription(String value) {
+		this.description = value;
+	}
 
-    /**
-     * Gets the value of the awardingInstitutionID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAwardingInstitutionID() {
-        return awardingInstitutionID;
-    }
+	/**
+	 * Gets the value of the awardingInstitutionID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAwardingInstitutionID() {
+		return awardingInstitutionID;
+	}
 
-    /**
-     * Sets the value of the awardingInstitutionID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAwardingInstitutionID(String value) {
-        this.awardingInstitutionID = value;
-    }
+	/**
+	 * Sets the value of the awardingInstitutionID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAwardingInstitutionID(String value) {
+		this.awardingInstitutionID = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialsCertifyingType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialsCertifyingType.java
index 392e8d412..c77b684c3 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialsCertifyingType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialsCertifyingType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.util.ArrayList;
@@ -15,13 +14,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Officials certifying
  * 
- * <p>Java class for OfficialsCertifyingType complex type.
+ * <p>
+ * Java class for OfficialsCertifyingType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="OfficialsCertifyingType">
@@ -38,41 +38,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OfficialsCertifyingType", propOrder = {
-    "officialCertifying"
-})
+@XmlType(name = "OfficialsCertifyingType", propOrder = { "officialCertifying" })
 public class OfficialsCertifyingType {
 
-    @XmlElement(name = "OfficialCertifying", required = true)
-    protected List<OfficialCertifyingType> officialCertifying;
+	@XmlElement(name = "OfficialCertifying", required = true)
+	protected List<OfficialCertifyingType> officialCertifying;
 
-    /**
-     * Gets the value of the officialCertifying property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the officialCertifying property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOfficialCertifying().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link OfficialCertifyingType }
-     * 
-     * 
-     */
-    public List<OfficialCertifyingType> getOfficialCertifying() {
-        if (officialCertifying == null) {
-            officialCertifying = new ArrayList<OfficialCertifyingType>();
-        }
-        return this.officialCertifying;
-    }
+	/**
+	 * Gets the value of the officialCertifying property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the officialCertifying property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getOfficialCertifying().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link OfficialCertifyingType }
+	 * 
+	 * 
+	 */
+	public List<OfficialCertifyingType> getOfficialCertifying() {
+		if (officialCertifying == null) {
+			officialCertifying = new ArrayList<OfficialCertifyingType>();
+		}
+		return this.officialCertifying;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeDetailsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeDetailsType.java
index a6e27914c..9c2ac3744 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeDetailsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeDetailsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Programme details
  * 
- * <p>Java class for ProgrammeDetailsType complex type.
+ * <p>
+ * Java class for ProgrammeDetailsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ProgrammeDetailsType">
@@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProgrammeDetailsType", propOrder = {
-    "courseStructureDiagram",
-    "coursesAttendedInOtherInstitutionInMobilityPrograms"
-})
+@XmlType(name = "ProgrammeDetailsType", propOrder = { "courseStructureDiagram", "coursesAttendedInOtherInstitutionInMobilityPrograms" })
 public class ProgrammeDetailsType {
 
-    @XmlElement(name = "CourseStructureDiagram", required = true)
-    protected CourseStructureDiagramType courseStructureDiagram;
-    @XmlElement(name = "CoursesAttendedInOtherInstitutionInMobilityPrograms")
-    protected CoursesAttendedInOtherInstitutionInMobilityProgramsType coursesAttendedInOtherInstitutionInMobilityPrograms;
+	@XmlElement(name = "CourseStructureDiagram", required = true)
+	protected CourseStructureDiagramType courseStructureDiagram;
+	@XmlElement(name = "CoursesAttendedInOtherInstitutionInMobilityPrograms")
+	protected CoursesAttendedInOtherInstitutionInMobilityProgramsType coursesAttendedInOtherInstitutionInMobilityPrograms;
 
-    /**
-     * Gets the value of the courseStructureDiagram property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseStructureDiagramType }
-     *     
-     */
-    public CourseStructureDiagramType getCourseStructureDiagram() {
-        return courseStructureDiagram;
-    }
+	/**
+	 * Gets the value of the courseStructureDiagram property.
+	 * 
+	 * @return possible object is {@link CourseStructureDiagramType }
+	 * 
+	 */
+	public CourseStructureDiagramType getCourseStructureDiagram() {
+		return courseStructureDiagram;
+	}
 
-    /**
-     * Sets the value of the courseStructureDiagram property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseStructureDiagramType }
-     *     
-     */
-    public void setCourseStructureDiagram(CourseStructureDiagramType value) {
-        this.courseStructureDiagram = value;
-    }
+	/**
+	 * Sets the value of the courseStructureDiagram property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseStructureDiagramType }
+	 * 
+	 */
+	public void setCourseStructureDiagram(CourseStructureDiagramType value) {
+		this.courseStructureDiagram = value;
+	}
 
-    /**
-     * Gets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
-     *     
-     */
-    public CoursesAttendedInOtherInstitutionInMobilityProgramsType getCoursesAttendedInOtherInstitutionInMobilityPrograms() {
-        return coursesAttendedInOtherInstitutionInMobilityPrograms;
-    }
+	/**
+	 * Gets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
+	 * 
+	 * @return possible object is {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
+	 * 
+	 */
+	public CoursesAttendedInOtherInstitutionInMobilityProgramsType getCoursesAttendedInOtherInstitutionInMobilityPrograms() {
+		return coursesAttendedInOtherInstitutionInMobilityPrograms;
+	}
 
-    /**
-     * Sets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
-     *     
-     */
-    public void setCoursesAttendedInOtherInstitutionInMobilityPrograms(CoursesAttendedInOtherInstitutionInMobilityProgramsType value) {
-        this.coursesAttendedInOtherInstitutionInMobilityPrograms = value;
-    }
+	/**
+	 * Sets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
+	 * 
+	 */
+	public void setCoursesAttendedInOtherInstitutionInMobilityPrograms(CoursesAttendedInOtherInstitutionInMobilityProgramsType value) {
+		this.coursesAttendedInOtherInstitutionInMobilityPrograms = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeRequirementsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeRequirementsType.java
index e0f358aca..e21a8d821 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeRequirementsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeRequirementsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Programme requirements
  * 
- * <p>Java class for ProgrammeRequirementsType complex type.
+ * <p>
+ * Java class for ProgrammeRequirementsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ProgrammeRequirementsType">
@@ -37,63 +37,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProgrammeRequirementsType", propOrder = {
-    "requirements",
-    "keyLearningOutcomes"
-})
+@XmlType(name = "ProgrammeRequirementsType", propOrder = { "requirements", "keyLearningOutcomes" })
 public class ProgrammeRequirementsType {
 
-    @XmlElement(name = "Requirements", required = true)
-    protected RichTextTagType requirements;
-    @XmlElement(name = "KeyLearningOutcomes")
-    protected RichTextTagType keyLearningOutcomes;
+	@XmlElement(name = "Requirements", required = true)
+	protected RichTextTagType requirements;
+	@XmlElement(name = "KeyLearningOutcomes")
+	protected RichTextTagType keyLearningOutcomes;
 
-    /**
-     * Gets the value of the requirements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getRequirements() {
-        return requirements;
-    }
+	/**
+	 * Gets the value of the requirements property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getRequirements() {
+		return requirements;
+	}
 
-    /**
-     * Sets the value of the requirements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setRequirements(RichTextTagType value) {
-        this.requirements = value;
-    }
+	/**
+	 * Sets the value of the requirements property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setRequirements(RichTextTagType value) {
+		this.requirements = value;
+	}
 
-    /**
-     * Gets the value of the keyLearningOutcomes property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getKeyLearningOutcomes() {
-        return keyLearningOutcomes;
-    }
+	/**
+	 * Gets the value of the keyLearningOutcomes property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getKeyLearningOutcomes() {
+		return keyLearningOutcomes;
+	}
 
-    /**
-     * Sets the value of the keyLearningOutcomes property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setKeyLearningOutcomes(RichTextTagType value) {
-        this.keyLearningOutcomes = value;
-    }
+	/**
+	 * Sets the value of the keyLearningOutcomes property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setKeyLearningOutcomes(RichTextTagType value) {
+		this.keyLearningOutcomes = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java
index 8700fcfca..4414ef05d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,13 +13,14 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Qualification
  * 
- * <p>Java class for QualificationType complex type.
+ * <p>
+ * Java class for QualificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="QualificationType">
@@ -40,115 +40,100 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "QualificationType", propOrder = {
-    "name",
-    "additionalInformation"
-})
+@XmlType(name = "QualificationType", propOrder = { "name", "additionalInformation" })
 public class QualificationType {
 
-    @XmlElement(name = "Name", required = true)
-    protected String name;
-    @XmlElement(name = "AdditionalInformation")
-    protected RichTextTagType additionalInformation;
-    @XmlAttribute(name = "localID")
-    protected String localID;
-    @XmlAttribute(name = "nationalID")
-    protected String nationalID;
+	@XmlElement(name = "Name", required = true)
+	protected String name;
+	@XmlElement(name = "AdditionalInformation")
+	protected RichTextTagType additionalInformation;
+	@XmlAttribute(name = "localID")
+	protected String localID;
+	@XmlAttribute(name = "nationalID")
+	protected String nationalID;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
 
-    /**
-     * Gets the value of the additionalInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAdditionalInformation() {
-        return additionalInformation;
-    }
+	/**
+	 * Gets the value of the additionalInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAdditionalInformation() {
+		return additionalInformation;
+	}
 
-    /**
-     * Sets the value of the additionalInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAdditionalInformation(RichTextTagType value) {
-        this.additionalInformation = value;
-    }
+	/**
+	 * Sets the value of the additionalInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAdditionalInformation(RichTextTagType value) {
+		this.additionalInformation = value;
+	}
 
-    /**
-     * Gets the value of the localID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLocalID() {
-        return localID;
-    }
+	/**
+	 * Gets the value of the localID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getLocalID() {
+		return localID;
+	}
 
-    /**
-     * Sets the value of the localID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLocalID(String value) {
-        this.localID = value;
-    }
+	/**
+	 * Sets the value of the localID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setLocalID(String value) {
+		this.localID = value;
+	}
 
-    /**
-     * Gets the value of the nationalID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNationalID() {
-        return nationalID;
-    }
+	/**
+	 * Gets the value of the nationalID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNationalID() {
+		return nationalID;
+	}
 
-    /**
-     * Sets the value of the nationalID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNationalID(String value) {
-        this.nationalID = value;
-    }
+	/**
+	 * Sets the value of the nationalID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNationalID(String value) {
+		this.nationalID = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/RichTextTagType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/RichTextTagType.java
index 18d44c09b..68c5ec627 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/RichTextTagType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/RichTextTagType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import java.io.Serializable;
@@ -24,13 +23,14 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
  * Rich text tag
  * 
- * <p>Java class for RichTextTagType complex type.
+ * <p>
+ * Java class for RichTextTagType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="RichTextTagType">
@@ -59,143 +59,124 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RichTextTagType", propOrder = {
-    "content"
-})
-@XmlSeeAlso({
-    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus.class,
-    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheLevelOfTheQualificationType.Level.class,
-    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme.class,
-    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheContentsAndResultsGainedType.ModeOfStudy.class,
-    eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.LanguagesOfInstructionAndExaminationType.Language.class
-})
+@XmlType(name = "RichTextTagType", propOrder = { "content" })
+@XmlSeeAlso({ eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus.class,
+		eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheLevelOfTheQualificationType.Level.class,
+		eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme.class,
+		eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.InformationOnTheContentsAndResultsGainedType.ModeOfStudy.class,
+		eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.LanguagesOfInstructionAndExaminationType.Language.class })
 public class RichTextTagType {
 
-    @XmlElementRefs({
-        @XmlElementRef(name = "Underline", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "AttachedRef", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "BreakLine", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Bold", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Italic", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false)
-    })
-    @XmlMixed
-    protected List<Serializable> content;
-
-    /**
-     * Rich text tag Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link String }
-     * {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * 
-     * 
-     */
-    public List<Serializable> getContent() {
-        if (content == null) {
-            content = new ArrayList<Serializable>();
-        }
-        return this.content;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
-     *       &lt;attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AttachedRef {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "attachedID", required = true)
-        @XmlIDREF
-        @XmlSchemaType(name = "IDREF")
-        protected Object attachedID;
-
-        /**
-         * Plain text constraint
-         * 
-         * Non empty text
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the attachedID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getAttachedID() {
-            return attachedID;
-        }
-
-        /**
-         * Sets the value of the attachedID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setAttachedID(Object value) {
-            this.attachedID = value;
-        }
-
-    }
+	@XmlElementRefs({ @XmlElementRef(name = "Underline", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "AttachedRef", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "BreakLine", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "Bold", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "Italic", namespace = "urn:crue:academic:xsd:language:diplomasupplement", type = JAXBElement.class, required = false) })
+	@XmlMixed
+	protected List<Serializable> content;
+
+	/**
+	 * Rich text tag Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link String }{@code >} {@link String } {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }
+	 * {@code >} {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 * 
+	 */
+	public List<Serializable> getContent() {
+		if (content == null) {
+			content = new ArrayList<Serializable>();
+		}
+		return this.content;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+	 *       &lt;attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class AttachedRef {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "attachedID", required = true)
+		@XmlIDREF
+		@XmlSchemaType(name = "IDREF")
+		protected Object attachedID;
+
+		/**
+		 * Plain text constraint
+		 * 
+		 * Non empty text
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the attachedID property.
+		 * 
+		 * @return possible object is {@link Object }
+		 * 
+		 */
+		public Object getAttachedID() {
+			return attachedID;
+		}
+
+		/**
+		 * Sets the value of the attachedID property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Object }
+		 * 
+		 */
+		public void setAttachedID(Object value) {
+			this.attachedID = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/SourceGradeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/SourceGradeType.java
index be97a835f..f9bb1708d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/SourceGradeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/SourceGradeType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for SourceGradeType.
+ * <p>
+ * Java class for SourceGradeType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="SourceGradeType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -33,44 +34,43 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum SourceGradeType {
 
+	/**
+	 * Recognized
+	 * 
+	 */
+	@XmlEnumValue("Recognized")
+	RECOGNIZED("Recognized"),
 
-    /**
-     * Recognized
-     * 
-     */
-    @XmlEnumValue("Recognized")
-    RECOGNIZED("Recognized"),
-
-    /**
-     * Course unit attended in mobility programme
-     * 
-     */
-    @XmlEnumValue("MobilityProgramme")
-    MOBILITY_PROGRAMME("MobilityProgramme"),
+	/**
+	 * Course unit attended in mobility programme
+	 * 
+	 */
+	@XmlEnumValue("MobilityProgramme")
+	MOBILITY_PROGRAMME("MobilityProgramme"),
 
-    /**
-     * Another
-     * 
-     */
-    @XmlEnumValue("Another")
-    ANOTHER("Another");
-    private final String value;
+	/**
+	 * Another
+	 * 
+	 */
+	@XmlEnumValue("Another")
+	ANOTHER("Another");
+	private final String value;
 
-    SourceGradeType(String v) {
-        value = v;
-    }
+	SourceGradeType(String v) {
+		value = v;
+	}
 
-    public String value() {
-        return value;
-    }
+	public String value() {
+		return value;
+	}
 
-    public static SourceGradeType fromValue(String v) {
-        for (SourceGradeType c: SourceGradeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	public static SourceGradeType fromValue(String v) {
+		for (SourceGradeType c : SourceGradeType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/TitleConferredType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/TitleConferredType.java
index 7d06458e0..4bb02cd12 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/TitleConferredType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/TitleConferredType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,13 +12,14 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
  * Title conferred
  * 
- * <p>Java class for TitleConferredType complex type.
+ * <p>
+ * Java class for TitleConferredType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="TitleConferredType">
@@ -36,36 +36,31 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TitleConferredType", propOrder = {
-    "name"
-})
+@XmlType(name = "TitleConferredType", propOrder = { "name" })
 public class TitleConferredType {
 
-    @XmlElement(name = "Name", required = true)
-    protected String name;
+	@XmlElement(name = "Name", required = true)
+	protected String name;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/package-info.java
index 427159cb8..84b6707b7 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/package-info.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/package-info.java
@@ -7,3 +7,4 @@
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "urn:crue:academic:xsd:language:diplomasupplement", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement;
+
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AcTitleType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AcTitleType.java
index 7877f8cee..14d28d64e 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AcTitleType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AcTitleType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for acTitleType complex type.
+ * <p>
+ * Java class for acTitleType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="acTitleType">
@@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "acTitleType", propOrder = {
-    "titleNormalised",
-    "aqaa"
-})
+@XmlType(name = "acTitleType", propOrder = { "titleNormalised", "aqaa" })
 public class AcTitleType {
 
-    @XmlElement(required = true)
-    protected String titleNormalised;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String titleNormalised;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the titleNormalised property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTitleNormalised() {
-        return titleNormalised;
-    }
+	/**
+	 * Gets the value of the titleNormalised property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTitleNormalised() {
+		return titleNormalised;
+	}
 
-    /**
-     * Sets the value of the titleNormalised property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTitleNormalised(String value) {
-        this.titleNormalised = value;
-    }
+	/**
+	 * Sets the value of the titleNormalised property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTitleNormalised(String value) {
+		this.titleNormalised = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AttributeStatusType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AttributeStatusType.java
index e2dd4e5e0..fe44adaac 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AttributeStatusType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/AttributeStatusType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for AttributeStatusType.
+ * <p>
+ * Java class for AttributeStatusType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="AttributeStatusType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -33,29 +34,27 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum AttributeStatusType {
 
-    @XmlEnumValue("Available")
-    AVAILABLE("Available"),
-    @XmlEnumValue("NotAvailable")
-    NOT_AVAILABLE("NotAvailable"),
-    @XmlEnumValue("Withheld")
-    WITHHELD("Withheld");
-    private final String value;
-
-    AttributeStatusType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static AttributeStatusType fromValue(String v) {
-        for (AttributeStatusType c: AttributeStatusType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	@XmlEnumValue("Available")
+	AVAILABLE("Available"), @XmlEnumValue("NotAvailable")
+	NOT_AVAILABLE("NotAvailable"), @XmlEnumValue("Withheld")
+	WITHHELD("Withheld");
+	private final String value;
+
+	AttributeStatusType(String v) {
+		value = v;
+	}
+
+	public String value() {
+		return value;
+	}
+
+	public static AttributeStatusType fromValue(String v) {
+		for (AttributeStatusType c : AttributeStatusType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CanonicalAddressType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CanonicalAddressType.java
index 2c2117c14..981884efa 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CanonicalAddressType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CanonicalAddressType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 /**
- * <p>Java class for canonicalAddressType complex type.
+ * <p>
+ * Java class for canonicalAddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="canonicalAddressType">
@@ -43,222 +43,189 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "canonicalAddressType", propOrder = {
-    "countryCodeAddress",
-    "state",
-    "municipalityCode",
-    "town",
-    "postalCode",
-    "streetName",
-    "streetNumber",
-    "apartmentNumber"
-})
+@XmlType(name = "canonicalAddressType", propOrder = { "countryCodeAddress", "state", "municipalityCode", "town", "postalCode", "streetName", "streetNumber", "apartmentNumber" })
 public class CanonicalAddressType {
 
-    @XmlElement(required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String countryCodeAddress;
-    protected String state;
-    protected String municipalityCode;
-    @XmlElement(required = true)
-    protected String town;
-    @XmlElement(required = true)
-    protected String postalCode;
-    @XmlElement(required = true)
-    protected String streetName;
-    protected String streetNumber;
-    protected String apartmentNumber;
-
-    /**
-     * Gets the value of the countryCodeAddress property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCountryCodeAddress() {
-        return countryCodeAddress;
-    }
-
-    /**
-     * Sets the value of the countryCodeAddress property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCountryCodeAddress(String value) {
-        this.countryCodeAddress = value;
-    }
-
-    /**
-     * Gets the value of the state property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getState() {
-        return state;
-    }
-
-    /**
-     * Sets the value of the state property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setState(String value) {
-        this.state = value;
-    }
-
-    /**
-     * Gets the value of the municipalityCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMunicipalityCode() {
-        return municipalityCode;
-    }
-
-    /**
-     * Sets the value of the municipalityCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMunicipalityCode(String value) {
-        this.municipalityCode = value;
-    }
-
-    /**
-     * Gets the value of the town property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTown() {
-        return town;
-    }
-
-    /**
-     * Sets the value of the town property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTown(String value) {
-        this.town = value;
-    }
-
-    /**
-     * Gets the value of the postalCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPostalCode() {
-        return postalCode;
-    }
-
-    /**
-     * Sets the value of the postalCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPostalCode(String value) {
-        this.postalCode = value;
-    }
-
-    /**
-     * Gets the value of the streetName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStreetName() {
-        return streetName;
-    }
-
-    /**
-     * Sets the value of the streetName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStreetName(String value) {
-        this.streetName = value;
-    }
-
-    /**
-     * Gets the value of the streetNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStreetNumber() {
-        return streetNumber;
-    }
-
-    /**
-     * Sets the value of the streetNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStreetNumber(String value) {
-        this.streetNumber = value;
-    }
-
-    /**
-     * Gets the value of the apartmentNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getApartmentNumber() {
-        return apartmentNumber;
-    }
-
-    /**
-     * Sets the value of the apartmentNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setApartmentNumber(String value) {
-        this.apartmentNumber = value;
-    }
+	@XmlElement(required = true)
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	protected String countryCodeAddress;
+	protected String state;
+	protected String municipalityCode;
+	@XmlElement(required = true)
+	protected String town;
+	@XmlElement(required = true)
+	protected String postalCode;
+	@XmlElement(required = true)
+	protected String streetName;
+	protected String streetNumber;
+	protected String apartmentNumber;
+
+	/**
+	 * Gets the value of the countryCodeAddress property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCountryCodeAddress() {
+		return countryCodeAddress;
+	}
+
+	/**
+	 * Sets the value of the countryCodeAddress property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCountryCodeAddress(String value) {
+		this.countryCodeAddress = value;
+	}
+
+	/**
+	 * Gets the value of the state property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getState() {
+		return state;
+	}
+
+	/**
+	 * Sets the value of the state property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setState(String value) {
+		this.state = value;
+	}
+
+	/**
+	 * Gets the value of the municipalityCode property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getMunicipalityCode() {
+		return municipalityCode;
+	}
+
+	/**
+	 * Sets the value of the municipalityCode property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setMunicipalityCode(String value) {
+		this.municipalityCode = value;
+	}
+
+	/**
+	 * Gets the value of the town property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTown() {
+		return town;
+	}
+
+	/**
+	 * Sets the value of the town property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTown(String value) {
+		this.town = value;
+	}
+
+	/**
+	 * Gets the value of the postalCode property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	/**
+	 * Sets the value of the postalCode property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setPostalCode(String value) {
+		this.postalCode = value;
+	}
+
+	/**
+	 * Gets the value of the streetName property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getStreetName() {
+		return streetName;
+	}
+
+	/**
+	 * Sets the value of the streetName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setStreetName(String value) {
+		this.streetName = value;
+	}
+
+	/**
+	 * Gets the value of the streetNumber property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getStreetNumber() {
+		return streetNumber;
+	}
+
+	/**
+	 * Sets the value of the streetNumber property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setStreetNumber(String value) {
+		this.streetNumber = value;
+	}
+
+	/**
+	 * Gets the value of the apartmentNumber property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getApartmentNumber() {
+		return apartmentNumber;
+	}
+
+	/**
+	 * Sets the value of the apartmentNumber property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setApartmentNumber(String value) {
+		this.apartmentNumber = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CurrentStudiesType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CurrentStudiesType.java
index 71f028cea..58e4bf02b 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CurrentStudiesType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CurrentStudiesType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import java.math.BigInteger;
@@ -17,11 +16,12 @@ import javax.xml.bind.annotation.XmlType;
 import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.GeneralDiplomaType;
 import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.MultilingualGeneralDiplomaType;
 
-
 /**
- * <p>Java class for currentStudiesType complex type.
+ * <p>
+ * Java class for currentStudiesType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="currentStudiesType">
@@ -45,154 +45,135 @@ import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.ge
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "currentStudiesType", propOrder = {
-    "multilingualGeneralDiploma",
-    "generalDiploma",
-    "yearOfStudy",
-    "isEligibleForInternship",
-    "aqaa",
-    "any"
-})
+@XmlType(name = "currentStudiesType", propOrder = { "multilingualGeneralDiploma", "generalDiploma", "yearOfStudy", "isEligibleForInternship", "aqaa", "any" })
 public class CurrentStudiesType {
 
-    @XmlElement(name = "MultilingualGeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
-    protected MultilingualGeneralDiplomaType multilingualGeneralDiploma;
-    @XmlElement(name = "GeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
-    protected GeneralDiplomaType generalDiploma;
-    @XmlElement(required = true)
-    protected BigInteger yearOfStudy;
-    protected boolean isEligibleForInternship;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-    @XmlAnyElement(lax = true)
-    protected Object any;
-
-    /**
-     * Gets the value of the multilingualGeneralDiploma property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MultilingualGeneralDiplomaType }
-     *     
-     */
-    public MultilingualGeneralDiplomaType getMultilingualGeneralDiploma() {
-        return multilingualGeneralDiploma;
-    }
-
-    /**
-     * Sets the value of the multilingualGeneralDiploma property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MultilingualGeneralDiplomaType }
-     *     
-     */
-    public void setMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) {
-        this.multilingualGeneralDiploma = value;
-    }
-
-    /**
-     * Gets the value of the generalDiploma property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GeneralDiplomaType }
-     *     
-     */
-    public GeneralDiplomaType getGeneralDiploma() {
-        return generalDiploma;
-    }
-
-    /**
-     * Sets the value of the generalDiploma property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GeneralDiplomaType }
-     *     
-     */
-    public void setGeneralDiploma(GeneralDiplomaType value) {
-        this.generalDiploma = value;
-    }
-
-    /**
-     * Gets the value of the yearOfStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getYearOfStudy() {
-        return yearOfStudy;
-    }
-
-    /**
-     * Sets the value of the yearOfStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setYearOfStudy(BigInteger value) {
-        this.yearOfStudy = value;
-    }
-
-    /**
-     * Gets the value of the isEligibleForInternship property.
-     * 
-     */
-    public boolean isIsEligibleForInternship() {
-        return isEligibleForInternship;
-    }
-
-    /**
-     * Sets the value of the isEligibleForInternship property.
-     * 
-     */
-    public void setIsEligibleForInternship(boolean value) {
-        this.isEligibleForInternship = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getAny() {
-        return any;
-    }
-
-    /**
-     * Sets the value of the any property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setAny(Object value) {
-        this.any = value;
-    }
+	@XmlElement(name = "MultilingualGeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
+	protected MultilingualGeneralDiplomaType multilingualGeneralDiploma;
+	@XmlElement(name = "GeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
+	protected GeneralDiplomaType generalDiploma;
+	@XmlElement(required = true)
+	protected BigInteger yearOfStudy;
+	protected boolean isEligibleForInternship;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
+	@XmlAnyElement(lax = true)
+	protected Object any;
+
+	/**
+	 * Gets the value of the multilingualGeneralDiploma property.
+	 * 
+	 * @return possible object is {@link MultilingualGeneralDiplomaType }
+	 * 
+	 */
+	public MultilingualGeneralDiplomaType getMultilingualGeneralDiploma() {
+		return multilingualGeneralDiploma;
+	}
+
+	/**
+	 * Sets the value of the multilingualGeneralDiploma property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MultilingualGeneralDiplomaType }
+	 * 
+	 */
+	public void setMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) {
+		this.multilingualGeneralDiploma = value;
+	}
+
+	/**
+	 * Gets the value of the generalDiploma property.
+	 * 
+	 * @return possible object is {@link GeneralDiplomaType }
+	 * 
+	 */
+	public GeneralDiplomaType getGeneralDiploma() {
+		return generalDiploma;
+	}
+
+	/**
+	 * Sets the value of the generalDiploma property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link GeneralDiplomaType }
+	 * 
+	 */
+	public void setGeneralDiploma(GeneralDiplomaType value) {
+		this.generalDiploma = value;
+	}
+
+	/**
+	 * Gets the value of the yearOfStudy property.
+	 * 
+	 * @return possible object is {@link BigInteger }
+	 * 
+	 */
+	public BigInteger getYearOfStudy() {
+		return yearOfStudy;
+	}
+
+	/**
+	 * Sets the value of the yearOfStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigInteger }
+	 * 
+	 */
+	public void setYearOfStudy(BigInteger value) {
+		this.yearOfStudy = value;
+	}
+
+	/**
+	 * Gets the value of the isEligibleForInternship property.
+	 * 
+	 */
+	public boolean isIsEligibleForInternship() {
+		return isEligibleForInternship;
+	}
+
+	/**
+	 * Sets the value of the isEligibleForInternship property.
+	 * 
+	 */
+	public void setIsEligibleForInternship(boolean value) {
+		this.isEligibleForInternship = value;
+	}
+
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
+
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
+
+	/**
+	 * Gets the value of the any property.
+	 * 
+	 * @return possible object is {@link Object }
+	 * 
+	 */
+	public Object getAny() {
+		return any;
+	}
+
+	/**
+	 * Sets the value of the any property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link Object }
+	 * 
+	 */
+	public void setAny(Object value) {
+		this.any = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/DiplomaSupplementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/DiplomaSupplementType.java
index 584a2e771..c02ffc01f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/DiplomaSupplementType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/DiplomaSupplementType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -17,11 +16,12 @@ import eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupple
 import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.GeneralDiplomaType;
 import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.MultilingualGeneralDiplomaType;
 
-
 /**
- * <p>Java class for diplomaSupplementType complex type.
+ * <p>
+ * Java class for diplomaSupplementType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="diplomaSupplementType">
@@ -45,163 +45,141 @@ import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.ge
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "diplomaSupplementType", propOrder = {
-    "multilingualDiplomaSupplement",
-    "diplomaSupplement",
-    "multilingualGeneralDiploma",
-    "generalDiploma",
-    "aqaa",
-    "any"
-})
+@XmlType(name = "diplomaSupplementType", propOrder = { "multilingualDiplomaSupplement", "diplomaSupplement", "multilingualGeneralDiploma", "generalDiploma", "aqaa", "any" })
 public class DiplomaSupplementType {
 
-    @XmlElement(name = "MultilingualDiplomaSupplement", namespace = "urn:crue:academic:xsd:language:diplomasupplement")
-    protected MultilingualDiplomaSupplementType multilingualDiplomaSupplement;
-    @XmlElement(name = "DiplomaSupplement", namespace = "urn:crue:academic:xsd:language:diplomasupplement")
-    protected eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType diplomaSupplement;
-    @XmlElement(name = "MultilingualGeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
-    protected MultilingualGeneralDiplomaType multilingualGeneralDiploma;
-    @XmlElement(name = "GeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
-    protected GeneralDiplomaType generalDiploma;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-    @XmlAnyElement(lax = true)
-    protected Object any;
-
-    /**
-     * Gets the value of the multilingualDiplomaSupplement property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MultilingualDiplomaSupplementType }
-     *     
-     */
-    public MultilingualDiplomaSupplementType getMultilingualDiplomaSupplement() {
-        return multilingualDiplomaSupplement;
-    }
-
-    /**
-     * Sets the value of the multilingualDiplomaSupplement property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MultilingualDiplomaSupplementType }
-     *     
-     */
-    public void setMultilingualDiplomaSupplement(MultilingualDiplomaSupplementType value) {
-        this.multilingualDiplomaSupplement = value;
-    }
-
-    /**
-     * Gets the value of the diplomaSupplement property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType }
-     *     
-     */
-    public eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType getDiplomaSupplement() {
-        return diplomaSupplement;
-    }
-
-    /**
-     * Sets the value of the diplomaSupplement property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType }
-     *     
-     */
-    public void setDiplomaSupplement(eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType value) {
-        this.diplomaSupplement = value;
-    }
-
-    /**
-     * Gets the value of the multilingualGeneralDiploma property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MultilingualGeneralDiplomaType }
-     *     
-     */
-    public MultilingualGeneralDiplomaType getMultilingualGeneralDiploma() {
-        return multilingualGeneralDiploma;
-    }
-
-    /**
-     * Sets the value of the multilingualGeneralDiploma property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MultilingualGeneralDiplomaType }
-     *     
-     */
-    public void setMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) {
-        this.multilingualGeneralDiploma = value;
-    }
-
-    /**
-     * Gets the value of the generalDiploma property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GeneralDiplomaType }
-     *     
-     */
-    public GeneralDiplomaType getGeneralDiploma() {
-        return generalDiploma;
-    }
-
-    /**
-     * Sets the value of the generalDiploma property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GeneralDiplomaType }
-     *     
-     */
-    public void setGeneralDiploma(GeneralDiplomaType value) {
-        this.generalDiploma = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Object }
-     *     
-     */
-    public Object getAny() {
-        return any;
-    }
-
-    /**
-     * Sets the value of the any property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Object }
-     *     
-     */
-    public void setAny(Object value) {
-        this.any = value;
-    }
+	@XmlElement(name = "MultilingualDiplomaSupplement", namespace = "urn:crue:academic:xsd:language:diplomasupplement")
+	protected MultilingualDiplomaSupplementType multilingualDiplomaSupplement;
+	@XmlElement(name = "DiplomaSupplement", namespace = "urn:crue:academic:xsd:language:diplomasupplement")
+	protected eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType diplomaSupplement;
+	@XmlElement(name = "MultilingualGeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
+	protected MultilingualGeneralDiplomaType multilingualGeneralDiploma;
+	@XmlElement(name = "GeneralDiploma", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma")
+	protected GeneralDiplomaType generalDiploma;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
+	@XmlAnyElement(lax = true)
+	protected Object any;
+
+	/**
+	 * Gets the value of the multilingualDiplomaSupplement property.
+	 * 
+	 * @return possible object is {@link MultilingualDiplomaSupplementType }
+	 * 
+	 */
+	public MultilingualDiplomaSupplementType getMultilingualDiplomaSupplement() {
+		return multilingualDiplomaSupplement;
+	}
+
+	/**
+	 * Sets the value of the multilingualDiplomaSupplement property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MultilingualDiplomaSupplementType }
+	 * 
+	 */
+	public void setMultilingualDiplomaSupplement(MultilingualDiplomaSupplementType value) {
+		this.multilingualDiplomaSupplement = value;
+	}
+
+	/**
+	 * Gets the value of the diplomaSupplement property.
+	 * 
+	 * @return possible object is {@link crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType }
+	 * 
+	 */
+	public eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType getDiplomaSupplement() {
+		return diplomaSupplement;
+	}
+
+	/**
+	 * Sets the value of the diplomaSupplement property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType }
+	 * 
+	 */
+	public void setDiplomaSupplement(eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.DiplomaSupplementType value) {
+		this.diplomaSupplement = value;
+	}
+
+	/**
+	 * Gets the value of the multilingualGeneralDiploma property.
+	 * 
+	 * @return possible object is {@link MultilingualGeneralDiplomaType }
+	 * 
+	 */
+	public MultilingualGeneralDiplomaType getMultilingualGeneralDiploma() {
+		return multilingualGeneralDiploma;
+	}
+
+	/**
+	 * Sets the value of the multilingualGeneralDiploma property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MultilingualGeneralDiplomaType }
+	 * 
+	 */
+	public void setMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) {
+		this.multilingualGeneralDiploma = value;
+	}
+
+	/**
+	 * Gets the value of the generalDiploma property.
+	 * 
+	 * @return possible object is {@link GeneralDiplomaType }
+	 * 
+	 */
+	public GeneralDiplomaType getGeneralDiploma() {
+		return generalDiploma;
+	}
+
+	/**
+	 * Sets the value of the generalDiploma property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link GeneralDiplomaType }
+	 * 
+	 */
+	public void setGeneralDiploma(GeneralDiplomaType value) {
+		this.generalDiploma = value;
+	}
+
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
+
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
+
+	/**
+	 * Gets the value of the any property.
+	 * 
+	 * @return possible object is {@link Object }
+	 * 
+	 */
+	public Object getAny() {
+		return any;
+	}
+
+	/**
+	 * Sets the value of the any property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link Object }
+	 * 
+	 */
+	public void setAny(Object value) {
+		this.any = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/Habilitation.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/Habilitation.java
index b0fc4d245..dcb37d8f6 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/Habilitation.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/Habilitation.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for habilitation complex type.
+ * <p>
+ * Java class for habilitation complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="habilitation">
@@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "habilitation", propOrder = {
-    "ability",
-    "aqaa"
-})
+@XmlType(name = "habilitation", propOrder = { "ability", "aqaa" })
 public class Habilitation {
 
-    @XmlElement(required = true)
-    protected String ability;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String ability;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the ability property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAbility() {
-        return ability;
-    }
+	/**
+	 * Gets the value of the ability property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAbility() {
+		return ability;
+	}
 
-    /**
-     * Sets the value of the ability property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAbility(String value) {
-        this.ability = value;
-    }
+	/**
+	 * Sets the value of the ability property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAbility(String value) {
+		this.ability = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HabilitationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HabilitationType.java
index 92d600244..736d68b61 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HabilitationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HabilitationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for habilitationType complex type.
+ * <p>
+ * Java class for habilitationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="habilitationType">
@@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "habilitationType", propOrder = {
-    "ability",
-    "aqaa"
-})
+@XmlType(name = "habilitationType", propOrder = { "ability", "aqaa" })
 public class HabilitationType {
 
-    @XmlElement(required = true)
-    protected String ability;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String ability;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the ability property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAbility() {
-        return ability;
-    }
+	/**
+	 * Gets the value of the ability property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAbility() {
+		return ability;
+	}
 
-    /**
-     * Sets the value of the ability property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAbility(String value) {
-        this.ability = value;
-    }
+	/**
+	 * Sets the value of the ability property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAbility(String value) {
+		this.ability = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasAccountInBankType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasAccountInBankType.java
index 6e4edc6e0..4130094a2 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasAccountInBankType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasAccountInBankType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for hasAccountInBankType complex type.
+ * <p>
+ * Java class for hasAccountInBankType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="hasAccountInBankType">
@@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "hasAccountInBankType", propOrder = {
-    "bankName",
-    "aqaa"
-})
+@XmlType(name = "hasAccountInBankType", propOrder = { "bankName", "aqaa" })
 public class HasAccountInBankType {
 
-    @XmlElement(required = true)
-    protected String bankName;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String bankName;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the bankName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getBankName() {
-        return bankName;
-    }
+	/**
+	 * Gets the value of the bankName property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getBankName() {
+		return bankName;
+	}
 
-    /**
-     * Sets the value of the bankName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setBankName(String value) {
-        this.bankName = value;
-    }
+	/**
+	 * Sets the value of the bankName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setBankName(String value) {
+		this.bankName = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasDegreeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasDegreeType.java
index 789a527e4..c9e387823 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasDegreeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/HasDegreeType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import java.math.BigInteger;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for hasDegreeType complex type.
+ * <p>
+ * Java class for hasDegreeType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="hasDegreeType">
@@ -39,136 +39,118 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "hasDegreeType", propOrder = {
-    "study",
-    "level",
-    "yearObtained",
-    "nameOfInstitution",
-    "aqaa"
-})
+@XmlType(name = "hasDegreeType", propOrder = { "study", "level", "yearObtained", "nameOfInstitution", "aqaa" })
 public class HasDegreeType {
 
-    @XmlElement(required = true)
-    protected String study;
-    @XmlElement(required = true)
-    protected String level;
-    @XmlElement(required = true)
-    protected BigInteger yearObtained;
-    @XmlElement(required = true)
-    protected String nameOfInstitution;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
-
-    /**
-     * Gets the value of the study property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStudy() {
-        return study;
-    }
-
-    /**
-     * Sets the value of the study property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStudy(String value) {
-        this.study = value;
-    }
-
-    /**
-     * Gets the value of the level property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLevel() {
-        return level;
-    }
-
-    /**
-     * Sets the value of the level property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLevel(String value) {
-        this.level = value;
-    }
-
-    /**
-     * Gets the value of the yearObtained property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getYearObtained() {
-        return yearObtained;
-    }
-
-    /**
-     * Sets the value of the yearObtained property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setYearObtained(BigInteger value) {
-        this.yearObtained = value;
-    }
-
-    /**
-     * Gets the value of the nameOfInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfInstitution() {
-        return nameOfInstitution;
-    }
-
-    /**
-     * Sets the value of the nameOfInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfInstitution(String value) {
-        this.nameOfInstitution = value;
-    }
-
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
-
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	@XmlElement(required = true)
+	protected String study;
+	@XmlElement(required = true)
+	protected String level;
+	@XmlElement(required = true)
+	protected BigInteger yearObtained;
+	@XmlElement(required = true)
+	protected String nameOfInstitution;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
+
+	/**
+	 * Gets the value of the study property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getStudy() {
+		return study;
+	}
+
+	/**
+	 * Sets the value of the study property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setStudy(String value) {
+		this.study = value;
+	}
+
+	/**
+	 * Gets the value of the level property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getLevel() {
+		return level;
+	}
+
+	/**
+	 * Sets the value of the level property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setLevel(String value) {
+		this.level = value;
+	}
+
+	/**
+	 * Gets the value of the yearObtained property.
+	 * 
+	 * @return possible object is {@link BigInteger }
+	 * 
+	 */
+	public BigInteger getYearObtained() {
+		return yearObtained;
+	}
+
+	/**
+	 * Sets the value of the yearObtained property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigInteger }
+	 * 
+	 */
+	public void setYearObtained(BigInteger value) {
+		this.yearObtained = value;
+	}
+
+	/**
+	 * Gets the value of the nameOfInstitution property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNameOfInstitution() {
+		return nameOfInstitution;
+	}
+
+	/**
+	 * Sets the value of the nameOfInstitution property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNameOfInstitution(String value) {
+		this.nameOfInstitution = value;
+	}
+
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
+
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAcademicStaffType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAcademicStaffType.java
index fe4422b94..6ce45f90d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAcademicStaffType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAcademicStaffType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for isAcademicStaffType complex type.
+ * <p>
+ * Java class for isAcademicStaffType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="isAcademicStaffType">
@@ -37,108 +37,94 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isAcademicStaffType", propOrder = {
-    "nameOfInstitution",
-    "occupation",
-    "knowledgeArea",
-    "aqaa"
-})
+@XmlType(name = "isAcademicStaffType", propOrder = { "nameOfInstitution", "occupation", "knowledgeArea", "aqaa" })
 public class IsAcademicStaffType {
 
-    @XmlElement(required = true)
-    protected String nameOfInstitution;
-    @XmlElement(required = true)
-    protected String occupation;
-    protected String knowledgeArea;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String nameOfInstitution;
+	@XmlElement(required = true)
+	protected String occupation;
+	protected String knowledgeArea;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the nameOfInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfInstitution() {
-        return nameOfInstitution;
-    }
+	/**
+	 * Gets the value of the nameOfInstitution property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNameOfInstitution() {
+		return nameOfInstitution;
+	}
 
-    /**
-     * Sets the value of the nameOfInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfInstitution(String value) {
-        this.nameOfInstitution = value;
-    }
+	/**
+	 * Sets the value of the nameOfInstitution property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNameOfInstitution(String value) {
+		this.nameOfInstitution = value;
+	}
 
-    /**
-     * Gets the value of the occupation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOccupation() {
-        return occupation;
-    }
+	/**
+	 * Gets the value of the occupation property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getOccupation() {
+		return occupation;
+	}
 
-    /**
-     * Sets the value of the occupation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOccupation(String value) {
-        this.occupation = value;
-    }
+	/**
+	 * Sets the value of the occupation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setOccupation(String value) {
+		this.occupation = value;
+	}
 
-    /**
-     * Gets the value of the knowledgeArea property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKnowledgeArea() {
-        return knowledgeArea;
-    }
+	/**
+	 * Gets the value of the knowledgeArea property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getKnowledgeArea() {
+		return knowledgeArea;
+	}
 
-    /**
-     * Sets the value of the knowledgeArea property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKnowledgeArea(String value) {
-        this.knowledgeArea = value;
-    }
+	/**
+	 * Sets the value of the knowledgeArea property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setKnowledgeArea(String value) {
+		this.knowledgeArea = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAdminStaffType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAdminStaffType.java
index 3cc073ed8..b48f6192f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAdminStaffType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsAdminStaffType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for isAdminStaffType complex type.
+ * <p>
+ * Java class for isAdminStaffType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="isAdminStaffType">
@@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isAdminStaffType", propOrder = {
-    "adminStaff",
-    "aqaa"
-})
+@XmlType(name = "isAdminStaffType", propOrder = { "adminStaff", "aqaa" })
 public class IsAdminStaffType {
 
-    @XmlElement(required = true)
-    protected String adminStaff;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String adminStaff;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the adminStaff property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAdminStaff() {
-        return adminStaff;
-    }
+	/**
+	 * Gets the value of the adminStaff property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAdminStaff() {
+		return adminStaff;
+	}
 
-    /**
-     * Sets the value of the adminStaff property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAdminStaff(String value) {
-        this.adminStaff = value;
-    }
+	/**
+	 * Sets the value of the adminStaff property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAdminStaff(String value) {
+		this.adminStaff = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsCourseCoordinatorType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsCourseCoordinatorType.java
index d2151e30c..492acfbec 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsCourseCoordinatorType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsCourseCoordinatorType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for isCourseCoordinatorType complex type.
+ * <p>
+ * Java class for isCourseCoordinatorType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="isCourseCoordinatorType">
@@ -35,55 +35,49 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isCourseCoordinatorType", propOrder = {
-    "courseCoodinator",
-    "aqaa"
-})
+@XmlType(name = "isCourseCoordinatorType", propOrder = { "courseCoodinator", "aqaa" })
 public class IsCourseCoordinatorType {
 
-    @XmlElement(required = true)
-    protected String courseCoodinator;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String courseCoodinator;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the courseCoodinator property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCourseCoodinator() {
-        return courseCoodinator;
-    }
+	/**
+	 * Gets the value of the courseCoodinator property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCourseCoodinator() {
+		return courseCoodinator;
+	}
 
-    /**
-     * Sets the value of the courseCoodinator property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCourseCoodinator(String value) {
-        this.courseCoodinator = value;
-    }
+	/**
+	 * Sets the value of the courseCoodinator property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCourseCoodinator(String value) {
+		this.courseCoodinator = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalDeprecatedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalDeprecatedType.java
index 711b7d68d..a448a7bbe 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalDeprecatedType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalDeprecatedType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.11.27 at 06:17:01 PM CET 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for isHealthCareProfessional_deprecatedType complex type.
+ * <p>
+ * Java class for isHealthCareProfessional_deprecatedType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="isHealthCareProfessional_deprecatedType">
@@ -37,109 +37,95 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isHealthCareProfessional_deprecatedType", propOrder = {
-    "nameOfOrganisation",
-    "hcpType",
-    "specialisation",
-    "aqaa"
-})
+@XmlType(name = "isHealthCareProfessional_deprecatedType", propOrder = { "nameOfOrganisation", "hcpType", "specialisation", "aqaa" })
 public class IsHealthCareProfessionalDeprecatedType {
 
-    @XmlElement(required = true)
-    protected String nameOfOrganisation;
-    @XmlElement(name = "HCPType", required = true)
-    protected String hcpType;
-    @XmlElement(required = true)
-    protected String specialisation;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String nameOfOrganisation;
+	@XmlElement(name = "HCPType", required = true)
+	protected String hcpType;
+	@XmlElement(required = true)
+	protected String specialisation;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the nameOfOrganisation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfOrganisation() {
-        return nameOfOrganisation;
-    }
+	/**
+	 * Gets the value of the nameOfOrganisation property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNameOfOrganisation() {
+		return nameOfOrganisation;
+	}
 
-    /**
-     * Sets the value of the nameOfOrganisation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfOrganisation(String value) {
-        this.nameOfOrganisation = value;
-    }
+	/**
+	 * Sets the value of the nameOfOrganisation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNameOfOrganisation(String value) {
+		this.nameOfOrganisation = value;
+	}
 
-    /**
-     * Gets the value of the hcpType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getHCPType() {
-        return hcpType;
-    }
+	/**
+	 * Gets the value of the hcpType property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getHCPType() {
+		return hcpType;
+	}
 
-    /**
-     * Sets the value of the hcpType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setHCPType(String value) {
-        this.hcpType = value;
-    }
+	/**
+	 * Sets the value of the hcpType property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setHCPType(String value) {
+		this.hcpType = value;
+	}
 
-    /**
-     * Gets the value of the specialisation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSpecialisation() {
-        return specialisation;
-    }
+	/**
+	 * Gets the value of the specialisation property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getSpecialisation() {
+		return specialisation;
+	}
 
-    /**
-     * Sets the value of the specialisation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSpecialisation(String value) {
-        this.specialisation = value;
-    }
+	/**
+	 * Sets the value of the specialisation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setSpecialisation(String value) {
+		this.specialisation = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalType.java
index be11e4ee8..02379d8b0 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsHealthCareProfessionalType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.11.27 at 06:17:01 PM CET 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for isHealthCareProfessionalType complex type.
+ * <p>
+ * Java class for isHealthCareProfessionalType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="isHealthCareProfessionalType">
@@ -60,109 +60,95 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isHealthCareProfessionalType", propOrder = {
-    "typeOfHCP",
-    "nameOfOrganisation",
-    "typeOfOrganisation",
-    "aqaa"
-})
+@XmlType(name = "isHealthCareProfessionalType", propOrder = { "typeOfHCP", "nameOfOrganisation", "typeOfOrganisation", "aqaa" })
 public class IsHealthCareProfessionalType {
 
-    @XmlElement(required = true)
-    protected String typeOfHCP;
-    @XmlElement(required = true)
-    protected String nameOfOrganisation;
-    @XmlElement(required = true)
-    protected String typeOfOrganisation;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String typeOfHCP;
+	@XmlElement(required = true)
+	protected String nameOfOrganisation;
+	@XmlElement(required = true)
+	protected String typeOfOrganisation;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the typeOfHCP property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypeOfHCP() {
-        return typeOfHCP;
-    }
+	/**
+	 * Gets the value of the typeOfHCP property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTypeOfHCP() {
+		return typeOfHCP;
+	}
 
-    /**
-     * Sets the value of the typeOfHCP property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypeOfHCP(String value) {
-        this.typeOfHCP = value;
-    }
+	/**
+	 * Sets the value of the typeOfHCP property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTypeOfHCP(String value) {
+		this.typeOfHCP = value;
+	}
 
-    /**
-     * Gets the value of the nameOfOrganisation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfOrganisation() {
-        return nameOfOrganisation;
-    }
+	/**
+	 * Gets the value of the nameOfOrganisation property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNameOfOrganisation() {
+		return nameOfOrganisation;
+	}
 
-    /**
-     * Sets the value of the nameOfOrganisation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfOrganisation(String value) {
-        this.nameOfOrganisation = value;
-    }
+	/**
+	 * Sets the value of the nameOfOrganisation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNameOfOrganisation(String value) {
+		this.nameOfOrganisation = value;
+	}
 
-    /**
-     * Gets the value of the typeOfOrganisation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypeOfOrganisation() {
-        return typeOfOrganisation;
-    }
+	/**
+	 * Gets the value of the typeOfOrganisation property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTypeOfOrganisation() {
+		return typeOfOrganisation;
+	}
 
-    /**
-     * Sets the value of the typeOfOrganisation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypeOfOrganisation(String value) {
-        this.typeOfOrganisation = value;
-    }
+	/**
+	 * Sets the value of the typeOfOrganisation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTypeOfOrganisation(String value) {
+		this.typeOfOrganisation = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsStudentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsStudentType.java
index e02ec9811..02fed8bc8 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsStudentType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsStudentType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for isStudentType complex type.
+ * <p>
+ * Java class for isStudentType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="isStudentType">
@@ -37,107 +37,93 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isStudentType", propOrder = {
-    "study",
-    "nameOfInstitution",
-    "course",
-    "aqaa"
-})
+@XmlType(name = "isStudentType", propOrder = { "study", "nameOfInstitution", "course", "aqaa" })
 public class IsStudentType {
 
-    protected String study;
-    @XmlElement(required = true)
-    protected String nameOfInstitution;
-    protected String course;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	protected String study;
+	@XmlElement(required = true)
+	protected String nameOfInstitution;
+	protected String course;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the study property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStudy() {
-        return study;
-    }
+	/**
+	 * Gets the value of the study property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getStudy() {
+		return study;
+	}
 
-    /**
-     * Sets the value of the study property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStudy(String value) {
-        this.study = value;
-    }
+	/**
+	 * Sets the value of the study property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setStudy(String value) {
+		this.study = value;
+	}
 
-    /**
-     * Gets the value of the nameOfInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfInstitution() {
-        return nameOfInstitution;
-    }
+	/**
+	 * Gets the value of the nameOfInstitution property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNameOfInstitution() {
+		return nameOfInstitution;
+	}
 
-    /**
-     * Sets the value of the nameOfInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfInstitution(String value) {
-        this.nameOfInstitution = value;
-    }
+	/**
+	 * Sets the value of the nameOfInstitution property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNameOfInstitution(String value) {
+		this.nameOfInstitution = value;
+	}
 
-    /**
-     * Gets the value of the course property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCourse() {
-        return course;
-    }
+	/**
+	 * Gets the value of the course property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCourse() {
+		return course;
+	}
 
-    /**
-     * Sets the value of the course property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCourse(String value) {
-        this.course = value;
-    }
+	/**
+	 * Sets the value of the course property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCourse(String value) {
+		this.course = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsTeacherOfType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsTeacherOfType.java
index 4a1262003..9de9d18c9 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsTeacherOfType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/IsTeacherOfType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for isTeacherOfType complex type.
+ * <p>
+ * Java class for isTeacherOfType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="isTeacherOfType">
@@ -37,109 +37,95 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "isTeacherOfType", propOrder = {
-    "nameOfInstitution",
-    "course",
-    "role",
-    "aqaa"
-})
+@XmlType(name = "isTeacherOfType", propOrder = { "nameOfInstitution", "course", "role", "aqaa" })
 public class IsTeacherOfType {
 
-    @XmlElement(required = true)
-    protected String nameOfInstitution;
-    @XmlElement(required = true)
-    protected String course;
-    @XmlElement(required = true)
-    protected String role;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String nameOfInstitution;
+	@XmlElement(required = true)
+	protected String course;
+	@XmlElement(required = true)
+	protected String role;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
 
-    /**
-     * Gets the value of the nameOfInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameOfInstitution() {
-        return nameOfInstitution;
-    }
+	/**
+	 * Gets the value of the nameOfInstitution property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNameOfInstitution() {
+		return nameOfInstitution;
+	}
 
-    /**
-     * Sets the value of the nameOfInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameOfInstitution(String value) {
-        this.nameOfInstitution = value;
-    }
+	/**
+	 * Sets the value of the nameOfInstitution property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNameOfInstitution(String value) {
+		this.nameOfInstitution = value;
+	}
 
-    /**
-     * Gets the value of the course property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCourse() {
-        return course;
-    }
+	/**
+	 * Gets the value of the course property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCourse() {
+		return course;
+	}
 
-    /**
-     * Sets the value of the course property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCourse(String value) {
-        this.course = value;
-    }
+	/**
+	 * Sets the value of the course property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCourse(String value) {
+		this.course = value;
+	}
 
-    /**
-     * Gets the value of the role property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRole() {
-        return role;
-    }
+	/**
+	 * Gets the value of the role property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getRole() {
+		return role;
+	}
 
-    /**
-     * Sets the value of the role property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRole(String value) {
-        this.role = value;
-    }
+	/**
+	 * Sets the value of the role property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setRole(String value) {
+		this.role = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateContentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateContentType.java
index b3386cdb5..824e79c70 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateContentType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateContentType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.10.29 at 02:15:24 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for mandateContentType complex type.
+ * <p>
+ * Java class for mandateContentType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="mandateContentType">
@@ -43,267 +43,234 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "mandateContentType", propOrder = {
-    "typePower",
-    "typeOfPower",
-    "timeRestriction",
-    "transactionLimit",
-    "isJoined",
-    "isJoint",
-    "isChained",
-    "originalMandateType",
-    "originalMandate",
-    "aqaa"
-})
+@XmlType(name = "mandateContentType", propOrder = { "typePower", "typeOfPower", "timeRestriction", "transactionLimit", "isJoined", "isJoint", "isChained", "originalMandateType", "originalMandate",
+		"aqaa" })
 public class MandateContentType {
 
-    @XmlElement(required = true)
-    protected String typePower;
-    @XmlElement(required = true)
-    protected String typeOfPower;
-    @XmlElement(required = true)
-    protected TimeRestrictionType timeRestriction;
-    @XmlElement(required = true)
-    protected String isJoined;
-    @XmlElement(required = true)
-    protected String isJoint;
-    protected boolean isChained;
-    @XmlElement(required = true)
-    protected byte[] originalMandate;
-    @XmlElement(required = true)
-    protected String originalMandateType;
-    @XmlElement(required = true)
-    protected TransactionLimitRestrictionType transactionLimit;
-    @XmlElement(name = "AQAA")
-    protected int aqaa;
+	@XmlElement(required = true)
+	protected String typePower;
+	@XmlElement(required = true)
+	protected String typeOfPower;
+	@XmlElement(required = true)
+	protected TimeRestrictionType timeRestriction;
+	@XmlElement(required = true)
+	protected String isJoined;
+	@XmlElement(required = true)
+	protected String isJoint;
+	protected boolean isChained;
+	@XmlElement(required = true)
+	protected byte[] originalMandate;
+	@XmlElement(required = true)
+	protected String originalMandateType;
+	@XmlElement(required = true)
+	protected TransactionLimitRestrictionType transactionLimit;
+	@XmlElement(name = "AQAA")
+	protected int aqaa;
+
+	/**
+	 * Gets the value of the typePower property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTypePower() {
+		return typePower;
+	}
+
+	/**
+	 * Sets the value of the typePower property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTypePower(String value) {
+		this.typePower = value;
+		this.typeOfPower = value;
+	}
+
+	/**
+	 * Gets the value of the typeOfPower property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTypeOfPower() {
+		return typeOfPower;
+	}
 
-    /**
-     * Gets the value of the typePower property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypePower() {
-        return typePower;
-    }
+	/**
+	 * Sets the value of the typeOfPower property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTypeOfPower(String value) {
+		this.typeOfPower = value;
+		this.typePower = value;
+	}
 
-    /**
-     * Sets the value of the typePower property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypePower(String value) {
-        this.typePower = value;
-        this.typeOfPower = value;
-    }
+	/**
+	 * Gets the value of the timeRestriction property.
+	 * 
+	 * @return possible object is {@link TimeRestrictionType }
+	 * 
+	 */
+	public TimeRestrictionType getTimeRestriction() {
+		return timeRestriction;
+	}
 
-    /**
-     * Gets the value of the typeOfPower property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTypeOfPower() {
-        return typeOfPower;
-    }
+	/**
+	 * Sets the value of the timeRestriction property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link TimeRestrictionType }
+	 * 
+	 */
+	public void setTimeRestriction(TimeRestrictionType value) {
+		this.timeRestriction = value;
+	}
 
-    /**
-     * Sets the value of the typeOfPower property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTypeOfPower(String value) {
-        this.typeOfPower = value;
-        this.typePower = value;
-    }
+	/**
+	 * Gets the value of the isJoined property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getIsJoined() {
+		return isJoined;
+	}
 
-    /**
-     * Gets the value of the timeRestriction property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TimeRestrictionType }
-     *     
-     */
-    public TimeRestrictionType getTimeRestriction() {
-        return timeRestriction;
-    }
+	/**
+	 * Sets the value of the isJoined property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setIsJoined(String value) {
+		this.isJoined = value;
+		this.isJoint = value;
+	}
 
-    /**
-     * Sets the value of the timeRestriction property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TimeRestrictionType }
-     *     
-     */
-    public void setTimeRestriction(TimeRestrictionType value) {
-        this.timeRestriction = value;
-    }
+	/**
+	 * Gets the value of the isJoint property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getIsJoint() {
+		return isJoint;
+	}
 
-    /**
-     * Gets the value of the isJoined property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIsJoined() {
-        return isJoined;
-    }
+	/**
+	 * Sets the value of the isJoint property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setIsJoint(String value) {
+		this.isJoint = value;
+		this.isJoined = value;
+	}
 
-    /**
-     * Sets the value of the isJoined property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIsJoined(String value) {
-        this.isJoined = value;
-        this.isJoint = value;
-    }
+	/**
+	 * Gets the value of the isChained property.
+	 * 
+	 */
+	public boolean isIsChained() {
+		return isChained;
+	}
 
-    /**
-     * Gets the value of the isJoint property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getIsJoint() {
-        return isJoint;
-    }
+	/**
+	 * Sets the value of the isChained property.
+	 * 
+	 */
+	public void setIsChained(boolean value) {
+		this.isChained = value;
+	}
 
-    /**
-     * Sets the value of the isJoint property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setIsJoint(String value) {
-        this.isJoint = value;
-        this.isJoined = value;
-    }
+	public void setIschained(boolean value) {
+		setIsChained(value);
+	}
 
-    /**
-     * Gets the value of the isChained property.
-     * 
-     */
-    public boolean isIsChained() {
-        return isChained;
-    }
-    
-    /**
-     * Sets the value of the isChained property.
-     * 
-     */
-    public void setIsChained(boolean value) {
-        this.isChained = value;
-    }
-    
-    public void setIschained(boolean value){
-    	setIsChained(value);
-    }
-    /**
-     * Gets the value of the originalMandate property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getOriginalMandate() {
-        return originalMandate;
-    }
+	/**
+	 * Gets the value of the originalMandate property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getOriginalMandate() {
+		return originalMandate;
+	}
 
-    /**
-     * Sets the value of the originalMandate property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setOriginalMandate(byte[] value) {
-        this.originalMandate = value;
-    }
+	/**
+	 * Sets the value of the originalMandate property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setOriginalMandate(byte[] value) {
+		this.originalMandate = value;
+	}
 
-    /**
-     * Gets the value of the originalMandateType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getOriginalMandateType() {
-        return originalMandateType;
-    }
+	/**
+	 * Gets the value of the originalMandateType property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getOriginalMandateType() {
+		return originalMandateType;
+	}
 
-    /**
-     * Sets the value of the originalMandateType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setOriginalMandateType(String value) {
-        this.originalMandateType = value;
-    }
+	/**
+	 * Sets the value of the originalMandateType property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setOriginalMandateType(String value) {
+		this.originalMandateType = value;
+	}
 
-    /**
-     * Gets the value of the transactionLimit property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransactionLimitRestrictionType }
-     *     
-     */
-    public TransactionLimitRestrictionType getTransactionLimit() {
-        return transactionLimit;
-    }
+	/**
+	 * Gets the value of the transactionLimit property.
+	 * 
+	 * @return possible object is {@link TransactionLimitRestrictionType }
+	 * 
+	 */
+	public TransactionLimitRestrictionType getTransactionLimit() {
+		return transactionLimit;
+	}
 
-    /**
-     * Sets the value of the transactionLimit property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransactionLimitRestrictionType }
-     *     
-     */
-    public void setTransactionLimit(TransactionLimitRestrictionType value) {
-        this.transactionLimit = value;
-    }
+	/**
+	 * Sets the value of the transactionLimit property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link TransactionLimitRestrictionType }
+	 * 
+	 */
+	public void setTransactionLimit(TransactionLimitRestrictionType value) {
+		this.transactionLimit = value;
+	}
 
-    /**
-     * Gets the value of the aqaa property.
-     * 
-     */
-    public int getAQAA() {
-        return aqaa;
-    }
+	/**
+	 * Gets the value of the aqaa property.
+	 * 
+	 */
+	public int getAQAA() {
+		return aqaa;
+	}
 
-    /**
-     * Sets the value of the aqaa property.
-     * 
-     */
-    public void setAQAA(int value) {
-        this.aqaa = value;
-    }
+	/**
+	 * Sets the value of the aqaa property.
+	 * 
+	 */
+	public void setAQAA(int value) {
+		this.aqaa = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateType.java
index 5ac29e2df..94bc2fcff 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.10.09 at 10:11:43 AM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for mandateType complex type.
+ * <p>
+ * Java class for mandateType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="mandateType">
@@ -39,124 +39,108 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "mandateType", propOrder = {
-    "represented",
-    "representing",
-    "representative",
-    "mandateContent"
-})
+@XmlType(name = "mandateType", propOrder = { "represented", "representing", "representative", "mandateContent" })
 public class MandateType {
 
-    @XmlElement(required = true)
-    protected RepresentationPersonType represented;
-    @XmlElement(required = true)
-    protected RepresentationPersonType representing;
-    @XmlElement(required = true)
-    protected RepresentationPersonType representative;
-    @XmlElement(required = true)
-    protected List<MandateContentType> mandateContent;
+	@XmlElement(required = true)
+	protected RepresentationPersonType represented;
+	@XmlElement(required = true)
+	protected RepresentationPersonType representing;
+	@XmlElement(required = true)
+	protected RepresentationPersonType representative;
+	@XmlElement(required = true)
+	protected List<MandateContentType> mandateContent;
 
-    /**
-     * Gets the value of the represented property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RepresentationPersonType }
-     *     
-     */
-    public RepresentationPersonType getRepresented() {
-        return represented;
-    }
+	/**
+	 * Gets the value of the represented property.
+	 * 
+	 * @return possible object is {@link RepresentationPersonType }
+	 * 
+	 */
+	public RepresentationPersonType getRepresented() {
+		return represented;
+	}
 
-    /**
-     * Sets the value of the represented property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RepresentationPersonType }
-     *     
-     */
-    public void setRepresented(RepresentationPersonType value) {
-        this.represented = value;
-    }
+	/**
+	 * Sets the value of the represented property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RepresentationPersonType }
+	 * 
+	 */
+	public void setRepresented(RepresentationPersonType value) {
+		this.represented = value;
+	}
 
-    /**
-     * Gets the value of the representing property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RepresentationPersonType }
-     *     
-     */
-    public RepresentationPersonType getRepresenting() {
-        return representing;
-    }
+	/**
+	 * Gets the value of the representing property.
+	 * 
+	 * @return possible object is {@link RepresentationPersonType }
+	 * 
+	 */
+	public RepresentationPersonType getRepresenting() {
+		return representing;
+	}
 
-    /**
-     * Sets the value of the representing property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RepresentationPersonType }
-     *     
-     */
-    public void setRepresenting(RepresentationPersonType value) {
-        this.representing = value;
-        this.representative = value;
-    }
+	/**
+	 * Sets the value of the representing property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RepresentationPersonType }
+	 * 
+	 */
+	public void setRepresenting(RepresentationPersonType value) {
+		this.representing = value;
+		this.representative = value;
+	}
 
-    /**
-     * Gets the value of the representative property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RepresentationPersonType }
-     *     
-     */
-    public RepresentationPersonType getRepresentative() {
-        return representative;
-    }
+	/**
+	 * Gets the value of the representative property.
+	 * 
+	 * @return possible object is {@link RepresentationPersonType }
+	 * 
+	 */
+	public RepresentationPersonType getRepresentative() {
+		return representative;
+	}
 
-    /**
-     * Sets the value of the representative property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RepresentationPersonType }
-     *     
-     */
-    public void setRepresentative(RepresentationPersonType value) {
-        this.representative = value;
-        this.representing = value;
-    }
+	/**
+	 * Sets the value of the representative property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RepresentationPersonType }
+	 * 
+	 */
+	public void setRepresentative(RepresentationPersonType value) {
+		this.representative = value;
+		this.representing = value;
+	}
 
-    /**
-     * Gets the value of the mandateContent property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the mandateContent property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getMandateContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MandateContentType }
-     * 
-     * 
-     */
-    public List<MandateContentType> getMandateContent() {
-        if (mandateContent == null) {
-            mandateContent = new ArrayList<MandateContentType>();
-        }
-        return this.mandateContent;
-    }
+	/**
+	 * Gets the value of the mandateContent property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the mandateContent property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getMandateContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link MandateContentType }
+	 * 
+	 * 
+	 */
+	public List<MandateContentType> getMandateContent() {
+		if (mandateContent == null) {
+			mandateContent = new ArrayList<MandateContentType>();
+		}
+		return this.mandateContent;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
index f1ea05d65..02db708c6 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/ObjectFactory.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.11.27 at 06:25:14 PM CET 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.JAXBElement;
@@ -15,509 +14,475 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import javax.xml.namespace.QName;
 
-
 /**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the eu.stork.names.tc.stork._1_0.assertion package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
+ * This object contains factory methods for each Java content interface and Java element interface generated in the eu.stork.names.tc.stork._1_0.assertion package.
+ * <p>
+ * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist of schema derived interfaces
+ * and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of these are provided in this class.
  * 
  */
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _Habilitation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "habilitation");
-    private final static QName _SpApplication_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spApplication");
-    private final static QName _Specialisation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "specialisation");
-    private final static QName _AQAA_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AQAA");
-    private final static QName _QualityAuthenticationAssuranceLevel_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "QualityAuthenticationAssuranceLevel");
-    private final static QName _IsAcademicStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAcademicStaff");
-    private final static QName _MandateContent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandateContent");
-    private final static QName _IsHealthCareProfessionalDeprecated_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional_deprecated");
-    private final static QName _CanonicalRegisteredAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalRegisteredAddress");
-    private final static QName _SpCountry_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spCountry");
-    private final static QName _IsAdminStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAdminStaff");
-    private final static QName _AttributeValue_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AttributeValue");
-    private final static QName _CountryCodeAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "countryCodeAddress");
-    private final static QName _HasAccountInBank_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasAccountInBank");
-    private final static QName _CurrentStudiesSupplement_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "currentStudiesSupplement");
-    private final static QName _Mandate_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandate");
-    private final static QName _RequestedAttribute_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "RequestedAttribute");
-    private final static QName _SpSector_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spSector");
-    private final static QName _HasDegree_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasDegree");
-    private final static QName _DiplomaSupplement_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "diplomaSupplement");
-    private final static QName _IsStudent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isStudent");
-    private final static QName _HCPType_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "HCPType");
-    private final static QName _RepresentationPerson_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "representationPerson");
-    private final static QName _CanonicalResidenceAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalResidenceAddress");
-    private final static QName _AcTitle_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "acTitle");
-    private final static QName _IsTeacherOf_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isTeacherOf");
-    private final static QName _IsCourseCoordinator_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isCourseCoordinator");
-    private final static QName _CitizenCountryCode_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "CitizenCountryCode");
-    private final static QName _Study_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "study");
-    private final static QName _IsHealthCareProfessional_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.names.tc.stork._1_0.assertion
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link CurrentStudiesType }
-     * 
-     */
-    public CurrentStudiesType createCurrentStudiesType() {
-        return new CurrentStudiesType();
-    }
-
-    /**
-     * Create an instance of {@link MandateType }
-     * 
-     */
-    public MandateType createMandateType() {
-        return new MandateType();
-    }
-
-    /**
-     * Create an instance of {@link RequestedAttributeType }
-     * 
-     */
-    public RequestedAttributeType createRequestedAttributeType() {
-        return new RequestedAttributeType();
-    }
-
-    /**
-     * Create an instance of {@link HasAccountInBankType }
-     * 
-     */
-    public HasAccountInBankType createHasAccountInBankType() {
-        return new HasAccountInBankType();
-    }
-
-    /**
-     * Create an instance of {@link IsHealthCareProfessionalType }
-     * 
-     */
-    public IsHealthCareProfessionalType createIsHealthCareProfessionalType() {
-        return new IsHealthCareProfessionalType();
-    }
-
-    /**
-     * Create an instance of {@link IsAdminStaffType }
-     * 
-     */
-    public IsAdminStaffType createIsAdminStaffType() {
-        return new IsAdminStaffType();
-    }
-
-    /**
-     * Create an instance of {@link CanonicalAddressType }
-     * 
-     */
-    public CanonicalAddressType createCanonicalAddressType() {
-        return new CanonicalAddressType();
-    }
-
-    /**
-     * Create an instance of {@link IsHealthCareProfessionalDeprecatedType }
-     * 
-     */
-    public IsHealthCareProfessionalDeprecatedType createIsHealthCareProfessionalDeprecatedType() {
-        return new IsHealthCareProfessionalDeprecatedType();
-    }
-
-    /**
-     * Create an instance of {@link MandateContentType }
-     * 
-     */
-    public MandateContentType createMandateContentType() {
-        return new MandateContentType();
-    }
-
-    /**
-     * Create an instance of {@link IsCourseCoordinatorType }
-     * 
-     */
-    public IsCourseCoordinatorType createIsCourseCoordinatorType() {
-        return new IsCourseCoordinatorType();
-    }
-
-    /**
-     * Create an instance of {@link IsAcademicStaffType }
-     * 
-     */
-    public IsAcademicStaffType createIsAcademicStaffType() {
-        return new IsAcademicStaffType();
-    }
-
-    /**
-     * Create an instance of {@link IsTeacherOfType }
-     * 
-     */
-    public IsTeacherOfType createIsTeacherOfType() {
-        return new IsTeacherOfType();
-    }
-
-    /**
-     * Create an instance of {@link AcTitleType }
-     * 
-     */
-    public AcTitleType createAcTitleType() {
-        return new AcTitleType();
-    }
-
-    /**
-     * Create an instance of {@link RepresentationPersonType }
-     * 
-     */
-    public RepresentationPersonType createRepresentationPersonType() {
-        return new RepresentationPersonType();
-    }
-
-    /**
-     * Create an instance of {@link IsStudentType }
-     * 
-     */
-    public IsStudentType createIsStudentType() {
-        return new IsStudentType();
-    }
-
-    /**
-     * Create an instance of {@link HasDegreeType }
-     * 
-     */
-    public HasDegreeType createHasDegreeType() {
-        return new HasDegreeType();
-    }
-
-    /**
-     * Create an instance of {@link DiplomaSupplementType }
-     * 
-     */
-    public DiplomaSupplementType createDiplomaSupplementType() {
-        return new DiplomaSupplementType();
-    }
-
-    /**
-     * Create an instance of {@link HabilitationType }
-     * 
-     */
-    public HabilitationType createHabilitationType() {
-        return new HabilitationType();
-    }
-
-    /**
-     * Create an instance of {@link TimeRestrictionType }
-     * 
-     */
-    public TimeRestrictionType createTimeRestrictionType() {
-        return new TimeRestrictionType();
-    }
-
-    /**
-     * Create an instance of {@link Habilitation }
-     * 
-     */
-    public Habilitation createHabilitation() {
-        return new Habilitation();
-    }
-
-    /**
-     * Create an instance of {@link TransactionLimitRestrictionType }
-     * 
-     */
-    public TransactionLimitRestrictionType createTransactionLimitRestrictionType() {
-        return new TransactionLimitRestrictionType();
-    }
-
-    /**
-     * Create an instance of {@link IsHCPType }
-     * 
-     */
-    //public IsHCPType createIsHCPType() {
-    //    return new IsHCPType();
-    //}
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link HabilitationType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "habilitation")
-    public JAXBElement<HabilitationType> createHabilitation(HabilitationType value) {
-        return new JAXBElement<HabilitationType>(_Habilitation_QNAME, HabilitationType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spApplication")
-    public JAXBElement<String> createSpApplication(String value) {
-        return new JAXBElement<String>(_SpApplication_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "specialisation")
-    public JAXBElement<String> createSpecialisation(String value) {
-        return new JAXBElement<String>(_Specialisation_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AQAA")
-    public JAXBElement<Integer> createAQAA(Integer value) {
-        return new JAXBElement<Integer>(_AQAA_QNAME, Integer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "QualityAuthenticationAssuranceLevel")
-    public JAXBElement<Integer> createQualityAuthenticationAssuranceLevel(Integer value) {
-        return new JAXBElement<Integer>(_QualityAuthenticationAssuranceLevel_QNAME, Integer.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsAcademicStaffType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAcademicStaff")
-    public JAXBElement<IsAcademicStaffType> createIsAcademicStaff(IsAcademicStaffType value) {
-        return new JAXBElement<IsAcademicStaffType>(_IsAcademicStaff_QNAME, IsAcademicStaffType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MandateContentType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandateContent")
-    public JAXBElement<MandateContentType> createMandateContent(MandateContentType value) {
-        return new JAXBElement<MandateContentType>(_MandateContent_QNAME, MandateContentType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalDeprecatedType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional_deprecated")
-    public JAXBElement<IsHealthCareProfessionalDeprecatedType> createIsHealthCareProfessionalDeprecated(IsHealthCareProfessionalDeprecatedType value) {
-        return new JAXBElement<IsHealthCareProfessionalDeprecatedType>(_IsHealthCareProfessionalDeprecated_QNAME, IsHealthCareProfessionalDeprecatedType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalRegisteredAddress")
-    public JAXBElement<CanonicalAddressType> createCanonicalRegisteredAddress(CanonicalAddressType value) {
-        return new JAXBElement<CanonicalAddressType>(_CanonicalRegisteredAddress_QNAME, CanonicalAddressType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spCountry")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createSpCountry(String value) {
-        return new JAXBElement<String>(_SpCountry_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsAdminStaffType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAdminStaff")
-    public JAXBElement<IsAdminStaffType> createIsAdminStaff(IsAdminStaffType value) {
-        return new JAXBElement<IsAdminStaffType>(_IsAdminStaff_QNAME, IsAdminStaffType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AttributeValue")
-    public JAXBElement<Object> createAttributeValue(Object value) {
-        return new JAXBElement<Object>(_AttributeValue_QNAME, Object.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "countryCodeAddress")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createCountryCodeAddress(String value) {
-        return new JAXBElement<String>(_CountryCodeAddress_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link HasAccountInBankType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasAccountInBank")
-    public JAXBElement<HasAccountInBankType> createHasAccountInBank(HasAccountInBankType value) {
-        return new JAXBElement<HasAccountInBankType>(_HasAccountInBank_QNAME, HasAccountInBankType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CurrentStudiesType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "currentStudiesSupplement")
-    public JAXBElement<CurrentStudiesType> createCurrentStudiesSupplement(CurrentStudiesType value) {
-        return new JAXBElement<CurrentStudiesType>(_CurrentStudiesSupplement_QNAME, CurrentStudiesType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
-    public JAXBElement<MandateType> createMandate(MandateType value) {
-        return new JAXBElement<MandateType>(_Mandate_QNAME, MandateType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RequestedAttributeType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "RequestedAttribute")
-    public JAXBElement<RequestedAttributeType> createRequestedAttribute(RequestedAttributeType value) {
-        return new JAXBElement<RequestedAttributeType>(_RequestedAttribute_QNAME, RequestedAttributeType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spSector")
-    public JAXBElement<String> createSpSector(String value) {
-        return new JAXBElement<String>(_SpSector_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link HasDegreeType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasDegree")
-    public JAXBElement<HasDegreeType> createHasDegree(HasDegreeType value) {
-        return new JAXBElement<HasDegreeType>(_HasDegree_QNAME, HasDegreeType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DiplomaSupplementType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "diplomaSupplement")
-    public JAXBElement<DiplomaSupplementType> createDiplomaSupplement(DiplomaSupplementType value) {
-        return new JAXBElement<DiplomaSupplementType>(_DiplomaSupplement_QNAME, DiplomaSupplementType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsStudentType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isStudent")
-    public JAXBElement<IsStudentType> createIsStudent(IsStudentType value) {
-        return new JAXBElement<IsStudentType>(_IsStudent_QNAME, IsStudentType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "HCPType")
-    public JAXBElement<String> createHCPType(String value) {
-        return new JAXBElement<String>(_HCPType_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RepresentationPersonType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "representationPerson")
-    public JAXBElement<RepresentationPersonType> createRepresentationPerson(RepresentationPersonType value) {
-        return new JAXBElement<RepresentationPersonType>(_RepresentationPerson_QNAME, RepresentationPersonType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalResidenceAddress")
-    public JAXBElement<CanonicalAddressType> createCanonicalResidenceAddress(CanonicalAddressType value) {
-        return new JAXBElement<CanonicalAddressType>(_CanonicalResidenceAddress_QNAME, CanonicalAddressType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AcTitleType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "acTitle")
-    public JAXBElement<AcTitleType> createAcTitle(AcTitleType value) {
-        return new JAXBElement<AcTitleType>(_AcTitle_QNAME, AcTitleType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsTeacherOfType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isTeacherOf")
-    public JAXBElement<IsTeacherOfType> createIsTeacherOf(IsTeacherOfType value) {
-        return new JAXBElement<IsTeacherOfType>(_IsTeacherOf_QNAME, IsTeacherOfType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsCourseCoordinatorType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isCourseCoordinator")
-    public JAXBElement<IsCourseCoordinatorType> createIsCourseCoordinator(IsCourseCoordinatorType value) {
-        return new JAXBElement<IsCourseCoordinatorType>(_IsCourseCoordinator_QNAME, IsCourseCoordinatorType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "CitizenCountryCode")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    public JAXBElement<String> createCitizenCountryCode(String value) {
-        return new JAXBElement<String>(_CitizenCountryCode_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "study")
-    public JAXBElement<String> createStudy(String value) {
-        return new JAXBElement<String>(_Study_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional")
-    public JAXBElement<IsHealthCareProfessionalType> createIsHealthCareProfessional(IsHealthCareProfessionalType value) {
-        return new JAXBElement<IsHealthCareProfessionalType>(_IsHealthCareProfessional_QNAME, IsHealthCareProfessionalType.class, null, value);
-    }
+	private final static QName _Habilitation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "habilitation");
+	private final static QName _SpApplication_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spApplication");
+	private final static QName _Specialisation_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "specialisation");
+	private final static QName _AQAA_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AQAA");
+	private final static QName _QualityAuthenticationAssuranceLevel_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "QualityAuthenticationAssuranceLevel");
+	private final static QName _IsAcademicStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAcademicStaff");
+	private final static QName _MandateContent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandateContent");
+	private final static QName _CanonicalRegisteredAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalRegisteredAddress");
+	private final static QName _SpCountry_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spCountry");
+	private final static QName _IsAdminStaff_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isAdminStaff");
+	private final static QName _AttributeValue_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AttributeValue");
+	private final static QName _CountryCodeAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "countryCodeAddress");
+	private final static QName _HasAccountInBank_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasAccountInBank");
+	private final static QName _CurrentStudiesSupplement_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "currentStudiesSupplement");
+	private final static QName _Mandate_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "mandate");
+	private final static QName _RequestedAttribute_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "RequestedAttribute");
+	private final static QName _SpSector_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "spSector");
+	private final static QName _HasDegree_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasDegree");
+	private final static QName _DiplomaSupplement_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "diplomaSupplement");
+	private final static QName _IsStudent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isStudent");
+	private final static QName _HCPType_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "HCPType");
+	private final static QName _RepresentationPerson_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "representationPerson");
+	private final static QName _CanonicalResidenceAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "canonicalResidenceAddress");
+	private final static QName _AcTitle_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "acTitle");
+	private final static QName _IsTeacherOf_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isTeacherOf");
+	private final static QName _IsCourseCoordinator_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isCourseCoordinator");
+	private final static QName _CitizenCountryCode_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "CitizenCountryCode");
+	private final static QName _Study_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "study");
+	private final static QName _IsHealthCareProfessional_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isHealthCareProfessional");
+
+	/**
+	 * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.names.tc.stork._1_0.assertion
+	 * 
+	 */
+	public ObjectFactory() {
+	}
+
+	/**
+	 * Create an instance of {@link CurrentStudiesType }
+	 * 
+	 */
+	public CurrentStudiesType createCurrentStudiesType() {
+		return new CurrentStudiesType();
+	}
+
+	/**
+	 * Create an instance of {@link RequestedAttributeType }
+	 *
+	 */
+	public RequestedAttributeType createRequestedAttributeType() {
+		return new RequestedAttributeType();
+	}
+
+	/**
+	 * Create an instance of {@link MandateType }
+	 *
+	 */
+	public MandateType createMandateType() {
+		return new MandateType();
+	}
+
+	/**
+	 * Create an instance of {@link HasAccountInBankType }
+	 * 
+	 */
+	public HasAccountInBankType createHasAccountInBankType() {
+		return new HasAccountInBankType();
+	}
+
+	/**
+	 * Create an instance of {@link IsHealthCareProfessionalType }
+	 * 
+	 */
+	public IsHealthCareProfessionalType createIsHealthCareProfessionalType() {
+		return new IsHealthCareProfessionalType();
+	}
+
+	/**
+	 * Create an instance of {@link IsAdminStaffType }
+	 * 
+	 */
+	public IsAdminStaffType createIsAdminStaffType() {
+		return new IsAdminStaffType();
+	}
+
+	/**
+	 * Create an instance of {@link CanonicalAddressType }
+	 * 
+	 */
+	public CanonicalAddressType createCanonicalAddressType() {
+		return new CanonicalAddressType();
+	}
+
+	/**
+	 * Create an instance of {@link MandateContentType }
+	 * 
+	 */
+	public MandateContentType createMandateContentType() {
+		return new MandateContentType();
+	}
+
+	/**
+	 * Create an instance of {@link IsCourseCoordinatorType }
+	 * 
+	 */
+	public IsCourseCoordinatorType createIsCourseCoordinatorType() {
+		return new IsCourseCoordinatorType();
+	}
+
+	/**
+	 * Create an instance of {@link IsAcademicStaffType }
+	 * 
+	 */
+	public IsAcademicStaffType createIsAcademicStaffType() {
+		return new IsAcademicStaffType();
+	}
+
+	/**
+	 * Create an instance of {@link IsTeacherOfType }
+	 * 
+	 */
+	public IsTeacherOfType createIsTeacherOfType() {
+		return new IsTeacherOfType();
+	}
+
+	/**
+	 * Create an instance of {@link AcTitleType }
+	 * 
+	 */
+	public AcTitleType createAcTitleType() {
+		return new AcTitleType();
+	}
+
+	/**
+	 * Create an instance of {@link RepresentationPersonType }
+	 * 
+	 */
+	public RepresentationPersonType createRepresentationPersonType() {
+		return new RepresentationPersonType();
+	}
+
+	/**
+	 * Create an instance of {@link IsStudentType }
+	 * 
+	 */
+	public IsStudentType createIsStudentType() {
+		return new IsStudentType();
+	}
+
+	/**
+	 * Create an instance of {@link HasDegreeType }
+	 * 
+	 */
+	public HasDegreeType createHasDegreeType() {
+		return new HasDegreeType();
+	}
+
+	/**
+	 * Create an instance of {@link DiplomaSupplementType }
+	 * 
+	 */
+	public DiplomaSupplementType createDiplomaSupplementType() {
+		return new DiplomaSupplementType();
+	}
+
+	/**
+	 * Create an instance of {@link HabilitationType }
+	 * 
+	 */
+	public HabilitationType createHabilitationType() {
+		return new HabilitationType();
+	}
+
+	/**
+	 * Create an instance of {@link TimeRestrictionType }
+	 * 
+	 */
+	public TimeRestrictionType createTimeRestrictionType() {
+		return new TimeRestrictionType();
+	}
+
+	/**
+	 * Create an instance of {@link Habilitation }
+	 * 
+	 */
+	public Habilitation createHabilitation() {
+		return new Habilitation();
+	}
+
+	/**
+	 * Create an instance of {@link TransactionLimitRestrictionType }
+	 * 
+	 */
+	public TransactionLimitRestrictionType createTransactionLimitRestrictionType() {
+		return new TransactionLimitRestrictionType();
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link HabilitationType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "habilitation")
+	public JAXBElement<HabilitationType> createHabilitation(HabilitationType value) {
+		return new JAXBElement<HabilitationType>(_Habilitation_QNAME, HabilitationType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spApplication")
+	public JAXBElement<String> createSpApplication(String value) {
+		return new JAXBElement<String>(_SpApplication_QNAME, String.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "specialisation")
+	public JAXBElement<String> createSpecialisation(String value) {
+		return new JAXBElement<String>(_Specialisation_QNAME, String.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AQAA")
+	public JAXBElement<Integer> createAQAA(Integer value) {
+		return new JAXBElement<Integer>(_AQAA_QNAME, Integer.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link Integer }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "QualityAuthenticationAssuranceLevel")
+	public JAXBElement<Integer> createQualityAuthenticationAssuranceLevel(Integer value) {
+		return new JAXBElement<Integer>(_QualityAuthenticationAssuranceLevel_QNAME, Integer.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link IsAcademicStaffType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAcademicStaff")
+	public JAXBElement<IsAcademicStaffType> createIsAcademicStaff(IsAcademicStaffType value) {
+		return new JAXBElement<IsAcademicStaffType>(_IsAcademicStaff_QNAME, IsAcademicStaffType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link MandateContentType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandateContent")
+	public JAXBElement<MandateContentType> createMandateContent(MandateContentType value) {
+		return new JAXBElement<MandateContentType>(_MandateContent_QNAME, MandateContentType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalRegisteredAddress")
+	public JAXBElement<CanonicalAddressType> createCanonicalRegisteredAddress(CanonicalAddressType value) {
+		return new JAXBElement<CanonicalAddressType>(_CanonicalRegisteredAddress_QNAME, CanonicalAddressType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spCountry")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	public JAXBElement<String> createSpCountry(String value) {
+		return new JAXBElement<String>(_SpCountry_QNAME, String.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link IsAdminStaffType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isAdminStaff")
+	public JAXBElement<IsAdminStaffType> createIsAdminStaff(IsAdminStaffType value) {
+		return new JAXBElement<IsAdminStaffType>(_IsAdminStaff_QNAME, IsAdminStaffType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "AttributeValue")
+	public JAXBElement<Object> createAttributeValue(Object value) {
+		return new JAXBElement<Object>(_AttributeValue_QNAME, Object.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "countryCodeAddress")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	public JAXBElement<String> createCountryCodeAddress(String value) {
+		return new JAXBElement<String>(_CountryCodeAddress_QNAME, String.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link HasAccountInBankType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasAccountInBank")
+	public JAXBElement<HasAccountInBankType> createHasAccountInBank(HasAccountInBankType value) {
+		return new JAXBElement<HasAccountInBankType>(_HasAccountInBank_QNAME, HasAccountInBankType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link CurrentStudiesType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "currentStudiesSupplement")
+	public JAXBElement<CurrentStudiesType> createCurrentStudiesSupplement(CurrentStudiesType value) {
+		return new JAXBElement<CurrentStudiesType>(_CurrentStudiesSupplement_QNAME, CurrentStudiesType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link RequestedAttributeType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "RequestedAttribute")
+	public JAXBElement<RequestedAttributeType> createRequestedAttribute(RequestedAttributeType value) {
+		return new JAXBElement<RequestedAttributeType>(_RequestedAttribute_QNAME, RequestedAttributeType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link MandateType }{@code >}
+	 *
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "mandate")
+	public JAXBElement<MandateType> createMandate(MandateType value) {
+		return new JAXBElement<MandateType>(_Mandate_QNAME, MandateType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "spSector")
+	public JAXBElement<String> createSpSector(String value) {
+		return new JAXBElement<String>(_SpSector_QNAME, String.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link HasDegreeType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "hasDegree")
+	public JAXBElement<HasDegreeType> createHasDegree(HasDegreeType value) {
+		return new JAXBElement<HasDegreeType>(_HasDegree_QNAME, HasDegreeType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link DiplomaSupplementType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "diplomaSupplement")
+	public JAXBElement<DiplomaSupplementType> createDiplomaSupplement(DiplomaSupplementType value) {
+		return new JAXBElement<DiplomaSupplementType>(_DiplomaSupplement_QNAME, DiplomaSupplementType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link IsStudentType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isStudent")
+	public JAXBElement<IsStudentType> createIsStudent(IsStudentType value) {
+		return new JAXBElement<IsStudentType>(_IsStudent_QNAME, IsStudentType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "HCPType")
+	public JAXBElement<String> createHCPType(String value) {
+		return new JAXBElement<String>(_HCPType_QNAME, String.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link RepresentationPersonType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "representationPerson")
+	public JAXBElement<RepresentationPersonType> createRepresentationPerson(RepresentationPersonType value) {
+		return new JAXBElement<RepresentationPersonType>(_RepresentationPerson_QNAME, RepresentationPersonType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalAddressType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "canonicalResidenceAddress")
+	public JAXBElement<CanonicalAddressType> createCanonicalResidenceAddress(CanonicalAddressType value) {
+		return new JAXBElement<CanonicalAddressType>(_CanonicalResidenceAddress_QNAME, CanonicalAddressType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link AcTitleType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "acTitle")
+	public JAXBElement<AcTitleType> createAcTitle(AcTitleType value) {
+		return new JAXBElement<AcTitleType>(_AcTitle_QNAME, AcTitleType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link IsTeacherOfType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isTeacherOf")
+	public JAXBElement<IsTeacherOfType> createIsTeacherOf(IsTeacherOfType value) {
+		return new JAXBElement<IsTeacherOfType>(_IsTeacherOf_QNAME, IsTeacherOfType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link IsCourseCoordinatorType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isCourseCoordinator")
+	public JAXBElement<IsCourseCoordinatorType> createIsCourseCoordinator(IsCourseCoordinatorType value) {
+		return new JAXBElement<IsCourseCoordinatorType>(_IsCourseCoordinator_QNAME, IsCourseCoordinatorType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "CitizenCountryCode")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	public JAXBElement<String> createCitizenCountryCode(String value) {
+		return new JAXBElement<String>(_CitizenCountryCode_QNAME, String.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "study")
+	public JAXBElement<String> createStudy(String value) {
+		return new JAXBElement<String>(_Study_QNAME, String.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link IsHealthCareProfessionalType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", name = "isHealthCareProfessional")
+	public JAXBElement<IsHealthCareProfessionalType> createIsHealthCareProfessional(IsHealthCareProfessionalType value) {
+		return new JAXBElement<IsHealthCareProfessionalType>(_IsHealthCareProfessional_QNAME, IsHealthCareProfessionalType.class, null, value);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/OriginalMandateType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/OriginalMandateType.java
index 776b36644..ddcb6bb19 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/OriginalMandateType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/OriginalMandateType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.10.09 at 10:11:43 AM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
- * <p>Java class for originalMandateType complex type.
+ * <p>
+ * Java class for originalMandateType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="originalMandateType">
@@ -33,60 +33,52 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "originalMandateType", propOrder = {
-    "value"
-})
+@XmlType(name = "originalMandateType", propOrder = { "value" })
 public class OriginalMandateType {
 
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "mimeType")
-    protected String mimeType;
+	@XmlValue
+	protected byte[] value;
+	@XmlAttribute(name = "mimeType")
+	protected String mimeType;
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
+	/**
+	 * Gets the value of the value property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getValue() {
+		return value;
+	}
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
+	/**
+	 * Sets the value of the value property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setValue(byte[] value) {
+		this.value = value;
+	}
 
-    /**
-     * Gets the value of the mimeType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMimeType() {
-        return mimeType;
-    }
+	/**
+	 * Gets the value of the mimeType property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getMimeType() {
+		return mimeType;
+	}
 
-    /**
-     * Sets the value of the mimeType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMimeType(String value) {
-        this.mimeType = value;
-    }
+	/**
+	 * Sets the value of the mimeType property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setMimeType(String value) {
+		this.mimeType = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RepresentationPersonType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RepresentationPersonType.java
index fd7aa460a..23046f431 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RepresentationPersonType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RepresentationPersonType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.10.29 at 02:15:24 PM GMT
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for representationPersonType complex type.
+ * <p>
+ * Java class for representationPersonType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="representationPersonType">
@@ -46,244 +46,208 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "representationPersonType", propOrder = {
-    "eIdentifier",
-    "givenName",
-    "surname",
-    "dateOfBirth",
-    "elpIdentifier",
-    "legalName",
-    "textRegisteredAddress",
-    "canonicalRegisteredAddress",
-    "legalForm"
-})
+@XmlType(name = "representationPersonType", propOrder = { "eIdentifier", "givenName", "surname", "dateOfBirth", "elpIdentifier", "legalName", "textRegisteredAddress", "canonicalRegisteredAddress",
+		"legalForm" })
 public class RepresentationPersonType {
 
-    protected String eIdentifier;
-    protected String givenName;
-    protected String surname;
-    protected String dateOfBirth;
-    @XmlElement(name = "eLPIdentifier")
-    protected String elpIdentifier;
-    protected String legalName;
-    protected String textRegisteredAddress;
-    protected CanonicalAddressType canonicalRegisteredAddress;
-    protected String legalForm;
-
-    /**
-     * Gets the value of the eIdentifier property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEIdentifier() {
-        return eIdentifier;
-    }
-
-    /**
-     * Sets the value of the eIdentifier property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEIdentifier(String value) {
-        this.eIdentifier = value;
-    }
-
-    /**
-     * Gets the value of the givenName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGivenName() {
-        return givenName;
-    }
-
-    /**
-     * Sets the value of the givenName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGivenName(String value) {
-        this.givenName = value;
-    }
-
-    /**
-     * Gets the value of the surname property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getSurname() {
-        return surname;
-    }
-
-    /**
-     * Sets the value of the surname property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setSurname(String value) {
-        this.surname = value;
-    }
-
-    /**
-     * Gets the value of the dateOfBirth property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDateOfBirth() {
-        return dateOfBirth;
-    }
-
-    /**
-     * Sets the value of the dateOfBirth property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDateOfBirth(String value) {
-        this.dateOfBirth = value;
-    }
-
-    /**
-     * Gets the value of the elpIdentifier property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getELPIdentifier() {
-        return elpIdentifier;
-    }
-
-    /**
-     * Sets the value of the elpIdentifier property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setELPIdentifier(String value) {
-        this.elpIdentifier = value;
-    }
-
-    /**
-     * Gets the value of the legalName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLegalName() {
-        return legalName;
-    }
-
-    /**
-     * Sets the value of the legalName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLegalName(String value) {
-        this.legalName = value;
-    }
-
-    /**
-     * Gets the value of the textRegisteredAddress property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTextRegisteredAddress() {
-        return textRegisteredAddress;
-    }
-
-    /**
-     * Sets the value of the textRegisteredAddress property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTextRegisteredAddress(String value) {
-        this.textRegisteredAddress = value;
-    }
-
-    /**
-     * Gets the value of the canonicalRegisteredAddress property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CanonicalAddressType }
-     *     
-     */
-    public CanonicalAddressType getCanonicalRegisteredAddress() {
-        return canonicalRegisteredAddress;
-    }
-
-    /**
-     * Sets the value of the canonicalRegisteredAddress property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CanonicalAddressType }
-     *     
-     */
-    public void setCanonicalRegisteredAddress(CanonicalAddressType value) {
-        this.canonicalRegisteredAddress = value;
-    }
-
-    /**
-     * Gets the value of the legalForm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLegalForm() {
-        return legalForm;
-    }
-
-    /**
-     * Sets the value of the legalForm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLegalForm(String value) {
-        this.legalForm = value;
-    }
+	protected String eIdentifier;
+	protected String givenName;
+	protected String surname;
+	protected String dateOfBirth;
+	@XmlElement(name = "eLPIdentifier")
+	protected String elpIdentifier;
+	protected String legalName;
+	protected String textRegisteredAddress;
+	protected CanonicalAddressType canonicalRegisteredAddress;
+	protected String legalForm;
+
+	/**
+	 * Gets the value of the eIdentifier property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getEIdentifier() {
+		return eIdentifier;
+	}
+
+	/**
+	 * Sets the value of the eIdentifier property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setEIdentifier(String value) {
+		this.eIdentifier = value;
+	}
+
+	/**
+	 * Gets the value of the givenName property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getGivenName() {
+		return givenName;
+	}
+
+	/**
+	 * Sets the value of the givenName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setGivenName(String value) {
+		this.givenName = value;
+	}
+
+	/**
+	 * Gets the value of the surname property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getSurname() {
+		return surname;
+	}
+
+	/**
+	 * Sets the value of the surname property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setSurname(String value) {
+		this.surname = value;
+	}
+
+	/**
+	 * Gets the value of the dateOfBirth property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDateOfBirth() {
+		return dateOfBirth;
+	}
+
+	/**
+	 * Sets the value of the dateOfBirth property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDateOfBirth(String value) {
+		this.dateOfBirth = value;
+	}
+
+	/**
+	 * Gets the value of the elpIdentifier property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getELPIdentifier() {
+		return elpIdentifier;
+	}
+
+	/**
+	 * Sets the value of the elpIdentifier property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setELPIdentifier(String value) {
+		this.elpIdentifier = value;
+	}
+
+	/**
+	 * Gets the value of the legalName property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getLegalName() {
+		return legalName;
+	}
+
+	/**
+	 * Sets the value of the legalName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setLegalName(String value) {
+		this.legalName = value;
+	}
+
+	/**
+	 * Gets the value of the textRegisteredAddress property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTextRegisteredAddress() {
+		return textRegisteredAddress;
+	}
+
+	/**
+	 * Sets the value of the textRegisteredAddress property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTextRegisteredAddress(String value) {
+		this.textRegisteredAddress = value;
+	}
+
+	/**
+	 * Gets the value of the canonicalRegisteredAddress property.
+	 * 
+	 * @return possible object is {@link CanonicalAddressType }
+	 * 
+	 */
+	public CanonicalAddressType getCanonicalRegisteredAddress() {
+		return canonicalRegisteredAddress;
+	}
+
+	/**
+	 * Sets the value of the canonicalRegisteredAddress property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CanonicalAddressType }
+	 * 
+	 */
+	public void setCanonicalRegisteredAddress(CanonicalAddressType value) {
+		this.canonicalRegisteredAddress = value;
+	}
+
+	/**
+	 * Gets the value of the legalForm property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getLegalForm() {
+		return legalForm;
+	}
+
+	/**
+	 * Sets the value of the legalForm property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setLegalForm(String value) {
+		this.legalForm = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RequestedAttributeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RequestedAttributeType.java
index 4800a2cfc..88146c90d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RequestedAttributeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/RequestedAttributeType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import java.util.ArrayList;
@@ -21,11 +20,12 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.namespace.QName;
 
-
 /**
- * <p>Java class for RequestedAttributeType complex type.
+ * <p>
+ * Java class for RequestedAttributeType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="RequestedAttributeType">
@@ -47,166 +47,147 @@ import javax.xml.namespace.QName;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RequestedAttributeType", propOrder = {
-    "attributeValue"
-})
+@XmlType(name = "RequestedAttributeType", propOrder = { "attributeValue" })
 public class RequestedAttributeType {
 
-    @XmlElement(name = "AttributeValue")
-    protected List<Object> attributeValue;
-    @XmlAttribute(name = "Name", required = true)
-    protected String name;
-    @XmlAttribute(name = "NameFormat", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String nameFormat;
-    @XmlAttribute(name = "FriendlyName")
-    protected String friendlyName;
-    @XmlAttribute(name = "isRequired")
-    protected Boolean isRequired;
-    @XmlAnyAttribute
-    private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-    /**
-     * Gets the value of the attributeValue property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attributeValue property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttributeValue().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAttributeValue() {
-        if (attributeValue == null) {
-            attributeValue = new ArrayList<Object>();
-        }
-        return this.attributeValue;
-    }
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the nameFormat property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNameFormat() {
-        return nameFormat;
-    }
-
-    /**
-     * Sets the value of the nameFormat property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNameFormat(String value) {
-        this.nameFormat = value;
-    }
-
-    /**
-     * Gets the value of the friendlyName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFriendlyName() {
-        return friendlyName;
-    }
-
-    /**
-     * Sets the value of the friendlyName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFriendlyName(String value) {
-        this.friendlyName = value;
-    }
-
-    /**
-     * Gets the value of the isRequired property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public Boolean isIsRequired() {
-        return isRequired;
-    }
-
-    /**
-     * Sets the value of the isRequired property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setIsRequired(Boolean value) {
-        this.isRequired = value;
-    }
-
-    /**
-     * Gets a map that contains attributes that aren't bound to any typed property on this class.
-     * 
-     * <p>
-     * the map is keyed by the name of the attribute and 
-     * the value is the string value of the attribute.
-     * 
-     * the map returned by this method is live, and you can add new attribute
-     * by updating the map directly. Because of this design, there's no setter.
-     * 
-     * 
-     * @return
-     *     always non-null
-     */
-    public Map<QName, String> getOtherAttributes() {
-        return otherAttributes;
-    }
+	@XmlElement(name = "AttributeValue")
+	protected List<Object> attributeValue;
+	@XmlAttribute(name = "Name", required = true)
+	protected String name;
+	@XmlAttribute(name = "NameFormat", required = true)
+	@XmlSchemaType(name = "anyURI")
+	protected String nameFormat;
+	@XmlAttribute(name = "FriendlyName")
+	protected String friendlyName;
+	@XmlAttribute(name = "isRequired")
+	protected Boolean isRequired;
+	@XmlAnyAttribute
+	private Map<QName, String> otherAttributes = new HashMap<QName, String>();
+
+	/**
+	 * Gets the value of the attributeValue property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the attributeValue property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getAttributeValue().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link Object }
+	 * 
+	 * 
+	 */
+	public List<Object> getAttributeValue() {
+		if (attributeValue == null) {
+			attributeValue = new ArrayList<Object>();
+		}
+		return this.attributeValue;
+	}
+
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
+
+	/**
+	 * Gets the value of the nameFormat property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNameFormat() {
+		return nameFormat;
+	}
+
+	/**
+	 * Sets the value of the nameFormat property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNameFormat(String value) {
+		this.nameFormat = value;
+	}
+
+	/**
+	 * Gets the value of the friendlyName property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getFriendlyName() {
+		return friendlyName;
+	}
+
+	/**
+	 * Sets the value of the friendlyName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setFriendlyName(String value) {
+		this.friendlyName = value;
+	}
+
+	/**
+	 * Gets the value of the isRequired property.
+	 * 
+	 * @return possible object is {@link Boolean }
+	 * 
+	 */
+	public Boolean isIsRequired() {
+		return isRequired;
+	}
+
+	/**
+	 * Sets the value of the isRequired property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link Boolean }
+	 * 
+	 */
+	public void setIsRequired(Boolean value) {
+		this.isRequired = value;
+	}
+
+	/**
+	 * Gets a map that contains attributes that aren't bound to any typed property on this class.
+	 * 
+	 * <p>
+	 * the map is keyed by the name of the attribute and the value is the string value of the attribute.
+	 * 
+	 * the map returned by this method is live, and you can add new attribute by updating the map directly. Because of this design, there's no setter.
+	 * 
+	 * 
+	 * @return always non-null
+	 */
+	public Map<QName, String> getOtherAttributes() {
+		return otherAttributes;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TimeRestrictionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TimeRestrictionType.java
index 34cfb978a..2ae80c697 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TimeRestrictionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TimeRestrictionType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.05.12 at 10:04:52 AM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
- * <p>Java class for TimeRestrictionType complex type.
+ * <p>
+ * Java class for TimeRestrictionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="TimeRestrictionType">
@@ -37,65 +37,56 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TimeRestrictionType", propOrder = {
-    "validFrom",
-    "validTo"
-})
+@XmlType(name = "TimeRestrictionType", propOrder = { "validFrom", "validTo" })
 public class TimeRestrictionType {
 
-    @XmlElement(required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar validFrom;
-    @XmlElement(required = true)
-    @XmlSchemaType(name = "date")
-    protected XMLGregorianCalendar validTo;
+	@XmlElement(required = true)
+	@XmlSchemaType(name = "date")
+	protected XMLGregorianCalendar validFrom;
+	@XmlElement(required = true)
+	@XmlSchemaType(name = "date")
+	protected XMLGregorianCalendar validTo;
 
-    /**
-     * Gets the value of the validFrom property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getValidFrom() {
-        return validFrom;
-    }
+	/**
+	 * Gets the value of the validFrom property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getValidFrom() {
+		return validFrom;
+	}
 
-    /**
-     * Sets the value of the validFrom property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setValidFrom(XMLGregorianCalendar value) {
-        this.validFrom = value;
-    }
+	/**
+	 * Sets the value of the validFrom property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setValidFrom(XMLGregorianCalendar value) {
+		this.validFrom = value;
+	}
 
-    /**
-     * Gets the value of the validTo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getValidTo() {
-        return validTo;
-    }
+	/**
+	 * Gets the value of the validTo property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getValidTo() {
+		return validTo;
+	}
 
-    /**
-     * Sets the value of the validTo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setValidTo(XMLGregorianCalendar value) {
-        this.validTo = value;
-    }
+	/**
+	 * Sets the value of the validTo property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setValidTo(XMLGregorianCalendar value) {
+		this.validTo = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TransactionLimitRestrictionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TransactionLimitRestrictionType.java
index b9db4ea0d..39a20c7c2 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TransactionLimitRestrictionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TransactionLimitRestrictionType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.05.12 at 10:04:52 AM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import java.math.BigDecimal;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for TransactionLimitRestrictionType complex type.
+ * <p>
+ * Java class for TransactionLimitRestrictionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="TransactionLimitRestrictionType">
@@ -36,63 +36,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransactionLimitRestrictionType", propOrder = {
-    "amount",
-    "currency"
-})
+@XmlType(name = "TransactionLimitRestrictionType", propOrder = { "amount", "currency" })
 public class TransactionLimitRestrictionType {
 
-    @XmlElement(required = true)
-    protected BigDecimal amount;
-    @XmlElement(required = true)
-    protected String currency;
+	@XmlElement(required = true)
+	protected BigDecimal amount;
+	@XmlElement(required = true)
+	protected String currency;
 
-    /**
-     * Gets the value of the amount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getAmount() {
-        return amount;
-    }
+	/**
+	 * Gets the value of the amount property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getAmount() {
+		return amount;
+	}
 
-    /**
-     * Sets the value of the amount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setAmount(BigDecimal value) {
-        this.amount = value;
-    }
+	/**
+	 * Sets the value of the amount property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setAmount(BigDecimal value) {
+		this.amount = value;
+	}
 
-    /**
-     * Gets the value of the currency property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCurrency() {
-        return currency;
-    }
+	/**
+	 * Gets the value of the currency property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCurrency() {
+		return currency;
+	}
 
-    /**
-     * Sets the value of the currency property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCurrency(String value) {
-        this.currency = value;
-    }
+	/**
+	 * Sets the value of the currency property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCurrency(String value) {
+		this.currency = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/package-info.java
index e94518e03..075851135 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/package-info.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/package-info.java
@@ -7,3 +7,4 @@
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "urn:eu:stork:names:tc:STORK:1.0:assertion", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
+
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AdditionalInformationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AdditionalInformationType.java
index 6b26bd000..c636217ca 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AdditionalInformationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AdditionalInformationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for AdditionalInformationType complex type.
+ * <p>
+ * Java class for AdditionalInformationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AdditionalInformationType">
@@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AdditionalInformationType", propOrder = {
-    "specificInformation",
-    "otherSources"
-})
+@XmlType(name = "AdditionalInformationType", propOrder = { "specificInformation", "otherSources" })
 public class AdditionalInformationType {
 
-    @XmlElement(name = "SpecificInformation")
-    protected RichTextTagType specificInformation;
-    @XmlElement(name = "OtherSources")
-    protected RichTextTagType otherSources;
+	@XmlElement(name = "SpecificInformation")
+	protected RichTextTagType specificInformation;
+	@XmlElement(name = "OtherSources")
+	protected RichTextTagType otherSources;
 
-    /**
-     * Gets the value of the specificInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getSpecificInformation() {
-        return specificInformation;
-    }
+	/**
+	 * Gets the value of the specificInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getSpecificInformation() {
+		return specificInformation;
+	}
 
-    /**
-     * Sets the value of the specificInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setSpecificInformation(RichTextTagType value) {
-        this.specificInformation = value;
-    }
+	/**
+	 * Sets the value of the specificInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setSpecificInformation(RichTextTagType value) {
+		this.specificInformation = value;
+	}
 
-    /**
-     * Gets the value of the otherSources property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getOtherSources() {
-        return otherSources;
-    }
+	/**
+	 * Gets the value of the otherSources property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getOtherSources() {
+		return otherSources;
+	}
 
-    /**
-     * Sets the value of the otherSources property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setOtherSources(RichTextTagType value) {
-        this.otherSources = value;
-    }
+	/**
+	 * Sets the value of the otherSources property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setOtherSources(RichTextTagType value) {
+		this.otherSources = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AddressType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AddressType.java
index d7fae6b34..67ef6d2dc 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AddressType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AddressType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for AddressType complex type.
+ * <p>
+ * Java class for AddressType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AddressType">
@@ -40,149 +40,129 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AddressType", propOrder = {
-    "line",
-    "city",
-    "stateOrRegion",
-    "postalCode",
-    "country"
-})
+@XmlType(name = "AddressType", propOrder = { "line", "city", "stateOrRegion", "postalCode", "country" })
 public class AddressType {
 
-    @XmlElement(name = "Line", required = true)
-    protected List<String> line;
-    @XmlElement(name = "City")
-    protected String city;
-    @XmlElement(name = "StateOrRegion")
-    protected String stateOrRegion;
-    @XmlElement(name = "PostalCode")
-    protected String postalCode;
-    @XmlElement(name = "Country")
-    protected CountryTextCodeType country;
-
-    /**
-     * Gets the value of the line property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the line property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getLine().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getLine() {
-        if (line == null) {
-            line = new ArrayList<String>();
-        }
-        return this.line;
-    }
-
-    /**
-     * Gets the value of the city property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCity() {
-        return city;
-    }
-
-    /**
-     * Sets the value of the city property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCity(String value) {
-        this.city = value;
-    }
-
-    /**
-     * Gets the value of the stateOrRegion property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStateOrRegion() {
-        return stateOrRegion;
-    }
-
-    /**
-     * Sets the value of the stateOrRegion property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStateOrRegion(String value) {
-        this.stateOrRegion = value;
-    }
-
-    /**
-     * Gets the value of the postalCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPostalCode() {
-        return postalCode;
-    }
-
-    /**
-     * Sets the value of the postalCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPostalCode(String value) {
-        this.postalCode = value;
-    }
-
-    /**
-     * Gets the value of the country property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CountryTextCodeType }
-     *     
-     */
-    public CountryTextCodeType getCountry() {
-        return country;
-    }
-
-    /**
-     * Sets the value of the country property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CountryTextCodeType }
-     *     
-     */
-    public void setCountry(CountryTextCodeType value) {
-        this.country = value;
-    }
+	@XmlElement(name = "Line", required = true)
+	protected List<String> line;
+	@XmlElement(name = "City")
+	protected String city;
+	@XmlElement(name = "StateOrRegion")
+	protected String stateOrRegion;
+	@XmlElement(name = "PostalCode")
+	protected String postalCode;
+	@XmlElement(name = "Country")
+	protected CountryTextCodeType country;
+
+	/**
+	 * Gets the value of the line property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the line property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getLine().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getLine() {
+		if (line == null) {
+			line = new ArrayList<String>();
+		}
+		return this.line;
+	}
+
+	/**
+	 * Gets the value of the city property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCity() {
+		return city;
+	}
+
+	/**
+	 * Sets the value of the city property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCity(String value) {
+		this.city = value;
+	}
+
+	/**
+	 * Gets the value of the stateOrRegion property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getStateOrRegion() {
+		return stateOrRegion;
+	}
+
+	/**
+	 * Sets the value of the stateOrRegion property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setStateOrRegion(String value) {
+		this.stateOrRegion = value;
+	}
+
+	/**
+	 * Gets the value of the postalCode property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	/**
+	 * Sets the value of the postalCode property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setPostalCode(String value) {
+		this.postalCode = value;
+	}
+
+	/**
+	 * Gets the value of the country property.
+	 * 
+	 * @return possible object is {@link CountryTextCodeType }
+	 * 
+	 */
+	public CountryTextCodeType getCountry() {
+		return country;
+	}
+
+	/**
+	 * Sets the value of the country property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CountryTextCodeType }
+	 * 
+	 */
+	public void setCountry(CountryTextCodeType value) {
+		this.country = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileDataType.java
index f905dcdd5..f0114d912 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileDataType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileDataType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for AttachedFileDataType complex type.
+ * <p>
+ * Java class for AttachedFileDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachedFileDataType">
@@ -36,88 +36,75 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachedFileDataType", propOrder = {
-    "description",
-    "mime",
-    "data"
-})
+@XmlType(name = "AttachedFileDataType", propOrder = { "description", "mime", "data" })
 public class AttachedFileDataType {
 
-    @XmlElement(name = "Description", required = true)
-    protected String description;
-    @XmlElement(name = "Mime", required = true)
-    protected MimeType mime;
-    @XmlElement(name = "Data", required = true)
-    protected byte[] data;
+	@XmlElement(name = "Description", required = true)
+	protected String description;
+	@XmlElement(name = "Mime", required = true)
+	protected MimeType mime;
+	@XmlElement(name = "Data", required = true)
+	protected byte[] data;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+	/**
+	 * Gets the value of the description property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDescription() {
+		return description;
+	}
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+	/**
+	 * Sets the value of the description property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDescription(String value) {
+		this.description = value;
+	}
 
-    /**
-     * Gets the value of the mime property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MimeType }
-     *     
-     */
-    public MimeType getMime() {
-        return mime;
-    }
+	/**
+	 * Gets the value of the mime property.
+	 * 
+	 * @return possible object is {@link MimeType }
+	 * 
+	 */
+	public MimeType getMime() {
+		return mime;
+	}
 
-    /**
-     * Sets the value of the mime property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MimeType }
-     *     
-     */
-    public void setMime(MimeType value) {
-        this.mime = value;
-    }
+	/**
+	 * Sets the value of the mime property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MimeType }
+	 * 
+	 */
+	public void setMime(MimeType value) {
+		this.mime = value;
+	}
 
-    /**
-     * Gets the value of the data property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getData() {
-        return data;
-    }
+	/**
+	 * Gets the value of the data property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getData() {
+		return data;
+	}
 
-    /**
-     * Sets the value of the data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setData(byte[] value) {
-        this.data = value;
-    }
+	/**
+	 * Sets the value of the data property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setData(byte[] value) {
+		this.data = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileURLType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileURLType.java
index 7bd89fef8..4e9bf3c4b 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileURLType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileURLType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for AttachedFileURLType complex type.
+ * <p>
+ * Java class for AttachedFileURLType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachedFileURLType">
@@ -36,90 +36,77 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachedFileURLType", propOrder = {
-    "description",
-    "mime",
-    "url"
-})
+@XmlType(name = "AttachedFileURLType", propOrder = { "description", "mime", "url" })
 public class AttachedFileURLType {
 
-    @XmlElement(name = "Description", required = true)
-    protected String description;
-    @XmlElement(name = "Mime", required = true)
-    protected MimeType mime;
-    @XmlElement(name = "URL", required = true)
-    protected String url;
+	@XmlElement(name = "Description", required = true)
+	protected String description;
+	@XmlElement(name = "Mime", required = true)
+	protected MimeType mime;
+	@XmlElement(name = "URL", required = true)
+	protected String url;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+	/**
+	 * Gets the value of the description property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDescription() {
+		return description;
+	}
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+	/**
+	 * Sets the value of the description property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDescription(String value) {
+		this.description = value;
+	}
 
-    /**
-     * Gets the value of the mime property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MimeType }
-     *     
-     */
-    public MimeType getMime() {
-        return mime;
-    }
+	/**
+	 * Gets the value of the mime property.
+	 * 
+	 * @return possible object is {@link MimeType }
+	 * 
+	 */
+	public MimeType getMime() {
+		return mime;
+	}
 
-    /**
-     * Sets the value of the mime property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MimeType }
-     *     
-     */
-    public void setMime(MimeType value) {
-        this.mime = value;
-    }
+	/**
+	 * Sets the value of the mime property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MimeType }
+	 * 
+	 */
+	public void setMime(MimeType value) {
+		this.mime = value;
+	}
 
-    /**
-     * Gets the value of the url property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURL() {
-        return url;
-    }
+	/**
+	 * Gets the value of the url property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getURL() {
+		return url;
+	}
 
-    /**
-     * Sets the value of the url property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURL(String value) {
-        this.url = value;
-    }
+	/**
+	 * Sets the value of the url property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setURL(String value) {
+		this.url = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageDataType.java
index cf964d7d0..61be0a30a 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageDataType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageDataType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for AttachedImageDataType complex type.
+ * <p>
+ * Java class for AttachedImageDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachedImageDataType">
@@ -36,88 +36,75 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachedImageDataType", propOrder = {
-    "description",
-    "mime",
-    "data"
-})
+@XmlType(name = "AttachedImageDataType", propOrder = { "description", "mime", "data" })
 public class AttachedImageDataType {
 
-    @XmlElement(name = "Description", required = true)
-    protected String description;
-    @XmlElement(name = "Mime", required = true)
-    protected ImageMimeType mime;
-    @XmlElement(name = "Data", required = true)
-    protected byte[] data;
+	@XmlElement(name = "Description", required = true)
+	protected String description;
+	@XmlElement(name = "Mime", required = true)
+	protected ImageMimeType mime;
+	@XmlElement(name = "Data", required = true)
+	protected byte[] data;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+	/**
+	 * Gets the value of the description property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDescription() {
+		return description;
+	}
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+	/**
+	 * Sets the value of the description property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDescription(String value) {
+		this.description = value;
+	}
 
-    /**
-     * Gets the value of the mime property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ImageMimeType }
-     *     
-     */
-    public ImageMimeType getMime() {
-        return mime;
-    }
+	/**
+	 * Gets the value of the mime property.
+	 * 
+	 * @return possible object is {@link ImageMimeType }
+	 * 
+	 */
+	public ImageMimeType getMime() {
+		return mime;
+	}
 
-    /**
-     * Sets the value of the mime property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ImageMimeType }
-     *     
-     */
-    public void setMime(ImageMimeType value) {
-        this.mime = value;
-    }
+	/**
+	 * Sets the value of the mime property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ImageMimeType }
+	 * 
+	 */
+	public void setMime(ImageMimeType value) {
+		this.mime = value;
+	}
 
-    /**
-     * Gets the value of the data property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getData() {
-        return data;
-    }
+	/**
+	 * Gets the value of the data property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getData() {
+		return data;
+	}
 
-    /**
-     * Sets the value of the data property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setData(byte[] value) {
-        this.data = value;
-    }
+	/**
+	 * Sets the value of the data property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setData(byte[] value) {
+		this.data = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageURLType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageURLType.java
index 945b715fe..e6c11edda 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageURLType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageURLType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for AttachedImageURLType complex type.
+ * <p>
+ * Java class for AttachedImageURLType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachedImageURLType">
@@ -36,90 +36,77 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachedImageURLType", propOrder = {
-    "description",
-    "mime",
-    "url"
-})
+@XmlType(name = "AttachedImageURLType", propOrder = { "description", "mime", "url" })
 public class AttachedImageURLType {
 
-    @XmlElement(name = "Description", required = true)
-    protected String description;
-    @XmlElement(name = "Mime", required = true)
-    protected ImageMimeType mime;
-    @XmlElement(name = "URL", required = true)
-    protected String url;
+	@XmlElement(name = "Description", required = true)
+	protected String description;
+	@XmlElement(name = "Mime", required = true)
+	protected ImageMimeType mime;
+	@XmlElement(name = "URL", required = true)
+	protected String url;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+	/**
+	 * Gets the value of the description property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDescription() {
+		return description;
+	}
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+	/**
+	 * Sets the value of the description property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDescription(String value) {
+		this.description = value;
+	}
 
-    /**
-     * Gets the value of the mime property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ImageMimeType }
-     *     
-     */
-    public ImageMimeType getMime() {
-        return mime;
-    }
+	/**
+	 * Gets the value of the mime property.
+	 * 
+	 * @return possible object is {@link ImageMimeType }
+	 * 
+	 */
+	public ImageMimeType getMime() {
+		return mime;
+	}
 
-    /**
-     * Sets the value of the mime property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ImageMimeType }
-     *     
-     */
-    public void setMime(ImageMimeType value) {
-        this.mime = value;
-    }
+	/**
+	 * Sets the value of the mime property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ImageMimeType }
+	 * 
+	 */
+	public void setMime(ImageMimeType value) {
+		this.mime = value;
+	}
 
-    /**
-     * Gets the value of the url property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURL() {
-        return url;
-    }
+	/**
+	 * Gets the value of the url property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getURL() {
+		return url;
+	}
 
-    /**
-     * Sets the value of the url property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURL(String value) {
-        this.url = value;
-    }
+	/**
+	 * Sets the value of the url property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setURL(String value) {
+		this.url = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedType.java
index 83cb26800..a4e64d560 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 /**
- * <p>Java class for AttachedType complex type.
+ * <p>
+ * Java class for AttachedType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachedType">
@@ -43,146 +43,126 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachedType", propOrder = {
-    "fileData",
-    "fileURI",
-    "imageData",
-    "imageURI"
-})
+@XmlType(name = "AttachedType", propOrder = { "fileData", "fileURI", "imageData", "imageURI" })
 public class AttachedType {
 
-    @XmlElement(name = "FileData")
-    protected AttachedFileDataType fileData;
-    @XmlElement(name = "FileURI")
-    protected AttachedFileURLType fileURI;
-    @XmlElement(name = "ImageData")
-    protected AttachedImageDataType imageData;
-    @XmlElement(name = "ImageURI")
-    protected AttachedImageURLType imageURI;
-    @XmlAttribute(name = "attachedID", required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String attachedID;
-
-    /**
-     * Gets the value of the fileData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttachedFileDataType }
-     *     
-     */
-    public AttachedFileDataType getFileData() {
-        return fileData;
-    }
-
-    /**
-     * Sets the value of the fileData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttachedFileDataType }
-     *     
-     */
-    public void setFileData(AttachedFileDataType value) {
-        this.fileData = value;
-    }
-
-    /**
-     * Gets the value of the fileURI property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttachedFileURLType }
-     *     
-     */
-    public AttachedFileURLType getFileURI() {
-        return fileURI;
-    }
-
-    /**
-     * Sets the value of the fileURI property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttachedFileURLType }
-     *     
-     */
-    public void setFileURI(AttachedFileURLType value) {
-        this.fileURI = value;
-    }
-
-    /**
-     * Gets the value of the imageData property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttachedImageDataType }
-     *     
-     */
-    public AttachedImageDataType getImageData() {
-        return imageData;
-    }
-
-    /**
-     * Sets the value of the imageData property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttachedImageDataType }
-     *     
-     */
-    public void setImageData(AttachedImageDataType value) {
-        this.imageData = value;
-    }
-
-    /**
-     * Gets the value of the imageURI property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttachedImageURLType }
-     *     
-     */
-    public AttachedImageURLType getImageURI() {
-        return imageURI;
-    }
-
-    /**
-     * Sets the value of the imageURI property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttachedImageURLType }
-     *     
-     */
-    public void setImageURI(AttachedImageURLType value) {
-        this.imageURI = value;
-    }
-
-    /**
-     * Gets the value of the attachedID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAttachedID() {
-        return attachedID;
-    }
-
-    /**
-     * Sets the value of the attachedID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAttachedID(String value) {
-        this.attachedID = value;
-    }
+	@XmlElement(name = "FileData")
+	protected AttachedFileDataType fileData;
+	@XmlElement(name = "FileURI")
+	protected AttachedFileURLType fileURI;
+	@XmlElement(name = "ImageData")
+	protected AttachedImageDataType imageData;
+	@XmlElement(name = "ImageURI")
+	protected AttachedImageURLType imageURI;
+	@XmlAttribute(name = "attachedID", required = true)
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String attachedID;
+
+	/**
+	 * Gets the value of the fileData property.
+	 * 
+	 * @return possible object is {@link AttachedFileDataType }
+	 * 
+	 */
+	public AttachedFileDataType getFileData() {
+		return fileData;
+	}
+
+	/**
+	 * Sets the value of the fileData property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AttachedFileDataType }
+	 * 
+	 */
+	public void setFileData(AttachedFileDataType value) {
+		this.fileData = value;
+	}
+
+	/**
+	 * Gets the value of the fileURI property.
+	 * 
+	 * @return possible object is {@link AttachedFileURLType }
+	 * 
+	 */
+	public AttachedFileURLType getFileURI() {
+		return fileURI;
+	}
+
+	/**
+	 * Sets the value of the fileURI property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AttachedFileURLType }
+	 * 
+	 */
+	public void setFileURI(AttachedFileURLType value) {
+		this.fileURI = value;
+	}
+
+	/**
+	 * Gets the value of the imageData property.
+	 * 
+	 * @return possible object is {@link AttachedImageDataType }
+	 * 
+	 */
+	public AttachedImageDataType getImageData() {
+		return imageData;
+	}
+
+	/**
+	 * Sets the value of the imageData property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AttachedImageDataType }
+	 * 
+	 */
+	public void setImageData(AttachedImageDataType value) {
+		this.imageData = value;
+	}
+
+	/**
+	 * Gets the value of the imageURI property.
+	 * 
+	 * @return possible object is {@link AttachedImageURLType }
+	 * 
+	 */
+	public AttachedImageURLType getImageURI() {
+		return imageURI;
+	}
+
+	/**
+	 * Sets the value of the imageURI property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AttachedImageURLType }
+	 * 
+	 */
+	public void setImageURI(AttachedImageURLType value) {
+		this.imageURI = value;
+	}
+
+	/**
+	 * Gets the value of the attachedID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAttachedID() {
+		return attachedID;
+	}
+
+	/**
+	 * Sets the value of the attachedID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAttachedID(String value) {
+		this.attachedID = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachmentsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachmentsType.java
index a8612ae63..abb61728a 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachmentsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachmentsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for AttachmentsType complex type.
+ * <p>
+ * Java class for AttachmentsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="AttachmentsType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "AttachmentsType", propOrder = {
-    "attached"
-})
+@XmlType(name = "AttachmentsType", propOrder = { "attached" })
 public class AttachmentsType {
 
-    @XmlElement(name = "Attached", required = true)
-    protected List<AttachedType> attached;
+	@XmlElement(name = "Attached", required = true)
+	protected List<AttachedType> attached;
 
-    /**
-     * Gets the value of the attached property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the attached property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAttached().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link AttachedType }
-     * 
-     * 
-     */
-    public List<AttachedType> getAttached() {
-        if (attached == null) {
-            attached = new ArrayList<AttachedType>();
-        }
-        return this.attached;
-    }
+	/**
+	 * Gets the value of the attached property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the attached property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getAttached().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link AttachedType }
+	 * 
+	 * 
+	 */
+	public List<AttachedType> getAttached() {
+		if (attached == null) {
+			attached = new ArrayList<AttachedType>();
+		}
+		return this.attached;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CertificationOfTheSupplementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CertificationOfTheSupplementType.java
index c154e92c3..0ca2d1a02 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CertificationOfTheSupplementType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CertificationOfTheSupplementType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
- * <p>Java class for CertificationOfTheSupplementType complex type.
+ * <p>
+ * Java class for CertificationOfTheSupplementType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CertificationOfTheSupplementType">
@@ -37,90 +37,77 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CertificationOfTheSupplementType", propOrder = {
-    "certificationDate",
-    "officialsCertifying",
-    "officialStamp"
-})
+@XmlType(name = "CertificationOfTheSupplementType", propOrder = { "certificationDate", "officialsCertifying", "officialStamp" })
 public class CertificationOfTheSupplementType {
 
-    @XmlElement(name = "CertificationDate")
-    protected XMLGregorianCalendar certificationDate;
-    @XmlElement(name = "OfficialsCertifying")
-    protected OfficialsCertifyingType officialsCertifying;
-    @XmlElement(name = "OfficialStamp")
-    protected OfficialStampType officialStamp;
+	@XmlElement(name = "CertificationDate")
+	protected XMLGregorianCalendar certificationDate;
+	@XmlElement(name = "OfficialsCertifying")
+	protected OfficialsCertifyingType officialsCertifying;
+	@XmlElement(name = "OfficialStamp")
+	protected OfficialStampType officialStamp;
 
-    /**
-     * Gets the value of the certificationDate property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getCertificationDate() {
-        return certificationDate;
-    }
+	/**
+	 * Gets the value of the certificationDate property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getCertificationDate() {
+		return certificationDate;
+	}
 
-    /**
-     * Sets the value of the certificationDate property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setCertificationDate(XMLGregorianCalendar value) {
-        this.certificationDate = value;
-    }
+	/**
+	 * Sets the value of the certificationDate property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setCertificationDate(XMLGregorianCalendar value) {
+		this.certificationDate = value;
+	}
 
-    /**
-     * Gets the value of the officialsCertifying property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OfficialsCertifyingType }
-     *     
-     */
-    public OfficialsCertifyingType getOfficialsCertifying() {
-        return officialsCertifying;
-    }
+	/**
+	 * Gets the value of the officialsCertifying property.
+	 * 
+	 * @return possible object is {@link OfficialsCertifyingType }
+	 * 
+	 */
+	public OfficialsCertifyingType getOfficialsCertifying() {
+		return officialsCertifying;
+	}
 
-    /**
-     * Sets the value of the officialsCertifying property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OfficialsCertifyingType }
-     *     
-     */
-    public void setOfficialsCertifying(OfficialsCertifyingType value) {
-        this.officialsCertifying = value;
-    }
+	/**
+	 * Sets the value of the officialsCertifying property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link OfficialsCertifyingType }
+	 * 
+	 */
+	public void setOfficialsCertifying(OfficialsCertifyingType value) {
+		this.officialsCertifying = value;
+	}
 
-    /**
-     * Gets the value of the officialStamp property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OfficialStampType }
-     *     
-     */
-    public OfficialStampType getOfficialStamp() {
-        return officialStamp;
-    }
+	/**
+	 * Gets the value of the officialStamp property.
+	 * 
+	 * @return possible object is {@link OfficialStampType }
+	 * 
+	 */
+	public OfficialStampType getOfficialStamp() {
+		return officialStamp;
+	}
 
-    /**
-     * Sets the value of the officialStamp property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OfficialStampType }
-     *     
-     */
-    public void setOfficialStamp(OfficialStampType value) {
-        this.officialStamp = value;
-    }
+	/**
+	 * Sets the value of the officialStamp property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link OfficialStampType }
+	 * 
+	 */
+	public void setOfficialStamp(OfficialStampType value) {
+		this.officialStamp = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ContactInformationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ContactInformationType.java
index 3ed1697e7..155849e3f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ContactInformationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ContactInformationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ContactInformationType complex type.
+ * <p>
+ * Java class for ContactInformationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ContactInformationType">
@@ -39,132 +39,118 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ContactInformationType", propOrder = {
-    "address",
-    "phoneNumber",
-    "email",
-    "webSite"
-})
+@XmlType(name = "ContactInformationType", propOrder = { "address", "phoneNumber", "email", "webSite" })
 public class ContactInformationType {
 
-    @XmlElement(name = "Address")
-    protected AddressType address;
-    @XmlElement(name = "PhoneNumber")
-    protected List<String> phoneNumber;
-    @XmlElement(name = "Email")
-    protected List<String> email;
-    @XmlElement(name = "WebSite")
-    protected List<String> webSite;
+	@XmlElement(name = "Address")
+	protected AddressType address;
+	@XmlElement(name = "PhoneNumber")
+	protected List<String> phoneNumber;
+	@XmlElement(name = "Email")
+	protected List<String> email;
+	@XmlElement(name = "WebSite")
+	protected List<String> webSite;
 
-    /**
-     * Gets the value of the address property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AddressType }
-     *     
-     */
-    public AddressType getAddress() {
-        return address;
-    }
+	/**
+	 * Gets the value of the address property.
+	 * 
+	 * @return possible object is {@link AddressType }
+	 * 
+	 */
+	public AddressType getAddress() {
+		return address;
+	}
 
-    /**
-     * Sets the value of the address property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AddressType }
-     *     
-     */
-    public void setAddress(AddressType value) {
-        this.address = value;
-    }
+	/**
+	 * Sets the value of the address property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AddressType }
+	 * 
+	 */
+	public void setAddress(AddressType value) {
+		this.address = value;
+	}
 
-    /**
-     * Gets the value of the phoneNumber property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the phoneNumber property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getPhoneNumber().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getPhoneNumber() {
-        if (phoneNumber == null) {
-            phoneNumber = new ArrayList<String>();
-        }
-        return this.phoneNumber;
-    }
+	/**
+	 * Gets the value of the phoneNumber property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the phoneNumber property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getPhoneNumber().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getPhoneNumber() {
+		if (phoneNumber == null) {
+			phoneNumber = new ArrayList<String>();
+		}
+		return this.phoneNumber;
+	}
 
-    /**
-     * Gets the value of the email property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the email property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getEmail().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getEmail() {
-        if (email == null) {
-            email = new ArrayList<String>();
-        }
-        return this.email;
-    }
+	/**
+	 * Gets the value of the email property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the email property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getEmail().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getEmail() {
+		if (email == null) {
+			email = new ArrayList<String>();
+		}
+		return this.email;
+	}
 
-    /**
-     * Gets the value of the webSite property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the webSite property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getWebSite().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getWebSite() {
-        if (webSite == null) {
-            webSite = new ArrayList<String>();
-        }
-        return this.webSite;
-    }
+	/**
+	 * Gets the value of the webSite property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the webSite property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getWebSite().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getWebSite() {
+		if (webSite == null) {
+			webSite = new ArrayList<String>();
+		}
+		return this.webSite;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryTextCodeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryTextCodeType.java
index bf4dd984b..25aa0d5d2 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryTextCodeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryTextCodeType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
- * <p>Java class for CountryTextCodeType complex type.
+ * <p>
+ * Java class for CountryTextCodeType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CountryTextCodeType">
@@ -33,62 +33,54 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CountryTextCodeType", propOrder = {
-    "value"
-})
+@XmlType(name = "CountryTextCodeType", propOrder = { "value" })
 public class CountryTextCodeType {
 
-    @XmlValue
-    protected String value;
-    @XmlAttribute(name = "country")
-    protected CountryType country;
+	@XmlValue
+	protected String value;
+	@XmlAttribute(name = "country")
+	protected CountryType country;
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
+	/**
+	 * Gets the value of the value property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getValue() {
+		return value;
+	}
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
+	/**
+	 * Sets the value of the value property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setValue(String value) {
+		this.value = value;
+	}
 
-    /**
-     * Gets the value of the country property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CountryType }
-     *     
-     */
-    public CountryType getCountry() {
-        return country;
-    }
+	/**
+	 * Gets the value of the country property.
+	 * 
+	 * @return possible object is {@link CountryType }
+	 * 
+	 */
+	public CountryType getCountry() {
+		return country;
+	}
 
-    /**
-     * Sets the value of the country property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CountryType }
-     *     
-     */
-    public void setCountry(CountryType value) {
-        this.country = value;
-    }
+	/**
+	 * Sets the value of the country property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CountryType }
+	 * 
+	 */
+	public void setCountry(CountryType value) {
+		this.country = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryType.java
index b2fe16735..141788f5b 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryType.java
@@ -5,18 +5,19 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CountryType.
+ * <p>
+ * Java class for CountryType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="CountryType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -226,210 +227,14 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum CountryType {
 
-    AD,
-    AE,
-    AF,
-    AG,
-    AL,
-    AM,
-    AO,
-    AR,
-    AT,
-    AU,
-    AZ,
-    BA,
-    BB,
-    BD,
-    BE,
-    BF,
-    BG,
-    BH,
-    BI,
-    BJ,
-    BN,
-    BO,
-    BR,
-    BS,
-    BT,
-    BW,
-    BY,
-    BZ,
-    CA,
-    CD,
-    CF,
-    CG,
-    CH,
-    CI,
-    CL,
-    CM,
-    CN,
-    CO,
-    CR,
-    CU,
-    CV,
-    CY,
-    CZ,
-    DE,
-    DJ,
-    DK,
-    DM,
-    DO,
-    DZ,
-    EC,
-    EE,
-    EG,
-    ER,
-    ES,
-    ET,
-    FI,
-    FJ,
-    FM,
-    FR,
-    GA,
-    GB,
-    GD,
-    GE,
-    GH,
-    GL,
-    GM,
-    GN,
-    GQ,
-    GR,
-    GT,
-    GW,
-    GY,
-    HN,
-    HR,
-    HT,
-    HU,
-    ID,
-    IE,
-    IL,
-    IN,
-    IQ,
-    IR,
-    IS,
-    IT,
-    JM,
-    JO,
-    JP,
-    KE,
-    KG,
-    KH,
-    KI,
-    KM,
-    KN,
-    KP,
-    KR,
-    KW,
-    KZ,
-    LA,
-    LB,
-    LC,
-    LI,
-    LK,
-    LR,
-    LS,
-    LT,
-    LU,
-    LV,
-    LY,
-    MA,
-    MC,
-    MD,
-    ME,
-    MG,
-    MH,
-    MK,
-    ML,
-    MM,
-    MN,
-    MR,
-    MT,
-    MU,
-    MV,
-    MW,
-    MX,
-    MY,
-    MZ,
-    NA,
-    NE,
-    NG,
-    NI,
-    NL,
-    NO,
-    NP,
-    NR,
-    NU,
-    NZ,
-    OM,
-    PA,
-    PE,
-    PG,
-    PH,
-    PK,
-    PL,
-    PR,
-    PS,
-    PT,
-    PW,
-    PY,
-    QA,
-    RO,
-    RS,
-    RU,
-    RW,
-    SA,
-    SB,
-    SC,
-    SD,
-    SE,
-    SG,
-    SI,
-    SK,
-    SL,
-    SM,
-    SN,
-    SO,
-    SR,
-    ST,
-    SV,
-    SY,
-    SZ,
-    TD,
-    TG,
-    TH,
-    TJ,
-    TL,
-    TM,
-    TN,
-    TO,
-    TR,
-    TT,
-    TV,
-    TZ,
-    UA,
-    UG,
-    US,
-    UY,
-    UZ,
-    VA,
-    VC,
-    VE,
-    VN,
-    VU,
-    WS,
-    YE,
-    ZA,
-    ZM,
-    ZW;
+	AD, AE, AF, AG, AL, AM, AO, AR, AT, AU, AZ, BA, BB, BD, BE, BF, BG, BH, BI, BJ, BN, BO, BR, BS, BT, BW, BY, BZ, CA, CD, CF, CG, CH, CI, CL, CM, CN, CO, CR, CU, CV, CY, CZ, DE, DJ, DK, DM, DO, DZ, EC, EE, EG, ER, ES, ET, FI, FJ, FM, FR, GA, GB, GD, GE, GH, GL, GM, GN, GQ, GR, GT, GW, GY, HN, HR, HT, HU, ID, IE, IL, IN, IQ, IR, IS, IT, JM, JO, JP, KE, KG, KH, KI, KM, KN, KP, KR, KW, KZ, LA, LB, LC, LI, LK, LR, LS, LT, LU, LV, LY, MA, MC, MD, ME, MG, MH, MK, ML, MM, MN, MR, MT, MU, MV, MW, MX, MY, MZ, NA, NE, NG, NI, NL, NO, NP, NR, NU, NZ, OM, PA, PE, PG, PH, PK, PL, PR, PS, PT, PW, PY, QA, RO, RS, RU, RW, SA, SB, SC, SD, SE, SG, SI, SK, SL, SM, SN, SO, SR, ST, SV, SY, SZ, TD, TG, TH, TJ, TL, TM, TN, TO, TR, TT, TV, TZ, UA, UG, US, UY, UZ, VA, VC, VE, VN, VU, WS, YE, ZA, ZM, ZW;
 
-    public String value() {
-        return name();
-    }
+	public String value() {
+		return name();
+	}
 
-    public static CountryType fromValue(String v) {
-        return valueOf(v);
-    }
+	public static CountryType fromValue(String v) {
+		return valueOf(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseStructureDiagramType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseStructureDiagramType.java
index a73acb84a..619985a7e 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseStructureDiagramType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseStructureDiagramType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CourseStructureDiagramType complex type.
+ * <p>
+ * Java class for CourseStructureDiagramType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseStructureDiagramType">
@@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseStructureDiagramType", propOrder = {
-    "coursesGroups",
-    "coursesUnits"
-})
+@XmlType(name = "CourseStructureDiagramType", propOrder = { "coursesGroups", "coursesUnits" })
 public class CourseStructureDiagramType {
 
-    @XmlElement(name = "CoursesGroups")
-    protected CoursesGroupsType coursesGroups;
-    @XmlElement(name = "CoursesUnits")
-    protected CoursesUnitsType coursesUnits;
+	@XmlElement(name = "CoursesGroups")
+	protected CoursesGroupsType coursesGroups;
+	@XmlElement(name = "CoursesUnits")
+	protected CoursesUnitsType coursesUnits;
 
-    /**
-     * Gets the value of the coursesGroups property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CoursesGroupsType }
-     *     
-     */
-    public CoursesGroupsType getCoursesGroups() {
-        return coursesGroups;
-    }
+	/**
+	 * Gets the value of the coursesGroups property.
+	 * 
+	 * @return possible object is {@link CoursesGroupsType }
+	 * 
+	 */
+	public CoursesGroupsType getCoursesGroups() {
+		return coursesGroups;
+	}
 
-    /**
-     * Sets the value of the coursesGroups property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CoursesGroupsType }
-     *     
-     */
-    public void setCoursesGroups(CoursesGroupsType value) {
-        this.coursesGroups = value;
-    }
+	/**
+	 * Sets the value of the coursesGroups property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CoursesGroupsType }
+	 * 
+	 */
+	public void setCoursesGroups(CoursesGroupsType value) {
+		this.coursesGroups = value;
+	}
 
-    /**
-     * Gets the value of the coursesUnits property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CoursesUnitsType }
-     *     
-     */
-    public CoursesUnitsType getCoursesUnits() {
-        return coursesUnits;
-    }
+	/**
+	 * Gets the value of the coursesUnits property.
+	 * 
+	 * @return possible object is {@link CoursesUnitsType }
+	 * 
+	 */
+	public CoursesUnitsType getCoursesUnits() {
+		return coursesUnits;
+	}
 
-    /**
-     * Sets the value of the coursesUnits property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CoursesUnitsType }
-     *     
-     */
-    public void setCoursesUnits(CoursesUnitsType value) {
-        this.coursesUnits = value;
-    }
+	/**
+	 * Sets the value of the coursesUnits property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CoursesUnitsType }
+	 * 
+	 */
+	public void setCoursesUnits(CoursesUnitsType value) {
+		this.coursesUnits = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguageOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguageOfInstructionType.java
index 1c2461526..c531ead90 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguageOfInstructionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguageOfInstructionType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
- * <p>Java class for CourseUnitLanguageOfInstructionType complex type.
+ * <p>
+ * Java class for CourseUnitLanguageOfInstructionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitLanguageOfInstructionType">
@@ -33,62 +33,54 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = {
-    "value"
-})
+@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = { "value" })
 public class CourseUnitLanguageOfInstructionType {
 
-    @XmlValue
-    protected String value;
-    @XmlAttribute(name = "language", required = true)
-    protected LanguageType language;
+	@XmlValue
+	protected String value;
+	@XmlAttribute(name = "language", required = true)
+	protected LanguageType language;
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getValue() {
-        return value;
-    }
+	/**
+	 * Gets the value of the value property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getValue() {
+		return value;
+	}
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue(String value) {
-        this.value = value;
-    }
+	/**
+	 * Sets the value of the value property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setValue(String value) {
+		this.value = value;
+	}
 
-    /**
-     * Gets the value of the language property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LanguageType }
-     *     
-     */
-    public LanguageType getLanguage() {
-        return language;
-    }
+	/**
+	 * Gets the value of the language property.
+	 * 
+	 * @return possible object is {@link LanguageType }
+	 * 
+	 */
+	public LanguageType getLanguage() {
+		return language;
+	}
 
-    /**
-     * Sets the value of the language property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LanguageType }
-     *     
-     */
-    public void setLanguage(LanguageType value) {
-        this.language = value;
-    }
+	/**
+	 * Sets the value of the language property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LanguageType }
+	 * 
+	 */
+	public void setLanguage(LanguageType value) {
+		this.language = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguagesOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguagesOfInstructionType.java
index d09ce1d75..5d90755d9 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguagesOfInstructionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguagesOfInstructionType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CourseUnitLanguagesOfInstructionType complex type.
+ * <p>
+ * Java class for CourseUnitLanguagesOfInstructionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitLanguagesOfInstructionType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = {
-    "language"
-})
+@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = { "language" })
 public class CourseUnitLanguagesOfInstructionType {
 
-    @XmlElement(name = "Language", required = true)
-    protected List<CourseUnitLanguageOfInstructionType> language;
+	@XmlElement(name = "Language", required = true)
+	protected List<CourseUnitLanguageOfInstructionType> language;
 
-    /**
-     * Gets the value of the language property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the language property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getLanguage().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CourseUnitLanguageOfInstructionType }
-     * 
-     * 
-     */
-    public List<CourseUnitLanguageOfInstructionType> getLanguage() {
-        if (language == null) {
-            language = new ArrayList<CourseUnitLanguageOfInstructionType>();
-        }
-        return this.language;
-    }
+	/**
+	 * Gets the value of the language property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the language property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getLanguage().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link CourseUnitLanguageOfInstructionType }
+	 * 
+	 * 
+	 */
+	public List<CourseUnitLanguageOfInstructionType> getLanguage() {
+		if (language == null) {
+			language = new ArrayList<CourseUnitLanguageOfInstructionType>();
+		}
+		return this.language;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitStudentPerformanceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitStudentPerformanceType.java
index 0b8116a7f..25aaf29da 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitStudentPerformanceType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitStudentPerformanceType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CourseUnitStudentPerformanceType complex type.
+ * <p>
+ * Java class for CourseUnitStudentPerformanceType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitStudentPerformanceType">
@@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitStudentPerformanceType", propOrder = {
-    "localGrade",
-    "ectsGrade"
-})
+@XmlType(name = "CourseUnitStudentPerformanceType", propOrder = { "localGrade", "ectsGrade" })
 public class CourseUnitStudentPerformanceType {
 
-    @XmlElement(name = "LocalGrade", required = true)
-    protected LocalGradeType localGrade;
-    @XmlElement(name = "ECTSGrade")
-    protected ECTSGradingScaleType ectsGrade;
+	@XmlElement(name = "LocalGrade", required = true)
+	protected LocalGradeType localGrade;
+	@XmlElement(name = "ECTSGrade")
+	protected ECTSGradingScaleType ectsGrade;
 
-    /**
-     * Gets the value of the localGrade property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LocalGradeType }
-     *     
-     */
-    public LocalGradeType getLocalGrade() {
-        return localGrade;
-    }
+	/**
+	 * Gets the value of the localGrade property.
+	 * 
+	 * @return possible object is {@link LocalGradeType }
+	 * 
+	 */
+	public LocalGradeType getLocalGrade() {
+		return localGrade;
+	}
 
-    /**
-     * Sets the value of the localGrade property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LocalGradeType }
-     *     
-     */
-    public void setLocalGrade(LocalGradeType value) {
-        this.localGrade = value;
-    }
+	/**
+	 * Sets the value of the localGrade property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LocalGradeType }
+	 * 
+	 */
+	public void setLocalGrade(LocalGradeType value) {
+		this.localGrade = value;
+	}
 
-    /**
-     * Gets the value of the ectsGrade property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ECTSGradingScaleType }
-     *     
-     */
-    public ECTSGradingScaleType getECTSGrade() {
-        return ectsGrade;
-    }
+	/**
+	 * Gets the value of the ectsGrade property.
+	 * 
+	 * @return possible object is {@link ECTSGradingScaleType }
+	 * 
+	 */
+	public ECTSGradingScaleType getECTSGrade() {
+		return ectsGrade;
+	}
 
-    /**
-     * Sets the value of the ectsGrade property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ECTSGradingScaleType }
-     *     
-     */
-    public void setECTSGrade(ECTSGradingScaleType value) {
-        this.ectsGrade = value;
-    }
+	/**
+	 * Sets the value of the ectsGrade property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ECTSGradingScaleType }
+	 * 
+	 */
+	public void setECTSGrade(ECTSGradingScaleType value) {
+		this.ectsGrade = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitType.java
index f9725c6fc..925f89d3a 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.math.BigDecimal;
@@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
- * <p>Java class for CourseUnitType complex type.
+ * <p>
+ * Java class for CourseUnitType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitType">
@@ -96,1086 +96,950 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitType", propOrder = {
-    "code",
-    "scientificArea",
-    "title",
-    "theme",
-    "type",
-    "yearOfStudy",
-    "level",
-    "ectsCredits",
-    "localCredits",
-    "hours",
-    "languagesOfInstruction",
-    "modeOfDelivery",
-    "workPlacements",
-    "studentPerformance",
-    "nameOfLecturers",
-    "learningOutcomes",
-    "prerequisitesAndCorequisites",
-    "prerequisitesScholarshipLevel",
-    "prerequisitesOtherTitles",
-    "recomendedOptionalProgrammeComponents",
-    "courseContents",
-    "recomendedOrRequiredReading",
-    "planedLearningActivitiesAndTeachingMethod",
-    "assesmentMethodsAndCriteria",
-    "observations"
-})
+@XmlType(name = "CourseUnitType", propOrder = { "code", "scientificArea", "title", "theme", "type", "yearOfStudy", "level", "ectsCredits", "localCredits", "hours", "languagesOfInstruction",
+		"modeOfDelivery", "workPlacements", "studentPerformance", "nameOfLecturers", "learningOutcomes", "prerequisitesAndCorequisites", "prerequisitesScholarshipLevel", "prerequisitesOtherTitles",
+		"recomendedOptionalProgrammeComponents", "courseContents", "recomendedOrRequiredReading", "planedLearningActivitiesAndTeachingMethod", "assesmentMethodsAndCriteria", "observations" })
 public class CourseUnitType {
 
-    @XmlElement(name = "Code")
-    protected String code;
-    @XmlElement(name = "ScientificArea")
-    protected String scientificArea;
-    @XmlElement(name = "Title", required = true)
-    protected String title;
-    @XmlElement(name = "Theme")
-    protected String theme;
-    @XmlElement(name = "Type")
-    protected CourseUnitType.Type type;
-    @XmlElement(name = "YearOfStudy")
-    protected CourseUnitType.YearOfStudy yearOfStudy;
-    @XmlElement(name = "Level")
-    protected CourseUnitType.Level level;
-    @XmlElement(name = "ECTSCredits")
-    protected BigDecimal ectsCredits;
-    @XmlElement(name = "LocalCredits")
-    protected BigDecimal localCredits;
-    @XmlElement(name = "Hours")
-    protected BigDecimal hours;
-    @XmlElement(name = "LanguagesOfInstruction")
-    protected CourseUnitLanguagesOfInstructionType languagesOfInstruction;
-    @XmlElement(name = "ModeOfDelivery")
-    protected CourseUnitType.ModeOfDelivery modeOfDelivery;
-    @XmlElement(name = "WorkPlacements")
-    protected CourseUnitWorkPlacementsType workPlacements;
-    @XmlElement(name = "StudentPerformance")
-    protected CourseUnitStudentPerformanceType studentPerformance;
-    @XmlElement(name = "NameOfLecturers")
-    protected RichTextTagType nameOfLecturers;
-    @XmlElement(name = "LearningOutcomes")
-    protected RichTextTagType learningOutcomes;
-    @XmlElement(name = "PrerequisitesAndCorequisites")
-    protected RichTextTagType prerequisitesAndCorequisites;
-    @XmlElement(name = "PrerequisitesScholarshipLevel")
-    protected RichTextTagType prerequisitesScholarshipLevel;
-    @XmlElement(name = "PrerequisitesOtherTitles")
-    protected RichTextTagType prerequisitesOtherTitles;
-    @XmlElement(name = "RecomendedOptionalProgrammeComponents")
-    protected RichTextTagType recomendedOptionalProgrammeComponents;
-    @XmlElement(name = "CourseContents")
-    protected RichTextTagType courseContents;
-    @XmlElement(name = "RecomendedOrRequiredReading")
-    protected RichTextTagType recomendedOrRequiredReading;
-    @XmlElement(name = "PlanedLearningActivitiesAndTeachingMethod")
-    protected RichTextTagType planedLearningActivitiesAndTeachingMethod;
-    @XmlElement(name = "AssesmentMethodsAndCriteria")
-    protected RichTextTagType assesmentMethodsAndCriteria;
-    @XmlElement(name = "Observations")
-    protected RichTextTagType observations;
-    @XmlAttribute(name = "groupID")
-    protected String groupID;
-    @XmlAttribute(name = "institutionAdministeringStudiesID")
-    protected String institutionAdministeringStudiesID;
-    @XmlAttribute(name = "isRequiredByTheProgramme")
-    protected Boolean isRequiredByTheProgramme;
-
-    /**
-     * Gets the value of the code property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCode() {
-        return code;
-    }
-
-    /**
-     * Sets the value of the code property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCode(String value) {
-        this.code = value;
-    }
-
-    /**
-     * Gets the value of the scientificArea property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getScientificArea() {
-        return scientificArea;
-    }
-
-    /**
-     * Sets the value of the scientificArea property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setScientificArea(String value) {
-        this.scientificArea = value;
-    }
-
-    /**
-     * Gets the value of the title property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTitle() {
-        return title;
-    }
-
-    /**
-     * Sets the value of the title property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTitle(String value) {
-        this.title = value;
-    }
-
-    /**
-     * Gets the value of the theme property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTheme() {
-        return theme;
-    }
-
-    /**
-     * Sets the value of the theme property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTheme(String value) {
-        this.theme = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitType.Type }
-     *     
-     */
-    public CourseUnitType.Type getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitType.Type }
-     *     
-     */
-    public void setType(CourseUnitType.Type value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the yearOfStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitType.YearOfStudy }
-     *     
-     */
-    public CourseUnitType.YearOfStudy getYearOfStudy() {
-        return yearOfStudy;
-    }
-
-    /**
-     * Sets the value of the yearOfStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitType.YearOfStudy }
-     *     
-     */
-    public void setYearOfStudy(CourseUnitType.YearOfStudy value) {
-        this.yearOfStudy = value;
-    }
-
-    /**
-     * Gets the value of the level property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitType.Level }
-     *     
-     */
-    public CourseUnitType.Level getLevel() {
-        return level;
-    }
-
-    /**
-     * Sets the value of the level property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitType.Level }
-     *     
-     */
-    public void setLevel(CourseUnitType.Level value) {
-        this.level = value;
-    }
-
-    /**
-     * Gets the value of the ectsCredits property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getECTSCredits() {
-        return ectsCredits;
-    }
-
-    /**
-     * Sets the value of the ectsCredits property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setECTSCredits(BigDecimal value) {
-        this.ectsCredits = value;
-    }
-
-    /**
-     * Gets the value of the localCredits property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getLocalCredits() {
-        return localCredits;
-    }
-
-    /**
-     * Sets the value of the localCredits property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setLocalCredits(BigDecimal value) {
-        this.localCredits = value;
-    }
-
-    /**
-     * Gets the value of the hours property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getHours() {
-        return hours;
-    }
-
-    /**
-     * Sets the value of the hours property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setHours(BigDecimal value) {
-        this.hours = value;
-    }
-
-    /**
-     * Gets the value of the languagesOfInstruction property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitLanguagesOfInstructionType }
-     *     
-     */
-    public CourseUnitLanguagesOfInstructionType getLanguagesOfInstruction() {
-        return languagesOfInstruction;
-    }
-
-    /**
-     * Sets the value of the languagesOfInstruction property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitLanguagesOfInstructionType }
-     *     
-     */
-    public void setLanguagesOfInstruction(CourseUnitLanguagesOfInstructionType value) {
-        this.languagesOfInstruction = value;
-    }
-
-    /**
-     * Gets the value of the modeOfDelivery property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitType.ModeOfDelivery }
-     *     
-     */
-    public CourseUnitType.ModeOfDelivery getModeOfDelivery() {
-        return modeOfDelivery;
-    }
-
-    /**
-     * Sets the value of the modeOfDelivery property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitType.ModeOfDelivery }
-     *     
-     */
-    public void setModeOfDelivery(CourseUnitType.ModeOfDelivery value) {
-        this.modeOfDelivery = value;
-    }
-
-    /**
-     * Gets the value of the workPlacements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitWorkPlacementsType }
-     *     
-     */
-    public CourseUnitWorkPlacementsType getWorkPlacements() {
-        return workPlacements;
-    }
-
-    /**
-     * Sets the value of the workPlacements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitWorkPlacementsType }
-     *     
-     */
-    public void setWorkPlacements(CourseUnitWorkPlacementsType value) {
-        this.workPlacements = value;
-    }
-
-    /**
-     * Gets the value of the studentPerformance property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseUnitStudentPerformanceType }
-     *     
-     */
-    public CourseUnitStudentPerformanceType getStudentPerformance() {
-        return studentPerformance;
-    }
-
-    /**
-     * Sets the value of the studentPerformance property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseUnitStudentPerformanceType }
-     *     
-     */
-    public void setStudentPerformance(CourseUnitStudentPerformanceType value) {
-        this.studentPerformance = value;
-    }
-
-    /**
-     * Gets the value of the nameOfLecturers property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getNameOfLecturers() {
-        return nameOfLecturers;
-    }
-
-    /**
-     * Sets the value of the nameOfLecturers property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setNameOfLecturers(RichTextTagType value) {
-        this.nameOfLecturers = value;
-    }
-
-    /**
-     * Gets the value of the learningOutcomes property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getLearningOutcomes() {
-        return learningOutcomes;
-    }
-
-    /**
-     * Sets the value of the learningOutcomes property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setLearningOutcomes(RichTextTagType value) {
-        this.learningOutcomes = value;
-    }
-
-    /**
-     * Gets the value of the prerequisitesAndCorequisites property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getPrerequisitesAndCorequisites() {
-        return prerequisitesAndCorequisites;
-    }
-
-    /**
-     * Sets the value of the prerequisitesAndCorequisites property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setPrerequisitesAndCorequisites(RichTextTagType value) {
-        this.prerequisitesAndCorequisites = value;
-    }
-
-    /**
-     * Gets the value of the prerequisitesScholarshipLevel property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getPrerequisitesScholarshipLevel() {
-        return prerequisitesScholarshipLevel;
-    }
-
-    /**
-     * Sets the value of the prerequisitesScholarshipLevel property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setPrerequisitesScholarshipLevel(RichTextTagType value) {
-        this.prerequisitesScholarshipLevel = value;
-    }
-
-    /**
-     * Gets the value of the prerequisitesOtherTitles property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getPrerequisitesOtherTitles() {
-        return prerequisitesOtherTitles;
-    }
-
-    /**
-     * Sets the value of the prerequisitesOtherTitles property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setPrerequisitesOtherTitles(RichTextTagType value) {
-        this.prerequisitesOtherTitles = value;
-    }
-
-    /**
-     * Gets the value of the recomendedOptionalProgrammeComponents property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getRecomendedOptionalProgrammeComponents() {
-        return recomendedOptionalProgrammeComponents;
-    }
-
-    /**
-     * Sets the value of the recomendedOptionalProgrammeComponents property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setRecomendedOptionalProgrammeComponents(RichTextTagType value) {
-        this.recomendedOptionalProgrammeComponents = value;
-    }
-
-    /**
-     * Gets the value of the courseContents property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getCourseContents() {
-        return courseContents;
-    }
-
-    /**
-     * Sets the value of the courseContents property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setCourseContents(RichTextTagType value) {
-        this.courseContents = value;
-    }
-
-    /**
-     * Gets the value of the recomendedOrRequiredReading property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getRecomendedOrRequiredReading() {
-        return recomendedOrRequiredReading;
-    }
-
-    /**
-     * Sets the value of the recomendedOrRequiredReading property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setRecomendedOrRequiredReading(RichTextTagType value) {
-        this.recomendedOrRequiredReading = value;
-    }
-
-    /**
-     * Gets the value of the planedLearningActivitiesAndTeachingMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getPlanedLearningActivitiesAndTeachingMethod() {
-        return planedLearningActivitiesAndTeachingMethod;
-    }
-
-    /**
-     * Sets the value of the planedLearningActivitiesAndTeachingMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setPlanedLearningActivitiesAndTeachingMethod(RichTextTagType value) {
-        this.planedLearningActivitiesAndTeachingMethod = value;
-    }
-
-    /**
-     * Gets the value of the assesmentMethodsAndCriteria property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAssesmentMethodsAndCriteria() {
-        return assesmentMethodsAndCriteria;
-    }
-
-    /**
-     * Sets the value of the assesmentMethodsAndCriteria property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAssesmentMethodsAndCriteria(RichTextTagType value) {
-        this.assesmentMethodsAndCriteria = value;
-    }
-
-    /**
-     * Gets the value of the observations property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getObservations() {
-        return observations;
-    }
-
-    /**
-     * Sets the value of the observations property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setObservations(RichTextTagType value) {
-        this.observations = value;
-    }
-
-    /**
-     * Gets the value of the groupID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGroupID() {
-        return groupID;
-    }
-
-    /**
-     * Sets the value of the groupID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGroupID(String value) {
-        this.groupID = value;
-    }
-
-    /**
-     * Gets the value of the institutionAdministeringStudiesID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getInstitutionAdministeringStudiesID() {
-        if (institutionAdministeringStudiesID == null) {
-            return "DEF-IAS";
-        } else {
-            return institutionAdministeringStudiesID;
-        }
-    }
-
-    /**
-     * Sets the value of the institutionAdministeringStudiesID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setInstitutionAdministeringStudiesID(String value) {
-        this.institutionAdministeringStudiesID = value;
-    }
-
-    /**
-     * Gets the value of the isRequiredByTheProgramme property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isIsRequiredByTheProgramme() {
-        if (isRequiredByTheProgramme == null) {
-            return true;
-        } else {
-            return isRequiredByTheProgramme;
-        }
-    }
-
-    /**
-     * Sets the value of the isRequiredByTheProgramme property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setIsRequiredByTheProgramme(Boolean value) {
-        this.isRequiredByTheProgramme = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
-     *       &lt;attribute name="eheaFramework" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}EHEAFrameworkType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Level {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "eheaFramework")
-        protected EHEAFrameworkType eheaFramework;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the eheaFramework property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EHEAFrameworkType }
-         *     
-         */
-        public EHEAFrameworkType getEheaFramework() {
-            return eheaFramework;
-        }
-
-        /**
-         * Sets the value of the eheaFramework property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EHEAFrameworkType }
-         *     
-         */
-        public void setEheaFramework(EHEAFrameworkType value) {
-            this.eheaFramework = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
-     *       &lt;attribute name="modeOfDelivery" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ModeOfDeliveryType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class ModeOfDelivery {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "modeOfDelivery")
-        protected ModeOfDeliveryType modeOfDelivery;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the modeOfDelivery property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ModeOfDeliveryType }
-         *     
-         */
-        public ModeOfDeliveryType getModeOfDelivery() {
-            return modeOfDelivery;
-        }
-
-        /**
-         * Sets the value of the modeOfDelivery property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ModeOfDeliveryType }
-         *     
-         */
-        public void setModeOfDelivery(ModeOfDeliveryType value) {
-            this.modeOfDelivery = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
-     *       &lt;attribute name="type" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseUnitTypeType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Type {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "type")
-        protected CourseUnitTypeType type;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the type property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link CourseUnitTypeType }
-         *     
-         */
-        public CourseUnitTypeType getType() {
-            return type;
-        }
-
-        /**
-         * Sets the value of the type property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link CourseUnitTypeType }
-         *     
-         */
-        public void setType(CourseUnitTypeType value) {
-            this.type = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
-     *       &lt;attribute name="year" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class YearOfStudy {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "year")
-        protected BigDecimal year;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the year property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getYear() {
-            return year;
-        }
-
-        /**
-         * Sets the value of the year property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setYear(BigDecimal value) {
-            this.year = value;
-        }
-
-    }
+	@XmlElement(name = "Code")
+	protected String code;
+	@XmlElement(name = "ScientificArea")
+	protected String scientificArea;
+	@XmlElement(name = "Title", required = true)
+	protected String title;
+	@XmlElement(name = "Theme")
+	protected String theme;
+	@XmlElement(name = "Type")
+	protected CourseUnitType.Type type;
+	@XmlElement(name = "YearOfStudy")
+	protected CourseUnitType.YearOfStudy yearOfStudy;
+	@XmlElement(name = "Level")
+	protected CourseUnitType.Level level;
+	@XmlElement(name = "ECTSCredits")
+	protected BigDecimal ectsCredits;
+	@XmlElement(name = "LocalCredits")
+	protected BigDecimal localCredits;
+	@XmlElement(name = "Hours")
+	protected BigDecimal hours;
+	@XmlElement(name = "LanguagesOfInstruction")
+	protected CourseUnitLanguagesOfInstructionType languagesOfInstruction;
+	@XmlElement(name = "ModeOfDelivery")
+	protected CourseUnitType.ModeOfDelivery modeOfDelivery;
+	@XmlElement(name = "WorkPlacements")
+	protected CourseUnitWorkPlacementsType workPlacements;
+	@XmlElement(name = "StudentPerformance")
+	protected CourseUnitStudentPerformanceType studentPerformance;
+	@XmlElement(name = "NameOfLecturers")
+	protected RichTextTagType nameOfLecturers;
+	@XmlElement(name = "LearningOutcomes")
+	protected RichTextTagType learningOutcomes;
+	@XmlElement(name = "PrerequisitesAndCorequisites")
+	protected RichTextTagType prerequisitesAndCorequisites;
+	@XmlElement(name = "PrerequisitesScholarshipLevel")
+	protected RichTextTagType prerequisitesScholarshipLevel;
+	@XmlElement(name = "PrerequisitesOtherTitles")
+	protected RichTextTagType prerequisitesOtherTitles;
+	@XmlElement(name = "RecomendedOptionalProgrammeComponents")
+	protected RichTextTagType recomendedOptionalProgrammeComponents;
+	@XmlElement(name = "CourseContents")
+	protected RichTextTagType courseContents;
+	@XmlElement(name = "RecomendedOrRequiredReading")
+	protected RichTextTagType recomendedOrRequiredReading;
+	@XmlElement(name = "PlanedLearningActivitiesAndTeachingMethod")
+	protected RichTextTagType planedLearningActivitiesAndTeachingMethod;
+	@XmlElement(name = "AssesmentMethodsAndCriteria")
+	protected RichTextTagType assesmentMethodsAndCriteria;
+	@XmlElement(name = "Observations")
+	protected RichTextTagType observations;
+	@XmlAttribute(name = "groupID")
+	protected String groupID;
+	@XmlAttribute(name = "institutionAdministeringStudiesID")
+	protected String institutionAdministeringStudiesID;
+	@XmlAttribute(name = "isRequiredByTheProgramme")
+	protected Boolean isRequiredByTheProgramme;
+
+	/**
+	 * Gets the value of the code property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * Sets the value of the code property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCode(String value) {
+		this.code = value;
+	}
+
+	/**
+	 * Gets the value of the scientificArea property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getScientificArea() {
+		return scientificArea;
+	}
+
+	/**
+	 * Sets the value of the scientificArea property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setScientificArea(String value) {
+		this.scientificArea = value;
+	}
+
+	/**
+	 * Gets the value of the title property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTitle() {
+		return title;
+	}
+
+	/**
+	 * Sets the value of the title property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTitle(String value) {
+		this.title = value;
+	}
+
+	/**
+	 * Gets the value of the theme property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTheme() {
+		return theme;
+	}
+
+	/**
+	 * Sets the value of the theme property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTheme(String value) {
+		this.theme = value;
+	}
+
+	/**
+	 * Gets the value of the type property.
+	 * 
+	 * @return possible object is {@link CourseUnitType.Type }
+	 * 
+	 */
+	public CourseUnitType.Type getType() {
+		return type;
+	}
+
+	/**
+	 * Sets the value of the type property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitType.Type }
+	 * 
+	 */
+	public void setType(CourseUnitType.Type value) {
+		this.type = value;
+	}
+
+	/**
+	 * Gets the value of the yearOfStudy property.
+	 * 
+	 * @return possible object is {@link CourseUnitType.YearOfStudy }
+	 * 
+	 */
+	public CourseUnitType.YearOfStudy getYearOfStudy() {
+		return yearOfStudy;
+	}
+
+	/**
+	 * Sets the value of the yearOfStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitType.YearOfStudy }
+	 * 
+	 */
+	public void setYearOfStudy(CourseUnitType.YearOfStudy value) {
+		this.yearOfStudy = value;
+	}
+
+	/**
+	 * Gets the value of the level property.
+	 * 
+	 * @return possible object is {@link CourseUnitType.Level }
+	 * 
+	 */
+	public CourseUnitType.Level getLevel() {
+		return level;
+	}
+
+	/**
+	 * Sets the value of the level property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitType.Level }
+	 * 
+	 */
+	public void setLevel(CourseUnitType.Level value) {
+		this.level = value;
+	}
+
+	/**
+	 * Gets the value of the ectsCredits property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getECTSCredits() {
+		return ectsCredits;
+	}
+
+	/**
+	 * Sets the value of the ectsCredits property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setECTSCredits(BigDecimal value) {
+		this.ectsCredits = value;
+	}
+
+	/**
+	 * Gets the value of the localCredits property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getLocalCredits() {
+		return localCredits;
+	}
+
+	/**
+	 * Sets the value of the localCredits property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setLocalCredits(BigDecimal value) {
+		this.localCredits = value;
+	}
+
+	/**
+	 * Gets the value of the hours property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getHours() {
+		return hours;
+	}
+
+	/**
+	 * Sets the value of the hours property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setHours(BigDecimal value) {
+		this.hours = value;
+	}
+
+	/**
+	 * Gets the value of the languagesOfInstruction property.
+	 * 
+	 * @return possible object is {@link CourseUnitLanguagesOfInstructionType }
+	 * 
+	 */
+	public CourseUnitLanguagesOfInstructionType getLanguagesOfInstruction() {
+		return languagesOfInstruction;
+	}
+
+	/**
+	 * Sets the value of the languagesOfInstruction property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitLanguagesOfInstructionType }
+	 * 
+	 */
+	public void setLanguagesOfInstruction(CourseUnitLanguagesOfInstructionType value) {
+		this.languagesOfInstruction = value;
+	}
+
+	/**
+	 * Gets the value of the modeOfDelivery property.
+	 * 
+	 * @return possible object is {@link CourseUnitType.ModeOfDelivery }
+	 * 
+	 */
+	public CourseUnitType.ModeOfDelivery getModeOfDelivery() {
+		return modeOfDelivery;
+	}
+
+	/**
+	 * Sets the value of the modeOfDelivery property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitType.ModeOfDelivery }
+	 * 
+	 */
+	public void setModeOfDelivery(CourseUnitType.ModeOfDelivery value) {
+		this.modeOfDelivery = value;
+	}
+
+	/**
+	 * Gets the value of the workPlacements property.
+	 * 
+	 * @return possible object is {@link CourseUnitWorkPlacementsType }
+	 * 
+	 */
+	public CourseUnitWorkPlacementsType getWorkPlacements() {
+		return workPlacements;
+	}
+
+	/**
+	 * Sets the value of the workPlacements property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitWorkPlacementsType }
+	 * 
+	 */
+	public void setWorkPlacements(CourseUnitWorkPlacementsType value) {
+		this.workPlacements = value;
+	}
+
+	/**
+	 * Gets the value of the studentPerformance property.
+	 * 
+	 * @return possible object is {@link CourseUnitStudentPerformanceType }
+	 * 
+	 */
+	public CourseUnitStudentPerformanceType getStudentPerformance() {
+		return studentPerformance;
+	}
+
+	/**
+	 * Sets the value of the studentPerformance property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseUnitStudentPerformanceType }
+	 * 
+	 */
+	public void setStudentPerformance(CourseUnitStudentPerformanceType value) {
+		this.studentPerformance = value;
+	}
+
+	/**
+	 * Gets the value of the nameOfLecturers property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getNameOfLecturers() {
+		return nameOfLecturers;
+	}
+
+	/**
+	 * Sets the value of the nameOfLecturers property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setNameOfLecturers(RichTextTagType value) {
+		this.nameOfLecturers = value;
+	}
+
+	/**
+	 * Gets the value of the learningOutcomes property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getLearningOutcomes() {
+		return learningOutcomes;
+	}
+
+	/**
+	 * Sets the value of the learningOutcomes property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setLearningOutcomes(RichTextTagType value) {
+		this.learningOutcomes = value;
+	}
+
+	/**
+	 * Gets the value of the prerequisitesAndCorequisites property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getPrerequisitesAndCorequisites() {
+		return prerequisitesAndCorequisites;
+	}
+
+	/**
+	 * Sets the value of the prerequisitesAndCorequisites property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setPrerequisitesAndCorequisites(RichTextTagType value) {
+		this.prerequisitesAndCorequisites = value;
+	}
+
+	/**
+	 * Gets the value of the prerequisitesScholarshipLevel property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getPrerequisitesScholarshipLevel() {
+		return prerequisitesScholarshipLevel;
+	}
+
+	/**
+	 * Sets the value of the prerequisitesScholarshipLevel property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setPrerequisitesScholarshipLevel(RichTextTagType value) {
+		this.prerequisitesScholarshipLevel = value;
+	}
+
+	/**
+	 * Gets the value of the prerequisitesOtherTitles property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getPrerequisitesOtherTitles() {
+		return prerequisitesOtherTitles;
+	}
+
+	/**
+	 * Sets the value of the prerequisitesOtherTitles property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setPrerequisitesOtherTitles(RichTextTagType value) {
+		this.prerequisitesOtherTitles = value;
+	}
+
+	/**
+	 * Gets the value of the recomendedOptionalProgrammeComponents property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getRecomendedOptionalProgrammeComponents() {
+		return recomendedOptionalProgrammeComponents;
+	}
+
+	/**
+	 * Sets the value of the recomendedOptionalProgrammeComponents property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setRecomendedOptionalProgrammeComponents(RichTextTagType value) {
+		this.recomendedOptionalProgrammeComponents = value;
+	}
+
+	/**
+	 * Gets the value of the courseContents property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getCourseContents() {
+		return courseContents;
+	}
+
+	/**
+	 * Sets the value of the courseContents property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setCourseContents(RichTextTagType value) {
+		this.courseContents = value;
+	}
+
+	/**
+	 * Gets the value of the recomendedOrRequiredReading property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getRecomendedOrRequiredReading() {
+		return recomendedOrRequiredReading;
+	}
+
+	/**
+	 * Sets the value of the recomendedOrRequiredReading property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setRecomendedOrRequiredReading(RichTextTagType value) {
+		this.recomendedOrRequiredReading = value;
+	}
+
+	/**
+	 * Gets the value of the planedLearningActivitiesAndTeachingMethod property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getPlanedLearningActivitiesAndTeachingMethod() {
+		return planedLearningActivitiesAndTeachingMethod;
+	}
+
+	/**
+	 * Sets the value of the planedLearningActivitiesAndTeachingMethod property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setPlanedLearningActivitiesAndTeachingMethod(RichTextTagType value) {
+		this.planedLearningActivitiesAndTeachingMethod = value;
+	}
+
+	/**
+	 * Gets the value of the assesmentMethodsAndCriteria property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAssesmentMethodsAndCriteria() {
+		return assesmentMethodsAndCriteria;
+	}
+
+	/**
+	 * Sets the value of the assesmentMethodsAndCriteria property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAssesmentMethodsAndCriteria(RichTextTagType value) {
+		this.assesmentMethodsAndCriteria = value;
+	}
+
+	/**
+	 * Gets the value of the observations property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getObservations() {
+		return observations;
+	}
+
+	/**
+	 * Sets the value of the observations property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setObservations(RichTextTagType value) {
+		this.observations = value;
+	}
+
+	/**
+	 * Gets the value of the groupID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getGroupID() {
+		return groupID;
+	}
+
+	/**
+	 * Sets the value of the groupID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setGroupID(String value) {
+		this.groupID = value;
+	}
+
+	/**
+	 * Gets the value of the institutionAdministeringStudiesID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getInstitutionAdministeringStudiesID() {
+		if (institutionAdministeringStudiesID == null) {
+			return "DEF-IAS";
+		} else {
+			return institutionAdministeringStudiesID;
+		}
+	}
+
+	/**
+	 * Sets the value of the institutionAdministeringStudiesID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setInstitutionAdministeringStudiesID(String value) {
+		this.institutionAdministeringStudiesID = value;
+	}
+
+	/**
+	 * Gets the value of the isRequiredByTheProgramme property.
+	 * 
+	 * @return possible object is {@link Boolean }
+	 * 
+	 */
+	public boolean isIsRequiredByTheProgramme() {
+		if (isRequiredByTheProgramme == null) {
+			return true;
+		} else {
+			return isRequiredByTheProgramme;
+		}
+	}
+
+	/**
+	 * Sets the value of the isRequiredByTheProgramme property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link Boolean }
+	 * 
+	 */
+	public void setIsRequiredByTheProgramme(Boolean value) {
+		this.isRequiredByTheProgramme = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+	 *       &lt;attribute name="eheaFramework" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}EHEAFrameworkType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Level {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "eheaFramework")
+		protected EHEAFrameworkType eheaFramework;
+
+		/**
+		 * Gets the value of the value property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the eheaFramework property.
+		 * 
+		 * @return possible object is {@link EHEAFrameworkType }
+		 * 
+		 */
+		public EHEAFrameworkType getEheaFramework() {
+			return eheaFramework;
+		}
+
+		/**
+		 * Sets the value of the eheaFramework property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link EHEAFrameworkType }
+		 * 
+		 */
+		public void setEheaFramework(EHEAFrameworkType value) {
+			this.eheaFramework = value;
+		}
+
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+	 *       &lt;attribute name="modeOfDelivery" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ModeOfDeliveryType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class ModeOfDelivery {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "modeOfDelivery")
+		protected ModeOfDeliveryType modeOfDelivery;
+
+		/**
+		 * Gets the value of the value property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the modeOfDelivery property.
+		 * 
+		 * @return possible object is {@link ModeOfDeliveryType }
+		 * 
+		 */
+		public ModeOfDeliveryType getModeOfDelivery() {
+			return modeOfDelivery;
+		}
+
+		/**
+		 * Sets the value of the modeOfDelivery property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link ModeOfDeliveryType }
+		 * 
+		 */
+		public void setModeOfDelivery(ModeOfDeliveryType value) {
+			this.modeOfDelivery = value;
+		}
+
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+	 *       &lt;attribute name="type" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseUnitTypeType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Type {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "type")
+		protected CourseUnitTypeType type;
+
+		/**
+		 * Gets the value of the value property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the type property.
+		 * 
+		 * @return possible object is {@link CourseUnitTypeType }
+		 * 
+		 */
+		public CourseUnitTypeType getType() {
+			return type;
+		}
+
+		/**
+		 * Sets the value of the type property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link CourseUnitTypeType }
+		 * 
+		 */
+		public void setType(CourseUnitTypeType value) {
+			this.type = value;
+		}
+
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+	 *       &lt;attribute name="year" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class YearOfStudy {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "year")
+		protected BigDecimal year;
+
+		/**
+		 * Gets the value of the value property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the year property.
+		 * 
+		 * @return possible object is {@link BigDecimal }
+		 * 
+		 */
+		public BigDecimal getYear() {
+			return year;
+		}
+
+		/**
+		 * Sets the value of the year property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link BigDecimal }
+		 * 
+		 */
+		public void setYear(BigDecimal value) {
+			this.year = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitTypeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitTypeType.java
index dae27bc84..33b5563df 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitTypeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitTypeType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CourseUnitTypeType.
+ * <p>
+ * Java class for CourseUnitTypeType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="CourseUnitTypeType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -32,27 +33,26 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum CourseUnitTypeType {
 
-    @XmlEnumValue("Compulsory")
-    COMPULSORY("Compulsory"),
-    @XmlEnumValue("Optional")
-    OPTIONAL("Optional");
-    private final String value;
-
-    CourseUnitTypeType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static CourseUnitTypeType fromValue(String v) {
-        for (CourseUnitTypeType c: CourseUnitTypeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	@XmlEnumValue("Compulsory")
+	COMPULSORY("Compulsory"), @XmlEnumValue("Optional")
+	OPTIONAL("Optional");
+	private final String value;
+
+	CourseUnitTypeType(String v) {
+		value = v;
+	}
+
+	public String value() {
+		return value;
+	}
+
+	public static CourseUnitTypeType fromValue(String v) {
+		for (CourseUnitTypeType c : CourseUnitTypeType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementType.java
index 39eb67bc2..2694f4582 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.math.BigDecimal;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
- * <p>Java class for CourseUnitWorkPlacementType complex type.
+ * <p>
+ * Java class for CourseUnitWorkPlacementType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitWorkPlacementType">
@@ -39,117 +39,100 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitWorkPlacementType", propOrder = {
-    "collaboratingInstitution",
-    "dateFrom",
-    "dateTo",
-    "trainingHours"
-})
+@XmlType(name = "CourseUnitWorkPlacementType", propOrder = { "collaboratingInstitution", "dateFrom", "dateTo", "trainingHours" })
 public class CourseUnitWorkPlacementType {
 
-    @XmlElement(name = "CollaboratingInstitution", required = true)
-    protected String collaboratingInstitution;
-    @XmlElement(name = "DateFrom")
-    protected XMLGregorianCalendar dateFrom;
-    @XmlElement(name = "DateTo")
-    protected XMLGregorianCalendar dateTo;
-    @XmlElement(name = "TrainingHours")
-    protected BigDecimal trainingHours;
+	@XmlElement(name = "CollaboratingInstitution", required = true)
+	protected String collaboratingInstitution;
+	@XmlElement(name = "DateFrom")
+	protected XMLGregorianCalendar dateFrom;
+	@XmlElement(name = "DateTo")
+	protected XMLGregorianCalendar dateTo;
+	@XmlElement(name = "TrainingHours")
+	protected BigDecimal trainingHours;
 
-    /**
-     * Gets the value of the collaboratingInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCollaboratingInstitution() {
-        return collaboratingInstitution;
-    }
+	/**
+	 * Gets the value of the collaboratingInstitution property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCollaboratingInstitution() {
+		return collaboratingInstitution;
+	}
 
-    /**
-     * Sets the value of the collaboratingInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCollaboratingInstitution(String value) {
-        this.collaboratingInstitution = value;
-    }
+	/**
+	 * Sets the value of the collaboratingInstitution property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCollaboratingInstitution(String value) {
+		this.collaboratingInstitution = value;
+	}
 
-    /**
-     * Gets the value of the dateFrom property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateFrom() {
-        return dateFrom;
-    }
+	/**
+	 * Gets the value of the dateFrom property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateFrom() {
+		return dateFrom;
+	}
 
-    /**
-     * Sets the value of the dateFrom property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateFrom(XMLGregorianCalendar value) {
-        this.dateFrom = value;
-    }
+	/**
+	 * Sets the value of the dateFrom property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateFrom(XMLGregorianCalendar value) {
+		this.dateFrom = value;
+	}
 
-    /**
-     * Gets the value of the dateTo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateTo() {
-        return dateTo;
-    }
+	/**
+	 * Gets the value of the dateTo property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateTo() {
+		return dateTo;
+	}
 
-    /**
-     * Sets the value of the dateTo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateTo(XMLGregorianCalendar value) {
-        this.dateTo = value;
-    }
+	/**
+	 * Sets the value of the dateTo property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateTo(XMLGregorianCalendar value) {
+		this.dateTo = value;
+	}
 
-    /**
-     * Gets the value of the trainingHours property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getTrainingHours() {
-        return trainingHours;
-    }
+	/**
+	 * Gets the value of the trainingHours property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getTrainingHours() {
+		return trainingHours;
+	}
 
-    /**
-     * Sets the value of the trainingHours property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setTrainingHours(BigDecimal value) {
-        this.trainingHours = value;
-    }
+	/**
+	 * Sets the value of the trainingHours property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setTrainingHours(BigDecimal value) {
+		this.trainingHours = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementsType.java
index 9dfb3d6b7..28468d0b9 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CourseUnitWorkPlacementsType complex type.
+ * <p>
+ * Java class for CourseUnitWorkPlacementsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CourseUnitWorkPlacementsType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CourseUnitWorkPlacementsType", propOrder = {
-    "workPlacement"
-})
+@XmlType(name = "CourseUnitWorkPlacementsType", propOrder = { "workPlacement" })
 public class CourseUnitWorkPlacementsType {
 
-    @XmlElement(name = "WorkPlacement", required = true)
-    protected List<CourseUnitWorkPlacementType> workPlacement;
+	@XmlElement(name = "WorkPlacement", required = true)
+	protected List<CourseUnitWorkPlacementType> workPlacement;
 
-    /**
-     * Gets the value of the workPlacement property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the workPlacement property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getWorkPlacement().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CourseUnitWorkPlacementType }
-     * 
-     * 
-     */
-    public List<CourseUnitWorkPlacementType> getWorkPlacement() {
-        if (workPlacement == null) {
-            workPlacement = new ArrayList<CourseUnitWorkPlacementType>();
-        }
-        return this.workPlacement;
-    }
+	/**
+	 * Gets the value of the workPlacement property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the workPlacement property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getWorkPlacement().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link CourseUnitWorkPlacementType }
+	 * 
+	 * 
+	 */
+	public List<CourseUnitWorkPlacementType> getWorkPlacement() {
+		if (workPlacement == null) {
+			workPlacement = new ArrayList<CourseUnitWorkPlacementType>();
+		}
+		return this.workPlacement;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java
index 01c42298c..6e588acfd 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CoursesAttendedInOtherInstitutionInMobilityProgramsType complex type.
+ * <p>
+ * Java class for CoursesAttendedInOtherInstitutionInMobilityProgramsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CoursesAttendedInOtherInstitutionInMobilityProgramsType", propOrder = {
-    "mobilityProgramme"
-})
+@XmlType(name = "CoursesAttendedInOtherInstitutionInMobilityProgramsType", propOrder = { "mobilityProgramme" })
 public class CoursesAttendedInOtherInstitutionInMobilityProgramsType {
 
-    @XmlElement(name = "MobilityProgramme", required = true)
-    protected List<MobilityProgrammeType> mobilityProgramme;
+	@XmlElement(name = "MobilityProgramme", required = true)
+	protected List<MobilityProgrammeType> mobilityProgramme;
 
-    /**
-     * Gets the value of the mobilityProgramme property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the mobilityProgramme property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getMobilityProgramme().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MobilityProgrammeType }
-     * 
-     * 
-     */
-    public List<MobilityProgrammeType> getMobilityProgramme() {
-        if (mobilityProgramme == null) {
-            mobilityProgramme = new ArrayList<MobilityProgrammeType>();
-        }
-        return this.mobilityProgramme;
-    }
+	/**
+	 * Gets the value of the mobilityProgramme property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the mobilityProgramme property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getMobilityProgramme().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link MobilityProgrammeType }
+	 * 
+	 * 
+	 */
+	public List<MobilityProgrammeType> getMobilityProgramme() {
+		if (mobilityProgramme == null) {
+			mobilityProgramme = new ArrayList<MobilityProgrammeType>();
+		}
+		return this.mobilityProgramme;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupType.java
index 229b753ff..f754fce18 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CoursesGroupType complex type.
+ * <p>
+ * Java class for CoursesGroupType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CoursesGroupType">
@@ -41,148 +41,129 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CoursesGroupType", propOrder = {
-    "name",
-    "headerInformation",
-    "coursesGroup",
-    "footerInformation"
-})
+@XmlType(name = "CoursesGroupType", propOrder = { "name", "headerInformation", "coursesGroup", "footerInformation" })
 public class CoursesGroupType {
 
-    @XmlElement(name = "Name", required = true)
-    protected String name;
-    @XmlElement(name = "HeaderInformation")
-    protected RichTextTagType headerInformation;
-    @XmlElement(name = "CoursesGroup")
-    protected List<CoursesGroupType> coursesGroup;
-    @XmlElement(name = "FooterInformation")
-    protected RichTextTagType footerInformation;
-    @XmlAttribute(name = "groupID", required = true)
-    protected String groupID;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
-
-    /**
-     * Gets the value of the headerInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getHeaderInformation() {
-        return headerInformation;
-    }
-
-    /**
-     * Sets the value of the headerInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setHeaderInformation(RichTextTagType value) {
-        this.headerInformation = value;
-    }
-
-    /**
-     * Gets the value of the coursesGroup property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the coursesGroup property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCoursesGroup().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CoursesGroupType }
-     * 
-     * 
-     */
-    public List<CoursesGroupType> getCoursesGroup() {
-        if (coursesGroup == null) {
-            coursesGroup = new ArrayList<CoursesGroupType>();
-        }
-        return this.coursesGroup;
-    }
-
-    /**
-     * Gets the value of the footerInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getFooterInformation() {
-        return footerInformation;
-    }
-
-    /**
-     * Sets the value of the footerInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setFooterInformation(RichTextTagType value) {
-        this.footerInformation = value;
-    }
-
-    /**
-     * Gets the value of the groupID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGroupID() {
-        return groupID;
-    }
-
-    /**
-     * Sets the value of the groupID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGroupID(String value) {
-        this.groupID = value;
-    }
+	@XmlElement(name = "Name", required = true)
+	protected String name;
+	@XmlElement(name = "HeaderInformation")
+	protected RichTextTagType headerInformation;
+	@XmlElement(name = "CoursesGroup")
+	protected List<CoursesGroupType> coursesGroup;
+	@XmlElement(name = "FooterInformation")
+	protected RichTextTagType footerInformation;
+	@XmlAttribute(name = "groupID", required = true)
+	protected String groupID;
+
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
+
+	/**
+	 * Gets the value of the headerInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getHeaderInformation() {
+		return headerInformation;
+	}
+
+	/**
+	 * Sets the value of the headerInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setHeaderInformation(RichTextTagType value) {
+		this.headerInformation = value;
+	}
+
+	/**
+	 * Gets the value of the coursesGroup property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the coursesGroup property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getCoursesGroup().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link CoursesGroupType }
+	 * 
+	 * 
+	 */
+	public List<CoursesGroupType> getCoursesGroup() {
+		if (coursesGroup == null) {
+			coursesGroup = new ArrayList<CoursesGroupType>();
+		}
+		return this.coursesGroup;
+	}
+
+	/**
+	 * Gets the value of the footerInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getFooterInformation() {
+		return footerInformation;
+	}
+
+	/**
+	 * Sets the value of the footerInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setFooterInformation(RichTextTagType value) {
+		this.footerInformation = value;
+	}
+
+	/**
+	 * Gets the value of the groupID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getGroupID() {
+		return groupID;
+	}
+
+	/**
+	 * Sets the value of the groupID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setGroupID(String value) {
+		this.groupID = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupsType.java
index 74b1bec06..00b5cff1e 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CoursesGroupsType complex type.
+ * <p>
+ * Java class for CoursesGroupsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CoursesGroupsType">
@@ -39,122 +39,106 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CoursesGroupsType", propOrder = {
-    "name",
-    "headerInformation",
-    "coursesGroup",
-    "footerInformation"
-})
+@XmlType(name = "CoursesGroupsType", propOrder = { "name", "headerInformation", "coursesGroup", "footerInformation" })
 public class CoursesGroupsType {
 
-    @XmlElement(name = "Name")
-    protected String name;
-    @XmlElement(name = "HeaderInformation")
-    protected RichTextTagType headerInformation;
-    @XmlElement(name = "CoursesGroup")
-    protected List<CoursesGroupType> coursesGroup;
-    @XmlElement(name = "FooterInformation")
-    protected RichTextTagType footerInformation;
+	@XmlElement(name = "Name")
+	protected String name;
+	@XmlElement(name = "HeaderInformation")
+	protected RichTextTagType headerInformation;
+	@XmlElement(name = "CoursesGroup")
+	protected List<CoursesGroupType> coursesGroup;
+	@XmlElement(name = "FooterInformation")
+	protected RichTextTagType footerInformation;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
 
-    /**
-     * Gets the value of the headerInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getHeaderInformation() {
-        return headerInformation;
-    }
+	/**
+	 * Gets the value of the headerInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getHeaderInformation() {
+		return headerInformation;
+	}
 
-    /**
-     * Sets the value of the headerInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setHeaderInformation(RichTextTagType value) {
-        this.headerInformation = value;
-    }
+	/**
+	 * Sets the value of the headerInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setHeaderInformation(RichTextTagType value) {
+		this.headerInformation = value;
+	}
 
-    /**
-     * Gets the value of the coursesGroup property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the coursesGroup property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCoursesGroup().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CoursesGroupType }
-     * 
-     * 
-     */
-    public List<CoursesGroupType> getCoursesGroup() {
-        if (coursesGroup == null) {
-            coursesGroup = new ArrayList<CoursesGroupType>();
-        }
-        return this.coursesGroup;
-    }
+	/**
+	 * Gets the value of the coursesGroup property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the coursesGroup property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getCoursesGroup().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link CoursesGroupType }
+	 * 
+	 * 
+	 */
+	public List<CoursesGroupType> getCoursesGroup() {
+		if (coursesGroup == null) {
+			coursesGroup = new ArrayList<CoursesGroupType>();
+		}
+		return this.coursesGroup;
+	}
 
-    /**
-     * Gets the value of the footerInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getFooterInformation() {
-        return footerInformation;
-    }
+	/**
+	 * Gets the value of the footerInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getFooterInformation() {
+		return footerInformation;
+	}
 
-    /**
-     * Sets the value of the footerInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setFooterInformation(RichTextTagType value) {
-        this.footerInformation = value;
-    }
+	/**
+	 * Sets the value of the footerInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setFooterInformation(RichTextTagType value) {
+		this.footerInformation = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesUnitsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesUnitsType.java
index d56b4bd10..5102810a9 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesUnitsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesUnitsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CoursesUnitsType complex type.
+ * <p>
+ * Java class for CoursesUnitsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CoursesUnitsType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CoursesUnitsType", propOrder = {
-    "courseUnit"
-})
+@XmlType(name = "CoursesUnitsType", propOrder = { "courseUnit" })
 public class CoursesUnitsType {
 
-    @XmlElement(name = "CourseUnit", required = true)
-    protected List<CourseUnitType> courseUnit;
+	@XmlElement(name = "CourseUnit", required = true)
+	protected List<CourseUnitType> courseUnit;
 
-    /**
-     * Gets the value of the courseUnit property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the courseUnit property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCourseUnit().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link CourseUnitType }
-     * 
-     * 
-     */
-    public List<CourseUnitType> getCourseUnit() {
-        if (courseUnit == null) {
-            courseUnit = new ArrayList<CourseUnitType>();
-        }
-        return this.courseUnit;
-    }
+	/**
+	 * Gets the value of the courseUnit property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the courseUnit property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getCourseUnit().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link CourseUnitType }
+	 * 
+	 * 
+	 */
+	public List<CourseUnitType> getCourseUnit() {
+		if (courseUnit == null) {
+			courseUnit = new ArrayList<CourseUnitType>();
+		}
+		return this.courseUnit;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ECTSGradingScaleType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ECTSGradingScaleType.java
index a012c27a9..d126d7294 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ECTSGradingScaleType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ECTSGradingScaleType.java
@@ -5,18 +5,19 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ECTSGradingScaleType.
+ * <p>
+ * Java class for ECTSGradingScaleType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="ECTSGradingScaleType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -36,20 +37,14 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum ECTSGradingScaleType {
 
-    A,
-    B,
-    C,
-    D,
-    E,
-    FX,
-    F;
+	A, B, C, D, E, FX, F;
 
-    public String value() {
-        return name();
-    }
+	public String value() {
+		return name();
+	}
 
-    public static ECTSGradingScaleType fromValue(String v) {
-        return valueOf(v);
-    }
+	public static ECTSGradingScaleType fromValue(String v) {
+		return valueOf(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/EHEAFrameworkType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/EHEAFrameworkType.java
index 2f8d46c73..31b69e907 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/EHEAFrameworkType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/EHEAFrameworkType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for EHEAFrameworkType.
+ * <p>
+ * Java class for EHEAFrameworkType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="EHEAFrameworkType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -33,29 +34,27 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum EHEAFrameworkType {
 
-    @XmlEnumValue("FirstCycle")
-    FIRST_CYCLE("FirstCycle"),
-    @XmlEnumValue("SecondCycle")
-    SECOND_CYCLE("SecondCycle"),
-    @XmlEnumValue("ThirdCycle")
-    THIRD_CYCLE("ThirdCycle");
-    private final String value;
-
-    EHEAFrameworkType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static EHEAFrameworkType fromValue(String v) {
-        for (EHEAFrameworkType c: EHEAFrameworkType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	@XmlEnumValue("FirstCycle")
+	FIRST_CYCLE("FirstCycle"), @XmlEnumValue("SecondCycle")
+	SECOND_CYCLE("SecondCycle"), @XmlEnumValue("ThirdCycle")
+	THIRD_CYCLE("ThirdCycle");
+	private final String value;
+
+	EHEAFrameworkType(String v) {
+		value = v;
+	}
+
+	public String value() {
+		return value;
+	}
+
+	public static EHEAFrameworkType fromValue(String v) {
+		for (EHEAFrameworkType c : EHEAFrameworkType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ExtensionContentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ExtensionContentType.java
index 85daac00d..de8f10707 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ExtensionContentType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ExtensionContentType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlMixed;
 import javax.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
-
 /**
- * <p>Java class for ExtensionContentType complex type.
+ * <p>
+ * Java class for ExtensionContentType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ExtensionContentType">
@@ -40,70 +40,61 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ExtensionContentType", propOrder = {
-    "content"
-})
+@XmlType(name = "ExtensionContentType", propOrder = { "content" })
 public class ExtensionContentType {
 
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "id")
-    protected String id;
+	@XmlMixed
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
+	@XmlAttribute(name = "id")
+	protected String id;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String }
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/FamilyNameType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/FamilyNameType.java
index a69798709..007ea7bfb 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/FamilyNameType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/FamilyNameType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for FamilyNameType complex type.
+ * <p>
+ * Java class for FamilyNameType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="FamilyNameType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "FamilyNameType", propOrder = {
-    "surname"
-})
+@XmlType(name = "FamilyNameType", propOrder = { "surname" })
 public class FamilyNameType {
 
-    @XmlElement(name = "Surname", required = true)
-    protected List<String> surname;
+	@XmlElement(name = "Surname", required = true)
+	protected List<String> surname;
 
-    /**
-     * Gets the value of the surname property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the surname property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSurname().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getSurname() {
-        if (surname == null) {
-            surname = new ArrayList<String>();
-        }
-        return this.surname;
-    }
+	/**
+	 * Gets the value of the surname property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the surname property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getSurname().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getSurname() {
+		if (surname == null) {
+			surname = new ArrayList<String>();
+		}
+		return this.surname;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GenderType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GenderType.java
index 34a9a68b5..159810298 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GenderType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GenderType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for GenderType.
+ * <p>
+ * Java class for GenderType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="GenderType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -32,27 +33,26 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum GenderType {
 
-    @XmlEnumValue("Female")
-    FEMALE("Female"),
-    @XmlEnumValue("Male")
-    MALE("Male");
-    private final String value;
-
-    GenderType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static GenderType fromValue(String v) {
-        for (GenderType c: GenderType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	@XmlEnumValue("Female")
+	FEMALE("Female"), @XmlEnumValue("Male")
+	MALE("Male");
+	private final String value;
+
+	GenderType(String v) {
+		value = v;
+	}
+
+	public String value() {
+		return value;
+	}
+
+	public static GenderType fromValue(String v) {
+		for (GenderType c : GenderType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GeneralDiplomaType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GeneralDiplomaType.java
index b59e1b6b1..4dd196d31 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GeneralDiplomaType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GeneralDiplomaType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -17,11 +16,12 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
 
-
 /**
- * <p>Java class for GeneralDiplomaType complex type.
+ * <p>
+ * Java class for GeneralDiplomaType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="GeneralDiplomaType">
@@ -50,360 +50,316 @@ import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GeneralDiplomaType", propOrder = {
-    "informationIdentifyingTheHolderOfTheQualification",
-    "informationIdentifyingTheQualification",
-    "informationOnTheLevelOfTheQualification",
-    "informationOnTheContentsAndResultsGained",
-    "informationOnTheFunctionOfTheQualification",
-    "additionalInformation",
-    "certificationOfTheSupplement",
-    "informationOnTheNationalHigherEducationSystem",
-    "attachments",
-    "extensionContent",
-    "signature"
-})
+@XmlType(name = "GeneralDiplomaType", propOrder = { "informationIdentifyingTheHolderOfTheQualification", "informationIdentifyingTheQualification", "informationOnTheLevelOfTheQualification",
+		"informationOnTheContentsAndResultsGained", "informationOnTheFunctionOfTheQualification", "additionalInformation", "certificationOfTheSupplement",
+		"informationOnTheNationalHigherEducationSystem", "attachments", "extensionContent", "signature" })
 public class GeneralDiplomaType {
 
-    @XmlElement(name = "InformationIdentifyingTheHolderOfTheQualification", required = true)
-    protected InformationIdentifyingTheHolderOfTheQualificationType informationIdentifyingTheHolderOfTheQualification;
-    @XmlElement(name = "InformationIdentifyingTheQualification", required = true)
-    protected InformationIdentifyingTheQualificationType informationIdentifyingTheQualification;
-    @XmlElement(name = "InformationOnTheLevelOfTheQualification")
-    protected InformationOnTheLevelOfTheQualificationType informationOnTheLevelOfTheQualification;
-    @XmlElement(name = "InformationOnTheContentsAndResultsGained")
-    protected InformationOnTheContentsAndResultsGainedType informationOnTheContentsAndResultsGained;
-    @XmlElement(name = "InformationOnTheFunctionOfTheQualification")
-    protected InformationOnTheFunctionOfTheQualificationType informationOnTheFunctionOfTheQualification;
-    @XmlElement(name = "AdditionalInformation")
-    protected AdditionalInformationType additionalInformation;
-    @XmlElement(name = "CertificationOfTheSupplement")
-    protected CertificationOfTheSupplementType certificationOfTheSupplement;
-    @XmlElement(name = "InformationOnTheNationalHigherEducationSystem")
-    protected RichTextTagType informationOnTheNationalHigherEducationSystem;
-    @XmlElement(name = "Attachments")
-    protected AttachmentsType attachments;
-    @XmlElement(name = "ExtensionContent")
-    protected List<ExtensionContentType> extensionContent;
-    @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
-    protected List<SignatureType> signature;
-    @XmlAttribute(name = "language", required = true)
-    protected LanguageType language;
-    @XmlAttribute(name = "isTheOriginalLanguage", required = true)
-    protected boolean isTheOriginalLanguage;
+	@XmlElement(name = "InformationIdentifyingTheHolderOfTheQualification", required = true)
+	protected InformationIdentifyingTheHolderOfTheQualificationType informationIdentifyingTheHolderOfTheQualification;
+	@XmlElement(name = "InformationIdentifyingTheQualification", required = true)
+	protected InformationIdentifyingTheQualificationType informationIdentifyingTheQualification;
+	@XmlElement(name = "InformationOnTheLevelOfTheQualification")
+	protected InformationOnTheLevelOfTheQualificationType informationOnTheLevelOfTheQualification;
+	@XmlElement(name = "InformationOnTheContentsAndResultsGained")
+	protected InformationOnTheContentsAndResultsGainedType informationOnTheContentsAndResultsGained;
+	@XmlElement(name = "InformationOnTheFunctionOfTheQualification")
+	protected InformationOnTheFunctionOfTheQualificationType informationOnTheFunctionOfTheQualification;
+	@XmlElement(name = "AdditionalInformation")
+	protected AdditionalInformationType additionalInformation;
+	@XmlElement(name = "CertificationOfTheSupplement")
+	protected CertificationOfTheSupplementType certificationOfTheSupplement;
+	@XmlElement(name = "InformationOnTheNationalHigherEducationSystem")
+	protected RichTextTagType informationOnTheNationalHigherEducationSystem;
+	@XmlElement(name = "Attachments")
+	protected AttachmentsType attachments;
+	@XmlElement(name = "ExtensionContent")
+	protected List<ExtensionContentType> extensionContent;
+	@XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
+	protected List<SignatureType> signature;
+	@XmlAttribute(name = "language", required = true)
+	protected LanguageType language;
+	@XmlAttribute(name = "isTheOriginalLanguage", required = true)
+	protected boolean isTheOriginalLanguage;
 
-    /**
-     * Gets the value of the informationIdentifyingTheHolderOfTheQualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationIdentifyingTheHolderOfTheQualificationType }
-     *     
-     */
-    public InformationIdentifyingTheHolderOfTheQualificationType getInformationIdentifyingTheHolderOfTheQualification() {
-        return informationIdentifyingTheHolderOfTheQualification;
-    }
+	/**
+	 * Gets the value of the informationIdentifyingTheHolderOfTheQualification property.
+	 * 
+	 * @return possible object is {@link InformationIdentifyingTheHolderOfTheQualificationType }
+	 * 
+	 */
+	public InformationIdentifyingTheHolderOfTheQualificationType getInformationIdentifyingTheHolderOfTheQualification() {
+		return informationIdentifyingTheHolderOfTheQualification;
+	}
 
-    /**
-     * Sets the value of the informationIdentifyingTheHolderOfTheQualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationIdentifyingTheHolderOfTheQualificationType }
-     *     
-     */
-    public void setInformationIdentifyingTheHolderOfTheQualification(InformationIdentifyingTheHolderOfTheQualificationType value) {
-        this.informationIdentifyingTheHolderOfTheQualification = value;
-    }
+	/**
+	 * Sets the value of the informationIdentifyingTheHolderOfTheQualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationIdentifyingTheHolderOfTheQualificationType }
+	 * 
+	 */
+	public void setInformationIdentifyingTheHolderOfTheQualification(InformationIdentifyingTheHolderOfTheQualificationType value) {
+		this.informationIdentifyingTheHolderOfTheQualification = value;
+	}
 
-    /**
-     * Gets the value of the informationIdentifyingTheQualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationIdentifyingTheQualificationType }
-     *     
-     */
-    public InformationIdentifyingTheQualificationType getInformationIdentifyingTheQualification() {
-        return informationIdentifyingTheQualification;
-    }
+	/**
+	 * Gets the value of the informationIdentifyingTheQualification property.
+	 * 
+	 * @return possible object is {@link InformationIdentifyingTheQualificationType }
+	 * 
+	 */
+	public InformationIdentifyingTheQualificationType getInformationIdentifyingTheQualification() {
+		return informationIdentifyingTheQualification;
+	}
 
-    /**
-     * Sets the value of the informationIdentifyingTheQualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationIdentifyingTheQualificationType }
-     *     
-     */
-    public void setInformationIdentifyingTheQualification(InformationIdentifyingTheQualificationType value) {
-        this.informationIdentifyingTheQualification = value;
-    }
+	/**
+	 * Sets the value of the informationIdentifyingTheQualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationIdentifyingTheQualificationType }
+	 * 
+	 */
+	public void setInformationIdentifyingTheQualification(InformationIdentifyingTheQualificationType value) {
+		this.informationIdentifyingTheQualification = value;
+	}
 
-    /**
-     * Gets the value of the informationOnTheLevelOfTheQualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheLevelOfTheQualificationType }
-     *     
-     */
-    public InformationOnTheLevelOfTheQualificationType getInformationOnTheLevelOfTheQualification() {
-        return informationOnTheLevelOfTheQualification;
-    }
+	/**
+	 * Gets the value of the informationOnTheLevelOfTheQualification property.
+	 * 
+	 * @return possible object is {@link InformationOnTheLevelOfTheQualificationType }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType getInformationOnTheLevelOfTheQualification() {
+		return informationOnTheLevelOfTheQualification;
+	}
 
-    /**
-     * Sets the value of the informationOnTheLevelOfTheQualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheLevelOfTheQualificationType }
-     *     
-     */
-    public void setInformationOnTheLevelOfTheQualification(InformationOnTheLevelOfTheQualificationType value) {
-        this.informationOnTheLevelOfTheQualification = value;
-    }
+	/**
+	 * Sets the value of the informationOnTheLevelOfTheQualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheLevelOfTheQualificationType }
+	 * 
+	 */
+	public void setInformationOnTheLevelOfTheQualification(InformationOnTheLevelOfTheQualificationType value) {
+		this.informationOnTheLevelOfTheQualification = value;
+	}
 
-    /**
-     * Gets the value of the informationOnTheContentsAndResultsGained property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheContentsAndResultsGainedType }
-     *     
-     */
-    public InformationOnTheContentsAndResultsGainedType getInformationOnTheContentsAndResultsGained() {
-        return informationOnTheContentsAndResultsGained;
-    }
+	/**
+	 * Gets the value of the informationOnTheContentsAndResultsGained property.
+	 * 
+	 * @return possible object is {@link InformationOnTheContentsAndResultsGainedType }
+	 * 
+	 */
+	public InformationOnTheContentsAndResultsGainedType getInformationOnTheContentsAndResultsGained() {
+		return informationOnTheContentsAndResultsGained;
+	}
 
-    /**
-     * Sets the value of the informationOnTheContentsAndResultsGained property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheContentsAndResultsGainedType }
-     *     
-     */
-    public void setInformationOnTheContentsAndResultsGained(InformationOnTheContentsAndResultsGainedType value) {
-        this.informationOnTheContentsAndResultsGained = value;
-    }
+	/**
+	 * Sets the value of the informationOnTheContentsAndResultsGained property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheContentsAndResultsGainedType }
+	 * 
+	 */
+	public void setInformationOnTheContentsAndResultsGained(InformationOnTheContentsAndResultsGainedType value) {
+		this.informationOnTheContentsAndResultsGained = value;
+	}
 
-    /**
-     * Gets the value of the informationOnTheFunctionOfTheQualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheFunctionOfTheQualificationType }
-     *     
-     */
-    public InformationOnTheFunctionOfTheQualificationType getInformationOnTheFunctionOfTheQualification() {
-        return informationOnTheFunctionOfTheQualification;
-    }
+	/**
+	 * Gets the value of the informationOnTheFunctionOfTheQualification property.
+	 * 
+	 * @return possible object is {@link InformationOnTheFunctionOfTheQualificationType }
+	 * 
+	 */
+	public InformationOnTheFunctionOfTheQualificationType getInformationOnTheFunctionOfTheQualification() {
+		return informationOnTheFunctionOfTheQualification;
+	}
 
-    /**
-     * Sets the value of the informationOnTheFunctionOfTheQualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheFunctionOfTheQualificationType }
-     *     
-     */
-    public void setInformationOnTheFunctionOfTheQualification(InformationOnTheFunctionOfTheQualificationType value) {
-        this.informationOnTheFunctionOfTheQualification = value;
-    }
+	/**
+	 * Sets the value of the informationOnTheFunctionOfTheQualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheFunctionOfTheQualificationType }
+	 * 
+	 */
+	public void setInformationOnTheFunctionOfTheQualification(InformationOnTheFunctionOfTheQualificationType value) {
+		this.informationOnTheFunctionOfTheQualification = value;
+	}
 
-    /**
-     * Gets the value of the additionalInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AdditionalInformationType }
-     *     
-     */
-    public AdditionalInformationType getAdditionalInformation() {
-        return additionalInformation;
-    }
+	/**
+	 * Gets the value of the additionalInformation property.
+	 * 
+	 * @return possible object is {@link AdditionalInformationType }
+	 * 
+	 */
+	public AdditionalInformationType getAdditionalInformation() {
+		return additionalInformation;
+	}
 
-    /**
-     * Sets the value of the additionalInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AdditionalInformationType }
-     *     
-     */
-    public void setAdditionalInformation(AdditionalInformationType value) {
-        this.additionalInformation = value;
-    }
+	/**
+	 * Sets the value of the additionalInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AdditionalInformationType }
+	 * 
+	 */
+	public void setAdditionalInformation(AdditionalInformationType value) {
+		this.additionalInformation = value;
+	}
 
-    /**
-     * Gets the value of the certificationOfTheSupplement property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CertificationOfTheSupplementType }
-     *     
-     */
-    public CertificationOfTheSupplementType getCertificationOfTheSupplement() {
-        return certificationOfTheSupplement;
-    }
+	/**
+	 * Gets the value of the certificationOfTheSupplement property.
+	 * 
+	 * @return possible object is {@link CertificationOfTheSupplementType }
+	 * 
+	 */
+	public CertificationOfTheSupplementType getCertificationOfTheSupplement() {
+		return certificationOfTheSupplement;
+	}
 
-    /**
-     * Sets the value of the certificationOfTheSupplement property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CertificationOfTheSupplementType }
-     *     
-     */
-    public void setCertificationOfTheSupplement(CertificationOfTheSupplementType value) {
-        this.certificationOfTheSupplement = value;
-    }
+	/**
+	 * Sets the value of the certificationOfTheSupplement property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CertificationOfTheSupplementType }
+	 * 
+	 */
+	public void setCertificationOfTheSupplement(CertificationOfTheSupplementType value) {
+		this.certificationOfTheSupplement = value;
+	}
 
-    /**
-     * Gets the value of the informationOnTheNationalHigherEducationSystem property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getInformationOnTheNationalHigherEducationSystem() {
-        return informationOnTheNationalHigherEducationSystem;
-    }
+	/**
+	 * Gets the value of the informationOnTheNationalHigherEducationSystem property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getInformationOnTheNationalHigherEducationSystem() {
+		return informationOnTheNationalHigherEducationSystem;
+	}
 
-    /**
-     * Sets the value of the informationOnTheNationalHigherEducationSystem property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setInformationOnTheNationalHigherEducationSystem(RichTextTagType value) {
-        this.informationOnTheNationalHigherEducationSystem = value;
-    }
+	/**
+	 * Sets the value of the informationOnTheNationalHigherEducationSystem property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setInformationOnTheNationalHigherEducationSystem(RichTextTagType value) {
+		this.informationOnTheNationalHigherEducationSystem = value;
+	}
 
-    /**
-     * Gets the value of the attachments property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AttachmentsType }
-     *     
-     */
-    public AttachmentsType getAttachments() {
-        return attachments;
-    }
+	/**
+	 * Gets the value of the attachments property.
+	 * 
+	 * @return possible object is {@link AttachmentsType }
+	 * 
+	 */
+	public AttachmentsType getAttachments() {
+		return attachments;
+	}
 
-    /**
-     * Sets the value of the attachments property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AttachmentsType }
-     *     
-     */
-    public void setAttachments(AttachmentsType value) {
-        this.attachments = value;
-    }
+	/**
+	 * Sets the value of the attachments property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link AttachmentsType }
+	 * 
+	 */
+	public void setAttachments(AttachmentsType value) {
+		this.attachments = value;
+	}
 
-    /**
-     * Gets the value of the extensionContent property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extensionContent property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtensionContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionContentType }
-     * 
-     * 
-     */
-    public List<ExtensionContentType> getExtensionContent() {
-        if (extensionContent == null) {
-            extensionContent = new ArrayList<ExtensionContentType>();
-        }
-        return this.extensionContent;
-    }
+	/**
+	 * Gets the value of the extensionContent property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the extensionContent property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getExtensionContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link ExtensionContentType }
+	 * 
+	 * 
+	 */
+	public List<ExtensionContentType> getExtensionContent() {
+		if (extensionContent == null) {
+			extensionContent = new ArrayList<ExtensionContentType>();
+		}
+		return this.extensionContent;
+	}
 
-    /**
-     * Gets the value of the signature property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signature property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignature().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignatureType }
-     * 
-     * 
-     */
-    public List<SignatureType> getSignature() {
-        if (signature == null) {
-            signature = new ArrayList<SignatureType>();
-        }
-        return this.signature;
-    }
+	/**
+	 * Gets the value of the signature property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the signature property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getSignature().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link SignatureType }
+	 * 
+	 * 
+	 */
+	public List<SignatureType> getSignature() {
+		if (signature == null) {
+			signature = new ArrayList<SignatureType>();
+		}
+		return this.signature;
+	}
 
-    /**
-     * Gets the value of the language property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LanguageType }
-     *     
-     */
-    public LanguageType getLanguage() {
-        return language;
-    }
+	/**
+	 * Gets the value of the language property.
+	 * 
+	 * @return possible object is {@link LanguageType }
+	 * 
+	 */
+	public LanguageType getLanguage() {
+		return language;
+	}
 
-    /**
-     * Sets the value of the language property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LanguageType }
-     *     
-     */
-    public void setLanguage(LanguageType value) {
-        this.language = value;
-    }
+	/**
+	 * Sets the value of the language property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LanguageType }
+	 * 
+	 */
+	public void setLanguage(LanguageType value) {
+		this.language = value;
+	}
 
-    /**
-     * Gets the value of the isTheOriginalLanguage property.
-     * 
-     */
-    public boolean isIsTheOriginalLanguage() {
-        return isTheOriginalLanguage;
-    }
+	/**
+	 * Gets the value of the isTheOriginalLanguage property.
+	 * 
+	 */
+	public boolean isIsTheOriginalLanguage() {
+		return isTheOriginalLanguage;
+	}
 
-    /**
-     * Sets the value of the isTheOriginalLanguage property.
-     * 
-     */
-    public void setIsTheOriginalLanguage(boolean value) {
-        this.isTheOriginalLanguage = value;
-    }
+	/**
+	 * Sets the value of the isTheOriginalLanguage property.
+	 * 
+	 */
+	public void setIsTheOriginalLanguage(boolean value) {
+		this.isTheOriginalLanguage = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GivenNameType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GivenNameType.java
index cc9b70e5b..3818b52e1 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GivenNameType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GivenNameType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for GivenNameType complex type.
+ * <p>
+ * Java class for GivenNameType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="GivenNameType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GivenNameType", propOrder = {
-    "name"
-})
+@XmlType(name = "GivenNameType", propOrder = { "name" })
 public class GivenNameType {
 
-    @XmlElement(name = "Name", required = true)
-    protected List<String> name;
+	@XmlElement(name = "Name", required = true)
+	protected List<String> name;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the name property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getName().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<String> getName() {
-        if (name == null) {
-            name = new ArrayList<String>();
-        }
-        return this.name;
-    }
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the name property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getName().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String }
+	 * 
+	 * 
+	 */
+	public List<String> getName() {
+		if (name == null) {
+			name = new ArrayList<String>();
+		}
+		return this.name;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GradingSchemeAndGradeDistributionGuidanceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GradingSchemeAndGradeDistributionGuidanceType.java
index 9bb0de01d..471ff3a5f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GradingSchemeAndGradeDistributionGuidanceType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GradingSchemeAndGradeDistributionGuidanceType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for GradingSchemeAndGradeDistributionGuidanceType complex type.
+ * <p>
+ * Java class for GradingSchemeAndGradeDistributionGuidanceType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="GradingSchemeAndGradeDistributionGuidanceType">
@@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = {
-    "gradingScheme",
-    "gradeDistributionGuidance"
-})
+@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = { "gradingScheme", "gradeDistributionGuidance" })
 public class GradingSchemeAndGradeDistributionGuidanceType {
 
-    @XmlElement(name = "GradingScheme", required = true)
-    protected RichTextTagType gradingScheme;
-    @XmlElement(name = "GradeDistributionGuidance")
-    protected RichTextTagType gradeDistributionGuidance;
+	@XmlElement(name = "GradingScheme", required = true)
+	protected RichTextTagType gradingScheme;
+	@XmlElement(name = "GradeDistributionGuidance")
+	protected RichTextTagType gradeDistributionGuidance;
 
-    /**
-     * Gets the value of the gradingScheme property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getGradingScheme() {
-        return gradingScheme;
-    }
+	/**
+	 * Gets the value of the gradingScheme property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getGradingScheme() {
+		return gradingScheme;
+	}
 
-    /**
-     * Sets the value of the gradingScheme property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setGradingScheme(RichTextTagType value) {
-        this.gradingScheme = value;
-    }
+	/**
+	 * Sets the value of the gradingScheme property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setGradingScheme(RichTextTagType value) {
+		this.gradingScheme = value;
+	}
 
-    /**
-     * Gets the value of the gradeDistributionGuidance property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getGradeDistributionGuidance() {
-        return gradeDistributionGuidance;
-    }
+	/**
+	 * Gets the value of the gradeDistributionGuidance property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getGradeDistributionGuidance() {
+		return gradeDistributionGuidance;
+	}
 
-    /**
-     * Sets the value of the gradeDistributionGuidance property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setGradeDistributionGuidance(RichTextTagType value) {
-        this.gradeDistributionGuidance = value;
-    }
+	/**
+	 * Sets the value of the gradeDistributionGuidance property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setGradeDistributionGuidance(RichTextTagType value) {
+		this.gradeDistributionGuidance = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ImageMimeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ImageMimeType.java
index 8429a3229..22d889b67 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ImageMimeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ImageMimeType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ImageMimeType.
+ * <p>
+ * Java class for ImageMimeType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="ImageMimeType">
  *   &lt;restriction base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}MimeType">
@@ -35,33 +36,29 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum(MimeType.class)
 public enum ImageMimeType {
 
-    @XmlEnumValue("image/gif")
-    IMAGE_GIF(MimeType.IMAGE_GIF),
-    @XmlEnumValue("image/jpeg")
-    IMAGE_JPEG(MimeType.IMAGE_JPEG),
-    @XmlEnumValue("image/pjpeg")
-    IMAGE_PJPEG(MimeType.IMAGE_PJPEG),
-    @XmlEnumValue("image/png")
-    IMAGE_PNG(MimeType.IMAGE_PNG),
-    @XmlEnumValue("image/tiff")
-    IMAGE_TIFF(MimeType.IMAGE_TIFF);
-    private final MimeType value;
+	@XmlEnumValue("image/gif")
+	IMAGE_GIF(MimeType.IMAGE_GIF), @XmlEnumValue("image/jpeg")
+	IMAGE_JPEG(MimeType.IMAGE_JPEG), @XmlEnumValue("image/pjpeg")
+	IMAGE_PJPEG(MimeType.IMAGE_PJPEG), @XmlEnumValue("image/png")
+	IMAGE_PNG(MimeType.IMAGE_PNG), @XmlEnumValue("image/tiff")
+	IMAGE_TIFF(MimeType.IMAGE_TIFF);
+	private final MimeType value;
 
-    ImageMimeType(MimeType v) {
-        value = v;
-    }
+	ImageMimeType(MimeType v) {
+		value = v;
+	}
 
-    public MimeType value() {
-        return value;
-    }
+	public MimeType value() {
+		return value;
+	}
 
-    public static ImageMimeType fromValue(MimeType v) {
-        for (ImageMimeType c: ImageMimeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v.toString());
-    }
+	public static ImageMimeType fromValue(MimeType v) {
+		for (ImageMimeType c : ImageMimeType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v.toString());
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheHolderOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheHolderOfTheQualificationType.java
index c9da2e078..3443104e3 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheHolderOfTheQualificationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheHolderOfTheQualificationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
- * <p>Java class for InformationIdentifyingTheHolderOfTheQualificationType complex type.
+ * <p>
+ * Java class for InformationIdentifyingTheHolderOfTheQualificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InformationIdentifyingTheHolderOfTheQualificationType">
@@ -51,277 +51,242 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InformationIdentifyingTheHolderOfTheQualificationType", propOrder = {
-    "familyName",
-    "givenName",
-    "dateOfBirth",
-    "studentIdentificationNumber",
-    "countryOfBirth",
-    "placeOfBirth",
-    "gender"
-})
+@XmlType(name = "InformationIdentifyingTheHolderOfTheQualificationType", propOrder = { "familyName", "givenName", "dateOfBirth", "studentIdentificationNumber", "countryOfBirth", "placeOfBirth",
+		"gender" })
 public class InformationIdentifyingTheHolderOfTheQualificationType {
 
-    @XmlElement(name = "FamilyName", required = true)
-    protected FamilyNameType familyName;
-    @XmlElement(name = "GivenName", required = true)
-    protected GivenNameType givenName;
-    @XmlElement(name = "DateOfBirth")
-    protected XMLGregorianCalendar dateOfBirth;
-    @XmlElement(name = "StudentIdentificationNumber")
-    protected String studentIdentificationNumber;
-    @XmlElement(name = "CountryOfBirth")
-    protected CountryTextCodeType countryOfBirth;
-    @XmlElement(name = "PlaceOfBirth")
-    protected String placeOfBirth;
-    @XmlElement(name = "Gender")
-    protected InformationIdentifyingTheHolderOfTheQualificationType.Gender gender;
-
-    /**
-     * Gets the value of the familyName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FamilyNameType }
-     *     
-     */
-    public FamilyNameType getFamilyName() {
-        return familyName;
-    }
+	@XmlElement(name = "FamilyName", required = true)
+	protected FamilyNameType familyName;
+	@XmlElement(name = "GivenName", required = true)
+	protected GivenNameType givenName;
+	@XmlElement(name = "DateOfBirth")
+	protected XMLGregorianCalendar dateOfBirth;
+	@XmlElement(name = "StudentIdentificationNumber")
+	protected String studentIdentificationNumber;
+	@XmlElement(name = "CountryOfBirth")
+	protected CountryTextCodeType countryOfBirth;
+	@XmlElement(name = "PlaceOfBirth")
+	protected String placeOfBirth;
+	@XmlElement(name = "Gender")
+	protected InformationIdentifyingTheHolderOfTheQualificationType.Gender gender;
 
-    /**
-     * Sets the value of the familyName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FamilyNameType }
-     *     
-     */
-    public void setFamilyName(FamilyNameType value) {
-        this.familyName = value;
-    }
+	/**
+	 * Gets the value of the familyName property.
+	 * 
+	 * @return possible object is {@link FamilyNameType }
+	 * 
+	 */
+	public FamilyNameType getFamilyName() {
+		return familyName;
+	}
 
-    /**
-     * Gets the value of the givenName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GivenNameType }
-     *     
-     */
-    public GivenNameType getGivenName() {
-        return givenName;
-    }
+	/**
+	 * Sets the value of the familyName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link FamilyNameType }
+	 * 
+	 */
+	public void setFamilyName(FamilyNameType value) {
+		this.familyName = value;
+	}
 
-    /**
-     * Sets the value of the givenName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GivenNameType }
-     *     
-     */
-    public void setGivenName(GivenNameType value) {
-        this.givenName = value;
-    }
+	/**
+	 * Gets the value of the givenName property.
+	 * 
+	 * @return possible object is {@link GivenNameType }
+	 * 
+	 */
+	public GivenNameType getGivenName() {
+		return givenName;
+	}
 
-    /**
-     * Gets the value of the dateOfBirth property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateOfBirth() {
-        return dateOfBirth;
-    }
+	/**
+	 * Sets the value of the givenName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link GivenNameType }
+	 * 
+	 */
+	public void setGivenName(GivenNameType value) {
+		this.givenName = value;
+	}
 
-    /**
-     * Sets the value of the dateOfBirth property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateOfBirth(XMLGregorianCalendar value) {
-        this.dateOfBirth = value;
-    }
+	/**
+	 * Gets the value of the dateOfBirth property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateOfBirth() {
+		return dateOfBirth;
+	}
 
-    /**
-     * Gets the value of the studentIdentificationNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStudentIdentificationNumber() {
-        return studentIdentificationNumber;
-    }
+	/**
+	 * Sets the value of the dateOfBirth property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateOfBirth(XMLGregorianCalendar value) {
+		this.dateOfBirth = value;
+	}
 
-    /**
-     * Sets the value of the studentIdentificationNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStudentIdentificationNumber(String value) {
-        this.studentIdentificationNumber = value;
-    }
+	/**
+	 * Gets the value of the studentIdentificationNumber property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getStudentIdentificationNumber() {
+		return studentIdentificationNumber;
+	}
 
-    /**
-     * Gets the value of the countryOfBirth property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CountryTextCodeType }
-     *     
-     */
-    public CountryTextCodeType getCountryOfBirth() {
-        return countryOfBirth;
-    }
+	/**
+	 * Sets the value of the studentIdentificationNumber property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setStudentIdentificationNumber(String value) {
+		this.studentIdentificationNumber = value;
+	}
 
-    /**
-     * Sets the value of the countryOfBirth property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CountryTextCodeType }
-     *     
-     */
-    public void setCountryOfBirth(CountryTextCodeType value) {
-        this.countryOfBirth = value;
-    }
+	/**
+	 * Gets the value of the countryOfBirth property.
+	 * 
+	 * @return possible object is {@link CountryTextCodeType }
+	 * 
+	 */
+	public CountryTextCodeType getCountryOfBirth() {
+		return countryOfBirth;
+	}
 
-    /**
-     * Gets the value of the placeOfBirth property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getPlaceOfBirth() {
-        return placeOfBirth;
-    }
+	/**
+	 * Sets the value of the countryOfBirth property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CountryTextCodeType }
+	 * 
+	 */
+	public void setCountryOfBirth(CountryTextCodeType value) {
+		this.countryOfBirth = value;
+	}
 
-    /**
-     * Sets the value of the placeOfBirth property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setPlaceOfBirth(String value) {
-        this.placeOfBirth = value;
-    }
+	/**
+	 * Gets the value of the placeOfBirth property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getPlaceOfBirth() {
+		return placeOfBirth;
+	}
 
-    /**
-     * Gets the value of the gender property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
-     *     
-     */
-    public InformationIdentifyingTheHolderOfTheQualificationType.Gender getGender() {
-        return gender;
-    }
+	/**
+	 * Sets the value of the placeOfBirth property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setPlaceOfBirth(String value) {
+		this.placeOfBirth = value;
+	}
 
-    /**
-     * Sets the value of the gender property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
-     *     
-     */
-    public void setGender(InformationIdentifyingTheHolderOfTheQualificationType.Gender value) {
-        this.gender = value;
-    }
+	/**
+	 * Gets the value of the gender property.
+	 * 
+	 * @return possible object is {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
+	 * 
+	 */
+	public InformationIdentifyingTheHolderOfTheQualificationType.Gender getGender() {
+		return gender;
+	}
 
+	/**
+	 * Sets the value of the gender property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
+	 * 
+	 */
+	public void setGender(InformationIdentifyingTheHolderOfTheQualificationType.Gender value) {
+		this.gender = value;
+	}
 
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
-     *       &lt;attribute name="gender" use="required" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}GenderType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Gender {
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+	 *       &lt;attribute name="gender" use="required" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}GenderType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Gender {
 
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "gender", required = true)
-        protected GenderType gender;
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "gender", required = true)
+		protected GenderType gender;
 
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
+		/**
+		 * Gets the value of the value property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
 
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
 
-        /**
-         * Gets the value of the gender property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link GenderType }
-         *     
-         */
-        public GenderType getGender() {
-            return gender;
-        }
+		/**
+		 * Gets the value of the gender property.
+		 * 
+		 * @return possible object is {@link GenderType }
+		 * 
+		 */
+		public GenderType getGender() {
+			return gender;
+		}
 
-        /**
-         * Sets the value of the gender property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link GenderType }
-         *     
-         */
-        public void setGender(GenderType value) {
-            this.gender = value;
-        }
+		/**
+		 * Sets the value of the gender property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link GenderType }
+		 * 
+		 */
+		public void setGender(GenderType value) {
+			this.gender = value;
+		}
 
-    }
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheQualificationType.java
index 21040122c..6e257e6df 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheQualificationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheQualificationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for InformationIdentifyingTheQualificationType complex type.
+ * <p>
+ * Java class for InformationIdentifyingTheQualificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InformationIdentifyingTheQualificationType">
@@ -39,171 +39,147 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InformationIdentifyingTheQualificationType", propOrder = {
-    "qualification",
-    "titleConferred",
-    "mainFieldsOfStudy",
-    "nameAndStatusOfAwardingInstitution",
-    "nameAndStatusOfInstitutionAdministeringStudies",
-    "languagesOfInstructionAndExamination"
-})
+@XmlType(name = "InformationIdentifyingTheQualificationType", propOrder = { "qualification", "titleConferred", "mainFieldsOfStudy", "nameAndStatusOfAwardingInstitution",
+		"nameAndStatusOfInstitutionAdministeringStudies", "languagesOfInstructionAndExamination" })
 public class InformationIdentifyingTheQualificationType {
 
-    @XmlElement(name = "Qualification", required = true)
-    protected QualificationType qualification;
-    @XmlElement(name = "TitleConferred")
-    protected TitleConferredType titleConferred;
-    @XmlElement(name = "MainFieldsOfStudy")
-    protected RichTextTagType mainFieldsOfStudy;
-    @XmlElement(name = "NameAndStatusOfAwardingInstitution", required = true)
-    protected NameAndStatusOfAwardingInstitutionType nameAndStatusOfAwardingInstitution;
-    @XmlElement(name = "NameAndStatusOfInstitutionAdministeringStudies", required = true)
-    protected NameAndStatusOfInstitutionAdministeringStudiesType nameAndStatusOfInstitutionAdministeringStudies;
-    @XmlElement(name = "LanguagesOfInstructionAndExamination")
-    protected LanguagesOfInstructionAndExaminationType languagesOfInstructionAndExamination;
-
-    /**
-     * Gets the value of the qualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link QualificationType }
-     *     
-     */
-    public QualificationType getQualification() {
-        return qualification;
-    }
-
-    /**
-     * Sets the value of the qualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link QualificationType }
-     *     
-     */
-    public void setQualification(QualificationType value) {
-        this.qualification = value;
-    }
-
-    /**
-     * Gets the value of the titleConferred property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TitleConferredType }
-     *     
-     */
-    public TitleConferredType getTitleConferred() {
-        return titleConferred;
-    }
-
-    /**
-     * Sets the value of the titleConferred property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TitleConferredType }
-     *     
-     */
-    public void setTitleConferred(TitleConferredType value) {
-        this.titleConferred = value;
-    }
-
-    /**
-     * Gets the value of the mainFieldsOfStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getMainFieldsOfStudy() {
-        return mainFieldsOfStudy;
-    }
-
-    /**
-     * Sets the value of the mainFieldsOfStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setMainFieldsOfStudy(RichTextTagType value) {
-        this.mainFieldsOfStudy = value;
-    }
-
-    /**
-     * Gets the value of the nameAndStatusOfAwardingInstitution property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NameAndStatusOfAwardingInstitutionType }
-     *     
-     */
-    public NameAndStatusOfAwardingInstitutionType getNameAndStatusOfAwardingInstitution() {
-        return nameAndStatusOfAwardingInstitution;
-    }
-
-    /**
-     * Sets the value of the nameAndStatusOfAwardingInstitution property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NameAndStatusOfAwardingInstitutionType }
-     *     
-     */
-    public void setNameAndStatusOfAwardingInstitution(NameAndStatusOfAwardingInstitutionType value) {
-        this.nameAndStatusOfAwardingInstitution = value;
-    }
-
-    /**
-     * Gets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NameAndStatusOfInstitutionAdministeringStudiesType }
-     *     
-     */
-    public NameAndStatusOfInstitutionAdministeringStudiesType getNameAndStatusOfInstitutionAdministeringStudies() {
-        return nameAndStatusOfInstitutionAdministeringStudies;
-    }
-
-    /**
-     * Sets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NameAndStatusOfInstitutionAdministeringStudiesType }
-     *     
-     */
-    public void setNameAndStatusOfInstitutionAdministeringStudies(NameAndStatusOfInstitutionAdministeringStudiesType value) {
-        this.nameAndStatusOfInstitutionAdministeringStudies = value;
-    }
-
-    /**
-     * Gets the value of the languagesOfInstructionAndExamination property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LanguagesOfInstructionAndExaminationType }
-     *     
-     */
-    public LanguagesOfInstructionAndExaminationType getLanguagesOfInstructionAndExamination() {
-        return languagesOfInstructionAndExamination;
-    }
-
-    /**
-     * Sets the value of the languagesOfInstructionAndExamination property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LanguagesOfInstructionAndExaminationType }
-     *     
-     */
-    public void setLanguagesOfInstructionAndExamination(LanguagesOfInstructionAndExaminationType value) {
-        this.languagesOfInstructionAndExamination = value;
-    }
+	@XmlElement(name = "Qualification", required = true)
+	protected QualificationType qualification;
+	@XmlElement(name = "TitleConferred")
+	protected TitleConferredType titleConferred;
+	@XmlElement(name = "MainFieldsOfStudy")
+	protected RichTextTagType mainFieldsOfStudy;
+	@XmlElement(name = "NameAndStatusOfAwardingInstitution", required = true)
+	protected NameAndStatusOfAwardingInstitutionType nameAndStatusOfAwardingInstitution;
+	@XmlElement(name = "NameAndStatusOfInstitutionAdministeringStudies", required = true)
+	protected NameAndStatusOfInstitutionAdministeringStudiesType nameAndStatusOfInstitutionAdministeringStudies;
+	@XmlElement(name = "LanguagesOfInstructionAndExamination")
+	protected LanguagesOfInstructionAndExaminationType languagesOfInstructionAndExamination;
+
+	/**
+	 * Gets the value of the qualification property.
+	 * 
+	 * @return possible object is {@link QualificationType }
+	 * 
+	 */
+	public QualificationType getQualification() {
+		return qualification;
+	}
+
+	/**
+	 * Sets the value of the qualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link QualificationType }
+	 * 
+	 */
+	public void setQualification(QualificationType value) {
+		this.qualification = value;
+	}
+
+	/**
+	 * Gets the value of the titleConferred property.
+	 * 
+	 * @return possible object is {@link TitleConferredType }
+	 * 
+	 */
+	public TitleConferredType getTitleConferred() {
+		return titleConferred;
+	}
+
+	/**
+	 * Sets the value of the titleConferred property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link TitleConferredType }
+	 * 
+	 */
+	public void setTitleConferred(TitleConferredType value) {
+		this.titleConferred = value;
+	}
+
+	/**
+	 * Gets the value of the mainFieldsOfStudy property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getMainFieldsOfStudy() {
+		return mainFieldsOfStudy;
+	}
+
+	/**
+	 * Sets the value of the mainFieldsOfStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setMainFieldsOfStudy(RichTextTagType value) {
+		this.mainFieldsOfStudy = value;
+	}
+
+	/**
+	 * Gets the value of the nameAndStatusOfAwardingInstitution property.
+	 * 
+	 * @return possible object is {@link NameAndStatusOfAwardingInstitutionType }
+	 * 
+	 */
+	public NameAndStatusOfAwardingInstitutionType getNameAndStatusOfAwardingInstitution() {
+		return nameAndStatusOfAwardingInstitution;
+	}
+
+	/**
+	 * Sets the value of the nameAndStatusOfAwardingInstitution property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link NameAndStatusOfAwardingInstitutionType }
+	 * 
+	 */
+	public void setNameAndStatusOfAwardingInstitution(NameAndStatusOfAwardingInstitutionType value) {
+		this.nameAndStatusOfAwardingInstitution = value;
+	}
+
+	/**
+	 * Gets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
+	 * 
+	 * @return possible object is {@link NameAndStatusOfInstitutionAdministeringStudiesType }
+	 * 
+	 */
+	public NameAndStatusOfInstitutionAdministeringStudiesType getNameAndStatusOfInstitutionAdministeringStudies() {
+		return nameAndStatusOfInstitutionAdministeringStudies;
+	}
+
+	/**
+	 * Sets the value of the nameAndStatusOfInstitutionAdministeringStudies property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link NameAndStatusOfInstitutionAdministeringStudiesType }
+	 * 
+	 */
+	public void setNameAndStatusOfInstitutionAdministeringStudies(NameAndStatusOfInstitutionAdministeringStudiesType value) {
+		this.nameAndStatusOfInstitutionAdministeringStudies = value;
+	}
+
+	/**
+	 * Gets the value of the languagesOfInstructionAndExamination property.
+	 * 
+	 * @return possible object is {@link LanguagesOfInstructionAndExaminationType }
+	 * 
+	 */
+	public LanguagesOfInstructionAndExaminationType getLanguagesOfInstructionAndExamination() {
+		return languagesOfInstructionAndExamination;
+	}
+
+	/**
+	 * Sets the value of the languagesOfInstructionAndExamination property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LanguagesOfInstructionAndExaminationType }
+	 * 
+	 */
+	public void setLanguagesOfInstructionAndExamination(LanguagesOfInstructionAndExaminationType value) {
+		this.languagesOfInstructionAndExamination = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheContentsAndResultsGainedType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheContentsAndResultsGainedType.java
index 9255189f9..be1d1c670 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheContentsAndResultsGainedType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheContentsAndResultsGainedType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for InformationOnTheContentsAndResultsGainedType complex type.
+ * <p>
+ * Java class for InformationOnTheContentsAndResultsGainedType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InformationOnTheContentsAndResultsGainedType">
@@ -47,197 +47,173 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InformationOnTheContentsAndResultsGainedType", propOrder = {
-    "modeOfStudy",
-    "programmeRequirements",
-    "programmeDetails",
-    "gradingSchemeAndGradeDistributionGuidance",
-    "overallClassificationOfTheQualification"
-})
+@XmlType(name = "InformationOnTheContentsAndResultsGainedType", propOrder = { "modeOfStudy", "programmeRequirements", "programmeDetails", "gradingSchemeAndGradeDistributionGuidance",
+		"overallClassificationOfTheQualification" })
 public class InformationOnTheContentsAndResultsGainedType {
 
-    @XmlElement(name = "ModeOfStudy")
-    protected InformationOnTheContentsAndResultsGainedType.ModeOfStudy modeOfStudy;
-    @XmlElement(name = "ProgrammeRequirements")
-    protected ProgrammeRequirementsType programmeRequirements;
-    @XmlElement(name = "ProgrammeDetails")
-    protected ProgrammeDetailsType programmeDetails;
-    @XmlElement(name = "GradingSchemeAndGradeDistributionGuidance")
-    protected GradingSchemeAndGradeDistributionGuidanceType gradingSchemeAndGradeDistributionGuidance;
-    @XmlElement(name = "OverallClassificationOfTheQualification")
-    protected RichTextTagType overallClassificationOfTheQualification;
-
-    /**
-     * Gets the value of the modeOfStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
-     *     
-     */
-    public InformationOnTheContentsAndResultsGainedType.ModeOfStudy getModeOfStudy() {
-        return modeOfStudy;
-    }
-
-    /**
-     * Sets the value of the modeOfStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
-     *     
-     */
-    public void setModeOfStudy(InformationOnTheContentsAndResultsGainedType.ModeOfStudy value) {
-        this.modeOfStudy = value;
-    }
-
-    /**
-     * Gets the value of the programmeRequirements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ProgrammeRequirementsType }
-     *     
-     */
-    public ProgrammeRequirementsType getProgrammeRequirements() {
-        return programmeRequirements;
-    }
-
-    /**
-     * Sets the value of the programmeRequirements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ProgrammeRequirementsType }
-     *     
-     */
-    public void setProgrammeRequirements(ProgrammeRequirementsType value) {
-        this.programmeRequirements = value;
-    }
-
-    /**
-     * Gets the value of the programmeDetails property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ProgrammeDetailsType }
-     *     
-     */
-    public ProgrammeDetailsType getProgrammeDetails() {
-        return programmeDetails;
-    }
-
-    /**
-     * Sets the value of the programmeDetails property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ProgrammeDetailsType }
-     *     
-     */
-    public void setProgrammeDetails(ProgrammeDetailsType value) {
-        this.programmeDetails = value;
-    }
-
-    /**
-     * Gets the value of the gradingSchemeAndGradeDistributionGuidance property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GradingSchemeAndGradeDistributionGuidanceType }
-     *     
-     */
-    public GradingSchemeAndGradeDistributionGuidanceType getGradingSchemeAndGradeDistributionGuidance() {
-        return gradingSchemeAndGradeDistributionGuidance;
-    }
-
-    /**
-     * Sets the value of the gradingSchemeAndGradeDistributionGuidance property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GradingSchemeAndGradeDistributionGuidanceType }
-     *     
-     */
-    public void setGradingSchemeAndGradeDistributionGuidance(GradingSchemeAndGradeDistributionGuidanceType value) {
-        this.gradingSchemeAndGradeDistributionGuidance = value;
-    }
-
-    /**
-     * Gets the value of the overallClassificationOfTheQualification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getOverallClassificationOfTheQualification() {
-        return overallClassificationOfTheQualification;
-    }
-
-    /**
-     * Sets the value of the overallClassificationOfTheQualification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setOverallClassificationOfTheQualification(RichTextTagType value) {
-        this.overallClassificationOfTheQualification = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
-     *       &lt;attribute name="modeOfStudy" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ModeOfStudyType" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class ModeOfStudy
-        extends RichTextTagType
-    {
-
-        @XmlAttribute(name = "modeOfStudy")
-        protected ModeOfStudyType modeOfStudy;
-
-        /**
-         * Gets the value of the modeOfStudy property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link ModeOfStudyType }
-         *     
-         */
-        public ModeOfStudyType getModeOfStudy() {
-            return modeOfStudy;
-        }
-
-        /**
-         * Sets the value of the modeOfStudy property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link ModeOfStudyType }
-         *     
-         */
-        public void setModeOfStudy(ModeOfStudyType value) {
-            this.modeOfStudy = value;
-        }
-
-    }
+	@XmlElement(name = "ModeOfStudy")
+	protected InformationOnTheContentsAndResultsGainedType.ModeOfStudy modeOfStudy;
+	@XmlElement(name = "ProgrammeRequirements")
+	protected ProgrammeRequirementsType programmeRequirements;
+	@XmlElement(name = "ProgrammeDetails")
+	protected ProgrammeDetailsType programmeDetails;
+	@XmlElement(name = "GradingSchemeAndGradeDistributionGuidance")
+	protected GradingSchemeAndGradeDistributionGuidanceType gradingSchemeAndGradeDistributionGuidance;
+	@XmlElement(name = "OverallClassificationOfTheQualification")
+	protected RichTextTagType overallClassificationOfTheQualification;
+
+	/**
+	 * Gets the value of the modeOfStudy property.
+	 * 
+	 * @return possible object is {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
+	 * 
+	 */
+	public InformationOnTheContentsAndResultsGainedType.ModeOfStudy getModeOfStudy() {
+		return modeOfStudy;
+	}
+
+	/**
+	 * Sets the value of the modeOfStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
+	 * 
+	 */
+	public void setModeOfStudy(InformationOnTheContentsAndResultsGainedType.ModeOfStudy value) {
+		this.modeOfStudy = value;
+	}
+
+	/**
+	 * Gets the value of the programmeRequirements property.
+	 * 
+	 * @return possible object is {@link ProgrammeRequirementsType }
+	 * 
+	 */
+	public ProgrammeRequirementsType getProgrammeRequirements() {
+		return programmeRequirements;
+	}
+
+	/**
+	 * Sets the value of the programmeRequirements property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ProgrammeRequirementsType }
+	 * 
+	 */
+	public void setProgrammeRequirements(ProgrammeRequirementsType value) {
+		this.programmeRequirements = value;
+	}
+
+	/**
+	 * Gets the value of the programmeDetails property.
+	 * 
+	 * @return possible object is {@link ProgrammeDetailsType }
+	 * 
+	 */
+	public ProgrammeDetailsType getProgrammeDetails() {
+		return programmeDetails;
+	}
+
+	/**
+	 * Sets the value of the programmeDetails property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ProgrammeDetailsType }
+	 * 
+	 */
+	public void setProgrammeDetails(ProgrammeDetailsType value) {
+		this.programmeDetails = value;
+	}
+
+	/**
+	 * Gets the value of the gradingSchemeAndGradeDistributionGuidance property.
+	 * 
+	 * @return possible object is {@link GradingSchemeAndGradeDistributionGuidanceType }
+	 * 
+	 */
+	public GradingSchemeAndGradeDistributionGuidanceType getGradingSchemeAndGradeDistributionGuidance() {
+		return gradingSchemeAndGradeDistributionGuidance;
+	}
+
+	/**
+	 * Sets the value of the gradingSchemeAndGradeDistributionGuidance property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link GradingSchemeAndGradeDistributionGuidanceType }
+	 * 
+	 */
+	public void setGradingSchemeAndGradeDistributionGuidance(GradingSchemeAndGradeDistributionGuidanceType value) {
+		this.gradingSchemeAndGradeDistributionGuidance = value;
+	}
+
+	/**
+	 * Gets the value of the overallClassificationOfTheQualification property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getOverallClassificationOfTheQualification() {
+		return overallClassificationOfTheQualification;
+	}
+
+	/**
+	 * Sets the value of the overallClassificationOfTheQualification property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setOverallClassificationOfTheQualification(RichTextTagType value) {
+		this.overallClassificationOfTheQualification = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
+	 *       &lt;attribute name="modeOfStudy" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ModeOfStudyType" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class ModeOfStudy extends RichTextTagType {
+
+		@XmlAttribute(name = "modeOfStudy")
+		protected ModeOfStudyType modeOfStudy;
+
+		/**
+		 * Gets the value of the modeOfStudy property.
+		 * 
+		 * @return possible object is {@link ModeOfStudyType }
+		 * 
+		 */
+		public ModeOfStudyType getModeOfStudy() {
+			return modeOfStudy;
+		}
+
+		/**
+		 * Sets the value of the modeOfStudy property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link ModeOfStudyType }
+		 * 
+		 */
+		public void setModeOfStudy(ModeOfStudyType value) {
+			this.modeOfStudy = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheFunctionOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheFunctionOfTheQualificationType.java
index 903eb2a35..87bb10c71 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheFunctionOfTheQualificationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheFunctionOfTheQualificationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for InformationOnTheFunctionOfTheQualificationType complex type.
+ * <p>
+ * Java class for InformationOnTheFunctionOfTheQualificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InformationOnTheFunctionOfTheQualificationType">
@@ -44,116 +44,103 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InformationOnTheFunctionOfTheQualificationType", propOrder = {
-    "accessToFurtherStudy",
-    "professionalStatus"
-})
+@XmlType(name = "InformationOnTheFunctionOfTheQualificationType", propOrder = { "accessToFurtherStudy", "professionalStatus" })
 public class InformationOnTheFunctionOfTheQualificationType {
 
-    @XmlElement(name = "AccessToFurtherStudy")
-    protected RichTextTagType accessToFurtherStudy;
-    @XmlElement(name = "ProfessionalStatus")
-    protected InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus professionalStatus;
-
-    /**
-     * Gets the value of the accessToFurtherStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAccessToFurtherStudy() {
-        return accessToFurtherStudy;
-    }
-
-    /**
-     * Sets the value of the accessToFurtherStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAccessToFurtherStudy(RichTextTagType value) {
-        this.accessToFurtherStudy = value;
-    }
-
-    /**
-     * Gets the value of the professionalStatus property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
-     *     
-     */
-    public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus getProfessionalStatus() {
-        return professionalStatus;
-    }
-
-    /**
-     * Sets the value of the professionalStatus property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
-     *     
-     */
-    public void setProfessionalStatus(InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus value) {
-        this.professionalStatus = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
-     *       &lt;attribute name="isRegulatedProfession" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class ProfessionalStatus
-        extends RichTextTagType
-    {
-
-        @XmlAttribute(name = "isRegulatedProfession")
-        protected Boolean isRegulatedProfession;
-
-        /**
-         * Gets the value of the isRegulatedProfession property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isIsRegulatedProfession() {
-            return isRegulatedProfession;
-        }
-
-        /**
-         * Sets the value of the isRegulatedProfession property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setIsRegulatedProfession(Boolean value) {
-            this.isRegulatedProfession = value;
-        }
-
-    }
+	@XmlElement(name = "AccessToFurtherStudy")
+	protected RichTextTagType accessToFurtherStudy;
+	@XmlElement(name = "ProfessionalStatus")
+	protected InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus professionalStatus;
+
+	/**
+	 * Gets the value of the accessToFurtherStudy property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAccessToFurtherStudy() {
+		return accessToFurtherStudy;
+	}
+
+	/**
+	 * Sets the value of the accessToFurtherStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAccessToFurtherStudy(RichTextTagType value) {
+		this.accessToFurtherStudy = value;
+	}
+
+	/**
+	 * Gets the value of the professionalStatus property.
+	 * 
+	 * @return possible object is {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
+	 * 
+	 */
+	public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus getProfessionalStatus() {
+		return professionalStatus;
+	}
+
+	/**
+	 * Sets the value of the professionalStatus property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
+	 * 
+	 */
+	public void setProfessionalStatus(InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus value) {
+		this.professionalStatus = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
+	 *       &lt;attribute name="isRegulatedProfession" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class ProfessionalStatus extends RichTextTagType {
+
+		@XmlAttribute(name = "isRegulatedProfession")
+		protected Boolean isRegulatedProfession;
+
+		/**
+		 * Gets the value of the isRegulatedProfession property.
+		 * 
+		 * @return possible object is {@link Boolean }
+		 * 
+		 */
+		public Boolean isIsRegulatedProfession() {
+			return isRegulatedProfession;
+		}
+
+		/**
+		 * Sets the value of the isRegulatedProfession property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Boolean }
+		 * 
+		 */
+		public void setIsRegulatedProfession(Boolean value) {
+			this.isRegulatedProfession = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheLevelOfTheQualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheLevelOfTheQualificationType.java
index 2119f23bb..c759fdf52 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheLevelOfTheQualificationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheLevelOfTheQualificationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.math.BigDecimal;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for InformationOnTheLevelOfTheQualificationType complex type.
+ * <p>
+ * Java class for InformationOnTheLevelOfTheQualificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InformationOnTheLevelOfTheQualificationType">
@@ -59,331 +59,295 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InformationOnTheLevelOfTheQualificationType", propOrder = {
-    "level",
-    "officialLengthOfProgramme",
-    "accessRequirements"
-})
+@XmlType(name = "InformationOnTheLevelOfTheQualificationType", propOrder = { "level", "officialLengthOfProgramme", "accessRequirements" })
 public class InformationOnTheLevelOfTheQualificationType {
 
-    @XmlElement(name = "Level", required = true)
-    protected InformationOnTheLevelOfTheQualificationType.Level level;
-    @XmlElement(name = "OfficialLengthOfProgramme", required = true)
-    protected InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme officialLengthOfProgramme;
-    @XmlElement(name = "AccessRequirements")
-    protected RichTextTagType accessRequirements;
-
-    /**
-     * Gets the value of the level property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheLevelOfTheQualificationType.Level }
-     *     
-     */
-    public InformationOnTheLevelOfTheQualificationType.Level getLevel() {
-        return level;
-    }
-
-    /**
-     * Sets the value of the level property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheLevelOfTheQualificationType.Level }
-     *     
-     */
-    public void setLevel(InformationOnTheLevelOfTheQualificationType.Level value) {
-        this.level = value;
-    }
-
-    /**
-     * Gets the value of the officialLengthOfProgramme property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
-     *     
-     */
-    public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme getOfficialLengthOfProgramme() {
-        return officialLengthOfProgramme;
-    }
-
-    /**
-     * Sets the value of the officialLengthOfProgramme property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
-     *     
-     */
-    public void setOfficialLengthOfProgramme(InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme value) {
-        this.officialLengthOfProgramme = value;
-    }
-
-    /**
-     * Gets the value of the accessRequirements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAccessRequirements() {
-        return accessRequirements;
-    }
-
-    /**
-     * Sets the value of the accessRequirements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAccessRequirements(RichTextTagType value) {
-        this.accessRequirements = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
-     *       &lt;attribute name="isced1997" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ISCED1997Type" />
-     *       &lt;attribute name="isced2011" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ISCED2011Type" />
-     *       &lt;attribute name="eheaFramework" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}EHEAFrameworkType" />
-     *       &lt;attribute name="nfq" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}NFQType" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Level
-        extends RichTextTagType
-    {
-
-        @XmlAttribute(name = "isced1997")
-        protected String isced1997;
-        @XmlAttribute(name = "isced2011")
-        protected String isced2011;
-        @XmlAttribute(name = "eheaFramework")
-        protected EHEAFrameworkType eheaFramework;
-        @XmlAttribute(name = "nfq")
-        protected String nfq;
-
-        /**
-         * Gets the value of the isced1997 property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getIsced1997() {
-            return isced1997;
-        }
-
-        /**
-         * Sets the value of the isced1997 property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setIsced1997(String value) {
-            this.isced1997 = value;
-        }
-
-        /**
-         * Gets the value of the isced2011 property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getIsced2011() {
-            return isced2011;
-        }
-
-        /**
-         * Sets the value of the isced2011 property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setIsced2011(String value) {
-            this.isced2011 = value;
-        }
-
-        /**
-         * Gets the value of the eheaFramework property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link EHEAFrameworkType }
-         *     
-         */
-        public EHEAFrameworkType getEheaFramework() {
-            return eheaFramework;
-        }
-
-        /**
-         * Sets the value of the eheaFramework property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link EHEAFrameworkType }
-         *     
-         */
-        public void setEheaFramework(EHEAFrameworkType value) {
-            this.eheaFramework = value;
-        }
-
-        /**
-         * Gets the value of the nfq property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getNfq() {
-            return nfq;
-        }
-
-        /**
-         * Sets the value of the nfq property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setNfq(String value) {
-            this.nfq = value;
-        }
-
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
-     *       &lt;attribute name="ectsCredits" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
-     *       &lt;attribute name="years" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
-     *       &lt;attribute name="semesters" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveIntegerType" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class OfficialLengthOfProgramme
-        extends RichTextTagType
-    {
-
-        @XmlAttribute(name = "ectsCredits")
-        protected BigDecimal ectsCredits;
-        @XmlAttribute(name = "years")
-        protected BigDecimal years;
-        @XmlAttribute(name = "semesters")
-        protected Integer semesters;
-
-        /**
-         * Gets the value of the ectsCredits property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getEctsCredits() {
-            return ectsCredits;
-        }
-
-        /**
-         * Sets the value of the ectsCredits property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setEctsCredits(BigDecimal value) {
-            this.ectsCredits = value;
-        }
-
-        /**
-         * Gets the value of the years property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getYears() {
-            return years;
-        }
-
-        /**
-         * Sets the value of the years property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setYears(BigDecimal value) {
-            this.years = value;
-        }
-
-        /**
-         * Gets the value of the semesters property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Integer }
-         *     
-         */
-        public Integer getSemesters() {
-            return semesters;
-        }
-
-        /**
-         * Sets the value of the semesters property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Integer }
-         *     
-         */
-        public void setSemesters(Integer value) {
-            this.semesters = value;
-        }
-
-    }
+	@XmlElement(name = "Level", required = true)
+	protected InformationOnTheLevelOfTheQualificationType.Level level;
+	@XmlElement(name = "OfficialLengthOfProgramme", required = true)
+	protected InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme officialLengthOfProgramme;
+	@XmlElement(name = "AccessRequirements")
+	protected RichTextTagType accessRequirements;
+
+	/**
+	 * Gets the value of the level property.
+	 * 
+	 * @return possible object is {@link InformationOnTheLevelOfTheQualificationType.Level }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType.Level getLevel() {
+		return level;
+	}
+
+	/**
+	 * Sets the value of the level property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheLevelOfTheQualificationType.Level }
+	 * 
+	 */
+	public void setLevel(InformationOnTheLevelOfTheQualificationType.Level value) {
+		this.level = value;
+	}
+
+	/**
+	 * Gets the value of the officialLengthOfProgramme property.
+	 * 
+	 * @return possible object is {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme getOfficialLengthOfProgramme() {
+		return officialLengthOfProgramme;
+	}
+
+	/**
+	 * Sets the value of the officialLengthOfProgramme property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
+	 * 
+	 */
+	public void setOfficialLengthOfProgramme(InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme value) {
+		this.officialLengthOfProgramme = value;
+	}
+
+	/**
+	 * Gets the value of the accessRequirements property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAccessRequirements() {
+		return accessRequirements;
+	}
+
+	/**
+	 * Sets the value of the accessRequirements property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAccessRequirements(RichTextTagType value) {
+		this.accessRequirements = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
+	 *       &lt;attribute name="isced1997" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ISCED1997Type" />
+	 *       &lt;attribute name="isced2011" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ISCED2011Type" />
+	 *       &lt;attribute name="eheaFramework" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}EHEAFrameworkType" />
+	 *       &lt;attribute name="nfq" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}NFQType" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class Level extends RichTextTagType {
+
+		@XmlAttribute(name = "isced1997")
+		protected String isced1997;
+		@XmlAttribute(name = "isced2011")
+		protected String isced2011;
+		@XmlAttribute(name = "eheaFramework")
+		protected EHEAFrameworkType eheaFramework;
+		@XmlAttribute(name = "nfq")
+		protected String nfq;
+
+		/**
+		 * Gets the value of the isced1997 property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getIsced1997() {
+			return isced1997;
+		}
+
+		/**
+		 * Sets the value of the isced1997 property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setIsced1997(String value) {
+			this.isced1997 = value;
+		}
+
+		/**
+		 * Gets the value of the isced2011 property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getIsced2011() {
+			return isced2011;
+		}
+
+		/**
+		 * Sets the value of the isced2011 property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setIsced2011(String value) {
+			this.isced2011 = value;
+		}
+
+		/**
+		 * Gets the value of the eheaFramework property.
+		 * 
+		 * @return possible object is {@link EHEAFrameworkType }
+		 * 
+		 */
+		public EHEAFrameworkType getEheaFramework() {
+			return eheaFramework;
+		}
+
+		/**
+		 * Sets the value of the eheaFramework property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link EHEAFrameworkType }
+		 * 
+		 */
+		public void setEheaFramework(EHEAFrameworkType value) {
+			this.eheaFramework = value;
+		}
+
+		/**
+		 * Gets the value of the nfq property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getNfq() {
+			return nfq;
+		}
+
+		/**
+		 * Sets the value of the nfq property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setNfq(String value) {
+			this.nfq = value;
+		}
+
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
+	 *       &lt;attribute name="ectsCredits" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
+	 *       &lt;attribute name="years" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" />
+	 *       &lt;attribute name="semesters" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveIntegerType" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class OfficialLengthOfProgramme extends RichTextTagType {
+
+		@XmlAttribute(name = "ectsCredits")
+		protected BigDecimal ectsCredits;
+		@XmlAttribute(name = "years")
+		protected BigDecimal years;
+		@XmlAttribute(name = "semesters")
+		protected Integer semesters;
+
+		/**
+		 * Gets the value of the ectsCredits property.
+		 * 
+		 * @return possible object is {@link BigDecimal }
+		 * 
+		 */
+		public BigDecimal getEctsCredits() {
+			return ectsCredits;
+		}
+
+		/**
+		 * Sets the value of the ectsCredits property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link BigDecimal }
+		 * 
+		 */
+		public void setEctsCredits(BigDecimal value) {
+			this.ectsCredits = value;
+		}
+
+		/**
+		 * Gets the value of the years property.
+		 * 
+		 * @return possible object is {@link BigDecimal }
+		 * 
+		 */
+		public BigDecimal getYears() {
+			return years;
+		}
+
+		/**
+		 * Sets the value of the years property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link BigDecimal }
+		 * 
+		 */
+		public void setYears(BigDecimal value) {
+			this.years = value;
+		}
+
+		/**
+		 * Gets the value of the semesters property.
+		 * 
+		 * @return possible object is {@link Integer }
+		 * 
+		 */
+		public Integer getSemesters() {
+			return semesters;
+		}
+
+		/**
+		 * Sets the value of the semesters property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Integer }
+		 * 
+		 */
+		public void setSemesters(Integer value) {
+			this.semesters = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InstitutionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InstitutionType.java
index daab6ad3a..c6c27ca5f 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InstitutionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InstitutionType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
- * <p>Java class for InstitutionType complex type.
+ * <p>
+ * Java class for InstitutionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="InstitutionType">
@@ -54,308 +54,268 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "InstitutionType", propOrder = {
-    "name",
-    "status",
-    "country",
-    "additionalInformation",
-    "contactInformation",
-    "attachedImageRef"
-})
-@XmlSeeAlso({
-    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.NameAndStatusOfAwardingInstitutionType.AwardingInstitution.class,
-    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies.class
-})
+@XmlType(name = "InstitutionType", propOrder = { "name", "status", "country", "additionalInformation", "contactInformation", "attachedImageRef" })
+@XmlSeeAlso({ eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.NameAndStatusOfAwardingInstitutionType.AwardingInstitution.class,
+		eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies.class })
 public class InstitutionType {
 
-    @XmlElement(name = "Name", required = true)
-    protected String name;
-    @XmlElement(name = "Status")
-    protected String status;
-    @XmlElement(name = "Country")
-    protected CountryTextCodeType country;
-    @XmlElement(name = "AdditionalInformation")
-    protected RichTextTagType additionalInformation;
-    @XmlElement(name = "ContactInformation")
-    protected ContactInformationType contactInformation;
-    @XmlElement(name = "AttachedImageRef")
-    protected InstitutionType.AttachedImageRef attachedImageRef;
-    @XmlAttribute(name = "nationalID")
-    protected String nationalID;
-    @XmlAttribute(name = "erasmusID")
-    protected String erasmusID;
-
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+	@XmlElement(name = "Name", required = true)
+	protected String name;
+	@XmlElement(name = "Status")
+	protected String status;
+	@XmlElement(name = "Country")
+	protected CountryTextCodeType country;
+	@XmlElement(name = "AdditionalInformation")
+	protected RichTextTagType additionalInformation;
+	@XmlElement(name = "ContactInformation")
+	protected ContactInformationType contactInformation;
+	@XmlElement(name = "AttachedImageRef")
+	protected InstitutionType.AttachedImageRef attachedImageRef;
+	@XmlAttribute(name = "nationalID")
+	protected String nationalID;
+	@XmlAttribute(name = "erasmusID")
+	protected String erasmusID;
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * Gets the value of the status property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getStatus() {
-        return status;
-    }
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
 
-    /**
-     * Sets the value of the status property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setStatus(String value) {
-        this.status = value;
-    }
+	/**
+	 * Gets the value of the status property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getStatus() {
+		return status;
+	}
 
-    /**
-     * Gets the value of the country property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CountryTextCodeType }
-     *     
-     */
-    public CountryTextCodeType getCountry() {
-        return country;
-    }
+	/**
+	 * Sets the value of the status property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setStatus(String value) {
+		this.status = value;
+	}
 
-    /**
-     * Sets the value of the country property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CountryTextCodeType }
-     *     
-     */
-    public void setCountry(CountryTextCodeType value) {
-        this.country = value;
-    }
+	/**
+	 * Gets the value of the country property.
+	 * 
+	 * @return possible object is {@link CountryTextCodeType }
+	 * 
+	 */
+	public CountryTextCodeType getCountry() {
+		return country;
+	}
 
-    /**
-     * Gets the value of the additionalInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAdditionalInformation() {
-        return additionalInformation;
-    }
+	/**
+	 * Sets the value of the country property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CountryTextCodeType }
+	 * 
+	 */
+	public void setCountry(CountryTextCodeType value) {
+		this.country = value;
+	}
 
-    /**
-     * Sets the value of the additionalInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAdditionalInformation(RichTextTagType value) {
-        this.additionalInformation = value;
-    }
+	/**
+	 * Gets the value of the additionalInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAdditionalInformation() {
+		return additionalInformation;
+	}
 
-    /**
-     * Gets the value of the contactInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ContactInformationType }
-     *     
-     */
-    public ContactInformationType getContactInformation() {
-        return contactInformation;
-    }
+	/**
+	 * Sets the value of the additionalInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAdditionalInformation(RichTextTagType value) {
+		this.additionalInformation = value;
+	}
 
-    /**
-     * Sets the value of the contactInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ContactInformationType }
-     *     
-     */
-    public void setContactInformation(ContactInformationType value) {
-        this.contactInformation = value;
-    }
+	/**
+	 * Gets the value of the contactInformation property.
+	 * 
+	 * @return possible object is {@link ContactInformationType }
+	 * 
+	 */
+	public ContactInformationType getContactInformation() {
+		return contactInformation;
+	}
 
-    /**
-     * Gets the value of the attachedImageRef property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link InstitutionType.AttachedImageRef }
-     *     
-     */
-    public InstitutionType.AttachedImageRef getAttachedImageRef() {
-        return attachedImageRef;
-    }
+	/**
+	 * Sets the value of the contactInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link ContactInformationType }
+	 * 
+	 */
+	public void setContactInformation(ContactInformationType value) {
+		this.contactInformation = value;
+	}
 
-    /**
-     * Sets the value of the attachedImageRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link InstitutionType.AttachedImageRef }
-     *     
-     */
-    public void setAttachedImageRef(InstitutionType.AttachedImageRef value) {
-        this.attachedImageRef = value;
-    }
+	/**
+	 * Gets the value of the attachedImageRef property.
+	 * 
+	 * @return possible object is {@link InstitutionType.AttachedImageRef }
+	 * 
+	 */
+	public InstitutionType.AttachedImageRef getAttachedImageRef() {
+		return attachedImageRef;
+	}
 
-    /**
-     * Gets the value of the nationalID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNationalID() {
-        return nationalID;
-    }
+	/**
+	 * Sets the value of the attachedImageRef property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link InstitutionType.AttachedImageRef }
+	 * 
+	 */
+	public void setAttachedImageRef(InstitutionType.AttachedImageRef value) {
+		this.attachedImageRef = value;
+	}
 
-    /**
-     * Sets the value of the nationalID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNationalID(String value) {
-        this.nationalID = value;
-    }
+	/**
+	 * Gets the value of the nationalID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNationalID() {
+		return nationalID;
+	}
 
-    /**
-     * Gets the value of the erasmusID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getErasmusID() {
-        return erasmusID;
-    }
+	/**
+	 * Sets the value of the nationalID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNationalID(String value) {
+		this.nationalID = value;
+	}
 
-    /**
-     * Sets the value of the erasmusID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setErasmusID(String value) {
-        this.erasmusID = value;
-    }
+	/**
+	 * Gets the value of the erasmusID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getErasmusID() {
+		return erasmusID;
+	}
 
+	/**
+	 * Sets the value of the erasmusID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setErasmusID(String value) {
+		this.erasmusID = value;
+	}
 
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
-     *       &lt;attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AttachedImageRef {
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+	 *       &lt;attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class AttachedImageRef {
 
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "attachedID", required = true)
-        @XmlIDREF
-        @XmlSchemaType(name = "IDREF")
-        protected Object attachedID;
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "attachedID", required = true)
+		@XmlIDREF
+		@XmlSchemaType(name = "IDREF")
+		protected Object attachedID;
 
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
+		/**
+		 * Gets the value of the value property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
 
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
 
-        /**
-         * Gets the value of the attachedID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getAttachedID() {
-            return attachedID;
-        }
+		/**
+		 * Gets the value of the attachedID property.
+		 * 
+		 * @return possible object is {@link Object }
+		 * 
+		 */
+		public Object getAttachedID() {
+			return attachedID;
+		}
 
-        /**
-         * Sets the value of the attachedID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setAttachedID(Object value) {
-            this.attachedID = value;
-        }
+		/**
+		 * Sets the value of the attachedID property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Object }
+		 * 
+		 */
+		public void setAttachedID(Object value) {
+			this.attachedID = value;
+		}
 
-    }
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguageType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguageType.java
index 2ddf61e53..8dcc5c546 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguageType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguageType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for LanguageType.
+ * <p>
+ * Java class for LanguageType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="LanguageType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -128,219 +129,122 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum LanguageType {
 
-    @XmlEnumValue("ab")
-    AB("ab"),
-    @XmlEnumValue("af")
-    AF("af"),
-    @XmlEnumValue("an")
-    AN("an"),
-    @XmlEnumValue("ar")
-    AR("ar"),
-    @XmlEnumValue("as")
-    AS("as"),
-    @XmlEnumValue("az")
-    AZ("az"),
-    @XmlEnumValue("be")
-    BE("be"),
-    @XmlEnumValue("bg")
-    BG("bg"),
-    @XmlEnumValue("bn")
-    BN("bn"),
-    @XmlEnumValue("bo")
-    BO("bo"),
-    @XmlEnumValue("br")
-    BR("br"),
-    @XmlEnumValue("bs")
-    BS("bs"),
-    @XmlEnumValue("ca")
-    CA("ca"),
-    @XmlEnumValue("ce")
-    CE("ce"),
-    @XmlEnumValue("co")
-    CO("co"),
-    @XmlEnumValue("cs")
-    CS("cs"),
-    @XmlEnumValue("cy")
-    CY("cy"),
-    @XmlEnumValue("da")
-    DA("da"),
-    @XmlEnumValue("de")
-    DE("de"),
-    @XmlEnumValue("el")
-    EL("el"),
-    @XmlEnumValue("en")
-    EN("en"),
-    @XmlEnumValue("es")
-    ES("es"),
-    @XmlEnumValue("et")
-    ET("et"),
-    @XmlEnumValue("eu")
-    EU("eu"),
-    @XmlEnumValue("fa")
-    FA("fa"),
-    @XmlEnumValue("fi")
-    FI("fi"),
-    @XmlEnumValue("fj")
-    FJ("fj"),
-    @XmlEnumValue("fo")
-    FO("fo"),
-    @XmlEnumValue("fr")
-    FR("fr"),
-    @XmlEnumValue("fy")
-    FY("fy"),
-    @XmlEnumValue("ga")
-    GA("ga"),
-    @XmlEnumValue("gd")
-    GD("gd"),
-    @XmlEnumValue("gl")
-    GL("gl"),
-    @XmlEnumValue("gv")
-    GV("gv"),
-    @XmlEnumValue("grc")
-    GRC("grc"),
-    @XmlEnumValue("gsw")
-    GSW("gsw"),
-    @XmlEnumValue("he")
-    HE("he"),
-    @XmlEnumValue("hi")
-    HI("hi"),
-    @XmlEnumValue("hr")
-    HR("hr"),
-    @XmlEnumValue("ht")
-    HT("ht"),
-    @XmlEnumValue("hu")
-    HU("hu"),
-    @XmlEnumValue("hy")
-    HY("hy"),
-    @XmlEnumValue("id")
-    ID("id"),
-    @XmlEnumValue("is")
-    IS("is"),
-    @XmlEnumValue("it")
-    IT("it"),
-    @XmlEnumValue("ja")
-    JA("ja"),
-    @XmlEnumValue("jv")
-    JV("jv"),
-    @XmlEnumValue("ka")
-    KA("ka"),
-    @XmlEnumValue("kg")
-    KG("kg"),
-    @XmlEnumValue("ko")
-    KO("ko"),
-    @XmlEnumValue("ku")
-    KU("ku"),
-    @XmlEnumValue("kw")
-    KW("kw"),
-    @XmlEnumValue("ky")
-    KY("ky"),
-    @XmlEnumValue("lb")
-    LB("lb"),
-    @XmlEnumValue("li")
-    LI("li"),
-    @XmlEnumValue("ln")
-    LN("ln"),
-    @XmlEnumValue("lt")
-    LT("lt"),
-    @XmlEnumValue("lv")
-    LV("lv"),
-    @XmlEnumValue("mg")
-    MG("mg"),
-    @XmlEnumValue("mk")
-    MK("mk"),
-    @XmlEnumValue("mn")
-    MN("mn"),
-    @XmlEnumValue("mo")
-    MO("mo"),
-    @XmlEnumValue("ms")
-    MS("ms"),
-    @XmlEnumValue("mt")
-    MT("mt"),
-    @XmlEnumValue("my")
-    MY("my"),
-    @XmlEnumValue("nb")
-    NB("nb"),
-    @XmlEnumValue("ne")
-    NE("ne"),
-    @XmlEnumValue("nl")
-    NL("nl"),
-    @XmlEnumValue("nn")
-    NN("nn"),
-    @XmlEnumValue("no")
-    NO("no"),
-    @XmlEnumValue("pl")
-    PL("pl"),
-    @XmlEnumValue("pt")
-    PT("pt"),
-    @XmlEnumValue("rm")
-    RM("rm"),
-    @XmlEnumValue("ro")
-    RO("ro"),
-    @XmlEnumValue("ru")
-    RU("ru"),
-    @XmlEnumValue("sc")
-    SC("sc"),
-    @XmlEnumValue("se")
-    SE("se"),
-    @XmlEnumValue("sk")
-    SK("sk"),
-    @XmlEnumValue("sl")
-    SL("sl"),
-    @XmlEnumValue("so")
-    SO("so"),
-    @XmlEnumValue("sq")
-    SQ("sq"),
-    @XmlEnumValue("sr")
-    SR("sr"),
-    @XmlEnumValue("sv")
-    SV("sv"),
-    @XmlEnumValue("sw")
-    SW("sw"),
-    @XmlEnumValue("tk")
-    TK("tk"),
-    @XmlEnumValue("tr")
-    TR("tr"),
-    @XmlEnumValue("ty")
-    TY("ty"),
-    @XmlEnumValue("uk")
-    UK("uk"),
-    @XmlEnumValue("ur")
-    UR("ur"),
-    @XmlEnumValue("uz")
-    UZ("uz"),
-    @XmlEnumValue("vi")
-    VI("vi"),
-    @XmlEnumValue("yi")
-    YI("yi"),
-    @XmlEnumValue("zh")
-    ZH("zh"),
-    @XmlEnumValue("cu")
-    CU("cu"),
-    @XmlEnumValue("eo")
-    EO("eo"),
-    @XmlEnumValue("la")
-    LA("la"),
-    @XmlEnumValue("oc")
-    OC("oc"),
-    @XmlEnumValue("vo")
-    VO("vo");
-    private final String value;
+	@XmlEnumValue("ab")
+	AB("ab"), @XmlEnumValue("af")
+	AF("af"), @XmlEnumValue("an")
+	AN("an"), @XmlEnumValue("ar")
+	AR("ar"), @XmlEnumValue("as")
+	AS("as"), @XmlEnumValue("az")
+	AZ("az"), @XmlEnumValue("be")
+	BE("be"), @XmlEnumValue("bg")
+	BG("bg"), @XmlEnumValue("bn")
+	BN("bn"), @XmlEnumValue("bo")
+	BO("bo"), @XmlEnumValue("br")
+	BR("br"), @XmlEnumValue("bs")
+	BS("bs"), @XmlEnumValue("ca")
+	CA("ca"), @XmlEnumValue("ce")
+	CE("ce"), @XmlEnumValue("co")
+	CO("co"), @XmlEnumValue("cs")
+	CS("cs"), @XmlEnumValue("cy")
+	CY("cy"), @XmlEnumValue("da")
+	DA("da"), @XmlEnumValue("de")
+	DE("de"), @XmlEnumValue("el")
+	EL("el"), @XmlEnumValue("en")
+	EN("en"), @XmlEnumValue("es")
+	ES("es"), @XmlEnumValue("et")
+	ET("et"), @XmlEnumValue("eu")
+	EU("eu"), @XmlEnumValue("fa")
+	FA("fa"), @XmlEnumValue("fi")
+	FI("fi"), @XmlEnumValue("fj")
+	FJ("fj"), @XmlEnumValue("fo")
+	FO("fo"), @XmlEnumValue("fr")
+	FR("fr"), @XmlEnumValue("fy")
+	FY("fy"), @XmlEnumValue("ga")
+	GA("ga"), @XmlEnumValue("gd")
+	GD("gd"), @XmlEnumValue("gl")
+	GL("gl"), @XmlEnumValue("gv")
+	GV("gv"), @XmlEnumValue("grc")
+	GRC("grc"), @XmlEnumValue("gsw")
+	GSW("gsw"), @XmlEnumValue("he")
+	HE("he"), @XmlEnumValue("hi")
+	HI("hi"), @XmlEnumValue("hr")
+	HR("hr"), @XmlEnumValue("ht")
+	HT("ht"), @XmlEnumValue("hu")
+	HU("hu"), @XmlEnumValue("hy")
+	HY("hy"), @XmlEnumValue("id")
+	ID("id"), @XmlEnumValue("is")
+	IS("is"), @XmlEnumValue("it")
+	IT("it"), @XmlEnumValue("ja")
+	JA("ja"), @XmlEnumValue("jv")
+	JV("jv"), @XmlEnumValue("ka")
+	KA("ka"), @XmlEnumValue("kg")
+	KG("kg"), @XmlEnumValue("ko")
+	KO("ko"), @XmlEnumValue("ku")
+	KU("ku"), @XmlEnumValue("kw")
+	KW("kw"), @XmlEnumValue("ky")
+	KY("ky"), @XmlEnumValue("lb")
+	LB("lb"), @XmlEnumValue("li")
+	LI("li"), @XmlEnumValue("ln")
+	LN("ln"), @XmlEnumValue("lt")
+	LT("lt"), @XmlEnumValue("lv")
+	LV("lv"), @XmlEnumValue("mg")
+	MG("mg"), @XmlEnumValue("mk")
+	MK("mk"), @XmlEnumValue("mn")
+	MN("mn"), @XmlEnumValue("mo")
+	MO("mo"), @XmlEnumValue("ms")
+	MS("ms"), @XmlEnumValue("mt")
+	MT("mt"), @XmlEnumValue("my")
+	MY("my"), @XmlEnumValue("nb")
+	NB("nb"), @XmlEnumValue("ne")
+	NE("ne"), @XmlEnumValue("nl")
+	NL("nl"), @XmlEnumValue("nn")
+	NN("nn"), @XmlEnumValue("no")
+	NO("no"), @XmlEnumValue("pl")
+	PL("pl"), @XmlEnumValue("pt")
+	PT("pt"), @XmlEnumValue("rm")
+	RM("rm"), @XmlEnumValue("ro")
+	RO("ro"), @XmlEnumValue("ru")
+	RU("ru"), @XmlEnumValue("sc")
+	SC("sc"), @XmlEnumValue("se")
+	SE("se"), @XmlEnumValue("sk")
+	SK("sk"), @XmlEnumValue("sl")
+	SL("sl"), @XmlEnumValue("so")
+	SO("so"), @XmlEnumValue("sq")
+	SQ("sq"), @XmlEnumValue("sr")
+	SR("sr"), @XmlEnumValue("sv")
+	SV("sv"), @XmlEnumValue("sw")
+	SW("sw"), @XmlEnumValue("tk")
+	TK("tk"), @XmlEnumValue("tr")
+	TR("tr"), @XmlEnumValue("ty")
+	TY("ty"), @XmlEnumValue("uk")
+	UK("uk"), @XmlEnumValue("ur")
+	UR("ur"), @XmlEnumValue("uz")
+	UZ("uz"), @XmlEnumValue("vi")
+	VI("vi"), @XmlEnumValue("yi")
+	YI("yi"), @XmlEnumValue("zh")
+	ZH("zh"), @XmlEnumValue("cu")
+	CU("cu"), @XmlEnumValue("eo")
+	EO("eo"), @XmlEnumValue("la")
+	LA("la"), @XmlEnumValue("oc")
+	OC("oc"), @XmlEnumValue("vo")
+	VO("vo");
+	private final String value;
 
-    LanguageType(String v) {
-        value = v;
-    }
+	LanguageType(String v) {
+		value = v;
+	}
 
-    public String value() {
-        return value;
-    }
+	public String value() {
+		return value;
+	}
 
-    public static LanguageType fromValue(String v) {
-        for (LanguageType c: LanguageType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	public static LanguageType fromValue(String v) {
+		for (LanguageType c : LanguageType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguagesOfInstructionAndExaminationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguagesOfInstructionAndExaminationType.java
index 575d3b867..1bf2acba6 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguagesOfInstructionAndExaminationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguagesOfInstructionAndExaminationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.math.BigDecimal;
@@ -17,11 +16,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for LanguagesOfInstructionAndExaminationType complex type.
+ * <p>
+ * Java class for LanguagesOfInstructionAndExaminationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="LanguagesOfInstructionAndExaminationType">
@@ -49,179 +49,162 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "LanguagesOfInstructionAndExaminationType", propOrder = {
-    "language"
-})
+@XmlType(name = "LanguagesOfInstructionAndExaminationType", propOrder = { "language" })
 public class LanguagesOfInstructionAndExaminationType {
 
-    @XmlElement(name = "Language", required = true)
-    protected List<LanguagesOfInstructionAndExaminationType.Language> language;
-
-    /**
-     * Gets the value of the language property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the language property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getLanguage().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link LanguagesOfInstructionAndExaminationType.Language }
-     * 
-     * 
-     */
-    public List<LanguagesOfInstructionAndExaminationType.Language> getLanguage() {
-        if (language == null) {
-            language = new ArrayList<LanguagesOfInstructionAndExaminationType.Language>();
-        }
-        return this.language;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
-     *       &lt;attribute name="language" use="required" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguageType" />
-     *       &lt;attribute name="percent" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PercentType" />
-     *       &lt;attribute name="instruction" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
-     *       &lt;attribute name="examination" type="{http://www.w3.org/2001/XMLSchema}boolean" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class Language
-        extends RichTextTagType
-    {
-
-        @XmlAttribute(name = "language", required = true)
-        protected LanguageType language;
-        @XmlAttribute(name = "percent")
-        protected BigDecimal percent;
-        @XmlAttribute(name = "instruction")
-        protected Boolean instruction;
-        @XmlAttribute(name = "examination")
-        protected Boolean examination;
-
-        /**
-         * Gets the value of the language property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link LanguageType }
-         *     
-         */
-        public LanguageType getLanguage() {
-            return language;
-        }
-
-        /**
-         * Sets the value of the language property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link LanguageType }
-         *     
-         */
-        public void setLanguage(LanguageType value) {
-            this.language = value;
-        }
-
-        /**
-         * Gets the value of the percent property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public BigDecimal getPercent() {
-            return percent;
-        }
-
-        /**
-         * Sets the value of the percent property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link BigDecimal }
-         *     
-         */
-        public void setPercent(BigDecimal value) {
-            this.percent = value;
-        }
-
-        /**
-         * Gets the value of the instruction property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public boolean isInstruction() {
-            if (instruction == null) {
-                return true;
-            } else {
-                return instruction;
-            }
-        }
-
-        /**
-         * Sets the value of the instruction property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setInstruction(Boolean value) {
-            this.instruction = value;
-        }
-
-        /**
-         * Gets the value of the examination property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Boolean }
-         *     
-         */
-        public Boolean isExamination() {
-            return examination;
-        }
-
-        /**
-         * Sets the value of the examination property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Boolean }
-         *     
-         */
-        public void setExamination(Boolean value) {
-            this.examination = value;
-        }
-
-    }
+	@XmlElement(name = "Language", required = true)
+	protected List<LanguagesOfInstructionAndExaminationType.Language> language;
+
+	/**
+	 * Gets the value of the language property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the language property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getLanguage().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link LanguagesOfInstructionAndExaminationType.Language }
+	 * 
+	 * 
+	 */
+	public List<LanguagesOfInstructionAndExaminationType.Language> getLanguage() {
+		if (language == null) {
+			language = new ArrayList<LanguagesOfInstructionAndExaminationType.Language>();
+		}
+		return this.language;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType">
+	 *       &lt;attribute name="language" use="required" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguageType" />
+	 *       &lt;attribute name="percent" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PercentType" />
+	 *       &lt;attribute name="instruction" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+	 *       &lt;attribute name="examination" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class Language extends RichTextTagType {
+
+		@XmlAttribute(name = "language", required = true)
+		protected LanguageType language;
+		@XmlAttribute(name = "percent")
+		protected BigDecimal percent;
+		@XmlAttribute(name = "instruction")
+		protected Boolean instruction;
+		@XmlAttribute(name = "examination")
+		protected Boolean examination;
+
+		/**
+		 * Gets the value of the language property.
+		 * 
+		 * @return possible object is {@link LanguageType }
+		 * 
+		 */
+		public LanguageType getLanguage() {
+			return language;
+		}
+
+		/**
+		 * Sets the value of the language property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link LanguageType }
+		 * 
+		 */
+		public void setLanguage(LanguageType value) {
+			this.language = value;
+		}
+
+		/**
+		 * Gets the value of the percent property.
+		 * 
+		 * @return possible object is {@link BigDecimal }
+		 * 
+		 */
+		public BigDecimal getPercent() {
+			return percent;
+		}
+
+		/**
+		 * Sets the value of the percent property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link BigDecimal }
+		 * 
+		 */
+		public void setPercent(BigDecimal value) {
+			this.percent = value;
+		}
+
+		/**
+		 * Gets the value of the instruction property.
+		 * 
+		 * @return possible object is {@link Boolean }
+		 * 
+		 */
+		public boolean isInstruction() {
+			if (instruction == null) {
+				return true;
+			} else {
+				return instruction;
+			}
+		}
+
+		/**
+		 * Sets the value of the instruction property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Boolean }
+		 * 
+		 */
+		public void setInstruction(Boolean value) {
+			this.instruction = value;
+		}
+
+		/**
+		 * Gets the value of the examination property.
+		 * 
+		 * @return possible object is {@link Boolean }
+		 * 
+		 */
+		public Boolean isExamination() {
+			return examination;
+		}
+
+		/**
+		 * Sets the value of the examination property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Boolean }
+		 * 
+		 */
+		public void setExamination(Boolean value) {
+			this.examination = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LocalGradeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LocalGradeType.java
index de3b86c98..24582dc94 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LocalGradeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LocalGradeType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
- * <p>Java class for LocalGradeType complex type.
+ * <p>
+ * Java class for LocalGradeType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="LocalGradeType">
@@ -48,196 +48,172 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "LocalGradeType", propOrder = {
-    "academicYear",
-    "dateIssued",
-    "grade",
-    "source"
-})
+@XmlType(name = "LocalGradeType", propOrder = { "academicYear", "dateIssued", "grade", "source" })
 public class LocalGradeType {
 
-    @XmlElement(name = "AcademicYear")
-    protected String academicYear;
-    @XmlElement(name = "DateIssued")
-    protected XMLGregorianCalendar dateIssued;
-    @XmlElement(name = "Grade", required = true)
-    protected String grade;
-    @XmlElement(name = "Source")
-    protected LocalGradeType.Source source;
-
-    /**
-     * Gets the value of the academicYear property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAcademicYear() {
-        return academicYear;
-    }
-
-    /**
-     * Sets the value of the academicYear property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAcademicYear(String value) {
-        this.academicYear = value;
-    }
-
-    /**
-     * Gets the value of the dateIssued property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateIssued() {
-        return dateIssued;
-    }
-
-    /**
-     * Sets the value of the dateIssued property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateIssued(XMLGregorianCalendar value) {
-        this.dateIssued = value;
-    }
-
-    /**
-     * Gets the value of the grade property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGrade() {
-        return grade;
-    }
-
-    /**
-     * Sets the value of the grade property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGrade(String value) {
-        this.grade = value;
-    }
-
-    /**
-     * Gets the value of the source property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LocalGradeType.Source }
-     *     
-     */
-    public LocalGradeType.Source getSource() {
-        return source;
-    }
-
-    /**
-     * Sets the value of the source property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LocalGradeType.Source }
-     *     
-     */
-    public void setSource(LocalGradeType.Source value) {
-        this.source = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
-     *       &lt;attribute name="source" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}SourceGradeType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Source {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "source")
-        protected SourceGradeType source;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the source property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link SourceGradeType }
-         *     
-         */
-        public SourceGradeType getSource() {
-            return source;
-        }
-
-        /**
-         * Sets the value of the source property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link SourceGradeType }
-         *     
-         */
-        public void setSource(SourceGradeType value) {
-            this.source = value;
-        }
-
-    }
+	@XmlElement(name = "AcademicYear")
+	protected String academicYear;
+	@XmlElement(name = "DateIssued")
+	protected XMLGregorianCalendar dateIssued;
+	@XmlElement(name = "Grade", required = true)
+	protected String grade;
+	@XmlElement(name = "Source")
+	protected LocalGradeType.Source source;
+
+	/**
+	 * Gets the value of the academicYear property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAcademicYear() {
+		return academicYear;
+	}
+
+	/**
+	 * Sets the value of the academicYear property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAcademicYear(String value) {
+		this.academicYear = value;
+	}
+
+	/**
+	 * Gets the value of the dateIssued property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateIssued() {
+		return dateIssued;
+	}
+
+	/**
+	 * Sets the value of the dateIssued property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateIssued(XMLGregorianCalendar value) {
+		this.dateIssued = value;
+	}
+
+	/**
+	 * Gets the value of the grade property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getGrade() {
+		return grade;
+	}
+
+	/**
+	 * Sets the value of the grade property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setGrade(String value) {
+		this.grade = value;
+	}
+
+	/**
+	 * Gets the value of the source property.
+	 * 
+	 * @return possible object is {@link LocalGradeType.Source }
+	 * 
+	 */
+	public LocalGradeType.Source getSource() {
+		return source;
+	}
+
+	/**
+	 * Sets the value of the source property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link LocalGradeType.Source }
+	 * 
+	 */
+	public void setSource(LocalGradeType.Source value) {
+		this.source = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+	 *       &lt;attribute name="source" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}SourceGradeType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Source {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "source")
+		protected SourceGradeType source;
+
+		/**
+		 * Gets the value of the value property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the source property.
+		 * 
+		 * @return possible object is {@link SourceGradeType }
+		 * 
+		 */
+		public SourceGradeType getSource() {
+			return source;
+		}
+
+		/**
+		 * Sets the value of the source property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link SourceGradeType }
+		 * 
+		 */
+		public void setSource(SourceGradeType value) {
+			this.source = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MimeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MimeType.java
index 45a3bc403..c051cb2b4 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MimeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MimeType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for MimeType.
+ * <p>
+ * Java class for MimeType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="MimeType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -37,37 +38,31 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum MimeType {
 
-    @XmlEnumValue("image/gif")
-    IMAGE_GIF("image/gif"),
-    @XmlEnumValue("image/jpeg")
-    IMAGE_JPEG("image/jpeg"),
-    @XmlEnumValue("image/pjpeg")
-    IMAGE_PJPEG("image/pjpeg"),
-    @XmlEnumValue("image/png")
-    IMAGE_PNG("image/png"),
-    @XmlEnumValue("image/tiff")
-    IMAGE_TIFF("image/tiff"),
-    @XmlEnumValue("text/html")
-    TEXT_HTML("text/html"),
-    @XmlEnumValue("application/pdf")
-    APPLICATION_PDF("application/pdf");
-    private final String value;
+	@XmlEnumValue("image/gif")
+	IMAGE_GIF("image/gif"), @XmlEnumValue("image/jpeg")
+	IMAGE_JPEG("image/jpeg"), @XmlEnumValue("image/pjpeg")
+	IMAGE_PJPEG("image/pjpeg"), @XmlEnumValue("image/png")
+	IMAGE_PNG("image/png"), @XmlEnumValue("image/tiff")
+	IMAGE_TIFF("image/tiff"), @XmlEnumValue("text/html")
+	TEXT_HTML("text/html"), @XmlEnumValue("application/pdf")
+	APPLICATION_PDF("application/pdf");
+	private final String value;
 
-    MimeType(String v) {
-        value = v;
-    }
+	MimeType(String v) {
+		value = v;
+	}
 
-    public String value() {
-        return value;
-    }
+	public String value() {
+		return value;
+	}
 
-    public static MimeType fromValue(String v) {
-        for (MimeType c: MimeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	public static MimeType fromValue(String v) {
+		for (MimeType c : MimeType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCourseUnitType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCourseUnitType.java
index d254e5f4d..557473a0c 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCourseUnitType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCourseUnitType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.math.BigDecimal;
@@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
- * <p>Java class for MobilityProgrammeCourseUnitType complex type.
+ * <p>
+ * Java class for MobilityProgrammeCourseUnitType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="MobilityProgrammeCourseUnitType">
@@ -49,226 +49,199 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MobilityProgrammeCourseUnitType", propOrder = {
-    "code",
-    "title",
-    "ectsCredits",
-    "additionalInformation"
-})
+@XmlType(name = "MobilityProgrammeCourseUnitType", propOrder = { "code", "title", "ectsCredits", "additionalInformation" })
 public class MobilityProgrammeCourseUnitType {
 
-    @XmlElement(name = "Code")
-    protected String code;
-    @XmlElement(name = "Title", required = true)
-    protected MobilityProgrammeCourseUnitType.Title title;
-    @XmlElement(name = "ECTSCredits")
-    protected BigDecimal ectsCredits;
-    @XmlElement(name = "AdditionalInformation")
-    protected RichTextTagType additionalInformation;
-    @XmlAttribute(name = "isInTheLearningAgreement")
-    protected Boolean isInTheLearningAgreement;
-
-    /**
-     * Gets the value of the code property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCode() {
-        return code;
-    }
-
-    /**
-     * Sets the value of the code property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCode(String value) {
-        this.code = value;
-    }
-
-    /**
-     * Gets the value of the title property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MobilityProgrammeCourseUnitType.Title }
-     *     
-     */
-    public MobilityProgrammeCourseUnitType.Title getTitle() {
-        return title;
-    }
-
-    /**
-     * Sets the value of the title property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MobilityProgrammeCourseUnitType.Title }
-     *     
-     */
-    public void setTitle(MobilityProgrammeCourseUnitType.Title value) {
-        this.title = value;
-    }
-
-    /**
-     * Gets the value of the ectsCredits property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public BigDecimal getECTSCredits() {
-        return ectsCredits;
-    }
-
-    /**
-     * Sets the value of the ectsCredits property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigDecimal }
-     *     
-     */
-    public void setECTSCredits(BigDecimal value) {
-        this.ectsCredits = value;
-    }
-
-    /**
-     * Gets the value of the additionalInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAdditionalInformation() {
-        return additionalInformation;
-    }
-
-    /**
-     * Sets the value of the additionalInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAdditionalInformation(RichTextTagType value) {
-        this.additionalInformation = value;
-    }
-
-    /**
-     * Gets the value of the isInTheLearningAgreement property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Boolean }
-     *     
-     */
-    public boolean isIsInTheLearningAgreement() {
-        if (isInTheLearningAgreement == null) {
-            return true;
-        } else {
-            return isInTheLearningAgreement;
-        }
-    }
-
-    /**
-     * Sets the value of the isInTheLearningAgreement property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Boolean }
-     *     
-     */
-    public void setIsInTheLearningAgreement(Boolean value) {
-        this.isInTheLearningAgreement = value;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
-     *       &lt;attribute name="language" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguageType" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class Title {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "language")
-        protected LanguageType language;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the language property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link LanguageType }
-         *     
-         */
-        public LanguageType getLanguage() {
-            return language;
-        }
-
-        /**
-         * Sets the value of the language property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link LanguageType }
-         *     
-         */
-        public void setLanguage(LanguageType value) {
-            this.language = value;
-        }
-
-    }
+	@XmlElement(name = "Code")
+	protected String code;
+	@XmlElement(name = "Title", required = true)
+	protected MobilityProgrammeCourseUnitType.Title title;
+	@XmlElement(name = "ECTSCredits")
+	protected BigDecimal ectsCredits;
+	@XmlElement(name = "AdditionalInformation")
+	protected RichTextTagType additionalInformation;
+	@XmlAttribute(name = "isInTheLearningAgreement")
+	protected Boolean isInTheLearningAgreement;
+
+	/**
+	 * Gets the value of the code property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCode() {
+		return code;
+	}
+
+	/**
+	 * Sets the value of the code property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCode(String value) {
+		this.code = value;
+	}
+
+	/**
+	 * Gets the value of the title property.
+	 * 
+	 * @return possible object is {@link MobilityProgrammeCourseUnitType.Title }
+	 * 
+	 */
+	public MobilityProgrammeCourseUnitType.Title getTitle() {
+		return title;
+	}
+
+	/**
+	 * Sets the value of the title property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MobilityProgrammeCourseUnitType.Title }
+	 * 
+	 */
+	public void setTitle(MobilityProgrammeCourseUnitType.Title value) {
+		this.title = value;
+	}
+
+	/**
+	 * Gets the value of the ectsCredits property.
+	 * 
+	 * @return possible object is {@link BigDecimal }
+	 * 
+	 */
+	public BigDecimal getECTSCredits() {
+		return ectsCredits;
+	}
+
+	/**
+	 * Sets the value of the ectsCredits property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigDecimal }
+	 * 
+	 */
+	public void setECTSCredits(BigDecimal value) {
+		this.ectsCredits = value;
+	}
+
+	/**
+	 * Gets the value of the additionalInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAdditionalInformation() {
+		return additionalInformation;
+	}
+
+	/**
+	 * Sets the value of the additionalInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAdditionalInformation(RichTextTagType value) {
+		this.additionalInformation = value;
+	}
+
+	/**
+	 * Gets the value of the isInTheLearningAgreement property.
+	 * 
+	 * @return possible object is {@link Boolean }
+	 * 
+	 */
+	public boolean isIsInTheLearningAgreement() {
+		if (isInTheLearningAgreement == null) {
+			return true;
+		} else {
+			return isInTheLearningAgreement;
+		}
+	}
+
+	/**
+	 * Sets the value of the isInTheLearningAgreement property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link Boolean }
+	 * 
+	 */
+	public void setIsInTheLearningAgreement(Boolean value) {
+		this.isInTheLearningAgreement = value;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+	 *       &lt;attribute name="language" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguageType" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class Title {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "language")
+		protected LanguageType language;
+
+		/**
+		 * Gets the value of the value property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the language property.
+		 * 
+		 * @return possible object is {@link LanguageType }
+		 * 
+		 */
+		public LanguageType getLanguage() {
+			return language;
+		}
+
+		/**
+		 * Sets the value of the language property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link LanguageType }
+		 * 
+		 */
+		public void setLanguage(LanguageType value) {
+			this.language = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCoursesUnitsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCoursesUnitsType.java
index 1cc243487..63a4d0ecf 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCoursesUnitsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCoursesUnitsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for MobilityProgrammeCoursesUnitsType complex type.
+ * <p>
+ * Java class for MobilityProgrammeCoursesUnitsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="MobilityProgrammeCoursesUnitsType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MobilityProgrammeCoursesUnitsType", propOrder = {
-    "courseUnit"
-})
+@XmlType(name = "MobilityProgrammeCoursesUnitsType", propOrder = { "courseUnit" })
 public class MobilityProgrammeCoursesUnitsType {
 
-    @XmlElement(name = "CourseUnit", required = true)
-    protected List<MobilityProgrammeCourseUnitType> courseUnit;
+	@XmlElement(name = "CourseUnit", required = true)
+	protected List<MobilityProgrammeCourseUnitType> courseUnit;
 
-    /**
-     * Gets the value of the courseUnit property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the courseUnit property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getCourseUnit().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link MobilityProgrammeCourseUnitType }
-     * 
-     * 
-     */
-    public List<MobilityProgrammeCourseUnitType> getCourseUnit() {
-        if (courseUnit == null) {
-            courseUnit = new ArrayList<MobilityProgrammeCourseUnitType>();
-        }
-        return this.courseUnit;
-    }
+	/**
+	 * Gets the value of the courseUnit property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the courseUnit property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getCourseUnit().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link MobilityProgrammeCourseUnitType }
+	 * 
+	 * 
+	 */
+	public List<MobilityProgrammeCourseUnitType> getCourseUnit() {
+		if (courseUnit == null) {
+			courseUnit = new ArrayList<MobilityProgrammeCourseUnitType>();
+		}
+		return this.courseUnit;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeType.java
index 5ef23530a..dbb8bc284 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
- * <p>Java class for MobilityProgrammeType complex type.
+ * <p>
+ * Java class for MobilityProgrammeType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="MobilityProgrammeType">
@@ -42,225 +42,192 @@ import javax.xml.datatype.XMLGregorianCalendar;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MobilityProgrammeType", propOrder = {
-    "type",
-    "fieldOfStudy",
-    "country",
-    "receivingInstitutionName",
-    "academicYear",
-    "dateFrom",
-    "dateTo",
-    "coursesUnits"
-})
+@XmlType(name = "MobilityProgrammeType", propOrder = { "type", "fieldOfStudy", "country", "receivingInstitutionName", "academicYear", "dateFrom", "dateTo", "coursesUnits" })
 public class MobilityProgrammeType {
 
-    @XmlElement(name = "Type")
-    protected String type;
-    @XmlElement(name = "FieldOfStudy")
-    protected String fieldOfStudy;
-    @XmlElement(name = "Country", required = true)
-    protected CountryTextCodeType country;
-    @XmlElement(name = "ReceivingInstitutionName", required = true)
-    protected String receivingInstitutionName;
-    @XmlElement(name = "AcademicYear")
-    protected String academicYear;
-    @XmlElement(name = "DateFrom")
-    protected XMLGregorianCalendar dateFrom;
-    @XmlElement(name = "DateTo")
-    protected XMLGregorianCalendar dateTo;
-    @XmlElement(name = "CoursesUnits", required = true)
-    protected MobilityProgrammeCoursesUnitsType coursesUnits;
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
-
-    /**
-     * Gets the value of the fieldOfStudy property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getFieldOfStudy() {
-        return fieldOfStudy;
-    }
-
-    /**
-     * Sets the value of the fieldOfStudy property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setFieldOfStudy(String value) {
-        this.fieldOfStudy = value;
-    }
-
-    /**
-     * Gets the value of the country property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CountryTextCodeType }
-     *     
-     */
-    public CountryTextCodeType getCountry() {
-        return country;
-    }
-
-    /**
-     * Sets the value of the country property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CountryTextCodeType }
-     *     
-     */
-    public void setCountry(CountryTextCodeType value) {
-        this.country = value;
-    }
-
-    /**
-     * Gets the value of the receivingInstitutionName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReceivingInstitutionName() {
-        return receivingInstitutionName;
-    }
-
-    /**
-     * Sets the value of the receivingInstitutionName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReceivingInstitutionName(String value) {
-        this.receivingInstitutionName = value;
-    }
-
-    /**
-     * Gets the value of the academicYear property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAcademicYear() {
-        return academicYear;
-    }
-
-    /**
-     * Sets the value of the academicYear property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAcademicYear(String value) {
-        this.academicYear = value;
-    }
-
-    /**
-     * Gets the value of the dateFrom property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateFrom() {
-        return dateFrom;
-    }
-
-    /**
-     * Sets the value of the dateFrom property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateFrom(XMLGregorianCalendar value) {
-        this.dateFrom = value;
-    }
-
-    /**
-     * Gets the value of the dateTo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getDateTo() {
-        return dateTo;
-    }
-
-    /**
-     * Sets the value of the dateTo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setDateTo(XMLGregorianCalendar value) {
-        this.dateTo = value;
-    }
-
-    /**
-     * Gets the value of the coursesUnits property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MobilityProgrammeCoursesUnitsType }
-     *     
-     */
-    public MobilityProgrammeCoursesUnitsType getCoursesUnits() {
-        return coursesUnits;
-    }
-
-    /**
-     * Sets the value of the coursesUnits property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MobilityProgrammeCoursesUnitsType }
-     *     
-     */
-    public void setCoursesUnits(MobilityProgrammeCoursesUnitsType value) {
-        this.coursesUnits = value;
-    }
+	@XmlElement(name = "Type")
+	protected String type;
+	@XmlElement(name = "FieldOfStudy")
+	protected String fieldOfStudy;
+	@XmlElement(name = "Country", required = true)
+	protected CountryTextCodeType country;
+	@XmlElement(name = "ReceivingInstitutionName", required = true)
+	protected String receivingInstitutionName;
+	@XmlElement(name = "AcademicYear")
+	protected String academicYear;
+	@XmlElement(name = "DateFrom")
+	protected XMLGregorianCalendar dateFrom;
+	@XmlElement(name = "DateTo")
+	protected XMLGregorianCalendar dateTo;
+	@XmlElement(name = "CoursesUnits", required = true)
+	protected MobilityProgrammeCoursesUnitsType coursesUnits;
+
+	/**
+	 * Gets the value of the type property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Sets the value of the type property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setType(String value) {
+		this.type = value;
+	}
+
+	/**
+	 * Gets the value of the fieldOfStudy property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getFieldOfStudy() {
+		return fieldOfStudy;
+	}
+
+	/**
+	 * Sets the value of the fieldOfStudy property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setFieldOfStudy(String value) {
+		this.fieldOfStudy = value;
+	}
+
+	/**
+	 * Gets the value of the country property.
+	 * 
+	 * @return possible object is {@link CountryTextCodeType }
+	 * 
+	 */
+	public CountryTextCodeType getCountry() {
+		return country;
+	}
+
+	/**
+	 * Sets the value of the country property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CountryTextCodeType }
+	 * 
+	 */
+	public void setCountry(CountryTextCodeType value) {
+		this.country = value;
+	}
+
+	/**
+	 * Gets the value of the receivingInstitutionName property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getReceivingInstitutionName() {
+		return receivingInstitutionName;
+	}
+
+	/**
+	 * Sets the value of the receivingInstitutionName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setReceivingInstitutionName(String value) {
+		this.receivingInstitutionName = value;
+	}
+
+	/**
+	 * Gets the value of the academicYear property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAcademicYear() {
+		return academicYear;
+	}
+
+	/**
+	 * Sets the value of the academicYear property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAcademicYear(String value) {
+		this.academicYear = value;
+	}
+
+	/**
+	 * Gets the value of the dateFrom property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateFrom() {
+		return dateFrom;
+	}
+
+	/**
+	 * Sets the value of the dateFrom property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateFrom(XMLGregorianCalendar value) {
+		this.dateFrom = value;
+	}
+
+	/**
+	 * Gets the value of the dateTo property.
+	 * 
+	 * @return possible object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public XMLGregorianCalendar getDateTo() {
+		return dateTo;
+	}
+
+	/**
+	 * Sets the value of the dateTo property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link XMLGregorianCalendar }
+	 * 
+	 */
+	public void setDateTo(XMLGregorianCalendar value) {
+		this.dateTo = value;
+	}
+
+	/**
+	 * Gets the value of the coursesUnits property.
+	 * 
+	 * @return possible object is {@link MobilityProgrammeCoursesUnitsType }
+	 * 
+	 */
+	public MobilityProgrammeCoursesUnitsType getCoursesUnits() {
+		return coursesUnits;
+	}
+
+	/**
+	 * Sets the value of the coursesUnits property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link MobilityProgrammeCoursesUnitsType }
+	 * 
+	 */
+	public void setCoursesUnits(MobilityProgrammeCoursesUnitsType value) {
+		this.coursesUnits = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfDeliveryType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfDeliveryType.java
index bfff6cbda..1eca1ed60 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfDeliveryType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfDeliveryType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ModeOfDeliveryType.
+ * <p>
+ * Java class for ModeOfDeliveryType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="ModeOfDeliveryType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -33,29 +34,27 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum ModeOfDeliveryType {
 
-    @XmlEnumValue("FaceToFace")
-    FACE_TO_FACE("FaceToFace"),
-    @XmlEnumValue("DistanceLearning")
-    DISTANCE_LEARNING("DistanceLearning"),
-    @XmlEnumValue("Other")
-    OTHER("Other");
-    private final String value;
-
-    ModeOfDeliveryType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static ModeOfDeliveryType fromValue(String v) {
-        for (ModeOfDeliveryType c: ModeOfDeliveryType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	@XmlEnumValue("FaceToFace")
+	FACE_TO_FACE("FaceToFace"), @XmlEnumValue("DistanceLearning")
+	DISTANCE_LEARNING("DistanceLearning"), @XmlEnumValue("Other")
+	OTHER("Other");
+	private final String value;
+
+	ModeOfDeliveryType(String v) {
+		value = v;
+	}
+
+	public String value() {
+		return value;
+	}
+
+	public static ModeOfDeliveryType fromValue(String v) {
+		for (ModeOfDeliveryType c : ModeOfDeliveryType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfStudyType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfStudyType.java
index 4d9e43d8d..5a3b5a830 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfStudyType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfStudyType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ModeOfStudyType.
+ * <p>
+ * Java class for ModeOfStudyType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="ModeOfStudyType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -35,33 +36,29 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum ModeOfStudyType {
 
-    @XmlEnumValue("FullTime")
-    FULL_TIME("FullTime"),
-    @XmlEnumValue("ParTime")
-    PAR_TIME("ParTime"),
-    @XmlEnumValue("Distance")
-    DISTANCE("Distance"),
-    @XmlEnumValue("eLearning")
-    E_LEARNING("eLearning"),
-    @XmlEnumValue("Another")
-    ANOTHER("Another");
-    private final String value;
+	@XmlEnumValue("FullTime")
+	FULL_TIME("FullTime"), @XmlEnumValue("ParTime")
+	PAR_TIME("ParTime"), @XmlEnumValue("Distance")
+	DISTANCE("Distance"), @XmlEnumValue("eLearning")
+	E_LEARNING("eLearning"), @XmlEnumValue("Another")
+	ANOTHER("Another");
+	private final String value;
 
-    ModeOfStudyType(String v) {
-        value = v;
-    }
+	ModeOfStudyType(String v) {
+		value = v;
+	}
 
-    public String value() {
-        return value;
-    }
+	public String value() {
+		return value;
+	}
 
-    public static ModeOfStudyType fromValue(String v) {
-        for (ModeOfStudyType c: ModeOfStudyType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	public static ModeOfStudyType fromValue(String v) {
+		for (ModeOfStudyType c : ModeOfStudyType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MultilingualGeneralDiplomaType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MultilingualGeneralDiplomaType.java
index 7a3479a1f..7ffa2f2ea 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MultilingualGeneralDiplomaType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MultilingualGeneralDiplomaType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
 
-
 /**
- * <p>Java class for MultilingualGeneralDiplomaType complex type.
+ * <p>
+ * Java class for MultilingualGeneralDiplomaType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="MultilingualGeneralDiplomaType">
@@ -38,73 +38,66 @@ import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "MultilingualGeneralDiplomaType", propOrder = {
-    "generalDiploma",
-    "signature"
-})
+@XmlType(name = "MultilingualGeneralDiplomaType", propOrder = { "generalDiploma", "signature" })
 public class MultilingualGeneralDiplomaType {
 
-    @XmlElement(name = "GeneralDiploma", required = true)
-    protected List<GeneralDiplomaType> generalDiploma;
-    @XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
-    protected List<SignatureType> signature;
+	@XmlElement(name = "GeneralDiploma", required = true)
+	protected List<GeneralDiplomaType> generalDiploma;
+	@XmlElement(name = "Signature", namespace = "http://www.w3.org/2000/09/xmldsig#")
+	protected List<SignatureType> signature;
 
-    /**
-     * Gets the value of the generalDiploma property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the generalDiploma property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getGeneralDiploma().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link GeneralDiplomaType }
-     * 
-     * 
-     */
-    public List<GeneralDiplomaType> getGeneralDiploma() {
-        if (generalDiploma == null) {
-            generalDiploma = new ArrayList<GeneralDiplomaType>();
-        }
-        return this.generalDiploma;
-    }
+	/**
+	 * Gets the value of the generalDiploma property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the generalDiploma property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getGeneralDiploma().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link GeneralDiplomaType }
+	 * 
+	 * 
+	 */
+	public List<GeneralDiplomaType> getGeneralDiploma() {
+		if (generalDiploma == null) {
+			generalDiploma = new ArrayList<GeneralDiplomaType>();
+		}
+		return this.generalDiploma;
+	}
 
-    /**
-     * Gets the value of the signature property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signature property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignature().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignatureType }
-     * 
-     * 
-     */
-    public List<SignatureType> getSignature() {
-        if (signature == null) {
-            signature = new ArrayList<SignatureType>();
-        }
-        return this.signature;
-    }
+	/**
+	 * Gets the value of the signature property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the signature property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getSignature().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link SignatureType }
+	 * 
+	 * 
+	 */
+	public List<SignatureType> getSignature() {
+		if (signature == null) {
+			signature = new ArrayList<SignatureType>();
+		}
+		return this.signature;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfAwardingInstitutionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfAwardingInstitutionType.java
index 8662aef80..201efce45 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfAwardingInstitutionType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfAwardingInstitutionType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for NameAndStatusOfAwardingInstitutionType complex type.
+ * <p>
+ * Java class for NameAndStatusOfAwardingInstitutionType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="NameAndStatusOfAwardingInstitutionType">
@@ -45,98 +45,90 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "NameAndStatusOfAwardingInstitutionType", propOrder = {
-    "awardingInstitution"
-})
+@XmlType(name = "NameAndStatusOfAwardingInstitutionType", propOrder = { "awardingInstitution" })
 public class NameAndStatusOfAwardingInstitutionType {
 
-    @XmlElement(name = "AwardingInstitution", required = true)
-    protected List<NameAndStatusOfAwardingInstitutionType.AwardingInstitution> awardingInstitution;
-
-    /**
-     * Gets the value of the awardingInstitution property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the awardingInstitution property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAwardingInstitution().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution }
-     * 
-     * 
-     */
-    public List<NameAndStatusOfAwardingInstitutionType.AwardingInstitution> getAwardingInstitution() {
-        if (awardingInstitution == null) {
-            awardingInstitution = new ArrayList<NameAndStatusOfAwardingInstitutionType.AwardingInstitution>();
-        }
-        return this.awardingInstitution;
-    }
+	@XmlElement(name = "AwardingInstitution", required = true)
+	protected List<NameAndStatusOfAwardingInstitutionType.AwardingInstitution> awardingInstitution;
 
+	/**
+	 * Gets the value of the awardingInstitution property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the awardingInstitution property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getAwardingInstitution().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution }
+	 * 
+	 * 
+	 */
+	public List<NameAndStatusOfAwardingInstitutionType.AwardingInstitution> getAwardingInstitution() {
+		if (awardingInstitution == null) {
+			awardingInstitution = new ArrayList<NameAndStatusOfAwardingInstitutionType.AwardingInstitution>();
+		}
+		return this.awardingInstitution;
+	}
 
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InstitutionType">
-     *       &lt;attribute name="awardingInstitutionID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAW" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class AwardingInstitution
-        extends InstitutionType
-    {
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InstitutionType">
+	 *       &lt;attribute name="awardingInstitutionID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAW" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class AwardingInstitution extends InstitutionType {
 
-        @XmlAttribute(name = "awardingInstitutionID")
-        protected String awardingInstitutionID;
+		@XmlAttribute(name = "awardingInstitutionID")
+		protected String awardingInstitutionID;
 
-        /**
-         * Gets the value of the awardingInstitutionID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getAwardingInstitutionID() {
-            if (awardingInstitutionID == null) {
-                return "DEF-IAW";
-            } else {
-                return awardingInstitutionID;
-            }
-        }
+		/**
+		 * Gets the value of the awardingInstitutionID property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getAwardingInstitutionID() {
+			if (awardingInstitutionID == null) {
+				return "DEF-IAW";
+			} else {
+				return awardingInstitutionID;
+			}
+		}
 
-        /**
-         * Sets the value of the awardingInstitutionID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setAwardingInstitutionID(String value) {
-            this.awardingInstitutionID = value;
-        }
+		/**
+		 * Sets the value of the awardingInstitutionID property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setAwardingInstitutionID(String value) {
+			this.awardingInstitutionID = value;
+		}
 
-    }
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfInstitutionAdministeringStudiesType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfInstitutionAdministeringStudiesType.java
index 2ab19b491..c9e07208c 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfInstitutionAdministeringStudiesType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfInstitutionAdministeringStudiesType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -16,11 +15,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for NameAndStatusOfInstitutionAdministeringStudiesType complex type.
+ * <p>
+ * Java class for NameAndStatusOfInstitutionAdministeringStudiesType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="NameAndStatusOfInstitutionAdministeringStudiesType">
@@ -45,98 +45,90 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "NameAndStatusOfInstitutionAdministeringStudiesType", propOrder = {
-    "institutionAdministeringStudies"
-})
+@XmlType(name = "NameAndStatusOfInstitutionAdministeringStudiesType", propOrder = { "institutionAdministeringStudies" })
 public class NameAndStatusOfInstitutionAdministeringStudiesType {
 
-    @XmlElement(name = "InstitutionAdministeringStudies", required = true)
-    protected List<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies> institutionAdministeringStudies;
-
-    /**
-     * Gets the value of the institutionAdministeringStudies property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the institutionAdministeringStudies property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getInstitutionAdministeringStudies().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies }
-     * 
-     * 
-     */
-    public List<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies> getInstitutionAdministeringStudies() {
-        if (institutionAdministeringStudies == null) {
-            institutionAdministeringStudies = new ArrayList<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies>();
-        }
-        return this.institutionAdministeringStudies;
-    }
+	@XmlElement(name = "InstitutionAdministeringStudies", required = true)
+	protected List<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies> institutionAdministeringStudies;
 
+	/**
+	 * Gets the value of the institutionAdministeringStudies property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the institutionAdministeringStudies property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getInstitutionAdministeringStudies().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies }
+	 * 
+	 * 
+	 */
+	public List<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies> getInstitutionAdministeringStudies() {
+		if (institutionAdministeringStudies == null) {
+			institutionAdministeringStudies = new ArrayList<NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies>();
+		}
+		return this.institutionAdministeringStudies;
+	}
 
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;complexContent>
-     *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InstitutionType">
-     *       &lt;attribute name="institutionAdministeringStudiesID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAS" />
-     *     &lt;/extension>
-     *   &lt;/complexContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "")
-    public static class InstitutionAdministeringStudies
-        extends InstitutionType
-    {
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;complexContent>
+	 *     &lt;extension base="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InstitutionType">
+	 *       &lt;attribute name="institutionAdministeringStudiesID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAS" />
+	 *     &lt;/extension>
+	 *   &lt;/complexContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "")
+	public static class InstitutionAdministeringStudies extends InstitutionType {
 
-        @XmlAttribute(name = "institutionAdministeringStudiesID")
-        protected String institutionAdministeringStudiesID;
+		@XmlAttribute(name = "institutionAdministeringStudiesID")
+		protected String institutionAdministeringStudiesID;
 
-        /**
-         * Gets the value of the institutionAdministeringStudiesID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getInstitutionAdministeringStudiesID() {
-            if (institutionAdministeringStudiesID == null) {
-                return "DEF-IAS";
-            } else {
-                return institutionAdministeringStudiesID;
-            }
-        }
+		/**
+		 * Gets the value of the institutionAdministeringStudiesID property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getInstitutionAdministeringStudiesID() {
+			if (institutionAdministeringStudiesID == null) {
+				return "DEF-IAS";
+			} else {
+				return institutionAdministeringStudiesID;
+			}
+		}
 
-        /**
-         * Sets the value of the institutionAdministeringStudiesID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setInstitutionAdministeringStudiesID(String value) {
-            this.institutionAdministeringStudiesID = value;
-        }
+		/**
+		 * Sets the value of the institutionAdministeringStudiesID property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setInstitutionAdministeringStudiesID(String value) {
+			this.institutionAdministeringStudiesID = value;
+		}
 
-    }
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ObjectFactory.java
index 699ca76c7..3e2bbe5c0 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ObjectFactory.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ObjectFactory.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.JAXBElement;
@@ -13,620 +12,612 @@ import javax.xml.bind.annotation.XmlElementDecl;
 import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
-
 /**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the eu.stork.names.tc.stork._2_0.academic.generaldiploma package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
+ * This object contains factory methods for each Java content interface and Java element interface generated in the eu.stork.names.tc.stork._2_0.academic.generaldiploma package.
+ * <p>
+ * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist of schema derived interfaces
+ * and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of these are provided in this class.
  * 
  */
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _MultilingualGeneralDiploma_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "MultilingualGeneralDiploma");
-    private final static QName _GeneralDiploma_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "GeneralDiploma");
-    private final static QName _RichTextTagTypeBreakLine_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "BreakLine");
-    private final static QName _RichTextTagTypeAttachedRef_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "AttachedRef");
-    private final static QName _RichTextTagTypeItalic_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Italic");
-    private final static QName _RichTextTagTypeUnderline_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Underline");
-    private final static QName _RichTextTagTypeBold_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Bold");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.names.tc.stork._2_0.academic.generaldiploma
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link LanguagesOfInstructionAndExaminationType }
-     * 
-     */
-    public LanguagesOfInstructionAndExaminationType createLanguagesOfInstructionAndExaminationType() {
-        return new LanguagesOfInstructionAndExaminationType();
-    }
-
-    /**
-     * Create an instance of {@link RichTextTagType }
-     * 
-     */
-    public RichTextTagType createRichTextTagType() {
-        return new RichTextTagType();
-    }
-
-    /**
-     * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType }
-     * 
-     */
-    public NameAndStatusOfInstitutionAdministeringStudiesType createNameAndStatusOfInstitutionAdministeringStudiesType() {
-        return new NameAndStatusOfInstitutionAdministeringStudiesType();
-    }
-
-    /**
-     * Create an instance of {@link InstitutionType }
-     * 
-     */
-    public InstitutionType createInstitutionType() {
-        return new InstitutionType();
-    }
-
-    /**
-     * Create an instance of {@link MobilityProgrammeCourseUnitType }
-     * 
-     */
-    public MobilityProgrammeCourseUnitType createMobilityProgrammeCourseUnitType() {
-        return new MobilityProgrammeCourseUnitType();
-    }
-
-    /**
-     * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType }
-     * 
-     */
-    public InformationIdentifyingTheHolderOfTheQualificationType createInformationIdentifyingTheHolderOfTheQualificationType() {
-        return new InformationIdentifyingTheHolderOfTheQualificationType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitType }
-     * 
-     */
-    public CourseUnitType createCourseUnitType() {
-        return new CourseUnitType();
-    }
-
-    /**
-     * Create an instance of {@link LocalGradeType }
-     * 
-     */
-    public LocalGradeType createLocalGradeType() {
-        return new LocalGradeType();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheContentsAndResultsGainedType }
-     * 
-     */
-    public InformationOnTheContentsAndResultsGainedType createInformationOnTheContentsAndResultsGainedType() {
-        return new InformationOnTheContentsAndResultsGainedType();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheLevelOfTheQualificationType }
-     * 
-     */
-    public InformationOnTheLevelOfTheQualificationType createInformationOnTheLevelOfTheQualificationType() {
-        return new InformationOnTheLevelOfTheQualificationType();
-    }
-
-    /**
-     * Create an instance of {@link NameAndStatusOfAwardingInstitutionType }
-     * 
-     */
-    public NameAndStatusOfAwardingInstitutionType createNameAndStatusOfAwardingInstitutionType() {
-        return new NameAndStatusOfAwardingInstitutionType();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType }
-     * 
-     */
-    public InformationOnTheFunctionOfTheQualificationType createInformationOnTheFunctionOfTheQualificationType() {
-        return new InformationOnTheFunctionOfTheQualificationType();
-    }
-
-    /**
-     * Create an instance of {@link MultilingualGeneralDiplomaType }
-     * 
-     */
-    public MultilingualGeneralDiplomaType createMultilingualGeneralDiplomaType() {
-        return new MultilingualGeneralDiplomaType();
-    }
-
-    /**
-     * Create an instance of {@link GeneralDiplomaType }
-     * 
-     */
-    public GeneralDiplomaType createGeneralDiplomaType() {
-        return new GeneralDiplomaType();
-    }
-
-    /**
-     * Create an instance of {@link ExtensionContentType }
-     * 
-     */
-    public ExtensionContentType createExtensionContentType() {
-        return new ExtensionContentType();
-    }
-
-    /**
-     * Create an instance of {@link CountryTextCodeType }
-     * 
-     */
-    public CountryTextCodeType createCountryTextCodeType() {
-        return new CountryTextCodeType();
-    }
-
-    /**
-     * Create an instance of {@link AttachedImageURLType }
-     * 
-     */
-    public AttachedImageURLType createAttachedImageURLType() {
-        return new AttachedImageURLType();
-    }
-
-    /**
-     * Create an instance of {@link CourseStructureDiagramType }
-     * 
-     */
-    public CourseStructureDiagramType createCourseStructureDiagramType() {
-        return new CourseStructureDiagramType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitWorkPlacementType }
-     * 
-     */
-    public CourseUnitWorkPlacementType createCourseUnitWorkPlacementType() {
-        return new CourseUnitWorkPlacementType();
-    }
-
-    /**
-     * Create an instance of {@link InformationIdentifyingTheQualificationType }
-     * 
-     */
-    public InformationIdentifyingTheQualificationType createInformationIdentifyingTheQualificationType() {
-        return new InformationIdentifyingTheQualificationType();
-    }
-
-    /**
-     * Create an instance of {@link MobilityProgrammeCoursesUnitsType }
-     * 
-     */
-    public MobilityProgrammeCoursesUnitsType createMobilityProgrammeCoursesUnitsType() {
-        return new MobilityProgrammeCoursesUnitsType();
-    }
-
-    /**
-     * Create an instance of {@link QualificationType }
-     * 
-     */
-    public QualificationType createQualificationType() {
-        return new QualificationType();
-    }
-
-    /**
-     * Create an instance of {@link CertificationOfTheSupplementType }
-     * 
-     */
-    public CertificationOfTheSupplementType createCertificationOfTheSupplementType() {
-        return new CertificationOfTheSupplementType();
-    }
-
-    /**
-     * Create an instance of {@link AttachedFileURLType }
-     * 
-     */
-    public AttachedFileURLType createAttachedFileURLType() {
-        return new AttachedFileURLType();
-    }
-
-    /**
-     * Create an instance of {@link ProgrammeRequirementsType }
-     * 
-     */
-    public ProgrammeRequirementsType createProgrammeRequirementsType() {
-        return new ProgrammeRequirementsType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitWorkPlacementsType }
-     * 
-     */
-    public CourseUnitWorkPlacementsType createCourseUnitWorkPlacementsType() {
-        return new CourseUnitWorkPlacementsType();
-    }
-
-    /**
-     * Create an instance of {@link AdditionalInformationType }
-     * 
-     */
-    public AdditionalInformationType createAdditionalInformationType() {
-        return new AdditionalInformationType();
-    }
-
-    /**
-     * Create an instance of {@link GradingSchemeAndGradeDistributionGuidanceType }
-     * 
-     */
-    public GradingSchemeAndGradeDistributionGuidanceType createGradingSchemeAndGradeDistributionGuidanceType() {
-        return new GradingSchemeAndGradeDistributionGuidanceType();
-    }
-
-    /**
-     * Create an instance of {@link AttachmentsType }
-     * 
-     */
-    public AttachmentsType createAttachmentsType() {
-        return new AttachmentsType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitLanguageOfInstructionType }
-     * 
-     */
-    public CourseUnitLanguageOfInstructionType createCourseUnitLanguageOfInstructionType() {
-        return new CourseUnitLanguageOfInstructionType();
-    }
-
-    /**
-     * Create an instance of {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
-     * 
-     */
-    public CoursesAttendedInOtherInstitutionInMobilityProgramsType createCoursesAttendedInOtherInstitutionInMobilityProgramsType() {
-        return new CoursesAttendedInOtherInstitutionInMobilityProgramsType();
-    }
-
-    /**
-     * Create an instance of {@link FamilyNameType }
-     * 
-     */
-    public FamilyNameType createFamilyNameType() {
-        return new FamilyNameType();
-    }
-
-    /**
-     * Create an instance of {@link CoursesGroupsType }
-     * 
-     */
-    public CoursesGroupsType createCoursesGroupsType() {
-        return new CoursesGroupsType();
-    }
-
-    /**
-     * Create an instance of {@link TitleConferredType }
-     * 
-     */
-    public TitleConferredType createTitleConferredType() {
-        return new TitleConferredType();
-    }
-
-    /**
-     * Create an instance of {@link OfficialStampType }
-     * 
-     */
-    public OfficialStampType createOfficialStampType() {
-        return new OfficialStampType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitStudentPerformanceType }
-     * 
-     */
-    public CourseUnitStudentPerformanceType createCourseUnitStudentPerformanceType() {
-        return new CourseUnitStudentPerformanceType();
-    }
-
-    /**
-     * Create an instance of {@link GivenNameType }
-     * 
-     */
-    public GivenNameType createGivenNameType() {
-        return new GivenNameType();
-    }
-
-    /**
-     * Create an instance of {@link CoursesUnitsType }
-     * 
-     */
-    public CoursesUnitsType createCoursesUnitsType() {
-        return new CoursesUnitsType();
-    }
-
-    /**
-     * Create an instance of {@link MobilityProgrammeType }
-     * 
-     */
-    public MobilityProgrammeType createMobilityProgrammeType() {
-        return new MobilityProgrammeType();
-    }
-
-    /**
-     * Create an instance of {@link ProgrammeDetailsType }
-     * 
-     */
-    public ProgrammeDetailsType createProgrammeDetailsType() {
-        return new ProgrammeDetailsType();
-    }
-
-    /**
-     * Create an instance of {@link OfficialCertifyingType }
-     * 
-     */
-    public OfficialCertifyingType createOfficialCertifyingType() {
-        return new OfficialCertifyingType();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitLanguagesOfInstructionType }
-     * 
-     */
-    public CourseUnitLanguagesOfInstructionType createCourseUnitLanguagesOfInstructionType() {
-        return new CourseUnitLanguagesOfInstructionType();
-    }
-
-    /**
-     * Create an instance of {@link AttachedImageDataType }
-     * 
-     */
-    public AttachedImageDataType createAttachedImageDataType() {
-        return new AttachedImageDataType();
-    }
-
-    /**
-     * Create an instance of {@link AttachedType }
-     * 
-     */
-    public AttachedType createAttachedType() {
-        return new AttachedType();
-    }
-
-    /**
-     * Create an instance of {@link CoursesGroupType }
-     * 
-     */
-    public CoursesGroupType createCoursesGroupType() {
-        return new CoursesGroupType();
-    }
-
-    /**
-     * Create an instance of {@link AddressType }
-     * 
-     */
-    public AddressType createAddressType() {
-        return new AddressType();
-    }
-
-    /**
-     * Create an instance of {@link AttachedFileDataType }
-     * 
-     */
-    public AttachedFileDataType createAttachedFileDataType() {
-        return new AttachedFileDataType();
-    }
-
-    /**
-     * Create an instance of {@link ContactInformationType }
-     * 
-     */
-    public ContactInformationType createContactInformationType() {
-        return new ContactInformationType();
-    }
-
-    /**
-     * Create an instance of {@link OfficialsCertifyingType }
-     * 
-     */
-    public OfficialsCertifyingType createOfficialsCertifyingType() {
-        return new OfficialsCertifyingType();
-    }
-
-    /**
-     * Create an instance of {@link LanguagesOfInstructionAndExaminationType.Language }
-     * 
-     */
-    public LanguagesOfInstructionAndExaminationType.Language createLanguagesOfInstructionAndExaminationTypeLanguage() {
-        return new LanguagesOfInstructionAndExaminationType.Language();
-    }
-
-    /**
-     * Create an instance of {@link RichTextTagType.AttachedRef }
-     * 
-     */
-    public RichTextTagType.AttachedRef createRichTextTagTypeAttachedRef() {
-        return new RichTextTagType.AttachedRef();
-    }
-
-    /**
-     * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies }
-     * 
-     */
-    public NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies createNameAndStatusOfInstitutionAdministeringStudiesTypeInstitutionAdministeringStudies() {
-        return new NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies();
-    }
-
-    /**
-     * Create an instance of {@link InstitutionType.AttachedImageRef }
-     * 
-     */
-    public InstitutionType.AttachedImageRef createInstitutionTypeAttachedImageRef() {
-        return new InstitutionType.AttachedImageRef();
-    }
-
-    /**
-     * Create an instance of {@link MobilityProgrammeCourseUnitType.Title }
-     * 
-     */
-    public MobilityProgrammeCourseUnitType.Title createMobilityProgrammeCourseUnitTypeTitle() {
-        return new MobilityProgrammeCourseUnitType.Title();
-    }
-
-    /**
-     * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
-     * 
-     */
-    public InformationIdentifyingTheHolderOfTheQualificationType.Gender createInformationIdentifyingTheHolderOfTheQualificationTypeGender() {
-        return new InformationIdentifyingTheHolderOfTheQualificationType.Gender();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitType.Type }
-     * 
-     */
-    public CourseUnitType.Type createCourseUnitTypeType() {
-        return new CourseUnitType.Type();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitType.YearOfStudy }
-     * 
-     */
-    public CourseUnitType.YearOfStudy createCourseUnitTypeYearOfStudy() {
-        return new CourseUnitType.YearOfStudy();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitType.Level }
-     * 
-     */
-    public CourseUnitType.Level createCourseUnitTypeLevel() {
-        return new CourseUnitType.Level();
-    }
-
-    /**
-     * Create an instance of {@link CourseUnitType.ModeOfDelivery }
-     * 
-     */
-    public CourseUnitType.ModeOfDelivery createCourseUnitTypeModeOfDelivery() {
-        return new CourseUnitType.ModeOfDelivery();
-    }
-
-    /**
-     * Create an instance of {@link LocalGradeType.Source }
-     * 
-     */
-    public LocalGradeType.Source createLocalGradeTypeSource() {
-        return new LocalGradeType.Source();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
-     * 
-     */
-    public InformationOnTheContentsAndResultsGainedType.ModeOfStudy createInformationOnTheContentsAndResultsGainedTypeModeOfStudy() {
-        return new InformationOnTheContentsAndResultsGainedType.ModeOfStudy();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.Level }
-     * 
-     */
-    public InformationOnTheLevelOfTheQualificationType.Level createInformationOnTheLevelOfTheQualificationTypeLevel() {
-        return new InformationOnTheLevelOfTheQualificationType.Level();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
-     * 
-     */
-    public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme createInformationOnTheLevelOfTheQualificationTypeOfficialLengthOfProgramme() {
-        return new InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme();
-    }
-
-    /**
-     * Create an instance of {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution }
-     * 
-     */
-    public NameAndStatusOfAwardingInstitutionType.AwardingInstitution createNameAndStatusOfAwardingInstitutionTypeAwardingInstitution() {
-        return new NameAndStatusOfAwardingInstitutionType.AwardingInstitution();
-    }
-
-    /**
-     * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
-     * 
-     */
-    public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus createInformationOnTheFunctionOfTheQualificationTypeProfessionalStatus() {
-        return new InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link MultilingualGeneralDiplomaType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "MultilingualGeneralDiploma")
-    public JAXBElement<MultilingualGeneralDiplomaType> createMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) {
-        return new JAXBElement<MultilingualGeneralDiplomaType>(_MultilingualGeneralDiploma_QNAME, MultilingualGeneralDiplomaType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GeneralDiplomaType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "GeneralDiploma")
-    public JAXBElement<GeneralDiplomaType> createGeneralDiploma(GeneralDiplomaType value) {
-        return new JAXBElement<GeneralDiplomaType>(_GeneralDiploma_QNAME, GeneralDiplomaType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "BreakLine", scope = RichTextTagType.class)
-    public JAXBElement<String> createRichTextTagTypeBreakLine(String value) {
-        return new JAXBElement<String>(_RichTextTagTypeBreakLine_QNAME, String.class, RichTextTagType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "AttachedRef", scope = RichTextTagType.class)
-    public JAXBElement<RichTextTagType.AttachedRef> createRichTextTagTypeAttachedRef(RichTextTagType.AttachedRef value) {
-        return new JAXBElement<RichTextTagType.AttachedRef>(_RichTextTagTypeAttachedRef_QNAME, RichTextTagType.AttachedRef.class, RichTextTagType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Italic", scope = RichTextTagType.class)
-    public JAXBElement<String> createRichTextTagTypeItalic(String value) {
-        return new JAXBElement<String>(_RichTextTagTypeItalic_QNAME, String.class, RichTextTagType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Underline", scope = RichTextTagType.class)
-    public JAXBElement<String> createRichTextTagTypeUnderline(String value) {
-        return new JAXBElement<String>(_RichTextTagTypeUnderline_QNAME, String.class, RichTextTagType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Bold", scope = RichTextTagType.class)
-    public JAXBElement<String> createRichTextTagTypeBold(String value) {
-        return new JAXBElement<String>(_RichTextTagTypeBold_QNAME, String.class, RichTextTagType.class, value);
-    }
+	private final static QName _MultilingualGeneralDiploma_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "MultilingualGeneralDiploma");
+	private final static QName _GeneralDiploma_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "GeneralDiploma");
+	private final static QName _RichTextTagTypeBreakLine_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "BreakLine");
+	private final static QName _RichTextTagTypeAttachedRef_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "AttachedRef");
+	private final static QName _RichTextTagTypeItalic_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Italic");
+	private final static QName _RichTextTagTypeUnderline_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Underline");
+	private final static QName _RichTextTagTypeBold_QNAME = new QName("urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", "Bold");
+
+	/**
+	 * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.names.tc.stork._2_0.academic.generaldiploma
+	 * 
+	 */
+	public ObjectFactory() {
+	}
+
+	/**
+	 * Create an instance of {@link LanguagesOfInstructionAndExaminationType }
+	 * 
+	 */
+	public LanguagesOfInstructionAndExaminationType createLanguagesOfInstructionAndExaminationType() {
+		return new LanguagesOfInstructionAndExaminationType();
+	}
+
+	/**
+	 * Create an instance of {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType createRichTextTagType() {
+		return new RichTextTagType();
+	}
+
+	/**
+	 * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType }
+	 * 
+	 */
+	public NameAndStatusOfInstitutionAdministeringStudiesType createNameAndStatusOfInstitutionAdministeringStudiesType() {
+		return new NameAndStatusOfInstitutionAdministeringStudiesType();
+	}
+
+	/**
+	 * Create an instance of {@link InstitutionType }
+	 * 
+	 */
+	public InstitutionType createInstitutionType() {
+		return new InstitutionType();
+	}
+
+	/**
+	 * Create an instance of {@link MobilityProgrammeCourseUnitType }
+	 * 
+	 */
+	public MobilityProgrammeCourseUnitType createMobilityProgrammeCourseUnitType() {
+		return new MobilityProgrammeCourseUnitType();
+	}
+
+	/**
+	 * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType }
+	 * 
+	 */
+	public InformationIdentifyingTheHolderOfTheQualificationType createInformationIdentifyingTheHolderOfTheQualificationType() {
+		return new InformationIdentifyingTheHolderOfTheQualificationType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitType }
+	 * 
+	 */
+	public CourseUnitType createCourseUnitType() {
+		return new CourseUnitType();
+	}
+
+	/**
+	 * Create an instance of {@link LocalGradeType }
+	 * 
+	 */
+	public LocalGradeType createLocalGradeType() {
+		return new LocalGradeType();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheContentsAndResultsGainedType }
+	 * 
+	 */
+	public InformationOnTheContentsAndResultsGainedType createInformationOnTheContentsAndResultsGainedType() {
+		return new InformationOnTheContentsAndResultsGainedType();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheLevelOfTheQualificationType }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType createInformationOnTheLevelOfTheQualificationType() {
+		return new InformationOnTheLevelOfTheQualificationType();
+	}
+
+	/**
+	 * Create an instance of {@link NameAndStatusOfAwardingInstitutionType }
+	 * 
+	 */
+	public NameAndStatusOfAwardingInstitutionType createNameAndStatusOfAwardingInstitutionType() {
+		return new NameAndStatusOfAwardingInstitutionType();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType }
+	 * 
+	 */
+	public InformationOnTheFunctionOfTheQualificationType createInformationOnTheFunctionOfTheQualificationType() {
+		return new InformationOnTheFunctionOfTheQualificationType();
+	}
+
+	/**
+	 * Create an instance of {@link MultilingualGeneralDiplomaType }
+	 * 
+	 */
+	public MultilingualGeneralDiplomaType createMultilingualGeneralDiplomaType() {
+		return new MultilingualGeneralDiplomaType();
+	}
+
+	/**
+	 * Create an instance of {@link GeneralDiplomaType }
+	 * 
+	 */
+	public GeneralDiplomaType createGeneralDiplomaType() {
+		return new GeneralDiplomaType();
+	}
+
+	/**
+	 * Create an instance of {@link ExtensionContentType }
+	 * 
+	 */
+	public ExtensionContentType createExtensionContentType() {
+		return new ExtensionContentType();
+	}
+
+	/**
+	 * Create an instance of {@link CountryTextCodeType }
+	 * 
+	 */
+	public CountryTextCodeType createCountryTextCodeType() {
+		return new CountryTextCodeType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachedImageURLType }
+	 * 
+	 */
+	public AttachedImageURLType createAttachedImageURLType() {
+		return new AttachedImageURLType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseStructureDiagramType }
+	 * 
+	 */
+	public CourseStructureDiagramType createCourseStructureDiagramType() {
+		return new CourseStructureDiagramType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitWorkPlacementType }
+	 * 
+	 */
+	public CourseUnitWorkPlacementType createCourseUnitWorkPlacementType() {
+		return new CourseUnitWorkPlacementType();
+	}
+
+	/**
+	 * Create an instance of {@link InformationIdentifyingTheQualificationType }
+	 * 
+	 */
+	public InformationIdentifyingTheQualificationType createInformationIdentifyingTheQualificationType() {
+		return new InformationIdentifyingTheQualificationType();
+	}
+
+	/**
+	 * Create an instance of {@link MobilityProgrammeCoursesUnitsType }
+	 * 
+	 */
+	public MobilityProgrammeCoursesUnitsType createMobilityProgrammeCoursesUnitsType() {
+		return new MobilityProgrammeCoursesUnitsType();
+	}
+
+	/**
+	 * Create an instance of {@link QualificationType }
+	 * 
+	 */
+	public QualificationType createQualificationType() {
+		return new QualificationType();
+	}
+
+	/**
+	 * Create an instance of {@link CertificationOfTheSupplementType }
+	 * 
+	 */
+	public CertificationOfTheSupplementType createCertificationOfTheSupplementType() {
+		return new CertificationOfTheSupplementType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachedFileURLType }
+	 * 
+	 */
+	public AttachedFileURLType createAttachedFileURLType() {
+		return new AttachedFileURLType();
+	}
+
+	/**
+	 * Create an instance of {@link ProgrammeRequirementsType }
+	 * 
+	 */
+	public ProgrammeRequirementsType createProgrammeRequirementsType() {
+		return new ProgrammeRequirementsType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitWorkPlacementsType }
+	 * 
+	 */
+	public CourseUnitWorkPlacementsType createCourseUnitWorkPlacementsType() {
+		return new CourseUnitWorkPlacementsType();
+	}
+
+	/**
+	 * Create an instance of {@link AdditionalInformationType }
+	 * 
+	 */
+	public AdditionalInformationType createAdditionalInformationType() {
+		return new AdditionalInformationType();
+	}
+
+	/**
+	 * Create an instance of {@link GradingSchemeAndGradeDistributionGuidanceType }
+	 * 
+	 */
+	public GradingSchemeAndGradeDistributionGuidanceType createGradingSchemeAndGradeDistributionGuidanceType() {
+		return new GradingSchemeAndGradeDistributionGuidanceType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachmentsType }
+	 * 
+	 */
+	public AttachmentsType createAttachmentsType() {
+		return new AttachmentsType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitLanguageOfInstructionType }
+	 * 
+	 */
+	public CourseUnitLanguageOfInstructionType createCourseUnitLanguageOfInstructionType() {
+		return new CourseUnitLanguageOfInstructionType();
+	}
+
+	/**
+	 * Create an instance of {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
+	 * 
+	 */
+	public CoursesAttendedInOtherInstitutionInMobilityProgramsType createCoursesAttendedInOtherInstitutionInMobilityProgramsType() {
+		return new CoursesAttendedInOtherInstitutionInMobilityProgramsType();
+	}
+
+	/**
+	 * Create an instance of {@link FamilyNameType }
+	 * 
+	 */
+	public FamilyNameType createFamilyNameType() {
+		return new FamilyNameType();
+	}
+
+	/**
+	 * Create an instance of {@link CoursesGroupsType }
+	 * 
+	 */
+	public CoursesGroupsType createCoursesGroupsType() {
+		return new CoursesGroupsType();
+	}
+
+	/**
+	 * Create an instance of {@link TitleConferredType }
+	 * 
+	 */
+	public TitleConferredType createTitleConferredType() {
+		return new TitleConferredType();
+	}
+
+	/**
+	 * Create an instance of {@link OfficialStampType }
+	 * 
+	 */
+	public OfficialStampType createOfficialStampType() {
+		return new OfficialStampType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitStudentPerformanceType }
+	 * 
+	 */
+	public CourseUnitStudentPerformanceType createCourseUnitStudentPerformanceType() {
+		return new CourseUnitStudentPerformanceType();
+	}
+
+	/**
+	 * Create an instance of {@link GivenNameType }
+	 * 
+	 */
+	public GivenNameType createGivenNameType() {
+		return new GivenNameType();
+	}
+
+	/**
+	 * Create an instance of {@link CoursesUnitsType }
+	 * 
+	 */
+	public CoursesUnitsType createCoursesUnitsType() {
+		return new CoursesUnitsType();
+	}
+
+	/**
+	 * Create an instance of {@link MobilityProgrammeType }
+	 * 
+	 */
+	public MobilityProgrammeType createMobilityProgrammeType() {
+		return new MobilityProgrammeType();
+	}
+
+	/**
+	 * Create an instance of {@link ProgrammeDetailsType }
+	 * 
+	 */
+	public ProgrammeDetailsType createProgrammeDetailsType() {
+		return new ProgrammeDetailsType();
+	}
+
+	/**
+	 * Create an instance of {@link OfficialCertifyingType }
+	 * 
+	 */
+	public OfficialCertifyingType createOfficialCertifyingType() {
+		return new OfficialCertifyingType();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitLanguagesOfInstructionType }
+	 * 
+	 */
+	public CourseUnitLanguagesOfInstructionType createCourseUnitLanguagesOfInstructionType() {
+		return new CourseUnitLanguagesOfInstructionType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachedImageDataType }
+	 * 
+	 */
+	public AttachedImageDataType createAttachedImageDataType() {
+		return new AttachedImageDataType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachedType }
+	 * 
+	 */
+	public AttachedType createAttachedType() {
+		return new AttachedType();
+	}
+
+	/**
+	 * Create an instance of {@link CoursesGroupType }
+	 * 
+	 */
+	public CoursesGroupType createCoursesGroupType() {
+		return new CoursesGroupType();
+	}
+
+	/**
+	 * Create an instance of {@link AddressType }
+	 * 
+	 */
+	public AddressType createAddressType() {
+		return new AddressType();
+	}
+
+	/**
+	 * Create an instance of {@link AttachedFileDataType }
+	 * 
+	 */
+	public AttachedFileDataType createAttachedFileDataType() {
+		return new AttachedFileDataType();
+	}
+
+	/**
+	 * Create an instance of {@link ContactInformationType }
+	 * 
+	 */
+	public ContactInformationType createContactInformationType() {
+		return new ContactInformationType();
+	}
+
+	/**
+	 * Create an instance of {@link OfficialsCertifyingType }
+	 * 
+	 */
+	public OfficialsCertifyingType createOfficialsCertifyingType() {
+		return new OfficialsCertifyingType();
+	}
+
+	/**
+	 * Create an instance of {@link LanguagesOfInstructionAndExaminationType.Language }
+	 * 
+	 */
+	public LanguagesOfInstructionAndExaminationType.Language createLanguagesOfInstructionAndExaminationTypeLanguage() {
+		return new LanguagesOfInstructionAndExaminationType.Language();
+	}
+
+	/**
+	 * Create an instance of {@link RichTextTagType.AttachedRef }
+	 * 
+	 */
+	public RichTextTagType.AttachedRef createRichTextTagTypeAttachedRef() {
+		return new RichTextTagType.AttachedRef();
+	}
+
+	/**
+	 * Create an instance of {@link NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies }
+	 * 
+	 */
+	public NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies createNameAndStatusOfInstitutionAdministeringStudiesTypeInstitutionAdministeringStudies() {
+		return new NameAndStatusOfInstitutionAdministeringStudiesType.InstitutionAdministeringStudies();
+	}
+
+	/**
+	 * Create an instance of {@link InstitutionType.AttachedImageRef }
+	 * 
+	 */
+	public InstitutionType.AttachedImageRef createInstitutionTypeAttachedImageRef() {
+		return new InstitutionType.AttachedImageRef();
+	}
+
+	/**
+	 * Create an instance of {@link MobilityProgrammeCourseUnitType.Title }
+	 * 
+	 */
+	public MobilityProgrammeCourseUnitType.Title createMobilityProgrammeCourseUnitTypeTitle() {
+		return new MobilityProgrammeCourseUnitType.Title();
+	}
+
+	/**
+	 * Create an instance of {@link InformationIdentifyingTheHolderOfTheQualificationType.Gender }
+	 * 
+	 */
+	public InformationIdentifyingTheHolderOfTheQualificationType.Gender createInformationIdentifyingTheHolderOfTheQualificationTypeGender() {
+		return new InformationIdentifyingTheHolderOfTheQualificationType.Gender();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitType.Type }
+	 * 
+	 */
+	public CourseUnitType.Type createCourseUnitTypeType() {
+		return new CourseUnitType.Type();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitType.YearOfStudy }
+	 * 
+	 */
+	public CourseUnitType.YearOfStudy createCourseUnitTypeYearOfStudy() {
+		return new CourseUnitType.YearOfStudy();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitType.Level }
+	 * 
+	 */
+	public CourseUnitType.Level createCourseUnitTypeLevel() {
+		return new CourseUnitType.Level();
+	}
+
+	/**
+	 * Create an instance of {@link CourseUnitType.ModeOfDelivery }
+	 * 
+	 */
+	public CourseUnitType.ModeOfDelivery createCourseUnitTypeModeOfDelivery() {
+		return new CourseUnitType.ModeOfDelivery();
+	}
+
+	/**
+	 * Create an instance of {@link LocalGradeType.Source }
+	 * 
+	 */
+	public LocalGradeType.Source createLocalGradeTypeSource() {
+		return new LocalGradeType.Source();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheContentsAndResultsGainedType.ModeOfStudy }
+	 * 
+	 */
+	public InformationOnTheContentsAndResultsGainedType.ModeOfStudy createInformationOnTheContentsAndResultsGainedTypeModeOfStudy() {
+		return new InformationOnTheContentsAndResultsGainedType.ModeOfStudy();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.Level }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType.Level createInformationOnTheLevelOfTheQualificationTypeLevel() {
+		return new InformationOnTheLevelOfTheQualificationType.Level();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme }
+	 * 
+	 */
+	public InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme createInformationOnTheLevelOfTheQualificationTypeOfficialLengthOfProgramme() {
+		return new InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme();
+	}
+
+	/**
+	 * Create an instance of {@link NameAndStatusOfAwardingInstitutionType.AwardingInstitution }
+	 * 
+	 */
+	public NameAndStatusOfAwardingInstitutionType.AwardingInstitution createNameAndStatusOfAwardingInstitutionTypeAwardingInstitution() {
+		return new NameAndStatusOfAwardingInstitutionType.AwardingInstitution();
+	}
+
+	/**
+	 * Create an instance of {@link InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus }
+	 * 
+	 */
+	public InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus createInformationOnTheFunctionOfTheQualificationTypeProfessionalStatus() {
+		return new InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus();
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link MultilingualGeneralDiplomaType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "MultilingualGeneralDiploma")
+	public JAXBElement<MultilingualGeneralDiplomaType> createMultilingualGeneralDiploma(MultilingualGeneralDiplomaType value) {
+		return new JAXBElement<MultilingualGeneralDiplomaType>(_MultilingualGeneralDiploma_QNAME, MultilingualGeneralDiplomaType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link GeneralDiplomaType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "GeneralDiploma")
+	public JAXBElement<GeneralDiplomaType> createGeneralDiploma(GeneralDiplomaType value) {
+		return new JAXBElement<GeneralDiplomaType>(_GeneralDiploma_QNAME, GeneralDiplomaType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "BreakLine", scope = RichTextTagType.class)
+	public JAXBElement<String> createRichTextTagTypeBreakLine(String value) {
+		return new JAXBElement<String>(_RichTextTagTypeBreakLine_QNAME, String.class, RichTextTagType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "AttachedRef", scope = RichTextTagType.class)
+	public JAXBElement<RichTextTagType.AttachedRef> createRichTextTagTypeAttachedRef(RichTextTagType.AttachedRef value) {
+		return new JAXBElement<RichTextTagType.AttachedRef>(_RichTextTagTypeAttachedRef_QNAME, RichTextTagType.AttachedRef.class, RichTextTagType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Italic", scope = RichTextTagType.class)
+	public JAXBElement<String> createRichTextTagTypeItalic(String value) {
+		return new JAXBElement<String>(_RichTextTagTypeItalic_QNAME, String.class, RichTextTagType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Underline", scope = RichTextTagType.class)
+	public JAXBElement<String> createRichTextTagTypeUnderline(String value) {
+		return new JAXBElement<String>(_RichTextTagTypeUnderline_QNAME, String.class, RichTextTagType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", name = "Bold", scope = RichTextTagType.class)
+	public JAXBElement<String> createRichTextTagTypeBold(String value) {
+		return new JAXBElement<String>(_RichTextTagTypeBold_QNAME, String.class, RichTextTagType.class, value);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialCertifyingType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialCertifyingType.java
index 6564cad3a..a53e855d1 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialCertifyingType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialCertifyingType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for OfficialCertifyingType complex type.
+ * <p>
+ * Java class for OfficialCertifyingType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="OfficialCertifyingType">
@@ -38,120 +38,104 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OfficialCertifyingType", propOrder = {
-    "familyName",
-    "givenName",
-    "capacity"
-})
+@XmlType(name = "OfficialCertifyingType", propOrder = { "familyName", "givenName", "capacity" })
 public class OfficialCertifyingType {
 
-    @XmlElement(name = "FamilyName", required = true)
-    protected FamilyNameType familyName;
-    @XmlElement(name = "GivenName", required = true)
-    protected GivenNameType givenName;
-    @XmlElement(name = "Capacity")
-    protected String capacity;
-    @XmlAttribute(name = "awardingInstitutionID")
-    protected String awardingInstitutionID;
+	@XmlElement(name = "FamilyName", required = true)
+	protected FamilyNameType familyName;
+	@XmlElement(name = "GivenName", required = true)
+	protected GivenNameType givenName;
+	@XmlElement(name = "Capacity")
+	protected String capacity;
+	@XmlAttribute(name = "awardingInstitutionID")
+	protected String awardingInstitutionID;
 
-    /**
-     * Gets the value of the familyName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link FamilyNameType }
-     *     
-     */
-    public FamilyNameType getFamilyName() {
-        return familyName;
-    }
+	/**
+	 * Gets the value of the familyName property.
+	 * 
+	 * @return possible object is {@link FamilyNameType }
+	 * 
+	 */
+	public FamilyNameType getFamilyName() {
+		return familyName;
+	}
 
-    /**
-     * Sets the value of the familyName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link FamilyNameType }
-     *     
-     */
-    public void setFamilyName(FamilyNameType value) {
-        this.familyName = value;
-    }
+	/**
+	 * Sets the value of the familyName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link FamilyNameType }
+	 * 
+	 */
+	public void setFamilyName(FamilyNameType value) {
+		this.familyName = value;
+	}
 
-    /**
-     * Gets the value of the givenName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GivenNameType }
-     *     
-     */
-    public GivenNameType getGivenName() {
-        return givenName;
-    }
+	/**
+	 * Gets the value of the givenName property.
+	 * 
+	 * @return possible object is {@link GivenNameType }
+	 * 
+	 */
+	public GivenNameType getGivenName() {
+		return givenName;
+	}
 
-    /**
-     * Sets the value of the givenName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GivenNameType }
-     *     
-     */
-    public void setGivenName(GivenNameType value) {
-        this.givenName = value;
-    }
+	/**
+	 * Sets the value of the givenName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link GivenNameType }
+	 * 
+	 */
+	public void setGivenName(GivenNameType value) {
+		this.givenName = value;
+	}
 
-    /**
-     * Gets the value of the capacity property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCapacity() {
-        return capacity;
-    }
+	/**
+	 * Gets the value of the capacity property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getCapacity() {
+		return capacity;
+	}
 
-    /**
-     * Sets the value of the capacity property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCapacity(String value) {
-        this.capacity = value;
-    }
+	/**
+	 * Sets the value of the capacity property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setCapacity(String value) {
+		this.capacity = value;
+	}
 
-    /**
-     * Gets the value of the awardingInstitutionID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAwardingInstitutionID() {
-        if (awardingInstitutionID == null) {
-            return "DEF-IAW";
-        } else {
-            return awardingInstitutionID;
-        }
-    }
+	/**
+	 * Gets the value of the awardingInstitutionID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAwardingInstitutionID() {
+		if (awardingInstitutionID == null) {
+			return "DEF-IAW";
+		} else {
+			return awardingInstitutionID;
+		}
+	}
 
-    /**
-     * Sets the value of the awardingInstitutionID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAwardingInstitutionID(String value) {
-        this.awardingInstitutionID = value;
-    }
+	/**
+	 * Sets the value of the awardingInstitutionID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAwardingInstitutionID(String value) {
+		this.awardingInstitutionID = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialStampType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialStampType.java
index 61966f341..df1051a7c 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialStampType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialStampType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for OfficialStampType complex type.
+ * <p>
+ * Java class for OfficialStampType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="OfficialStampType">
@@ -36,66 +36,58 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OfficialStampType", propOrder = {
-    "description"
-})
+@XmlType(name = "OfficialStampType", propOrder = { "description" })
 public class OfficialStampType {
 
-    @XmlElement(name = "Description", required = true)
-    protected String description;
-    @XmlAttribute(name = "awardingInstitutionID")
-    protected String awardingInstitutionID;
+	@XmlElement(name = "Description", required = true)
+	protected String description;
+	@XmlAttribute(name = "awardingInstitutionID")
+	protected String awardingInstitutionID;
 
-    /**
-     * Gets the value of the description property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getDescription() {
-        return description;
-    }
+	/**
+	 * Gets the value of the description property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getDescription() {
+		return description;
+	}
 
-    /**
-     * Sets the value of the description property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setDescription(String value) {
-        this.description = value;
-    }
+	/**
+	 * Sets the value of the description property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setDescription(String value) {
+		this.description = value;
+	}
 
-    /**
-     * Gets the value of the awardingInstitutionID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAwardingInstitutionID() {
-        if (awardingInstitutionID == null) {
-            return "DEF-IAW";
-        } else {
-            return awardingInstitutionID;
-        }
-    }
+	/**
+	 * Gets the value of the awardingInstitutionID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAwardingInstitutionID() {
+		if (awardingInstitutionID == null) {
+			return "DEF-IAW";
+		} else {
+			return awardingInstitutionID;
+		}
+	}
 
-    /**
-     * Sets the value of the awardingInstitutionID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAwardingInstitutionID(String value) {
-        this.awardingInstitutionID = value;
-    }
+	/**
+	 * Sets the value of the awardingInstitutionID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAwardingInstitutionID(String value) {
+		this.awardingInstitutionID = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialsCertifyingType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialsCertifyingType.java
index dbb17d0bc..1760eddb3 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialsCertifyingType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialsCertifyingType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for OfficialsCertifyingType complex type.
+ * <p>
+ * Java class for OfficialsCertifyingType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="OfficialsCertifyingType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "OfficialsCertifyingType", propOrder = {
-    "officialCertifying"
-})
+@XmlType(name = "OfficialsCertifyingType", propOrder = { "officialCertifying" })
 public class OfficialsCertifyingType {
 
-    @XmlElement(name = "OfficialCertifying", required = true)
-    protected List<OfficialCertifyingType> officialCertifying;
+	@XmlElement(name = "OfficialCertifying", required = true)
+	protected List<OfficialCertifyingType> officialCertifying;
 
-    /**
-     * Gets the value of the officialCertifying property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the officialCertifying property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getOfficialCertifying().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link OfficialCertifyingType }
-     * 
-     * 
-     */
-    public List<OfficialCertifyingType> getOfficialCertifying() {
-        if (officialCertifying == null) {
-            officialCertifying = new ArrayList<OfficialCertifyingType>();
-        }
-        return this.officialCertifying;
-    }
+	/**
+	 * Gets the value of the officialCertifying property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the officialCertifying property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getOfficialCertifying().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link OfficialCertifyingType }
+	 * 
+	 * 
+	 */
+	public List<OfficialCertifyingType> getOfficialCertifying() {
+		if (officialCertifying == null) {
+			officialCertifying = new ArrayList<OfficialCertifyingType>();
+		}
+		return this.officialCertifying;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeDetailsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeDetailsType.java
index c5255c9ee..58d96bfe2 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeDetailsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeDetailsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ProgrammeDetailsType complex type.
+ * <p>
+ * Java class for ProgrammeDetailsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ProgrammeDetailsType">
@@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProgrammeDetailsType", propOrder = {
-    "courseStructureDiagram",
-    "coursesAttendedInOtherInstitutionInMobilityPrograms"
-})
+@XmlType(name = "ProgrammeDetailsType", propOrder = { "courseStructureDiagram", "coursesAttendedInOtherInstitutionInMobilityPrograms" })
 public class ProgrammeDetailsType {
 
-    @XmlElement(name = "CourseStructureDiagram", required = true)
-    protected CourseStructureDiagramType courseStructureDiagram;
-    @XmlElement(name = "CoursesAttendedInOtherInstitutionInMobilityPrograms")
-    protected CoursesAttendedInOtherInstitutionInMobilityProgramsType coursesAttendedInOtherInstitutionInMobilityPrograms;
+	@XmlElement(name = "CourseStructureDiagram", required = true)
+	protected CourseStructureDiagramType courseStructureDiagram;
+	@XmlElement(name = "CoursesAttendedInOtherInstitutionInMobilityPrograms")
+	protected CoursesAttendedInOtherInstitutionInMobilityProgramsType coursesAttendedInOtherInstitutionInMobilityPrograms;
 
-    /**
-     * Gets the value of the courseStructureDiagram property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CourseStructureDiagramType }
-     *     
-     */
-    public CourseStructureDiagramType getCourseStructureDiagram() {
-        return courseStructureDiagram;
-    }
+	/**
+	 * Gets the value of the courseStructureDiagram property.
+	 * 
+	 * @return possible object is {@link CourseStructureDiagramType }
+	 * 
+	 */
+	public CourseStructureDiagramType getCourseStructureDiagram() {
+		return courseStructureDiagram;
+	}
 
-    /**
-     * Sets the value of the courseStructureDiagram property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CourseStructureDiagramType }
-     *     
-     */
-    public void setCourseStructureDiagram(CourseStructureDiagramType value) {
-        this.courseStructureDiagram = value;
-    }
+	/**
+	 * Sets the value of the courseStructureDiagram property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CourseStructureDiagramType }
+	 * 
+	 */
+	public void setCourseStructureDiagram(CourseStructureDiagramType value) {
+		this.courseStructureDiagram = value;
+	}
 
-    /**
-     * Gets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
-     *     
-     */
-    public CoursesAttendedInOtherInstitutionInMobilityProgramsType getCoursesAttendedInOtherInstitutionInMobilityPrograms() {
-        return coursesAttendedInOtherInstitutionInMobilityPrograms;
-    }
+	/**
+	 * Gets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
+	 * 
+	 * @return possible object is {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
+	 * 
+	 */
+	public CoursesAttendedInOtherInstitutionInMobilityProgramsType getCoursesAttendedInOtherInstitutionInMobilityPrograms() {
+		return coursesAttendedInOtherInstitutionInMobilityPrograms;
+	}
 
-    /**
-     * Sets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
-     *     
-     */
-    public void setCoursesAttendedInOtherInstitutionInMobilityPrograms(CoursesAttendedInOtherInstitutionInMobilityProgramsType value) {
-        this.coursesAttendedInOtherInstitutionInMobilityPrograms = value;
-    }
+	/**
+	 * Sets the value of the coursesAttendedInOtherInstitutionInMobilityPrograms property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CoursesAttendedInOtherInstitutionInMobilityProgramsType }
+	 * 
+	 */
+	public void setCoursesAttendedInOtherInstitutionInMobilityPrograms(CoursesAttendedInOtherInstitutionInMobilityProgramsType value) {
+		this.coursesAttendedInOtherInstitutionInMobilityPrograms = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeRequirementsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeRequirementsType.java
index fac1755c3..a0481317d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeRequirementsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeRequirementsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for ProgrammeRequirementsType complex type.
+ * <p>
+ * Java class for ProgrammeRequirementsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ProgrammeRequirementsType">
@@ -35,63 +35,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ProgrammeRequirementsType", propOrder = {
-    "requirements",
-    "keyLearningOutcomes"
-})
+@XmlType(name = "ProgrammeRequirementsType", propOrder = { "requirements", "keyLearningOutcomes" })
 public class ProgrammeRequirementsType {
 
-    @XmlElement(name = "Requirements", required = true)
-    protected RichTextTagType requirements;
-    @XmlElement(name = "KeyLearningOutcomes")
-    protected RichTextTagType keyLearningOutcomes;
+	@XmlElement(name = "Requirements", required = true)
+	protected RichTextTagType requirements;
+	@XmlElement(name = "KeyLearningOutcomes")
+	protected RichTextTagType keyLearningOutcomes;
 
-    /**
-     * Gets the value of the requirements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getRequirements() {
-        return requirements;
-    }
+	/**
+	 * Gets the value of the requirements property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getRequirements() {
+		return requirements;
+	}
 
-    /**
-     * Sets the value of the requirements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setRequirements(RichTextTagType value) {
-        this.requirements = value;
-    }
+	/**
+	 * Sets the value of the requirements property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setRequirements(RichTextTagType value) {
+		this.requirements = value;
+	}
 
-    /**
-     * Gets the value of the keyLearningOutcomes property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getKeyLearningOutcomes() {
-        return keyLearningOutcomes;
-    }
+	/**
+	 * Gets the value of the keyLearningOutcomes property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getKeyLearningOutcomes() {
+		return keyLearningOutcomes;
+	}
 
-    /**
-     * Sets the value of the keyLearningOutcomes property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setKeyLearningOutcomes(RichTextTagType value) {
-        this.keyLearningOutcomes = value;
-    }
+	/**
+	 * Sets the value of the keyLearningOutcomes property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setKeyLearningOutcomes(RichTextTagType value) {
+		this.keyLearningOutcomes = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/QualificationType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/QualificationType.java
index 209094e4f..5fc5377d0 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/QualificationType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/QualificationType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAttribute;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for QualificationType complex type.
+ * <p>
+ * Java class for QualificationType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="QualificationType">
@@ -38,115 +38,100 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "QualificationType", propOrder = {
-    "name",
-    "additionalInformation"
-})
+@XmlType(name = "QualificationType", propOrder = { "name", "additionalInformation" })
 public class QualificationType {
 
-    @XmlElement(name = "Name", required = true)
-    protected String name;
-    @XmlElement(name = "AdditionalInformation")
-    protected RichTextTagType additionalInformation;
-    @XmlAttribute(name = "localID")
-    protected String localID;
-    @XmlAttribute(name = "nationalID")
-    protected String nationalID;
+	@XmlElement(name = "Name", required = true)
+	protected String name;
+	@XmlElement(name = "AdditionalInformation")
+	protected RichTextTagType additionalInformation;
+	@XmlAttribute(name = "localID")
+	protected String localID;
+	@XmlAttribute(name = "nationalID")
+	protected String nationalID;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
 
-    /**
-     * Gets the value of the additionalInformation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public RichTextTagType getAdditionalInformation() {
-        return additionalInformation;
-    }
+	/**
+	 * Gets the value of the additionalInformation property.
+	 * 
+	 * @return possible object is {@link RichTextTagType }
+	 * 
+	 */
+	public RichTextTagType getAdditionalInformation() {
+		return additionalInformation;
+	}
 
-    /**
-     * Sets the value of the additionalInformation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RichTextTagType }
-     *     
-     */
-    public void setAdditionalInformation(RichTextTagType value) {
-        this.additionalInformation = value;
-    }
+	/**
+	 * Sets the value of the additionalInformation property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link RichTextTagType }
+	 * 
+	 */
+	public void setAdditionalInformation(RichTextTagType value) {
+		this.additionalInformation = value;
+	}
 
-    /**
-     * Gets the value of the localID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getLocalID() {
-        return localID;
-    }
+	/**
+	 * Gets the value of the localID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getLocalID() {
+		return localID;
+	}
 
-    /**
-     * Sets the value of the localID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setLocalID(String value) {
-        this.localID = value;
-    }
+	/**
+	 * Sets the value of the localID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setLocalID(String value) {
+		this.localID = value;
+	}
 
-    /**
-     * Gets the value of the nationalID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getNationalID() {
-        return nationalID;
-    }
+	/**
+	 * Gets the value of the nationalID property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getNationalID() {
+		return nationalID;
+	}
 
-    /**
-     * Sets the value of the nationalID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setNationalID(String value) {
-        this.nationalID = value;
-    }
+	/**
+	 * Sets the value of the nationalID property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setNationalID(String value) {
+		this.nationalID = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/RichTextTagType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/RichTextTagType.java
index 8d1906142..0a79919d7 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/RichTextTagType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/RichTextTagType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import java.io.Serializable;
@@ -24,11 +23,12 @@ import javax.xml.bind.annotation.XmlSeeAlso;
 import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.XmlValue;
 
-
 /**
- * <p>Java class for RichTextTagType complex type.
+ * <p>
+ * Java class for RichTextTagType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="RichTextTagType">
@@ -57,141 +57,122 @@ import javax.xml.bind.annotation.XmlValue;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RichTextTagType", propOrder = {
-    "content"
-})
-@XmlSeeAlso({
-    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus.class,
-    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheLevelOfTheQualificationType.Level.class,
-    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme.class,
-    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheContentsAndResultsGainedType.ModeOfStudy.class,
-    eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.LanguagesOfInstructionAndExaminationType.Language.class
-})
+@XmlType(name = "RichTextTagType", propOrder = { "content" })
+@XmlSeeAlso({ eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheFunctionOfTheQualificationType.ProfessionalStatus.class,
+		eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheLevelOfTheQualificationType.Level.class,
+		eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheLevelOfTheQualificationType.OfficialLengthOfProgramme.class,
+		eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.InformationOnTheContentsAndResultsGainedType.ModeOfStudy.class,
+		eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma.LanguagesOfInstructionAndExaminationType.Language.class })
 public class RichTextTagType {
 
-    @XmlElementRefs({
-        @XmlElementRef(name = "Underline", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "BreakLine", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "AttachedRef", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Italic", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "Bold", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false)
-    })
-    @XmlMixed
-    protected List<Serializable> content;
-
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link String }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >}
-     * 
-     * 
-     */
-    public List<Serializable> getContent() {
-        if (content == null) {
-            content = new ArrayList<Serializable>();
-        }
-        return this.content;
-    }
-
-
-    /**
-     * <p>Java class for anonymous complex type.
-     * 
-     * <p>The following schema fragment specifies the expected content contained within this class.
-     * 
-     * <pre>
-     * &lt;complexType>
-     *   &lt;simpleContent>
-     *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
-     *       &lt;attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
-     *     &lt;/extension>
-     *   &lt;/simpleContent>
-     * &lt;/complexType>
-     * </pre>
-     * 
-     * 
-     */
-    @XmlAccessorType(XmlAccessType.FIELD)
-    @XmlType(name = "", propOrder = {
-        "value"
-    })
-    public static class AttachedRef {
-
-        @XmlValue
-        protected String value;
-        @XmlAttribute(name = "attachedID", required = true)
-        @XmlIDREF
-        @XmlSchemaType(name = "IDREF")
-        protected Object attachedID;
-
-        /**
-         * Gets the value of the value property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link String }
-         *     
-         */
-        public String getValue() {
-            return value;
-        }
-
-        /**
-         * Sets the value of the value property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link String }
-         *     
-         */
-        public void setValue(String value) {
-            this.value = value;
-        }
-
-        /**
-         * Gets the value of the attachedID property.
-         * 
-         * @return
-         *     possible object is
-         *     {@link Object }
-         *     
-         */
-        public Object getAttachedID() {
-            return attachedID;
-        }
-
-        /**
-         * Sets the value of the attachedID property.
-         * 
-         * @param value
-         *     allowed object is
-         *     {@link Object }
-         *     
-         */
-        public void setAttachedID(Object value) {
-            this.attachedID = value;
-        }
-
-    }
+	@XmlElementRefs({ @XmlElementRef(name = "Underline", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "BreakLine", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "AttachedRef", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "Italic", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "Bold", namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", type = JAXBElement.class, required = false) })
+	@XmlMixed
+	protected List<Serializable> content;
+
+	/**
+	 * Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}
+	 * {@link String }{@code >} {@link String } {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link RichTextTagType.AttachedRef }{@code >}
+	 * 
+	 * 
+	 */
+	public List<Serializable> getContent() {
+		if (content == null) {
+			content = new ArrayList<Serializable>();
+		}
+		return this.content;
+	}
+
+	/**
+	 * <p>
+	 * Java class for anonymous complex type.
+	 * 
+	 * <p>
+	 * The following schema fragment specifies the expected content contained within this class.
+	 * 
+	 * <pre>
+	 * &lt;complexType>
+	 *   &lt;simpleContent>
+	 *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+	 *       &lt;attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}IDREF" />
+	 *     &lt;/extension>
+	 *   &lt;/simpleContent>
+	 * &lt;/complexType>
+	 * </pre>
+	 * 
+	 * 
+	 */
+	@XmlAccessorType(XmlAccessType.FIELD)
+	@XmlType(name = "", propOrder = { "value" })
+	public static class AttachedRef {
+
+		@XmlValue
+		protected String value;
+		@XmlAttribute(name = "attachedID", required = true)
+		@XmlIDREF
+		@XmlSchemaType(name = "IDREF")
+		protected Object attachedID;
+
+		/**
+		 * Gets the value of the value property.
+		 * 
+		 * @return possible object is {@link String }
+		 * 
+		 */
+		public String getValue() {
+			return value;
+		}
+
+		/**
+		 * Sets the value of the value property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link String }
+		 * 
+		 */
+		public void setValue(String value) {
+			this.value = value;
+		}
+
+		/**
+		 * Gets the value of the attachedID property.
+		 * 
+		 * @return possible object is {@link Object }
+		 * 
+		 */
+		public Object getAttachedID() {
+			return attachedID;
+		}
+
+		/**
+		 * Sets the value of the attachedID property.
+		 * 
+		 * @param value
+		 *            allowed object is {@link Object }
+		 * 
+		 */
+		public void setAttachedID(Object value) {
+			this.attachedID = value;
+		}
+
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/SourceGradeType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/SourceGradeType.java
index 2fc0d4292..488f87974 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/SourceGradeType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/SourceGradeType.java
@@ -5,19 +5,20 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlEnum;
 import javax.xml.bind.annotation.XmlEnumValue;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for SourceGradeType.
+ * <p>
+ * Java class for SourceGradeType.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
  * <p>
+ * The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * 
  * <pre>
  * &lt;simpleType name="SourceGradeType">
  *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
@@ -33,29 +34,27 @@ import javax.xml.bind.annotation.XmlType;
 @XmlEnum
 public enum SourceGradeType {
 
-    @XmlEnumValue("Recognized")
-    RECOGNIZED("Recognized"),
-    @XmlEnumValue("MobilityProgramme")
-    MOBILITY_PROGRAMME("MobilityProgramme"),
-    @XmlEnumValue("Another")
-    ANOTHER("Another");
-    private final String value;
-
-    SourceGradeType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static SourceGradeType fromValue(String v) {
-        for (SourceGradeType c: SourceGradeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
+	@XmlEnumValue("Recognized")
+	RECOGNIZED("Recognized"), @XmlEnumValue("MobilityProgramme")
+	MOBILITY_PROGRAMME("MobilityProgramme"), @XmlEnumValue("Another")
+	ANOTHER("Another");
+	private final String value;
+
+	SourceGradeType(String v) {
+		value = v;
+	}
+
+	public String value() {
+		return value;
+	}
+
+	public static SourceGradeType fromValue(String v) {
+		for (SourceGradeType c : SourceGradeType.values()) {
+			if (c.value.equals(v)) {
+				return c;
+			}
+		}
+		throw new IllegalArgumentException(v);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/TitleConferredType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/TitleConferredType.java
index 2ca949caa..ea1e6e9bb 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/TitleConferredType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/TitleConferredType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for TitleConferredType complex type.
+ * <p>
+ * Java class for TitleConferredType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="TitleConferredType">
@@ -34,36 +34,31 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TitleConferredType", propOrder = {
-    "name"
-})
+@XmlType(name = "TitleConferredType", propOrder = { "name" })
 public class TitleConferredType {
 
-    @XmlElement(name = "Name", required = true)
-    protected String name;
+	@XmlElement(name = "Name", required = true)
+	protected String name;
 
-    /**
-     * Gets the value of the name property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getName() {
-        return name;
-    }
+	/**
+	 * Gets the value of the name property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getName() {
+		return name;
+	}
 
-    /**
-     * Sets the value of the name property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setName(String value) {
-        this.name = value;
-    }
+	/**
+	 * Sets the value of the name property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setName(String value) {
+		this.name = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/package-info.java
index 7d2131e52..0a37ab296 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/package-info.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/package-info.java
@@ -7,3 +7,4 @@
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._2_0.academic.generaldiploma;
+
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
index e2c2db71d..98e01dc8c 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlMixed;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for CanonicalizationMethodType complex type.
+ * <p>
+ * Java class for CanonicalizationMethodType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="CanonicalizationMethodType">
@@ -40,70 +40,62 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "CanonicalizationMethodType", propOrder = {
-    "content"
-})
+@XmlType(name = "CanonicalizationMethodType", propOrder = { "content" })
 public class CanonicalizationMethodType {
 
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
+	@XmlMixed
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
+	@XmlAttribute(name = "Algorithm", required = true)
+	@XmlSchemaType(name = "anyURI")
+	protected String algorithm;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link String } {@link Object }
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
+	/**
+	 * Gets the value of the algorithm property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAlgorithm() {
+		return algorithm;
+	}
 
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
+	/**
+	 * Sets the value of the algorithm property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAlgorithm(String value) {
+		this.algorithm = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java
index 7f7c48206..af0978a99 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for DSAKeyValueType complex type.
+ * <p>
+ * Java class for DSAKeyValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="DSAKeyValueType">
@@ -44,184 +44,155 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DSAKeyValueType", propOrder = {
-    "p",
-    "q",
-    "g",
-    "y",
-    "j",
-    "seed",
-    "pgenCounter"
-})
+@XmlType(name = "DSAKeyValueType", propOrder = { "p", "q", "g", "y", "j", "seed", "pgenCounter" })
 public class DSAKeyValueType {
 
-    @XmlElement(name = "P")
-    protected byte[] p;
-    @XmlElement(name = "Q")
-    protected byte[] q;
-    @XmlElement(name = "G")
-    protected byte[] g;
-    @XmlElement(name = "Y", required = true)
-    protected byte[] y;
-    @XmlElement(name = "J")
-    protected byte[] j;
-    @XmlElement(name = "Seed")
-    protected byte[] seed;
-    @XmlElement(name = "PgenCounter")
-    protected byte[] pgenCounter;
-
-    /**
-     * Gets the value of the p property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getP() {
-        return p;
-    }
-
-    /**
-     * Sets the value of the p property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setP(byte[] value) {
-        this.p = value;
-    }
-
-    /**
-     * Gets the value of the q property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getQ() {
-        return q;
-    }
-
-    /**
-     * Sets the value of the q property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setQ(byte[] value) {
-        this.q = value;
-    }
-
-    /**
-     * Gets the value of the g property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getG() {
-        return g;
-    }
-
-    /**
-     * Sets the value of the g property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setG(byte[] value) {
-        this.g = value;
-    }
-
-    /**
-     * Gets the value of the y property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getY() {
-        return y;
-    }
-
-    /**
-     * Sets the value of the y property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setY(byte[] value) {
-        this.y = value;
-    }
-
-    /**
-     * Gets the value of the j property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getJ() {
-        return j;
-    }
-
-    /**
-     * Sets the value of the j property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setJ(byte[] value) {
-        this.j = value;
-    }
-
-    /**
-     * Gets the value of the seed property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getSeed() {
-        return seed;
-    }
-
-    /**
-     * Sets the value of the seed property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setSeed(byte[] value) {
-        this.seed = value;
-    }
-
-    /**
-     * Gets the value of the pgenCounter property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getPgenCounter() {
-        return pgenCounter;
-    }
-
-    /**
-     * Sets the value of the pgenCounter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setPgenCounter(byte[] value) {
-        this.pgenCounter = value;
-    }
+	@XmlElement(name = "P")
+	protected byte[] p;
+	@XmlElement(name = "Q")
+	protected byte[] q;
+	@XmlElement(name = "G")
+	protected byte[] g;
+	@XmlElement(name = "Y", required = true)
+	protected byte[] y;
+	@XmlElement(name = "J")
+	protected byte[] j;
+	@XmlElement(name = "Seed")
+	protected byte[] seed;
+	@XmlElement(name = "PgenCounter")
+	protected byte[] pgenCounter;
+
+	/**
+	 * Gets the value of the p property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getP() {
+		return p;
+	}
+
+	/**
+	 * Sets the value of the p property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setP(byte[] value) {
+		this.p = value;
+	}
+
+	/**
+	 * Gets the value of the q property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getQ() {
+		return q;
+	}
+
+	/**
+	 * Sets the value of the q property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setQ(byte[] value) {
+		this.q = value;
+	}
+
+	/**
+	 * Gets the value of the g property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getG() {
+		return g;
+	}
+
+	/**
+	 * Sets the value of the g property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setG(byte[] value) {
+		this.g = value;
+	}
+
+	/**
+	 * Gets the value of the y property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getY() {
+		return y;
+	}
+
+	/**
+	 * Sets the value of the y property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setY(byte[] value) {
+		this.y = value;
+	}
+
+	/**
+	 * Gets the value of the j property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getJ() {
+		return j;
+	}
+
+	/**
+	 * Sets the value of the j property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setJ(byte[] value) {
+		this.j = value;
+	}
+
+	/**
+	 * Gets the value of the seed property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getSeed() {
+		return seed;
+	}
+
+	/**
+	 * Sets the value of the seed property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setSeed(byte[] value) {
+		this.seed = value;
+	}
+
+	/**
+	 * Gets the value of the pgenCounter property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getPgenCounter() {
+		return pgenCounter;
+	}
+
+	/**
+	 * Sets the value of the pgenCounter property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setPgenCounter(byte[] value) {
+		this.pgenCounter = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java
index 9d32757cb..e71a1fdd1 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -19,11 +18,12 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
-
 /**
- * <p>Java class for DigestMethodType complex type.
+ * <p>
+ * Java class for DigestMethodType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="DigestMethodType">
@@ -41,71 +41,62 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "DigestMethodType", propOrder = {
-    "content"
-})
+@XmlType(name = "DigestMethodType", propOrder = { "content" })
 public class DigestMethodType {
 
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
+	@XmlMixed
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
+	@XmlAttribute(name = "Algorithm", required = true)
+	@XmlSchemaType(name = "anyURI")
+	protected String algorithm;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String }
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
+	/**
+	 * Gets the value of the algorithm property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAlgorithm() {
+		return algorithm;
+	}
 
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
+	/**
+	 * Sets the value of the algorithm property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAlgorithm(String value) {
+		this.algorithm = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java
index 638d398ae..b5fbd20b2 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -25,11 +24,12 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.w3c.dom.Element;
 
-
 /**
- * <p>Java class for KeyInfoType complex type.
+ * <p>
+ * Java class for KeyInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="KeyInfoType">
@@ -54,89 +54,73 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyInfoType", propOrder = {
-    "content"
-})
+@XmlType(name = "KeyInfoType", propOrder = { "content" })
 public class KeyInfoType {
 
-    @XmlElementRefs({
-        @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
-    })
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
+	@XmlElementRefs({ @XmlElementRef(name = "PGPData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "X509Data", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "KeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "KeyName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "SPKIData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "RetrievalMethod", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "MgmtData", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
+	@XmlMixed
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
+	@XmlAttribute(name = "Id")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String id;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Element }
-     * {@link String }
-     * {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
-     * {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link PGPDataType }{@code >} {@link JAXBElement }{@code <}{@link X509DataType }{@code >} {@link Object }
+	 * {@link JAXBElement }{@code <}{@link KeyValueType }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >} {@link Element } {@link String } {@link JAXBElement }{@code <}{@link SPKIDataType }
+	 * {@code >} {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >} {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java
index 819c9d014..c4d1aea20 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -20,11 +19,12 @@ import javax.xml.bind.annotation.XmlMixed;
 import javax.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
-
 /**
- * <p>Java class for KeyValueType complex type.
+ * <p>
+ * Java class for KeyValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="KeyValueType">
@@ -43,50 +43,41 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "KeyValueType", propOrder = {
-    "content"
-})
+@XmlType(name = "KeyValueType", propOrder = { "content" })
 public class KeyValueType {
 
-    @XmlElementRefs({
-        @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
-    })
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
+	@XmlElementRefs({ @XmlElementRef(name = "RSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "DSAKeyValue", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
+	@XmlMixed
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
-     * {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >} {@link JAXBElement }{@code <}
+	 * {@link RSAKeyValueType }{@code >} {@link String }
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java
index 8f55486fa..cfd4a435d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -20,11 +19,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 /**
- * <p>Java class for ManifestType complex type.
+ * <p>
+ * Java class for ManifestType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ManifestType">
@@ -42,70 +42,63 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ManifestType", propOrder = {
-    "reference"
-})
+@XmlType(name = "ManifestType", propOrder = { "reference" })
 public class ManifestType {
 
-    @XmlElement(name = "Reference", required = true)
-    protected List<ReferenceType> reference;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
+	@XmlElement(name = "Reference", required = true)
+	protected List<ReferenceType> reference;
+	@XmlAttribute(name = "Id")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String id;
 
-    /**
-     * Gets the value of the reference property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getReference().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ReferenceType }
-     * 
-     * 
-     */
-    public List<ReferenceType> getReference() {
-        if (reference == null) {
-            reference = new ArrayList<ReferenceType>();
-        }
-        return this.reference;
-    }
+	/**
+	 * Gets the value of the reference property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the reference property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getReference().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link ReferenceType }
+	 * 
+	 * 
+	 */
+	public List<ReferenceType> getReference() {
+		if (reference == null) {
+			reference = new ArrayList<ReferenceType>();
+		}
+		return this.reference;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java
index 621d32125..64a1fd7e3 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.math.BigInteger;
@@ -14,546 +13,538 @@ import javax.xml.bind.annotation.XmlElementDecl;
 import javax.xml.bind.annotation.XmlRegistry;
 import javax.xml.namespace.QName;
 
-
 /**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the org.w3._2000._09.xmldsig package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
+ * This object contains factory methods for each Java content interface and Java element interface generated in the org.w3._2000._09.xmldsig package.
+ * <p>
+ * An ObjectFactory allows you to programatically construct new instances of the Java representation for XML content. The Java representation of XML content can consist of schema derived interfaces
+ * and classes representing the binding of schema type definitions, element declarations and model groups. Factory methods for each of these are provided in this class.
  * 
  */
 @XmlRegistry
 public class ObjectFactory {
 
-    private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
-    private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
-    private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData");
-    private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
-    private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
-    private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
-    private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
-    private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
-    private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
-    private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
-    private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
-    private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData");
-    private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference");
-    private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
-    private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
-    private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
-    private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
-    private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
-    private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
-    private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
-    private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
-    private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
-    private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
-    private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
-    private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
-    private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
-    private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
-    private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
-    private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
-    private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
-    private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
-    private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
-    private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
-    private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link KeyInfoType }
-     * 
-     */
-    public KeyInfoType createKeyInfoType() {
-        return new KeyInfoType();
-    }
-
-    /**
-     * Create an instance of {@link SignedInfoType }
-     * 
-     */
-    public SignedInfoType createSignedInfoType() {
-        return new SignedInfoType();
-    }
-
-    /**
-     * Create an instance of {@link RetrievalMethodType }
-     * 
-     */
-    public RetrievalMethodType createRetrievalMethodType() {
-        return new RetrievalMethodType();
-    }
-
-    /**
-     * Create an instance of {@link DigestMethodType }
-     * 
-     */
-    public DigestMethodType createDigestMethodType() {
-        return new DigestMethodType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureMethodType }
-     * 
-     */
-    public SignatureMethodType createSignatureMethodType() {
-        return new SignatureMethodType();
-    }
-
-    /**
-     * Create an instance of {@link SPKIDataType }
-     * 
-     */
-    public SPKIDataType createSPKIDataType() {
-        return new SPKIDataType();
-    }
-
-    /**
-     * Create an instance of {@link X509DataType }
-     * 
-     */
-    public X509DataType createX509DataType() {
-        return new X509DataType();
-    }
-
-    /**
-     * Create an instance of {@link PGPDataType }
-     * 
-     */
-    public PGPDataType createPGPDataType() {
-        return new PGPDataType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureType }
-     * 
-     */
-    public SignatureType createSignatureType() {
-        return new SignatureType();
-    }
-
-    /**
-     * Create an instance of {@link DSAKeyValueType }
-     * 
-     */
-    public DSAKeyValueType createDSAKeyValueType() {
-        return new DSAKeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link ManifestType }
-     * 
-     */
-    public ManifestType createManifestType() {
-        return new ManifestType();
-    }
-
-    /**
-     * Create an instance of {@link SignatureValueType }
-     * 
-     */
-    public SignatureValueType createSignatureValueType() {
-        return new SignatureValueType();
-    }
-
-    /**
-     * Create an instance of {@link TransformsType }
-     * 
-     */
-    public TransformsType createTransformsType() {
-        return new TransformsType();
-    }
-
-    /**
-     * Create an instance of {@link RSAKeyValueType }
-     * 
-     */
-    public RSAKeyValueType createRSAKeyValueType() {
-        return new RSAKeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link TransformType }
-     * 
-     */
-    public TransformType createTransformType() {
-        return new TransformType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePropertyType }
-     * 
-     */
-    public SignaturePropertyType createSignaturePropertyType() {
-        return new SignaturePropertyType();
-    }
-
-    /**
-     * Create an instance of {@link KeyValueType }
-     * 
-     */
-    public KeyValueType createKeyValueType() {
-        return new KeyValueType();
-    }
-
-    /**
-     * Create an instance of {@link ReferenceType }
-     * 
-     */
-    public ReferenceType createReferenceType() {
-        return new ReferenceType();
-    }
-
-    /**
-     * Create an instance of {@link CanonicalizationMethodType }
-     * 
-     */
-    public CanonicalizationMethodType createCanonicalizationMethodType() {
-        return new CanonicalizationMethodType();
-    }
-
-    /**
-     * Create an instance of {@link SignaturePropertiesType }
-     * 
-     */
-    public SignaturePropertiesType createSignaturePropertiesType() {
-        return new SignaturePropertiesType();
-    }
-
-    /**
-     * Create an instance of {@link ObjectType }
-     * 
-     */
-    public ObjectType createObjectType() {
-        return new ObjectType();
-    }
-
-    /**
-     * Create an instance of {@link X509IssuerSerialType }
-     * 
-     */
-    public X509IssuerSerialType createX509IssuerSerialType() {
-        return new X509IssuerSerialType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
-    public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
-        return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData")
-    public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
-        return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData")
-    public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
-        return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
-    public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
-        return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod")
-    public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) {
-        return new JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty")
-    public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) {
-        return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest")
-    public JAXBElement<ManifestType> createManifest(ManifestType value) {
-        return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
-    public JAXBElement<TransformsType> createTransforms(TransformsType value) {
-        return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod")
-    public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) {
-        return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo")
-    public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
-        return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod")
-    public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) {
-        return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, DigestMethodType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
-    public JAXBElement<String> createMgmtData(String value) {
-        return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference")
-    public JAXBElement<ReferenceType> createReference(ReferenceType value) {
-        return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue")
-    public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) {
-        return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature")
-    public JAXBElement<SignatureType> createSignature(SignatureType value) {
-        return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue")
-    public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) {
-        return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
-    public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
-        return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
-    public JAXBElement<ObjectType> createObject(ObjectType value) {
-        return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue")
-    public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) {
-        return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform")
-    public JAXBElement<TransformType> createTransform(TransformType value) {
-        return new JAXBElement<TransformType>(_Transform_QNAME, TransformType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
-    public JAXBElement<X509DataType> createX509Data(X509DataType value) {
-        return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue")
-    public JAXBElement<byte[]> createDigestValue(byte[] value) {
-        return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
-    public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
-        return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
-    public JAXBElement<String> createKeyName(String value) {
-        return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
-    public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
-        return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
-    public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
-        return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
-    public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
-        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
-    public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
-        return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class)
-    public JAXBElement<X509IssuerSerialType> createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) {
-        return new JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class)
-    public JAXBElement<String> createX509DataTypeX509SubjectName(String value) {
-        return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class)
-    public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
-        return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
-    public JAXBElement<String> createTransformTypeXPath(String value) {
-        return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
-    }
+	private final static QName _SignatureMethodTypeHMACOutputLength_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "HMACOutputLength");
+	private final static QName _PGPData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPData");
+	private final static QName _SPKIData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKIData");
+	private final static QName _RetrievalMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RetrievalMethod");
+	private final static QName _CanonicalizationMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "CanonicalizationMethod");
+	private final static QName _SignatureProperty_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperty");
+	private final static QName _Manifest_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Manifest");
+	private final static QName _Transforms_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transforms");
+	private final static QName _SignatureMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureMethod");
+	private final static QName _KeyInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyInfo");
+	private final static QName _DigestMethod_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestMethod");
+	private final static QName _MgmtData_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "MgmtData");
+	private final static QName _Reference_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Reference");
+	private final static QName _RSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "RSAKeyValue");
+	private final static QName _Signature_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Signature");
+	private final static QName _DSAKeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DSAKeyValue");
+	private final static QName _SignedInfo_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignedInfo");
+	private final static QName _Object_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Object");
+	private final static QName _SignatureValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureValue");
+	private final static QName _Transform_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "Transform");
+	private final static QName _X509Data_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Data");
+	private final static QName _DigestValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "DigestValue");
+	private final static QName _SignatureProperties_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SignatureProperties");
+	private final static QName _KeyName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyName");
+	private final static QName _KeyValue_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "KeyValue");
+	private final static QName _SPKIDataTypeSPKISexp_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "SPKISexp");
+	private final static QName _PGPDataTypePGPKeyID_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyID");
+	private final static QName _PGPDataTypePGPKeyPacket_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "PGPKeyPacket");
+	private final static QName _X509DataTypeX509IssuerSerial_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509IssuerSerial");
+	private final static QName _X509DataTypeX509Certificate_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509Certificate");
+	private final static QName _X509DataTypeX509SKI_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SKI");
+	private final static QName _X509DataTypeX509SubjectName_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509SubjectName");
+	private final static QName _X509DataTypeX509CRL_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "X509CRL");
+	private final static QName _TransformTypeXPath_QNAME = new QName("http://www.w3.org/2000/09/xmldsig#", "XPath");
+
+	/**
+	 * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.w3._2000._09.xmldsig
+	 * 
+	 */
+	public ObjectFactory() {
+	}
+
+	/**
+	 * Create an instance of {@link KeyInfoType }
+	 * 
+	 */
+	public KeyInfoType createKeyInfoType() {
+		return new KeyInfoType();
+	}
+
+	/**
+	 * Create an instance of {@link SignedInfoType }
+	 * 
+	 */
+	public SignedInfoType createSignedInfoType() {
+		return new SignedInfoType();
+	}
+
+	/**
+	 * Create an instance of {@link RetrievalMethodType }
+	 * 
+	 */
+	public RetrievalMethodType createRetrievalMethodType() {
+		return new RetrievalMethodType();
+	}
+
+	/**
+	 * Create an instance of {@link DigestMethodType }
+	 * 
+	 */
+	public DigestMethodType createDigestMethodType() {
+		return new DigestMethodType();
+	}
+
+	/**
+	 * Create an instance of {@link SignatureMethodType }
+	 * 
+	 */
+	public SignatureMethodType createSignatureMethodType() {
+		return new SignatureMethodType();
+	}
+
+	/**
+	 * Create an instance of {@link SPKIDataType }
+	 * 
+	 */
+	public SPKIDataType createSPKIDataType() {
+		return new SPKIDataType();
+	}
+
+	/**
+	 * Create an instance of {@link X509DataType }
+	 * 
+	 */
+	public X509DataType createX509DataType() {
+		return new X509DataType();
+	}
+
+	/**
+	 * Create an instance of {@link PGPDataType }
+	 * 
+	 */
+	public PGPDataType createPGPDataType() {
+		return new PGPDataType();
+	}
+
+	/**
+	 * Create an instance of {@link SignatureType }
+	 * 
+	 */
+	public SignatureType createSignatureType() {
+		return new SignatureType();
+	}
+
+	/**
+	 * Create an instance of {@link DSAKeyValueType }
+	 * 
+	 */
+	public DSAKeyValueType createDSAKeyValueType() {
+		return new DSAKeyValueType();
+	}
+
+	/**
+	 * Create an instance of {@link ManifestType }
+	 * 
+	 */
+	public ManifestType createManifestType() {
+		return new ManifestType();
+	}
+
+	/**
+	 * Create an instance of {@link SignatureValueType }
+	 * 
+	 */
+	public SignatureValueType createSignatureValueType() {
+		return new SignatureValueType();
+	}
+
+	/**
+	 * Create an instance of {@link TransformsType }
+	 * 
+	 */
+	public TransformsType createTransformsType() {
+		return new TransformsType();
+	}
+
+	/**
+	 * Create an instance of {@link RSAKeyValueType }
+	 * 
+	 */
+	public RSAKeyValueType createRSAKeyValueType() {
+		return new RSAKeyValueType();
+	}
+
+	/**
+	 * Create an instance of {@link TransformType }
+	 * 
+	 */
+	public TransformType createTransformType() {
+		return new TransformType();
+	}
+
+	/**
+	 * Create an instance of {@link SignaturePropertyType }
+	 * 
+	 */
+	public SignaturePropertyType createSignaturePropertyType() {
+		return new SignaturePropertyType();
+	}
+
+	/**
+	 * Create an instance of {@link KeyValueType }
+	 * 
+	 */
+	public KeyValueType createKeyValueType() {
+		return new KeyValueType();
+	}
+
+	/**
+	 * Create an instance of {@link ReferenceType }
+	 * 
+	 */
+	public ReferenceType createReferenceType() {
+		return new ReferenceType();
+	}
+
+	/**
+	 * Create an instance of {@link CanonicalizationMethodType }
+	 * 
+	 */
+	public CanonicalizationMethodType createCanonicalizationMethodType() {
+		return new CanonicalizationMethodType();
+	}
+
+	/**
+	 * Create an instance of {@link SignaturePropertiesType }
+	 * 
+	 */
+	public SignaturePropertiesType createSignaturePropertiesType() {
+		return new SignaturePropertiesType();
+	}
+
+	/**
+	 * Create an instance of {@link ObjectType }
+	 * 
+	 */
+	public ObjectType createObjectType() {
+		return new ObjectType();
+	}
+
+	/**
+	 * Create an instance of {@link X509IssuerSerialType }
+	 * 
+	 */
+	public X509IssuerSerialType createX509IssuerSerialType() {
+		return new X509IssuerSerialType();
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "HMACOutputLength", scope = SignatureMethodType.class)
+	public JAXBElement<BigInteger> createSignatureMethodTypeHMACOutputLength(BigInteger value) {
+		return new JAXBElement<BigInteger>(_SignatureMethodTypeHMACOutputLength_QNAME, BigInteger.class, SignatureMethodType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link PGPDataType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPData")
+	public JAXBElement<PGPDataType> createPGPData(PGPDataType value) {
+		return new JAXBElement<PGPDataType>(_PGPData_QNAME, PGPDataType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link SPKIDataType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKIData")
+	public JAXBElement<SPKIDataType> createSPKIData(SPKIDataType value) {
+		return new JAXBElement<SPKIDataType>(_SPKIData_QNAME, SPKIDataType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link RetrievalMethodType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RetrievalMethod")
+	public JAXBElement<RetrievalMethodType> createRetrievalMethod(RetrievalMethodType value) {
+		return new JAXBElement<RetrievalMethodType>(_RetrievalMethod_QNAME, RetrievalMethodType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link CanonicalizationMethodType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "CanonicalizationMethod")
+	public JAXBElement<CanonicalizationMethodType> createCanonicalizationMethod(CanonicalizationMethodType value) {
+		return new JAXBElement<CanonicalizationMethodType>(_CanonicalizationMethod_QNAME, CanonicalizationMethodType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertyType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperty")
+	public JAXBElement<SignaturePropertyType> createSignatureProperty(SignaturePropertyType value) {
+		return new JAXBElement<SignaturePropertyType>(_SignatureProperty_QNAME, SignaturePropertyType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link ManifestType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Manifest")
+	public JAXBElement<ManifestType> createManifest(ManifestType value) {
+		return new JAXBElement<ManifestType>(_Manifest_QNAME, ManifestType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link TransformsType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transforms")
+	public JAXBElement<TransformsType> createTransforms(TransformsType value) {
+		return new JAXBElement<TransformsType>(_Transforms_QNAME, TransformsType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link SignatureMethodType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureMethod")
+	public JAXBElement<SignatureMethodType> createSignatureMethod(SignatureMethodType value) {
+		return new JAXBElement<SignatureMethodType>(_SignatureMethod_QNAME, SignatureMethodType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link KeyInfoType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyInfo")
+	public JAXBElement<KeyInfoType> createKeyInfo(KeyInfoType value) {
+		return new JAXBElement<KeyInfoType>(_KeyInfo_QNAME, KeyInfoType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link DigestMethodType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestMethod")
+	public JAXBElement<DigestMethodType> createDigestMethod(DigestMethodType value) {
+		return new JAXBElement<DigestMethodType>(_DigestMethod_QNAME, DigestMethodType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "MgmtData")
+	public JAXBElement<String> createMgmtData(String value) {
+		return new JAXBElement<String>(_MgmtData_QNAME, String.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link ReferenceType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Reference")
+	public JAXBElement<ReferenceType> createReference(ReferenceType value) {
+		return new JAXBElement<ReferenceType>(_Reference_QNAME, ReferenceType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link RSAKeyValueType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "RSAKeyValue")
+	public JAXBElement<RSAKeyValueType> createRSAKeyValue(RSAKeyValueType value) {
+		return new JAXBElement<RSAKeyValueType>(_RSAKeyValue_QNAME, RSAKeyValueType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link SignatureType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Signature")
+	public JAXBElement<SignatureType> createSignature(SignatureType value) {
+		return new JAXBElement<SignatureType>(_Signature_QNAME, SignatureType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link DSAKeyValueType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DSAKeyValue")
+	public JAXBElement<DSAKeyValueType> createDSAKeyValue(DSAKeyValueType value) {
+		return new JAXBElement<DSAKeyValueType>(_DSAKeyValue_QNAME, DSAKeyValueType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link SignedInfoType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignedInfo")
+	public JAXBElement<SignedInfoType> createSignedInfo(SignedInfoType value) {
+		return new JAXBElement<SignedInfoType>(_SignedInfo_QNAME, SignedInfoType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link ObjectType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Object")
+	public JAXBElement<ObjectType> createObject(ObjectType value) {
+		return new JAXBElement<ObjectType>(_Object_QNAME, ObjectType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link SignatureValueType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureValue")
+	public JAXBElement<SignatureValueType> createSignatureValue(SignatureValueType value) {
+		return new JAXBElement<SignatureValueType>(_SignatureValue_QNAME, SignatureValueType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link TransformType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "Transform")
+	public JAXBElement<TransformType> createTransform(TransformType value) {
+		return new JAXBElement<TransformType>(_Transform_QNAME, TransformType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link X509DataType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Data")
+	public JAXBElement<X509DataType> createX509Data(X509DataType value) {
+		return new JAXBElement<X509DataType>(_X509Data_QNAME, X509DataType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "DigestValue")
+	public JAXBElement<byte[]> createDigestValue(byte[] value) {
+		return new JAXBElement<byte[]>(_DigestValue_QNAME, byte[].class, null, ((byte[]) value));
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link SignaturePropertiesType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SignatureProperties")
+	public JAXBElement<SignaturePropertiesType> createSignatureProperties(SignaturePropertiesType value) {
+		return new JAXBElement<SignaturePropertiesType>(_SignatureProperties_QNAME, SignaturePropertiesType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyName")
+	public JAXBElement<String> createKeyName(String value) {
+		return new JAXBElement<String>(_KeyName_QNAME, String.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link KeyValueType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "KeyValue")
+	public JAXBElement<KeyValueType> createKeyValue(KeyValueType value) {
+		return new JAXBElement<KeyValueType>(_KeyValue_QNAME, KeyValueType.class, null, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "SPKISexp", scope = SPKIDataType.class)
+	public JAXBElement<byte[]> createSPKIDataTypeSPKISexp(byte[] value) {
+		return new JAXBElement<byte[]>(_SPKIDataTypeSPKISexp_QNAME, byte[].class, SPKIDataType.class, ((byte[]) value));
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyID", scope = PGPDataType.class)
+	public JAXBElement<byte[]> createPGPDataTypePGPKeyID(byte[] value) {
+		return new JAXBElement<byte[]>(_PGPDataTypePGPKeyID_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "PGPKeyPacket", scope = PGPDataType.class)
+	public JAXBElement<byte[]> createPGPDataTypePGPKeyPacket(byte[] value) {
+		return new JAXBElement<byte[]>(_PGPDataTypePGPKeyPacket_QNAME, byte[].class, PGPDataType.class, ((byte[]) value));
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509IssuerSerial", scope = X509DataType.class)
+	public JAXBElement<X509IssuerSerialType> createX509DataTypeX509IssuerSerial(X509IssuerSerialType value) {
+		return new JAXBElement<X509IssuerSerialType>(_X509DataTypeX509IssuerSerial_QNAME, X509IssuerSerialType.class, X509DataType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509Certificate", scope = X509DataType.class)
+	public JAXBElement<byte[]> createX509DataTypeX509Certificate(byte[] value) {
+		return new JAXBElement<byte[]>(_X509DataTypeX509Certificate_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SKI", scope = X509DataType.class)
+	public JAXBElement<byte[]> createX509DataTypeX509SKI(byte[] value) {
+		return new JAXBElement<byte[]>(_X509DataTypeX509SKI_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509SubjectName", scope = X509DataType.class)
+	public JAXBElement<String> createX509DataTypeX509SubjectName(String value) {
+		return new JAXBElement<String>(_X509DataTypeX509SubjectName_QNAME, String.class, X509DataType.class, value);
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "X509CRL", scope = X509DataType.class)
+	public JAXBElement<byte[]> createX509DataTypeX509CRL(byte[] value) {
+		return new JAXBElement<byte[]>(_X509DataTypeX509CRL_QNAME, byte[].class, X509DataType.class, ((byte[]) value));
+	}
+
+	/**
+	 * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}
+	 * 
+	 */
+	@XmlElementDecl(namespace = "http://www.w3.org/2000/09/xmldsig#", name = "XPath", scope = TransformType.class)
+	public JAXBElement<String> createTransformTypeXPath(String value) {
+		return new JAXBElement<String>(_TransformTypeXPath_QNAME, String.class, TransformType.class, value);
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java
index 0c4509139..8f8573ead 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -22,11 +21,12 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.w3c.dom.Element;
 
-
 /**
- * <p>Java class for ObjectType complex type.
+ * <p>
+ * Java class for ObjectType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ObjectType">
@@ -46,126 +46,111 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ObjectType", propOrder = {
-    "content"
-})
+@XmlType(name = "ObjectType", propOrder = { "content" })
 public class ObjectType {
 
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "MimeType")
-    protected String mimeType;
-    @XmlAttribute(name = "Encoding")
-    @XmlSchemaType(name = "anyURI")
-    protected String encoding;
+	@XmlMixed
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
+	@XmlAttribute(name = "Id")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String id;
+	@XmlAttribute(name = "MimeType")
+	protected String mimeType;
+	@XmlAttribute(name = "Encoding")
+	@XmlSchemaType(name = "anyURI")
+	protected String encoding;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String }
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
-    /**
-     * Gets the value of the mimeType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMimeType() {
-        return mimeType;
-    }
+	/**
+	 * Gets the value of the mimeType property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getMimeType() {
+		return mimeType;
+	}
 
-    /**
-     * Sets the value of the mimeType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMimeType(String value) {
-        this.mimeType = value;
-    }
+	/**
+	 * Sets the value of the mimeType property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setMimeType(String value) {
+		this.mimeType = value;
+	}
 
-    /**
-     * Gets the value of the encoding property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getEncoding() {
-        return encoding;
-    }
+	/**
+	 * Gets the value of the encoding property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getEncoding() {
+		return encoding;
+	}
 
-    /**
-     * Sets the value of the encoding property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setEncoding(String value) {
-        this.encoding = value;
-    }
+	/**
+	 * Sets the value of the encoding property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setEncoding(String value) {
+		this.encoding = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java
index 8c0e1ceaa..a43e2857c 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -19,11 +18,12 @@ import javax.xml.bind.annotation.XmlElementRefs;
 import javax.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
-
 /**
- * <p>Java class for PGPDataType complex type.
+ * <p>
+ * Java class for PGPDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="PGPDataType">
@@ -48,58 +48,46 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "PGPDataType", propOrder = {
-    "content"
-})
+@XmlType(name = "PGPDataType", propOrder = { "content" })
 public class PGPDataType {
 
-    @XmlElementRefs({
-        @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
-    })
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
+	@XmlElementRefs({ @XmlElementRef(name = "PGPKeyPacket", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "PGPKeyID", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
 
-    /**
-     * Gets the rest of the content model. 
-     * 
-     * <p>
-     * You are getting this "catch-all" property because of the following reason: 
-     * The field name "PGPKeyPacket" is used by two different parts of a schema. See: 
-     * line 209 of file:/C:/Source/LatestSource/webgate.ec.europa.eu/branches/IS_branch/Commons/src/main/resources/schema/xmldsig-core-schema.xsd
-     * line 204 of file:/C:/Source/LatestSource/webgate.ec.europa.eu/branches/IS_branch/Commons/src/main/resources/schema/xmldsig-core-schema.xsd
-     * <p>
-     * To get rid of this property, apply a property customization to one 
-     * of both of the following declarations to change their names: 
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Gets the rest of the content model.
+	 * 
+	 * <p>
+	 * You are getting this "catch-all" property because of the following reason: The field name "PGPKeyPacket" is used by two different parts of a schema. See: line 209 of
+	 * file:/C:/Source/LatestSource/webgate.ec.europa.eu/branches/IS_branch/Commons/src/main/resources/schema/xmldsig-core-schema.xsd line 204 of
+	 * file:/C:/Source/LatestSource/webgate.ec.europa.eu/branches/IS_branch/Commons/src/main/resources/schema/xmldsig-core-schema.xsd
+	 * <p>
+	 * To get rid of this property, apply a property customization to one of both of the following declarations to change their names: Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link Object } {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link Element } {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java
index 892944965..eedb02899 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -13,11 +12,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for RSAKeyValueType complex type.
+ * <p>
+ * Java class for RSAKeyValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="RSAKeyValueType">
@@ -35,59 +35,50 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RSAKeyValueType", propOrder = {
-    "modulus",
-    "exponent"
-})
+@XmlType(name = "RSAKeyValueType", propOrder = { "modulus", "exponent" })
 public class RSAKeyValueType {
 
-    @XmlElement(name = "Modulus", required = true)
-    protected byte[] modulus;
-    @XmlElement(name = "Exponent", required = true)
-    protected byte[] exponent;
+	@XmlElement(name = "Modulus", required = true)
+	protected byte[] modulus;
+	@XmlElement(name = "Exponent", required = true)
+	protected byte[] exponent;
 
-    /**
-     * Gets the value of the modulus property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getModulus() {
-        return modulus;
-    }
+	/**
+	 * Gets the value of the modulus property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getModulus() {
+		return modulus;
+	}
 
-    /**
-     * Sets the value of the modulus property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setModulus(byte[] value) {
-        this.modulus = value;
-    }
+	/**
+	 * Sets the value of the modulus property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setModulus(byte[] value) {
+		this.modulus = value;
+	}
 
-    /**
-     * Gets the value of the exponent property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getExponent() {
-        return exponent;
-    }
+	/**
+	 * Gets the value of the exponent property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getExponent() {
+		return exponent;
+	}
 
-    /**
-     * Sets the value of the exponent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setExponent(byte[] value) {
-        this.exponent = value;
-    }
+	/**
+	 * Sets the value of the exponent property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setExponent(byte[] value) {
+		this.exponent = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java
index 117949e65..83f03f3c8 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 /**
- * <p>Java class for ReferenceType complex type.
+ * <p>
+ * Java class for ReferenceType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="ReferenceType">
@@ -44,171 +44,149 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "ReferenceType", propOrder = {
-    "transforms",
-    "digestMethod",
-    "digestValue"
-})
+@XmlType(name = "ReferenceType", propOrder = { "transforms", "digestMethod", "digestValue" })
 public class ReferenceType {
 
-    @XmlElement(name = "Transforms")
-    protected TransformsType transforms;
-    @XmlElement(name = "DigestMethod", required = true)
-    protected DigestMethodType digestMethod;
-    @XmlElement(name = "DigestValue", required = true)
-    protected byte[] digestValue;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-    @XmlAttribute(name = "URI")
-    @XmlSchemaType(name = "anyURI")
-    protected String uri;
-    @XmlAttribute(name = "Type")
-    @XmlSchemaType(name = "anyURI")
-    protected String type;
-
-    /**
-     * Gets the value of the transforms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransformsType }
-     *     
-     */
-    public TransformsType getTransforms() {
-        return transforms;
-    }
-
-    /**
-     * Sets the value of the transforms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransformsType }
-     *     
-     */
-    public void setTransforms(TransformsType value) {
-        this.transforms = value;
-    }
-
-    /**
-     * Gets the value of the digestMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DigestMethodType }
-     *     
-     */
-    public DigestMethodType getDigestMethod() {
-        return digestMethod;
-    }
-
-    /**
-     * Sets the value of the digestMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DigestMethodType }
-     *     
-     */
-    public void setDigestMethod(DigestMethodType value) {
-        this.digestMethod = value;
-    }
-
-    /**
-     * Gets the value of the digestValue property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getDigestValue() {
-        return digestValue;
-    }
-
-    /**
-     * Sets the value of the digestValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setDigestValue(byte[] value) {
-        this.digestValue = value;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
-
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURI() {
-        return uri;
-    }
-
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURI(String value) {
-        this.uri = value;
-    }
-
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
-
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
+	@XmlElement(name = "Transforms")
+	protected TransformsType transforms;
+	@XmlElement(name = "DigestMethod", required = true)
+	protected DigestMethodType digestMethod;
+	@XmlElement(name = "DigestValue", required = true)
+	protected byte[] digestValue;
+	@XmlAttribute(name = "Id")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String id;
+	@XmlAttribute(name = "URI")
+	@XmlSchemaType(name = "anyURI")
+	protected String uri;
+	@XmlAttribute(name = "Type")
+	@XmlSchemaType(name = "anyURI")
+	protected String type;
+
+	/**
+	 * Gets the value of the transforms property.
+	 * 
+	 * @return possible object is {@link TransformsType }
+	 * 
+	 */
+	public TransformsType getTransforms() {
+		return transforms;
+	}
+
+	/**
+	 * Sets the value of the transforms property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link TransformsType }
+	 * 
+	 */
+	public void setTransforms(TransformsType value) {
+		this.transforms = value;
+	}
+
+	/**
+	 * Gets the value of the digestMethod property.
+	 * 
+	 * @return possible object is {@link DigestMethodType }
+	 * 
+	 */
+	public DigestMethodType getDigestMethod() {
+		return digestMethod;
+	}
+
+	/**
+	 * Sets the value of the digestMethod property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link DigestMethodType }
+	 * 
+	 */
+	public void setDigestMethod(DigestMethodType value) {
+		this.digestMethod = value;
+	}
+
+	/**
+	 * Gets the value of the digestValue property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getDigestValue() {
+		return digestValue;
+	}
+
+	/**
+	 * Sets the value of the digestValue property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setDigestValue(byte[] value) {
+		this.digestValue = value;
+	}
+
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
+
+	/**
+	 * Gets the value of the uri property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getURI() {
+		return uri;
+	}
+
+	/**
+	 * Sets the value of the uri property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setURI(String value) {
+		this.uri = value;
+	}
+
+	/**
+	 * Gets the value of the type property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getType() {
+		return type;
+	}
+
+	/**
+	 * Sets the value of the type property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setType(String value) {
+		this.type = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java
index a8da5c998..6f1a94de5 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for RetrievalMethodType complex type.
+ * <p>
+ * Java class for RetrievalMethodType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="RetrievalMethodType">
@@ -38,90 +38,79 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "RetrievalMethodType", propOrder = {
-    "transforms"
-})
+@XmlType(name = "RetrievalMethodType", propOrder = { "transforms" })
 public class RetrievalMethodType {
 
-    @XmlElement(name = "Transforms")
-    protected TransformsType transforms;
-    @XmlAttribute(name = "URI")
-    @XmlSchemaType(name = "anyURI")
-    protected String uri;
-    @XmlAttribute(name = "Type")
-    @XmlSchemaType(name = "anyURI")
-    protected String type;
+	@XmlElement(name = "Transforms")
+	protected TransformsType transforms;
+	@XmlAttribute(name = "URI")
+	@XmlSchemaType(name = "anyURI")
+	protected String uri;
+	@XmlAttribute(name = "Type")
+	@XmlSchemaType(name = "anyURI")
+	protected String type;
 
-    /**
-     * Gets the value of the transforms property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TransformsType }
-     *     
-     */
-    public TransformsType getTransforms() {
-        return transforms;
-    }
+	/**
+	 * Gets the value of the transforms property.
+	 * 
+	 * @return possible object is {@link TransformsType }
+	 * 
+	 */
+	public TransformsType getTransforms() {
+		return transforms;
+	}
 
-    /**
-     * Sets the value of the transforms property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TransformsType }
-     *     
-     */
-    public void setTransforms(TransformsType value) {
-        this.transforms = value;
-    }
+	/**
+	 * Sets the value of the transforms property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link TransformsType }
+	 * 
+	 */
+	public void setTransforms(TransformsType value) {
+		this.transforms = value;
+	}
 
-    /**
-     * Gets the value of the uri property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getURI() {
-        return uri;
-    }
+	/**
+	 * Gets the value of the uri property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getURI() {
+		return uri;
+	}
 
-    /**
-     * Sets the value of the uri property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setURI(String value) {
-        this.uri = value;
-    }
+	/**
+	 * Sets the value of the uri property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setURI(String value) {
+		this.uri = value;
+	}
 
-    /**
-     * Gets the value of the type property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getType() {
-        return type;
-    }
+	/**
+	 * Gets the value of the type property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getType() {
+		return type;
+	}
 
-    /**
-     * Sets the value of the type property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setType(String value) {
-        this.type = value;
-    }
+	/**
+	 * Sets the value of the type property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setType(String value) {
+		this.type = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java
index a8154f49f..5199fb0e2 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlElementRef;
 import javax.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
-
 /**
- * <p>Java class for SPKIDataType complex type.
+ * <p>
+ * Java class for SPKIDataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="SPKIDataType">
@@ -40,44 +40,38 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SPKIDataType", propOrder = {
-    "spkiSexpAndAny"
-})
+@XmlType(name = "SPKIDataType", propOrder = { "spkiSexpAndAny" })
 public class SPKIDataType {
 
-    @XmlElementRef(name = "SPKISexp", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
-    @XmlAnyElement(lax = true)
-    protected List<Object> spkiSexpAndAny;
+	@XmlElementRef(name = "SPKISexp", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class)
+	@XmlAnyElement(lax = true)
+	protected List<Object> spkiSexpAndAny;
 
-    /**
-     * Gets the value of the spkiSexpAndAny property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the spkiSexpAndAny property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSPKISexpAndAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getSPKISexpAndAny() {
-        if (spkiSexpAndAny == null) {
-            spkiSexpAndAny = new ArrayList<Object>();
-        }
-        return this.spkiSexpAndAny;
-    }
+	/**
+	 * Gets the value of the spkiSexpAndAny property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the spkiSexpAndAny property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getSPKISexpAndAny().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link Element } {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link Object }
+	 * 
+	 * 
+	 */
+	public List<Object> getSPKISexpAndAny() {
+		if (spkiSexpAndAny == null) {
+			spkiSexpAndAny = new ArrayList<Object>();
+		}
+		return this.spkiSexpAndAny;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java
index 20c22bd5b..4f5658011 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.math.BigInteger;
@@ -21,11 +20,12 @@ import javax.xml.bind.annotation.XmlMixed;
 import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for SignatureMethodType complex type.
+ * <p>
+ * Java class for SignatureMethodType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="SignatureMethodType">
@@ -44,72 +44,63 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureMethodType", propOrder = {
-    "content"
-})
+@XmlType(name = "SignatureMethodType", propOrder = { "content" })
 public class SignatureMethodType {
 
-    @XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
+	@XmlElementRef(name = "HMACOutputLength", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+	@XmlMixed
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
+	@XmlAttribute(name = "Algorithm", required = true)
+	@XmlSchemaType(name = "anyURI")
+	protected String algorithm;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link BigInteger }{@code >}
-     * {@link Object }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link BigInteger }{@code >} {@link Object } {@link String }
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
+	/**
+	 * Gets the value of the algorithm property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAlgorithm() {
+		return algorithm;
+	}
 
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
+	/**
+	 * Sets the value of the algorithm property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAlgorithm(String value) {
+		this.algorithm = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java
index 163e314d3..481abd165 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -20,11 +19,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 /**
- * <p>Java class for SignaturePropertiesType complex type.
+ * <p>
+ * Java class for SignaturePropertiesType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="SignaturePropertiesType">
@@ -42,70 +42,63 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePropertiesType", propOrder = {
-    "signatureProperty"
-})
+@XmlType(name = "SignaturePropertiesType", propOrder = { "signatureProperty" })
 public class SignaturePropertiesType {
 
-    @XmlElement(name = "SignatureProperty", required = true)
-    protected List<SignaturePropertyType> signatureProperty;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
+	@XmlElement(name = "SignatureProperty", required = true)
+	protected List<SignaturePropertyType> signatureProperty;
+	@XmlAttribute(name = "Id")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String id;
 
-    /**
-     * Gets the value of the signatureProperty property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the signatureProperty property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getSignatureProperty().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link SignaturePropertyType }
-     * 
-     * 
-     */
-    public List<SignaturePropertyType> getSignatureProperty() {
-        if (signatureProperty == null) {
-            signatureProperty = new ArrayList<SignaturePropertyType>();
-        }
-        return this.signatureProperty;
-    }
+	/**
+	 * Gets the value of the signatureProperty property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the signatureProperty property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getSignatureProperty().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link SignaturePropertyType }
+	 * 
+	 * 
+	 */
+	public List<SignaturePropertyType> getSignatureProperty() {
+		if (signatureProperty == null) {
+			signatureProperty = new ArrayList<SignaturePropertyType>();
+		}
+		return this.signatureProperty;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java
index 1963a7399..027675315 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -22,11 +21,12 @@ import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 import org.w3c.dom.Element;
 
-
 /**
- * <p>Java class for SignaturePropertyType complex type.
+ * <p>
+ * Java class for SignaturePropertyType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="SignaturePropertyType">
@@ -45,100 +45,88 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignaturePropertyType", propOrder = {
-    "content"
-})
+@XmlType(name = "SignaturePropertyType", propOrder = { "content" })
 public class SignaturePropertyType {
 
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Target", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String target;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
+	@XmlMixed
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
+	@XmlAttribute(name = "Target", required = true)
+	@XmlSchemaType(name = "anyURI")
+	protected String target;
+	@XmlAttribute(name = "Id")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String id;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link Element }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link Object } {@link Element } {@link String }
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
-    /**
-     * Gets the value of the target property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getTarget() {
-        return target;
-    }
+	/**
+	 * Gets the value of the target property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getTarget() {
+		return target;
+	}
 
-    /**
-     * Sets the value of the target property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setTarget(String value) {
-        this.target = value;
-    }
+	/**
+	 * Sets the value of the target property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setTarget(String value) {
+		this.target = value;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java
index 3e7a1b97c..131cee1bc 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -20,11 +19,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 /**
- * <p>Java class for SignatureType complex type.
+ * <p>
+ * Java class for SignatureType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="SignatureType">
@@ -45,151 +45,132 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureType", propOrder = {
-    "signedInfo",
-    "signatureValue",
-    "keyInfo",
-    "object"
-})
+@XmlType(name = "SignatureType", propOrder = { "signedInfo", "signatureValue", "keyInfo", "object" })
 public class SignatureType {
 
-    @XmlElement(name = "SignedInfo", required = true)
-    protected SignedInfoType signedInfo;
-    @XmlElement(name = "SignatureValue", required = true)
-    protected SignatureValueType signatureValue;
-    @XmlElement(name = "KeyInfo")
-    protected KeyInfoType keyInfo;
-    @XmlElement(name = "Object")
-    protected List<ObjectType> object;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the signedInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignedInfoType }
-     *     
-     */
-    public SignedInfoType getSignedInfo() {
-        return signedInfo;
-    }
-
-    /**
-     * Sets the value of the signedInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignedInfoType }
-     *     
-     */
-    public void setSignedInfo(SignedInfoType value) {
-        this.signedInfo = value;
-    }
-
-    /**
-     * Gets the value of the signatureValue property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureValueType }
-     *     
-     */
-    public SignatureValueType getSignatureValue() {
-        return signatureValue;
-    }
-
-    /**
-     * Sets the value of the signatureValue property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureValueType }
-     *     
-     */
-    public void setSignatureValue(SignatureValueType value) {
-        this.signatureValue = value;
-    }
-
-    /**
-     * Gets the value of the keyInfo property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KeyInfoType }
-     *     
-     */
-    public KeyInfoType getKeyInfo() {
-        return keyInfo;
-    }
-
-    /**
-     * Sets the value of the keyInfo property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KeyInfoType }
-     *     
-     */
-    public void setKeyInfo(KeyInfoType value) {
-        this.keyInfo = value;
-    }
-
-    /**
-     * Gets the value of the object property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the object property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getObject().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ObjectType }
-     * 
-     * 
-     */
-    public List<ObjectType> getObject() {
-        if (object == null) {
-            object = new ArrayList<ObjectType>();
-        }
-        return this.object;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	@XmlElement(name = "SignedInfo", required = true)
+	protected SignedInfoType signedInfo;
+	@XmlElement(name = "SignatureValue", required = true)
+	protected SignatureValueType signatureValue;
+	@XmlElement(name = "KeyInfo")
+	protected KeyInfoType keyInfo;
+	@XmlElement(name = "Object")
+	protected List<ObjectType> object;
+	@XmlAttribute(name = "Id")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String id;
+
+	/**
+	 * Gets the value of the signedInfo property.
+	 * 
+	 * @return possible object is {@link SignedInfoType }
+	 * 
+	 */
+	public SignedInfoType getSignedInfo() {
+		return signedInfo;
+	}
+
+	/**
+	 * Sets the value of the signedInfo property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link SignedInfoType }
+	 * 
+	 */
+	public void setSignedInfo(SignedInfoType value) {
+		this.signedInfo = value;
+	}
+
+	/**
+	 * Gets the value of the signatureValue property.
+	 * 
+	 * @return possible object is {@link SignatureValueType }
+	 * 
+	 */
+	public SignatureValueType getSignatureValue() {
+		return signatureValue;
+	}
+
+	/**
+	 * Sets the value of the signatureValue property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link SignatureValueType }
+	 * 
+	 */
+	public void setSignatureValue(SignatureValueType value) {
+		this.signatureValue = value;
+	}
+
+	/**
+	 * Gets the value of the keyInfo property.
+	 * 
+	 * @return possible object is {@link KeyInfoType }
+	 * 
+	 */
+	public KeyInfoType getKeyInfo() {
+		return keyInfo;
+	}
+
+	/**
+	 * Sets the value of the keyInfo property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link KeyInfoType }
+	 * 
+	 */
+	public void setKeyInfo(KeyInfoType value) {
+		this.keyInfo = value;
+	}
+
+	/**
+	 * Gets the value of the object property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the object property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getObject().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link ObjectType }
+	 * 
+	 * 
+	 */
+	public List<ObjectType> getObject() {
+		if (object == null) {
+			object = new ArrayList<ObjectType>();
+		}
+		return this.object;
+	}
+
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
+
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java
index 6ae095c5a..af43e55cd 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import javax.xml.bind.annotation.XmlAccessType;
@@ -18,11 +17,12 @@ import javax.xml.bind.annotation.XmlValue;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 /**
- * <p>Java class for SignatureValueType complex type.
+ * <p>
+ * Java class for SignatureValueType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="SignatureValueType">
@@ -37,63 +37,55 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignatureValueType", propOrder = {
-    "value"
-})
+@XmlType(name = "SignatureValueType", propOrder = { "value" })
 public class SignatureValueType {
 
-    @XmlValue
-    protected byte[] value;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
+	@XmlValue
+	protected byte[] value;
+	@XmlAttribute(name = "Id")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String id;
 
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     byte[]
-     */
-    public byte[] getValue() {
-        return value;
-    }
+	/**
+	 * Gets the value of the value property.
+	 * 
+	 * @return possible object is byte[]
+	 */
+	public byte[] getValue() {
+		return value;
+	}
 
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     byte[]
-     */
-    public void setValue(byte[] value) {
-        this.value = value;
-    }
+	/**
+	 * Sets the value of the value property.
+	 * 
+	 * @param value
+	 *            allowed object is byte[]
+	 */
+	public void setValue(byte[] value) {
+		this.value = value;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java
index cc82093ef..2523af53c 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -20,11 +19,12 @@ import javax.xml.bind.annotation.XmlType;
 import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
 import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
 
-
 /**
- * <p>Java class for SignedInfoType complex type.
+ * <p>
+ * Java class for SignedInfoType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="SignedInfoType">
@@ -44,124 +44,109 @@ import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "SignedInfoType", propOrder = {
-    "canonicalizationMethod",
-    "signatureMethod",
-    "reference"
-})
+@XmlType(name = "SignedInfoType", propOrder = { "canonicalizationMethod", "signatureMethod", "reference" })
 public class SignedInfoType {
 
-    @XmlElement(name = "CanonicalizationMethod", required = true)
-    protected CanonicalizationMethodType canonicalizationMethod;
-    @XmlElement(name = "SignatureMethod", required = true)
-    protected SignatureMethodType signatureMethod;
-    @XmlElement(name = "Reference", required = true)
-    protected List<ReferenceType> reference;
-    @XmlAttribute(name = "Id")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
+	@XmlElement(name = "CanonicalizationMethod", required = true)
+	protected CanonicalizationMethodType canonicalizationMethod;
+	@XmlElement(name = "SignatureMethod", required = true)
+	protected SignatureMethodType signatureMethod;
+	@XmlElement(name = "Reference", required = true)
+	protected List<ReferenceType> reference;
+	@XmlAttribute(name = "Id")
+	@XmlJavaTypeAdapter(CollapsedStringAdapter.class)
+	@XmlID
+	@XmlSchemaType(name = "ID")
+	protected String id;
 
-    /**
-     * Gets the value of the canonicalizationMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link CanonicalizationMethodType }
-     *     
-     */
-    public CanonicalizationMethodType getCanonicalizationMethod() {
-        return canonicalizationMethod;
-    }
+	/**
+	 * Gets the value of the canonicalizationMethod property.
+	 * 
+	 * @return possible object is {@link CanonicalizationMethodType }
+	 * 
+	 */
+	public CanonicalizationMethodType getCanonicalizationMethod() {
+		return canonicalizationMethod;
+	}
 
-    /**
-     * Sets the value of the canonicalizationMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link CanonicalizationMethodType }
-     *     
-     */
-    public void setCanonicalizationMethod(CanonicalizationMethodType value) {
-        this.canonicalizationMethod = value;
-    }
+	/**
+	 * Sets the value of the canonicalizationMethod property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link CanonicalizationMethodType }
+	 * 
+	 */
+	public void setCanonicalizationMethod(CanonicalizationMethodType value) {
+		this.canonicalizationMethod = value;
+	}
 
-    /**
-     * Gets the value of the signatureMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SignatureMethodType }
-     *     
-     */
-    public SignatureMethodType getSignatureMethod() {
-        return signatureMethod;
-    }
+	/**
+	 * Gets the value of the signatureMethod property.
+	 * 
+	 * @return possible object is {@link SignatureMethodType }
+	 * 
+	 */
+	public SignatureMethodType getSignatureMethod() {
+		return signatureMethod;
+	}
 
-    /**
-     * Sets the value of the signatureMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SignatureMethodType }
-     *     
-     */
-    public void setSignatureMethod(SignatureMethodType value) {
-        this.signatureMethod = value;
-    }
+	/**
+	 * Sets the value of the signatureMethod property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link SignatureMethodType }
+	 * 
+	 */
+	public void setSignatureMethod(SignatureMethodType value) {
+		this.signatureMethod = value;
+	}
 
-    /**
-     * Gets the value of the reference property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the reference property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getReference().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ReferenceType }
-     * 
-     * 
-     */
-    public List<ReferenceType> getReference() {
-        if (reference == null) {
-            reference = new ArrayList<ReferenceType>();
-        }
-        return this.reference;
-    }
+	/**
+	 * Gets the value of the reference property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the reference property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getReference().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link ReferenceType }
+	 * 
+	 * 
+	 */
+	public List<ReferenceType> getReference() {
+		if (reference == null) {
+			reference = new ArrayList<ReferenceType>();
+		}
+		return this.reference;
+	}
 
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getId() {
-        return id;
-    }
+	/**
+	 * Gets the value of the id property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getId() {
+		return id;
+	}
 
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setId(String value) {
-        this.id = value;
-    }
+	/**
+	 * Sets the value of the id property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setId(String value) {
+		this.id = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java
index a56f59f0e..f47dc1251 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -21,11 +20,12 @@ import javax.xml.bind.annotation.XmlSchemaType;
 import javax.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
-
 /**
- * <p>Java class for TransformType complex type.
+ * <p>
+ * Java class for TransformType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="TransformType">
@@ -44,73 +44,63 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransformType", propOrder = {
-    "content"
-})
+@XmlType(name = "TransformType", propOrder = { "content" })
 public class TransformType {
 
-    @XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
-    @XmlMixed
-    @XmlAnyElement(lax = true)
-    protected List<Object> content;
-    @XmlAttribute(name = "Algorithm", required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String algorithm;
+	@XmlElementRef(name = "XPath", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
+	@XmlMixed
+	@XmlAnyElement(lax = true)
+	protected List<Object> content;
+	@XmlAttribute(name = "Algorithm", required = true)
+	@XmlSchemaType(name = "anyURI")
+	protected String algorithm;
 
-    /**
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Object }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link Element }
-     * {@link String }
-     * 
-     * 
-     */
-    public List<Object> getContent() {
-        if (content == null) {
-            content = new ArrayList<Object>();
-        }
-        return this.content;
-    }
+	/**
+	 * Gets the value of the content property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the content property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getContent().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link Object } {@link JAXBElement }{@code <}{@link String }{@code >} {@link Element } {@link String }
+	 * 
+	 * 
+	 */
+	public List<Object> getContent() {
+		if (content == null) {
+			content = new ArrayList<Object>();
+		}
+		return this.content;
+	}
 
-    /**
-     * Gets the value of the algorithm property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getAlgorithm() {
-        return algorithm;
-    }
+	/**
+	 * Gets the value of the algorithm property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getAlgorithm() {
+		return algorithm;
+	}
 
-    /**
-     * Sets the value of the algorithm property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setAlgorithm(String value) {
-        this.algorithm = value;
-    }
+	/**
+	 * Sets the value of the algorithm property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setAlgorithm(String value) {
+		this.algorithm = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java
index e326030fd..b31f36764 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -15,11 +14,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for TransformsType complex type.
+ * <p>
+ * Java class for TransformsType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="TransformsType">
@@ -36,41 +36,37 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "TransformsType", propOrder = {
-    "transform"
-})
+@XmlType(name = "TransformsType", propOrder = { "transform" })
 public class TransformsType {
 
-    @XmlElement(name = "Transform", required = true)
-    protected List<TransformType> transform;
+	@XmlElement(name = "Transform", required = true)
+	protected List<TransformType> transform;
 
-    /**
-     * Gets the value of the transform property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the transform property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getTransform().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link TransformType }
-     * 
-     * 
-     */
-    public List<TransformType> getTransform() {
-        if (transform == null) {
-            transform = new ArrayList<TransformType>();
-        }
-        return this.transform;
-    }
+	/**
+	 * Gets the value of the transform property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the transform property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getTransform().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link TransformType }
+	 * 
+	 * 
+	 */
+	public List<TransformType> getTransform() {
+		if (transform == null) {
+			transform = new ArrayList<TransformType>();
+		}
+		return this.transform;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java
index 2fac2e33a..b6260d67d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.util.ArrayList;
@@ -19,11 +18,12 @@ import javax.xml.bind.annotation.XmlElementRefs;
 import javax.xml.bind.annotation.XmlType;
 import org.w3c.dom.Element;
 
-
 /**
- * <p>Java class for X509DataType complex type.
+ * <p>
+ * Java class for X509DataType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="X509DataType">
@@ -47,54 +47,43 @@ import org.w3c.dom.Element;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "X509DataType", propOrder = {
-    "x509IssuerSerialOrX509SKIOrX509SubjectName"
-})
+@XmlType(name = "X509DataType", propOrder = { "x509IssuerSerialOrX509SKIOrX509SubjectName" })
 public class X509DataType {
 
-    @XmlElementRefs({
-        @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
-        @XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false)
-    })
-    @XmlAnyElement(lax = true)
-    protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
+	@XmlElementRefs({ @XmlElementRef(name = "X509SubjectName", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "X509Certificate", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "X509CRL", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "X509SKI", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false),
+			@XmlElementRef(name = "X509IssuerSerial", namespace = "http://www.w3.org/2000/09/xmldsig#", type = JAXBElement.class, required = false) })
+	@XmlAnyElement(lax = true)
+	protected List<Object> x509IssuerSerialOrX509SKIOrX509SubjectName;
 
-    /**
-     * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the x509IssuerSerialOrX509SKIOrX509SubjectName property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * {@link Object }
-     * {@link Element }
-     * {@link JAXBElement }{@code <}{@link String }{@code >}
-     * {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >}
-     * {@link JAXBElement }{@code <}{@link byte[]}{@code >}
-     * 
-     * 
-     */
-    public List<Object> getX509IssuerSerialOrX509SKIOrX509SubjectName() {
-        if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) {
-            x509IssuerSerialOrX509SKIOrX509SubjectName = new ArrayList<Object>();
-        }
-        return this.x509IssuerSerialOrX509SKIOrX509SubjectName;
-    }
+	/**
+	 * Gets the value of the x509IssuerSerialOrX509SKIOrX509SubjectName property.
+	 * 
+	 * <p>
+	 * This accessor method returns a reference to the live list, not a snapshot. Therefore any modification you make to the returned list will be present inside the JAXB object. This is why there is
+	 * not a <CODE>set</CODE> method for the x509IssuerSerialOrX509SKIOrX509SubjectName property.
+	 * 
+	 * <p>
+	 * For example, to add a new item, do as follows:
+	 * 
+	 * <pre>
+	 * getX509IssuerSerialOrX509SKIOrX509SubjectName().add(newItem);
+	 * </pre>
+	 * 
+	 * 
+	 * <p>
+	 * Objects of the following type(s) are allowed in the list {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link JAXBElement }{@code <}{@link byte[]}{@code >} {@link Object } {@link Element }
+	 * {@link JAXBElement }{@code <}{@link String }{@code >} {@link JAXBElement }{@code <}{@link X509IssuerSerialType }{@code >} {@link JAXBElement }{@code <}{@link byte[]}{@code >}
+	 * 
+	 * 
+	 */
+	public List<Object> getX509IssuerSerialOrX509SKIOrX509SubjectName() {
+		if (x509IssuerSerialOrX509SKIOrX509SubjectName == null) {
+			x509IssuerSerialOrX509SKIOrX509SubjectName = new ArrayList<Object>();
+		}
+		return this.x509IssuerSerialOrX509SKIOrX509SubjectName;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java
index 48c70e6d0..7da3185c8 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java
@@ -5,7 +5,6 @@
 // Generated on: 2014.04.12 at 12:22:50 PM GMT 
 //
 
-
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
 
 import java.math.BigInteger;
@@ -14,11 +13,12 @@ import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlType;
 
-
 /**
- * <p>Java class for X509IssuerSerialType complex type.
+ * <p>
+ * Java class for X509IssuerSerialType complex type.
  * 
- * <p>The following schema fragment specifies the expected content contained within this class.
+ * <p>
+ * The following schema fragment specifies the expected content contained within this class.
  * 
  * <pre>
  * &lt;complexType name="X509IssuerSerialType">
@@ -36,63 +36,54 @@ import javax.xml.bind.annotation.XmlType;
  * 
  */
 @XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "X509IssuerSerialType", propOrder = {
-    "x509IssuerName",
-    "x509SerialNumber"
-})
+@XmlType(name = "X509IssuerSerialType", propOrder = { "x509IssuerName", "x509SerialNumber" })
 public class X509IssuerSerialType {
 
-    @XmlElement(name = "X509IssuerName", required = true)
-    protected String x509IssuerName;
-    @XmlElement(name = "X509SerialNumber", required = true)
-    protected BigInteger x509SerialNumber;
+	@XmlElement(name = "X509IssuerName", required = true)
+	protected String x509IssuerName;
+	@XmlElement(name = "X509SerialNumber", required = true)
+	protected BigInteger x509SerialNumber;
 
-    /**
-     * Gets the value of the x509IssuerName property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getX509IssuerName() {
-        return x509IssuerName;
-    }
+	/**
+	 * Gets the value of the x509IssuerName property.
+	 * 
+	 * @return possible object is {@link String }
+	 * 
+	 */
+	public String getX509IssuerName() {
+		return x509IssuerName;
+	}
 
-    /**
-     * Sets the value of the x509IssuerName property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setX509IssuerName(String value) {
-        this.x509IssuerName = value;
-    }
+	/**
+	 * Sets the value of the x509IssuerName property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link String }
+	 * 
+	 */
+	public void setX509IssuerName(String value) {
+		this.x509IssuerName = value;
+	}
 
-    /**
-     * Gets the value of the x509SerialNumber property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getX509SerialNumber() {
-        return x509SerialNumber;
-    }
+	/**
+	 * Gets the value of the x509SerialNumber property.
+	 * 
+	 * @return possible object is {@link BigInteger }
+	 * 
+	 */
+	public BigInteger getX509SerialNumber() {
+		return x509SerialNumber;
+	}
 
-    /**
-     * Sets the value of the x509SerialNumber property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setX509SerialNumber(BigInteger value) {
-        this.x509SerialNumber = value;
-    }
+	/**
+	 * Sets the value of the x509SerialNumber property.
+	 * 
+	 * @param value
+	 *            allowed object is {@link BigInteger }
+	 * 
+	 */
+	public void setX509SerialNumber(BigInteger value) {
+		this.x509SerialNumber = value;
+	}
 
 }
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java
index 9d0e537e4..52572b90c 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java
@@ -7,3 +7,4 @@
 
 @javax.xml.bind.annotation.XmlSchema(namespace = "http://www.w3.org/2000/09/xmldsig#", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
 package eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig;
+
diff --git a/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd b/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
index 1dfd6b319..6db304388 100644
--- a/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
+++ b/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
@@ -1,314 +1,335 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<xs:schema elementFormDefault="qualified" targetNamespace="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol" xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:dps="urn:crue:academic:xsd:language:diplomasupplement" xmlns:gdp="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma">
-<xs:import namespace="urn:crue:academic:xsd:language:diplomasupplement" schemaLocation="crue-academic-language-diplomasupplement-schema-1_1.xsd"/>
-<xs:import namespace="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma" schemaLocation="diploma.xsd"/>
-<!--QAA -->
-<xs:element name="QualityAuthenticationAssuranceLevel" type="stork:QualityAuthenticationAssuranceLevelType"/>
-<xs:element name="spSector" type="stork:SPSectorType"/>
-<xs:element name="spApplication" type="stork:SPApplicationType"/>
-<xs:element name="spCountry" type="stork:CountryCodeType"/>
-<xs:element name="CitizenCountryCode" type="stork:CountryCodeType"/>
-<xs:element name="RequestedAttribute" type="stork:RequestedAttributeType"/>
-<xs:element name="AttributeValue" type="xs:anyType"/>
-<xs:element name="canonicalResidenceAddress" type="stork:canonicalAddressType"/>
-<xs:element name="countryCodeAddress" type="stork:CountryCodeType"/>
-<xs:element name="diplomaSupplement" type="stork:diplomaSupplementType"/>
-<xs:element name="currentStudiesSupplement" type="stork:currentStudiesType"/>
-<!-- We'll leave these new attributes for release 4 -->
-<!-- <xs:element name="languageQualification" type="stork:languageQualificationType" /> -->
-<!-- <xs:element name="academicRecommendation" type="stork:academicRecommendationType" /> -->
-<xs:element name="hasDegree" type="stork:hasDegreeType"/>
-<xs:element name="isStudent" type="stork:isStudentType"/>
-<xs:element name="isAcademicStaff" type="stork:isAcademicStaffType"/>
-<xs:element name="isTeacherOf" type="stork:isTeacherOfType"/>
-<xs:element name="isCourseCoordinator" type="stork:isCourseCoordinatorType"/>
-<xs:element name="isAdminStaff" type="stork:isAdminStaffType"/>
-<xs:element name="habilitation" type="stork:habilitationType"/>
-<xs:element name="acTitle" type="stork:acTitleType"/>
-<xs:element name="hasAccountInBank" type="stork:hasAccountInBankType"/>
-<xs:element name="isHealthCareProfessional" type="stork:isHealthCareProfessionalType"/>
-<xs:element name="isHealthCareProfessional_deprecated" type="stork:isHealthCareProfessional_deprecatedType"/>
-<xs:element name="canonicalRegisteredAddress" type="stork:canonicalAddressType"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-<xs:element name="mandate" type="stork:mandateType"/>
-<xs:element name="representationPerson" type="stork:representationPersonType"/>
-<xs:element name="mandateContent" type="stork:mandateContentType"/>
-<xs:element name="study" type="stork:studyType"/>
-<xs:element name="HCPType" type="stork:HCPType"/>
-<xs:attribute name="AttributeStatus" type="stork:AttributeStatusType"/>
-<xs:simpleType name="SPSectorType">
-<xs:restriction base="xs:string">
-<xs:minLength value="1"/>
-<xs:maxLength value="20"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:simpleType name="SPApplicationType">
-<xs:restriction base="xs:string">
-<xs:minLength value="1"/>
-<xs:maxLength value="100"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:simpleType name="AttributeStatusType">
-<xs:restriction base="xs:string">
-<xs:enumeration value="Available"/>
-<xs:enumeration value="NotAvailable"/>
-<xs:enumeration value="Withheld"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:simpleType name="studyType">
-<xs:restriction base="xs:string"/>
-</xs:simpleType>
-<xs:simpleType name="LevelType">
-<xs:restriction base="xs:string">
-<xs:minLength value="1"/>
-<xs:maxLength value="1"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:simpleType name="currencyType">
-<xs:restriction base="xs:string">
-<xs:minLength value="3"/>
-<xs:maxLength value="3"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:simpleType name="occupationType">
-<xs:restriction base="xs:string">
-<xs:minLength value="1"/>
-<xs:maxLength value="1"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:simpleType name="teacherRoleType">
-<xs:restriction base="xs:string">
-<xs:minLength value="1"/>
-<xs:maxLength value="1"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:simpleType name="titleNormalisedType">
-<xs:restriction base="xs:string">
-<xs:minLength value="1"/>
-<xs:maxLength value="1"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:simpleType name="HCPType">
-<xs:restriction base="xs:string">
-<xs:minLength value="1"/>
-<xs:maxLength value="1"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:simpleType name="specialisationType">
-<xs:restriction base="xs:string">
-<xs:minLength value="1"/>
-<xs:maxLength value="1"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:simpleType name="QualityAuthenticationAssuranceLevelType">
-<xs:restriction base="xs:integer">
-<xs:minInclusive value="1"/>
-<xs:maxInclusive value="4"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:complexType name="canonicalAddressType">
-<xs:sequence>
-<xs:element name="countryCodeAddress" type="stork:CountryCodeType"/>
-<xs:element name="state" type="xs:string" minOccurs="0"/>
-<xs:element name="municipalityCode" type="xs:string" minOccurs="0"/>
-<xs:element name="town" type="xs:string"/>
-<xs:element name="postalCode" type="xs:string"/>
-<xs:element name="streetName" type="xs:string"/>
-<xs:element name="streetNumber" type="xs:string" minOccurs="0"/>
-<xs:element name="apartmentNumber" type="xs:string" minOccurs="0"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="hasDegreeType">
-<xs:sequence>
-<xs:element name="study" type="stork:studyType"/>
-<xs:element name="level" type="stork:LevelType"/>
-<xs:element name="yearObtained" type="xs:integer"/>
-<xs:element name="nameOfInstitution" type="xs:string"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="isAcademicStaffType">
-<xs:sequence>
-<xs:element name="nameOfInstitution" type="xs:string"/>
-<xs:element name="occupation" type="stork:occupationType"/>
-<xs:element name="knowledgeArea" type="xs:string" minOccurs="0"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="isTeacherOfType">
-<xs:sequence>
-<xs:element name="nameOfInstitution" type="xs:string"/>
-<xs:element name="course" type="xs:string"/>
-<xs:element name="role" type="stork:teacherRoleType"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="isCourseCoordinatorType">
-<xs:sequence>
-<xs:element name="courseCoodinator" type="xs:string"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="isAdminStaffType">
-<xs:sequence>
-<xs:element name="adminStaff" type="xs:string"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="habilitation">
-<xs:sequence>
-<xs:element name="ability" type="xs:string"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="acTitleType">
-<xs:sequence>
-<xs:element name="titleNormalised" type="stork:titleNormalisedType"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="hasAccountInBankType">
-<xs:sequence>
-<xs:element name="bankName" type="xs:string"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="isHCPType">
-<xs:sequence>
-<xs:element name="nameOfOrganisation" type="xs:string"/>
-<xs:element name="HCPType" type="stork:HCPType"/>
-<xs:element name="specialisation" type="stork:specialisationType"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="representationPersonType">
-<xs:choice>
-<xs:sequence>
-<xs:element name="eIdentifier" type="xs:string"/>
-<xs:element name="givenName" type="xs:string"/>
-<xs:element name="surname" type="xs:string"/>
-<xs:element name="dateOfBirth" type="xs:string"/>
-</xs:sequence>
-<xs:sequence>
-<xs:element name="eLPIdentifier" type="xs:string"/>
-<xs:element name="legalName" type="xs:string"/>
-<xs:element name="textRegisteredAddress" type="xs:string"/>
-<xs:element name="canonicalRegisteredAddress" type="stork:canonicalAddressType"/>
-<xs:element name="legalForm" type="xs:string"/>
-</xs:sequence>
-</xs:choice>
-</xs:complexType>
-<xs:complexType name="TransactionLimitRestrictionType">
-<xs:sequence>
-<xs:element name="amount" type="xs:decimal"/>
-<xs:element name="currency" type="xs:string"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="TimeRestrictionType">
-<xs:sequence>
-<xs:element name="validFrom" type="xs:date"/>
-<xs:element name="validTo" type="xs:date"/>
-</xs:sequence>
-</xs:complexType>
-<!--     <xs:complexType name="originalMandateType"> -->
-<!--         <xs:simpleContent> -->
-<!--             <xs:extension base="xs:base64Binary"> -->
-<!--                 <xs:attribute -->
-<!--                     name="type" -->
-<!--                     type="xs:string"> -->
-<!--                 </xs:attribute> -->
-<!--             </xs:extension> -->
-<!--         </xs:simpleContent> -->
-<!--     </xs:complexType> -->
-<xs:complexType name="mandateContentType">
-<xs:sequence>
-<xs:element name="typePower" type="xs:string"/>
-<!-- Misspelled attribute typeOfPower-->
-<xs:element name="typeOfPower" type="xs:string"/>
-<xs:element name="timeRestriction" type="stork:TimeRestrictionType"/>
-
-<xs:element name="isJoined" type="xs:string"/>
-<!-- Misspelled attribute isJoint-->
-<xs:element name="isJoint" type="xs:string"/>
-<xs:element name="isChained" type="xs:boolean"/>
-<xs:element name="originalMandate" type="xs:base64Binary"/>
-<xs:element name="originalMandateType" type="xs:string"/>
-<xs:element name="transactionLimit" type="stork:TransactionLimitRestrictionType"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="mandateType">
-<xs:sequence>
-<xs:element name="represented" type="stork:representationPersonType"/>
-<xs:element name="representing" type="stork:representationPersonType"/>
-<!-- Misspelled attribute representative-->
-<xs:element name="representative" type="stork:representationPersonType"/>
-<xs:element name="mandateContent" type="stork:mandateContentType" maxOccurs="unbounded"/>
-</xs:sequence>
-</xs:complexType>
-<xs:simpleType name="CountryCodeType">
-<xs:restriction base="xs:token">
-<xs:pattern value="[A-Z]{2}"/>
-</xs:restriction>
-</xs:simpleType>
-<xs:complexType name="RequestedAttributeType">
-<xs:sequence>
-<xs:element minOccurs="0" maxOccurs="unbounded" ref="stork:AttributeValue"/>
-</xs:sequence>
-<xs:attribute name="Name" use="required" type="xs:string"/>
-<xs:attribute name="NameFormat" use="required" type="xs:anyURI"/>
-<xs:attribute name="FriendlyName" use="optional" type="xs:string"/>
-<xs:attribute name="isRequired" use="optional" type="xs:boolean"/>
-<xs:anyAttribute namespace="##other" processContents="lax"/>
-</xs:complexType>
-<xs:complexType name="isStudentType">
-<xs:sequence>
-<xs:element ref="stork:study" minOccurs="0"/>
-<xs:element name="nameOfInstitution" type="xs:string"/>
-<xs:element name="course" type="xs:string" minOccurs="0"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="habilitationType">
-<xs:sequence>
-<xs:element name="ability" type="xs:string"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="isHealthCareProfessional_deprecatedType">
-<xs:sequence>
-<xs:element name="nameOfOrganisation" type="xs:string"/>
-<xs:element ref="stork:HCPType"/>
-<xs:element ref="stork:specialisation"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="diplomaSupplementType">
-<xs:sequence>
-<xs:choice>
-<xs:element ref="dps:MultilingualDiplomaSupplement"/>
-<xs:element ref="dps:DiplomaSupplement"/>
-<xs:element ref="gdp:MultilingualGeneralDiploma"/>
-<xs:element ref="gdp:GeneralDiploma"/>
-</xs:choice>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-<xs:any minOccurs="0"/>
-</xs:sequence>
-</xs:complexType>
-<xs:complexType name="currentStudiesType">
-<xs:sequence>
-<xs:choice>
-<xs:element ref="gdp:MultilingualGeneralDiploma"/>
-<xs:element ref="gdp:GeneralDiploma"/>
-</xs:choice>
-<xs:element name="yearOfStudy" type="xs:integer"/>
-<xs:element name="isEligibleForInternship" type="xs:boolean"/>
-<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType"/>
-<xs:any minOccurs="0"/>
-</xs:sequence>
-</xs:complexType>
-<!-- We'll leave these new attributes for release 4 -->
-<!-- 
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:dps="urn:crue:academic:xsd:language:diplomasupplement" xmlns:gdp="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma" xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol" elementFormDefault="qualified" targetNamespace="urn:eu:stork:names:tc:STORK:1.0:assertion">
+	<xs:import namespace="urn:crue:academic:xsd:language:diplomasupplement" schemaLocation="crue-academic-language-diplomasupplement-schema-1_1.xsd" />
+	<xs:import namespace="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma" schemaLocation="diploma.xsd" />
+	<!--QAA -->
+	<xs:element name="QualityAuthenticationAssuranceLevel" type="stork:QualityAuthenticationAssuranceLevelType" />
+	<xs:element name="spSector" type="stork:SPSectorType" />
+	<xs:element name="spApplication" type="stork:SPApplicationType" />
+	<xs:element name="spCountry" type="stork:CountryCodeType" />
+	<xs:element name="CitizenCountryCode" type="stork:CountryCodeType" />
+	<xs:element name="RequestedAttribute" type="stork:RequestedAttributeType" />
+	<xs:element name="AttributeValue" type="xs:anyType" />
+	<xs:element name="canonicalResidenceAddress" type="stork:canonicalAddressType" />
+	<xs:element name="countryCodeAddress" type="stork:CountryCodeType" />
+	<xs:element name="diplomaSupplement" type="stork:diplomaSupplementType" />
+	<xs:element name="currentStudiesSupplement" type="stork:currentStudiesType" />
+	<!-- We'll leave these new attributes for release 4 -->
+	<!-- <xs:element name="languageQualification" type="stork:languageQualificationType" /> -->
+	<!-- <xs:element name="academicRecommendation" type="stork:academicRecommendationType" /> -->
+	<xs:element name="hasDegree" type="stork:hasDegreeType" />
+	<xs:element name="isStudent" type="stork:isStudentType" />
+	<xs:element name="isAcademicStaff" type="stork:isAcademicStaffType" />
+	<xs:element name="isTeacherOf" type="stork:isTeacherOfType" />
+	<xs:element name="isCourseCoordinator" type="stork:isCourseCoordinatorType" />
+	<xs:element name="isAdminStaff" type="stork:isAdminStaffType" />
+	<xs:element name="habilitation" type="stork:habilitationType" />
+	<xs:element name="acTitle" type="stork:acTitleType" />
+	<xs:element name="hasAccountInBank" type="stork:hasAccountInBankType" />
+	<xs:element name="isHealthCareProfessional" type="stork:isHealthCareProfessionalType" />
+	<xs:element name="canonicalRegisteredAddress" type="stork:canonicalAddressType" />
+	<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+	<xs:element name="mandate" type="stork:mandateType" />
+	<xs:element name="representationPerson" type="stork:representationPersonType" />
+	<xs:element name="mandateContent" type="stork:mandateContentType" />
+	<xs:element name="study" type="stork:studyType" />
+	<xs:element name="HCPType" type="stork:HCPType" />
+	<xs:attribute name="AttributeStatus" type="stork:AttributeStatusType" />
+	<xs:simpleType name="SPSectorType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="20" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="SPApplicationType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="100" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="AttributeStatusType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="Available" />
+			<xs:enumeration value="NotAvailable" />
+			<xs:enumeration value="Withheld" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="studyType">
+		<xs:restriction base="xs:string" />
+	</xs:simpleType>
+	<xs:simpleType name="LevelType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="currencyType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="3" />
+			<xs:maxLength value="3" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="occupationType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="teacherRoleType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="titleNormalisedType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="HCPType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="specialisationType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="1" />
+			<xs:maxLength value="1" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:simpleType name="QualityAuthenticationAssuranceLevelType">
+		<xs:restriction base="xs:integer">
+			<xs:minInclusive value="1" />
+			<xs:maxInclusive value="4" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="canonicalAddressType">
+		<xs:sequence>
+			<xs:element name="countryCodeAddress" type="stork:CountryCodeType" />
+			<xs:element name="state" type="xs:string" minOccurs="0" />
+			<xs:element name="municipalityCode" type="xs:string" minOccurs="0" />
+			<xs:element name="town" type="xs:string" />
+			<xs:element name="postalCode" type="xs:string" />
+			<xs:element name="streetName" type="xs:string" />
+			<xs:element name="streetNumber" type="xs:string" minOccurs="0" />
+			<xs:element name="apartmentNumber" type="xs:string" minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="hasDegreeType">
+		<xs:sequence>
+			<xs:element name="study" type="stork:studyType" />
+			<xs:element name="level" type="stork:LevelType" />
+			<xs:element name="yearObtained" type="xs:integer" />
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="isAcademicStaffType">
+		<xs:sequence>
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="occupation" type="stork:occupationType" />
+			<xs:element name="knowledgeArea" type="xs:string" minOccurs="0" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="isTeacherOfType">
+		<xs:sequence>
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="course" type="xs:string" />
+			<xs:element name="role" type="stork:teacherRoleType" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="isCourseCoordinatorType">
+		<xs:sequence>
+			<xs:element name="courseCoodinator" type="xs:string" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="isAdminStaffType">
+		<xs:sequence>
+			<xs:element name="adminStaff" type="xs:string" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="habilitation">
+		<xs:sequence>
+			<xs:element name="ability" type="xs:string" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="acTitleType">
+		<xs:sequence>
+			<xs:element name="titleNormalised" type="stork:titleNormalisedType" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="hasAccountInBankType">
+		<xs:sequence>
+			<xs:element name="bankName" type="xs:string" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="isHCPType">
+		<xs:sequence>
+			<xs:element name="nameOfOrganisation" type="xs:string" />
+			<xs:element name="HCPType" type="stork:HCPType" />
+			<xs:element name="specialisation" type="stork:specialisationType" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="representationPersonType">
+		<xs:choice>
+			<xs:sequence>
+				<xs:element name="eIdentifier" type="xs:string" />
+				<xs:element name="givenName" type="xs:string" />
+				<xs:element name="surname" type="xs:string" />
+				<xs:element name="dateOfBirth" type="xs:string" />
+			</xs:sequence>
+			<xs:sequence>
+				<xs:element name="eLPIdentifier" type="xs:string" />
+				<xs:element name="legalName" type="xs:string" />
+				<xs:element name="textRegisteredAddress" type="xs:string" />
+				<xs:element name="canonicalRegisteredAddress" type="stork:canonicalAddressType" />
+				<xs:element name="legalForm" type="xs:string" />
+			</xs:sequence>
+		</xs:choice>
+	</xs:complexType>
+	<xs:complexType name="TransactionLimitRestrictionType">
+		<xs:sequence>
+			<xs:element name="amount" type="xs:decimal" />
+			<xs:element name="currency" type="xs:string" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="TimeRestrictionType">
+		<xs:sequence>
+			<xs:element name="validFrom" type="xs:date" />
+			<xs:element name="validTo" type="xs:date" />
+		</xs:sequence>
+	</xs:complexType>
+	<!--     <xs:complexType name="originalMandateType"> -->
+	<!--         <xs:simpleContent> -->
+	<!--             <xs:extension base="xs:base64Binary"> -->
+	<!--                 <xs:attribute -->
+	<!--                     name="type" -->
+	<!--                     type="xs:string"> -->
+	<!--                 </xs:attribute> -->
+	<!--             </xs:extension> -->
+	<!--         </xs:simpleContent> -->
+	<!--     </xs:complexType> -->
+	<xs:complexType name="mandateContentType">
+		<xs:sequence>
+			<xs:element name="typePower" type="xs:string" />
+			<!-- Misspelled attribute typeOfPower-->
+			<xs:element name="typeOfPower" type="xs:string" />
+			<xs:element name="timeRestriction" type="stork:TimeRestrictionType" />
+			<xs:element name="isJoined" type="xs:string" />
+			<!-- Misspelled attribute isJoint-->
+			<xs:element name="isJoint" type="xs:string" />
+			<xs:element name="isChained" type="xs:boolean" />
+			<xs:element name="originalMandate" type="xs:base64Binary" />
+			<xs:element name="originalMandateType" type="xs:string" />
+			<xs:element name="transactionLimit" type="stork:TransactionLimitRestrictionType" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="mandateType">
+		<xs:sequence>
+			<xs:element name="represented" type="stork:representationPersonType" />
+			<xs:element name="representing" type="stork:representationPersonType" />
+			<!-- Misspelled attribute representative-->
+			<xs:element name="representative" type="stork:representationPersonType" />
+			<xs:element name="mandateContent" type="stork:mandateContentType" maxOccurs="unbounded" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:simpleType name="CountryCodeType">
+		<xs:restriction base="xs:token">
+			<xs:pattern value="[A-Z]{2}" />
+		</xs:restriction>
+	</xs:simpleType>
+	<xs:complexType name="RequestedAttributeType">
+		<xs:sequence>
+			<xs:element minOccurs="0" maxOccurs="unbounded" ref="stork:AttributeValue" />
+		</xs:sequence>
+		<xs:attribute name="Name" use="required" type="xs:string" />
+		<xs:attribute name="NameFormat" use="required" type="xs:anyURI" />
+		<xs:attribute name="FriendlyName" use="optional" type="xs:string" />
+		<xs:attribute name="isRequired" use="optional" type="xs:boolean" />
+		<xs:anyAttribute namespace="##other" processContents="lax" />
+	</xs:complexType>
+	<xs:complexType name="isStudentType">
+		<xs:sequence>
+			<xs:element ref="stork:study" minOccurs="0" />
+			<xs:element name="nameOfInstitution" type="xs:string" />
+			<xs:element name="course" type="xs:string" minOccurs="0" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="habilitationType">
+		<xs:sequence>
+			<xs:element name="ability" type="xs:string" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="isHealthCareProfessionalType">
+		<xs:sequence>
+			<xs:element name="typeOfHCP">
+				<xs:simpleType>
+					<xs:restriction base="xs:anyURI">
+						<xs:enumeration value="dentist" />
+						<xs:enumeration value="nurse" />
+						<xs:enumeration value="pharmacist" />
+						<xs:enumeration value="physician" />
+						<xs:enumeration value="nurse midwife" />
+						<xs:enumeration value="admission clerk" />
+						<xs:enumeration value="ancillary services" />
+						<xs:enumeration value="clinical services" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="nameOfOrganisation" type="xs:string" />
+			<xs:element name="typeOfOrganisation">
+				<xs:simpleType>
+					<xs:restriction base="xs:anyURI">
+						<xs:enumeration value="Hospital" />
+						<xs:enumeration value="Resident Physician" />
+						<xs:enumeration value="Pharmacy" />
+						<xs:enumeration value="Other" />
+						<xs:enumeration value="Unknown" />
+					</xs:restriction>
+				</xs:simpleType>
+			</xs:element>
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="diplomaSupplementType">
+		<xs:sequence>
+			<xs:choice>
+				<xs:element ref="dps:MultilingualDiplomaSupplement" />
+				<xs:element ref="dps:DiplomaSupplement" />
+				<xs:element ref="gdp:MultilingualGeneralDiploma" />
+				<xs:element ref="gdp:GeneralDiploma" />
+			</xs:choice>
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+			<xs:any minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+	<xs:complexType name="currentStudiesType">
+		<xs:sequence>
+			<xs:choice>
+				<xs:element ref="gdp:MultilingualGeneralDiploma" />
+				<xs:element ref="gdp:GeneralDiploma" />
+			</xs:choice>
+			<xs:element name="yearOfStudy" type="xs:integer" />
+			<xs:element name="isEligibleForInternship" type="xs:boolean" />
+			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
+			<xs:any minOccurs="0" />
+		</xs:sequence>
+	</xs:complexType>
+	<!-- We'll leave these new attributes for release 4 -->
+	<!-- 
 	<xs:complexType name="languageQualificationType">
    <xs:sequence>
      <xs:element name="language" type="stork:languageType" />
@@ -353,44 +374,12 @@
 		</xs:restriction>
 	</xs:simpleType>
  
--->
-<xs:element name="specialisation" type="stork:specialisationType"/>
-<xs:simpleType name="medical">
-<xs:restriction base="xs:string">
-<xs:maxLength value="2"/>
-<xs:minLength value="2"/>
-</xs:restriction>
-</xs:simpleType>
-
-	<xs:complexType name="isHealthCareProfessionalType">
-		<xs:sequence>
-			<xs:element name="typeOfHCP">
-				<xs:simpleType>
-					<xs:restriction base="xs:anyURI">
-						<xs:enumeration value="dentist" />
-						<xs:enumeration value="nurse" />
-						<xs:enumeration value="pharmacist" />
-						<xs:enumeration value="physician" />
-						<xs:enumeration value="nurse midwife" />
-						<xs:enumeration value="admission clerk" />
-						<xs:enumeration value="ancillary services" />
-						<xs:enumeration value="clinical services" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="nameOfOrganisation" type="xs:string" />
-			<xs:element name="typeOfOrganisation">
-				<xs:simpleType>
-					<xs:restriction base="xs:anyURI">
-						<xs:enumeration value="Hospital" />
-						<xs:enumeration value="Resident Physician" />
-						<xs:enumeration value="Pharmacy" />
-						<xs:enumeration value="Other" />
-						<xs:enumeration value="Unknown" />
-					</xs:restriction>
-				</xs:simpleType>
-			</xs:element>
-			<xs:element name="AQAA" type="stork:QualityAuthenticationAssuranceLevelType" />
-		</xs:sequence>
-	</xs:complexType>
-</xs:schema>
+    -->
+	<xs:element name="specialisation" type="stork:specialisationType" />
+	<xs:simpleType name="medical">
+		<xs:restriction base="xs:string">
+			<xs:maxLength value="2" />
+			<xs:minLength value="2" />
+		</xs:restriction>
+	</xs:simpleType>
+</xs:schema>
\ No newline at end of file
diff --git a/id/server/stork2-commons/src/main/resources/schema/diploma.xsd b/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
index bea3d03f1..b1c0b060f 100644
--- a/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
+++ b/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
@@ -1,1686 +1,1686 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xs:schema xmlns:dsig="http://www.w3.org/2000/09/xmldsig#" 
-	xmlns:gd="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma" 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-		targetNamespace="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma" 
-		elementFormDefault="qualified" 
-		attributeFormDefault="unqualified" version="1.1">
+           xmlns:gd="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma" 
+           xmlns:xs="http://www.w3.org/2001/XMLSchema" 
+           targetNamespace="urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma" 
+           elementFormDefault="qualified" 
+           attributeFormDefault="unqualified" version="1.1">
 		
-	<xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
+    <xs:import namespace="http://www.w3.org/2000/09/xmldsig#" schemaLocation="xmldsig-core-schema.xsd"/>
 	
-	<xs:simpleType name="AcademicYearType">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
+    <xs:simpleType name="AcademicYearType">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
 	
-	<xs:simpleType name="CountryType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="AD">
-			</xs:enumeration>
-			<xs:enumeration value="AE">
-			</xs:enumeration>
-			<xs:enumeration value="AF">
-			</xs:enumeration>
-			<xs:enumeration value="AG">
-			</xs:enumeration>
-			<xs:enumeration value="AL">
-			</xs:enumeration>
-			<xs:enumeration value="AM">
-			</xs:enumeration>
-			<xs:enumeration value="AO">
-			</xs:enumeration>
-			<xs:enumeration value="AR">
-			</xs:enumeration>
-			<xs:enumeration value="AT">
-			</xs:enumeration>
-			<xs:enumeration value="AU">
-			</xs:enumeration>
-			<xs:enumeration value="AZ">
-			</xs:enumeration>
-			<xs:enumeration value="BA">
-			</xs:enumeration>
-			<xs:enumeration value="BB">
-			</xs:enumeration>
-			<xs:enumeration value="BD">
-			</xs:enumeration>
-			<xs:enumeration value="BE">
-			</xs:enumeration>
-			<xs:enumeration value="BF">
-			</xs:enumeration>
-			<xs:enumeration value="BG">
-			</xs:enumeration>
-			<xs:enumeration value="BH">
-			</xs:enumeration>
-			<xs:enumeration value="BI">
-			</xs:enumeration>
-			<xs:enumeration value="BJ">
-			</xs:enumeration>
-			<xs:enumeration value="BN">
-			</xs:enumeration>
-			<xs:enumeration value="BO">
-			</xs:enumeration>
-			<xs:enumeration value="BR">
-			</xs:enumeration>
-			<xs:enumeration value="BS">
-			</xs:enumeration>
-			<xs:enumeration value="BT">
-			</xs:enumeration>
-			<xs:enumeration value="BW">
-			</xs:enumeration>
-			<xs:enumeration value="BY">
-			</xs:enumeration>
-			<xs:enumeration value="BZ">
-			</xs:enumeration>
-			<xs:enumeration value="CA">
-			</xs:enumeration>
-			<xs:enumeration value="CD">
-			</xs:enumeration>
-			<xs:enumeration value="CF">
-			</xs:enumeration>
-			<xs:enumeration value="CG">
-			</xs:enumeration>
-			<xs:enumeration value="CH">
-			</xs:enumeration>
-			<xs:enumeration value="CI">
-			</xs:enumeration>
-			<xs:enumeration value="CL">
-			</xs:enumeration>
-			<xs:enumeration value="CM">
-			</xs:enumeration>
-			<xs:enumeration value="CN">
-			</xs:enumeration>
-			<xs:enumeration value="CO">
-			</xs:enumeration>
-			<xs:enumeration value="CR">
-			</xs:enumeration>
-			<xs:enumeration value="CU">
-			</xs:enumeration>
-			<xs:enumeration value="CV">
-			</xs:enumeration>
-			<xs:enumeration value="CY">
-			</xs:enumeration>
-			<xs:enumeration value="CZ">
-			</xs:enumeration>
-			<xs:enumeration value="DE">
-			</xs:enumeration>
-			<xs:enumeration value="DJ">
-			</xs:enumeration>
-			<xs:enumeration value="DK">
-			</xs:enumeration>
-			<xs:enumeration value="DM">
-			</xs:enumeration>
-			<xs:enumeration value="DO">
-			</xs:enumeration>
-			<xs:enumeration value="DZ">
-			</xs:enumeration>
-			<xs:enumeration value="EC">
-			</xs:enumeration>
-			<xs:enumeration value="EE">
-			</xs:enumeration>
-			<xs:enumeration value="EG">
-			</xs:enumeration>
-			<xs:enumeration value="ER">
-			</xs:enumeration>
-			<xs:enumeration value="ES">
-			</xs:enumeration>
-			<xs:enumeration value="ET">
-			</xs:enumeration>
-			<xs:enumeration value="FI">
-			</xs:enumeration>
-			<xs:enumeration value="FJ">
-			</xs:enumeration>
-			<xs:enumeration value="FM">
-			</xs:enumeration>
-			<xs:enumeration value="FR">
-			</xs:enumeration>
-			<xs:enumeration value="GA">
-			</xs:enumeration>
-			<xs:enumeration value="GB">
-			</xs:enumeration>
-			<xs:enumeration value="GD">
-			</xs:enumeration>
-			<xs:enumeration value="GE">
-			</xs:enumeration>
-			<xs:enumeration value="GH">
-			</xs:enumeration>
-			<xs:enumeration value="GL">
-			</xs:enumeration>
-			<xs:enumeration value="GM">
-			</xs:enumeration>
-			<xs:enumeration value="GN">
-			</xs:enumeration>
-			<xs:enumeration value="GQ">
-			</xs:enumeration>
-			<xs:enumeration value="GR">
-			</xs:enumeration>
-			<xs:enumeration value="GT">
-			</xs:enumeration>
-			<xs:enumeration value="GW">
-			</xs:enumeration>
-			<xs:enumeration value="GY">
-			</xs:enumeration>
-			<xs:enumeration value="HN">
-			</xs:enumeration>
-			<xs:enumeration value="HR">
-			</xs:enumeration>
-			<xs:enumeration value="HT">
-			</xs:enumeration>
-			<xs:enumeration value="HU">
-			</xs:enumeration>
-			<xs:enumeration value="ID">
-			</xs:enumeration>
-			<xs:enumeration value="IE">
-			</xs:enumeration>
-			<xs:enumeration value="IL">
-			</xs:enumeration>
-			<xs:enumeration value="IN">
-			</xs:enumeration>
-			<xs:enumeration value="IQ">
-			</xs:enumeration>
-			<xs:enumeration value="IR">
-			</xs:enumeration>
-			<xs:enumeration value="IS">
-			</xs:enumeration>
-			<xs:enumeration value="IT">
-			</xs:enumeration>
-			<xs:enumeration value="JM">
-			</xs:enumeration>
-			<xs:enumeration value="JO">
-			</xs:enumeration>
-			<xs:enumeration value="JP">
-			</xs:enumeration>
-			<xs:enumeration value="KE">
-			</xs:enumeration>
-			<xs:enumeration value="KG">
-			</xs:enumeration>
-			<xs:enumeration value="KH">
-			</xs:enumeration>
-			<xs:enumeration value="KI">
-			</xs:enumeration>
-			<xs:enumeration value="KM">
-			</xs:enumeration>
-			<xs:enumeration value="KN">
-			</xs:enumeration>
-			<xs:enumeration value="KP">
-			</xs:enumeration>
-			<xs:enumeration value="KR">
-			</xs:enumeration>
-			<xs:enumeration value="KW">
-			</xs:enumeration>
-			<xs:enumeration value="KZ">
-			</xs:enumeration>
-			<xs:enumeration value="LA">
-			</xs:enumeration>
-			<xs:enumeration value="LB">
-			</xs:enumeration>
-			<xs:enumeration value="LC">
-			</xs:enumeration>
-			<xs:enumeration value="LI">
-			</xs:enumeration>
-			<xs:enumeration value="LK">
-			</xs:enumeration>
-			<xs:enumeration value="LR">
-			</xs:enumeration>
-			<xs:enumeration value="LS">
-			</xs:enumeration>
-			<xs:enumeration value="LT">
-			</xs:enumeration>
-			<xs:enumeration value="LU">
-			</xs:enumeration>
-			<xs:enumeration value="LV">
-			</xs:enumeration>
-			<xs:enumeration value="LY">
-			</xs:enumeration>
-			<xs:enumeration value="MA">
-			</xs:enumeration>
-			<xs:enumeration value="MC">
-			</xs:enumeration>
-			<xs:enumeration value="MD">
-			</xs:enumeration>
-			<xs:enumeration value="ME">
-			</xs:enumeration>
-			<xs:enumeration value="MG">
-			</xs:enumeration>
-			<xs:enumeration value="MH">
-			</xs:enumeration>
-			<xs:enumeration value="MK">
-			</xs:enumeration>
-			<xs:enumeration value="ML">
-			</xs:enumeration>
-			<xs:enumeration value="MM">
-			</xs:enumeration>
-			<xs:enumeration value="MN">
-			</xs:enumeration>
-			<xs:enumeration value="MR">
-			</xs:enumeration>
-			<xs:enumeration value="MT">
-			</xs:enumeration>
-			<xs:enumeration value="MU">
-			</xs:enumeration>
-			<xs:enumeration value="MV">
-			</xs:enumeration>
-			<xs:enumeration value="MW">
-			</xs:enumeration>
-			<xs:enumeration value="MX">
-			</xs:enumeration>
-			<xs:enumeration value="MY">
-			</xs:enumeration>
-			<xs:enumeration value="MZ">
-			</xs:enumeration>
-			<xs:enumeration value="NA">
-			</xs:enumeration>
-			<xs:enumeration value="NE">
-			</xs:enumeration>
-			<xs:enumeration value="NG">
-			</xs:enumeration>
-			<xs:enumeration value="NI">
-			</xs:enumeration>
-			<xs:enumeration value="NL">
-			</xs:enumeration>
-			<xs:enumeration value="NO">
-			</xs:enumeration>
-			<xs:enumeration value="NP">
-			</xs:enumeration>
-			<xs:enumeration value="NR">
-			</xs:enumeration>
-			<xs:enumeration value="NU">
-			</xs:enumeration>
-			<xs:enumeration value="NZ">
-			</xs:enumeration>
-			<xs:enumeration value="OM">
-			</xs:enumeration>
-			<xs:enumeration value="PA">
-			</xs:enumeration>
-			<xs:enumeration value="PE">
-			</xs:enumeration>
-			<xs:enumeration value="PG">
-			</xs:enumeration>
-			<xs:enumeration value="PH">
-			</xs:enumeration>
-			<xs:enumeration value="PK">
-			</xs:enumeration>
-			<xs:enumeration value="PL">
-			</xs:enumeration>
-			<xs:enumeration value="PR">
-			</xs:enumeration>
-			<xs:enumeration value="PS">
-			</xs:enumeration>
-			<xs:enumeration value="PT">
-			</xs:enumeration>
-			<xs:enumeration value="PW">
-			</xs:enumeration>
-			<xs:enumeration value="PY">
-			</xs:enumeration>
-			<xs:enumeration value="QA">
-			</xs:enumeration>
-			<xs:enumeration value="RO">
-			</xs:enumeration>
-			<xs:enumeration value="RS">
-			</xs:enumeration>
-			<xs:enumeration value="RU">
-			</xs:enumeration>
-			<xs:enumeration value="RW">
-			</xs:enumeration>
-			<xs:enumeration value="SA">
-			</xs:enumeration>
-			<xs:enumeration value="SB">
-			</xs:enumeration>
-			<xs:enumeration value="SC">
-			</xs:enumeration>
-			<xs:enumeration value="SD">
-			</xs:enumeration>
-			<xs:enumeration value="SE">
-			</xs:enumeration>
-			<xs:enumeration value="SG">
-			</xs:enumeration>
-			<xs:enumeration value="SI">
-			</xs:enumeration>
-			<xs:enumeration value="SK">
-			</xs:enumeration>
-			<xs:enumeration value="SL">
-			</xs:enumeration>
-			<xs:enumeration value="SM">
-			</xs:enumeration>
-			<xs:enumeration value="SN">
-			</xs:enumeration>
-			<xs:enumeration value="SO">
-			</xs:enumeration>
-			<xs:enumeration value="SR">
-			</xs:enumeration>
-			<xs:enumeration value="ST">
-			</xs:enumeration>
-			<xs:enumeration value="SV">
-			</xs:enumeration>
-			<xs:enumeration value="SY">
-			</xs:enumeration>
-			<xs:enumeration value="SZ">
-			</xs:enumeration>
-			<xs:enumeration value="TD">
-			</xs:enumeration>
-			<xs:enumeration value="TG">
-			</xs:enumeration>
-			<xs:enumeration value="TH">
-			</xs:enumeration>
-			<xs:enumeration value="TJ">
-			</xs:enumeration>
-			<xs:enumeration value="TL">
-			</xs:enumeration>
-			<xs:enumeration value="TM">
-			</xs:enumeration>
-			<xs:enumeration value="TN">
-			</xs:enumeration>
-			<xs:enumeration value="TO">
-			</xs:enumeration>
-			<xs:enumeration value="TR">
-			</xs:enumeration>
-			<xs:enumeration value="TT">
-			</xs:enumeration>
-			<xs:enumeration value="TV">
-			</xs:enumeration>
-			<xs:enumeration value="TZ">
-			</xs:enumeration>
-			<xs:enumeration value="UA">
-			</xs:enumeration>
-			<xs:enumeration value="UG">
-			</xs:enumeration>
-			<xs:enumeration value="US">
-			</xs:enumeration>
-			<xs:enumeration value="UY">
-			</xs:enumeration>
-			<xs:enumeration value="UZ">
-			</xs:enumeration>
-			<xs:enumeration value="VA">
-			</xs:enumeration>
-			<xs:enumeration value="VC">
-			</xs:enumeration>
-			<xs:enumeration value="VE">
-			</xs:enumeration>
-			<xs:enumeration value="VN">
-			</xs:enumeration>
-			<xs:enumeration value="VU">
-			</xs:enumeration>
-			<xs:enumeration value="WS">
-			</xs:enumeration>
-			<xs:enumeration value="YE">
-			</xs:enumeration>
-			<xs:enumeration value="ZA">
-			</xs:enumeration>
-			<xs:enumeration value="ZM">
-			</xs:enumeration>
-			<xs:enumeration value="ZW">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="CourseUnitTypeType">
-		<xs:restriction base="xs:string">
-		 <xs:enumeration value="Compulsory">
-			</xs:enumeration>
-			<xs:enumeration value="Optional">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="DateType">
-		<xs:restriction base="xs:date"/>
-	</xs:simpleType>
-	<xs:simpleType name="ECTSGradingScaleType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="A">
-			</xs:enumeration>
-			<xs:enumeration value="B">
-			</xs:enumeration>
-			<xs:enumeration value="C">
-			</xs:enumeration>
-			<xs:enumeration value="D">
-			</xs:enumeration>
-			<xs:enumeration value="E">
-			</xs:enumeration>
-			<xs:enumeration value="FX">
-			</xs:enumeration>
-			<xs:enumeration value="F">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EmailAddressType">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<xs:simpleType name="EHEAFrameworkType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="FirstCycle">
-			</xs:enumeration>
-			<xs:enumeration value="SecondCycle">
-			</xs:enumeration>
-			<xs:enumeration value="ThirdCycle">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="EmptyType">
-		<xs:restriction base="xs:string">
-			<xs:maxLength value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="GenderType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Female">
-			</xs:enumeration>
-			<xs:enumeration value="Male">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ImageMimeType">
-		<xs:restriction base="gd:MimeType">
-			<xs:enumeration value="image/gif">
-			</xs:enumeration>
-			<xs:enumeration value="image/jpeg">
-			</xs:enumeration>
-			<xs:enumeration value="image/pjpeg">
-			</xs:enumeration>
-			<xs:enumeration value="image/png">
-			</xs:enumeration>
-			<xs:enumeration value="image/tiff">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ISCED1997Type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="0">
-			</xs:enumeration>
-			<xs:enumeration value="1">
-			</xs:enumeration>
-			<xs:enumeration value="2">
-			</xs:enumeration>
-			<xs:enumeration value="3">
-			</xs:enumeration>
-			<xs:enumeration value="4">
-			</xs:enumeration>
-			<xs:enumeration value="5A">
-			</xs:enumeration>
-			<xs:enumeration value="5B">
-			</xs:enumeration>
-			<xs:enumeration value="6">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ISCED2011Type">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="0">
-			</xs:enumeration>
-			<xs:enumeration value="1">
-			</xs:enumeration>
-			<xs:enumeration value="2">
-			</xs:enumeration>
-			<xs:enumeration value="3">
-			</xs:enumeration>
-			<xs:enumeration value="4">
-			</xs:enumeration>
-			<xs:enumeration value="5">
-			</xs:enumeration>
-			<xs:enumeration value="6">
-			</xs:enumeration>
-			<xs:enumeration value="7">
-			</xs:enumeration>
-			<xs:enumeration value="8">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="LanguageType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="ab">
-			</xs:enumeration>
-			<xs:enumeration value="af">
-			</xs:enumeration>
-			<xs:enumeration value="an">
-			</xs:enumeration>
-			<xs:enumeration value="ar">
-			</xs:enumeration>
-			<xs:enumeration value="as">
-			</xs:enumeration>
-			<xs:enumeration value="az">
-			</xs:enumeration>
-			<xs:enumeration value="be">
-			</xs:enumeration>
-			<xs:enumeration value="bg">
-			</xs:enumeration>
-			<xs:enumeration value="bn">
-			</xs:enumeration>
-			<xs:enumeration value="bo">
-			</xs:enumeration>
-			<xs:enumeration value="br">
-			</xs:enumeration>
-			<xs:enumeration value="bs">
-			</xs:enumeration>
-			<xs:enumeration value="ca">
-			</xs:enumeration>
-			<xs:enumeration value="ce">
-			</xs:enumeration>
-			<xs:enumeration value="co">
-			</xs:enumeration>
-			<xs:enumeration value="cs">
-			</xs:enumeration>
-			<xs:enumeration value="cy">
-			</xs:enumeration>
-			<xs:enumeration value="da">
-			</xs:enumeration>
-			<xs:enumeration value="de">
-			</xs:enumeration>
-			<xs:enumeration value="el">
-			</xs:enumeration>
-			<xs:enumeration value="en">
-			</xs:enumeration>
-			<xs:enumeration value="es">
-			</xs:enumeration>
-			<xs:enumeration value="et">
-			</xs:enumeration>
-			<xs:enumeration value="eu">
-			</xs:enumeration>
-			<xs:enumeration value="fa">
-			</xs:enumeration>
-			<xs:enumeration value="fi">
-			</xs:enumeration>
-			<xs:enumeration value="fj">
-			</xs:enumeration>
-			<xs:enumeration value="fo">
-			</xs:enumeration>
-			<xs:enumeration value="fr">
-			</xs:enumeration>
-			<xs:enumeration value="fy">
-			</xs:enumeration>
-			<xs:enumeration value="ga">
-			</xs:enumeration>
-			<xs:enumeration value="gd">
-			</xs:enumeration>
-			<xs:enumeration value="gl">
-			</xs:enumeration>
-			<xs:enumeration value="gv">
-			</xs:enumeration>
-			<xs:enumeration value="grc">
-			</xs:enumeration>
-			<xs:enumeration value="gsw">
-			</xs:enumeration>
-			<xs:enumeration value="he">
-			</xs:enumeration>
-			<xs:enumeration value="hi">
-			</xs:enumeration>
-			<xs:enumeration value="hr">
-			</xs:enumeration>
-			<xs:enumeration value="ht">
-			</xs:enumeration>
-			<xs:enumeration value="hu">
-			</xs:enumeration>
-			<xs:enumeration value="hy">
-			</xs:enumeration>
-			<xs:enumeration value="id">
-			</xs:enumeration>
-			<xs:enumeration value="is">
-			</xs:enumeration>
-			<xs:enumeration value="it">
-			</xs:enumeration>
-			<xs:enumeration value="ja">
-			</xs:enumeration>
-			<xs:enumeration value="jv">
-			</xs:enumeration>
-			<xs:enumeration value="ka">
-			</xs:enumeration>
-			<xs:enumeration value="kg">
-			</xs:enumeration>
-			<xs:enumeration value="ko">
-			</xs:enumeration>
-			<xs:enumeration value="ku">
-			</xs:enumeration>
-			<xs:enumeration value="kw">
-			</xs:enumeration>
-			<xs:enumeration value="ky">
-			</xs:enumeration>
-			<xs:enumeration value="lb">
-			</xs:enumeration>
-			<xs:enumeration value="li">
-			</xs:enumeration>
-			<xs:enumeration value="ln">
-			</xs:enumeration>
-			<xs:enumeration value="lt">
-			</xs:enumeration>
-			<xs:enumeration value="lv">
-			</xs:enumeration>
-			<xs:enumeration value="mg">
-			</xs:enumeration>
-			<xs:enumeration value="mk">
-			</xs:enumeration>
-			<xs:enumeration value="mn">
-			</xs:enumeration>
-			<xs:enumeration value="mo">
-			</xs:enumeration>
-			<xs:enumeration value="ms">
-			</xs:enumeration>
-			<xs:enumeration value="mt">
-			</xs:enumeration>
-			<xs:enumeration value="my">
-			</xs:enumeration>
-			<xs:enumeration value="nb">
-			</xs:enumeration>
-			<xs:enumeration value="ne">
-			</xs:enumeration>
-			<xs:enumeration value="nl">
-			</xs:enumeration>
-			<xs:enumeration value="nn">
-			</xs:enumeration>
-			<xs:enumeration value="no">
-			</xs:enumeration>
-			<xs:enumeration value="pl">
-			</xs:enumeration>
-			<xs:enumeration value="pt">
-			</xs:enumeration>
-			<xs:enumeration value="rm">
-			</xs:enumeration>
-			<xs:enumeration value="ro">
-			</xs:enumeration>
-			<xs:enumeration value="ru">
-			</xs:enumeration>
-			<xs:enumeration value="sc">
-			</xs:enumeration>
-			<xs:enumeration value="se">
-			</xs:enumeration>
-			<xs:enumeration value="sk">
-			</xs:enumeration>
-			<xs:enumeration value="sl">
-			</xs:enumeration>
-			<xs:enumeration value="so">
-			</xs:enumeration>
-			<xs:enumeration value="sq">
-			</xs:enumeration>
-			<xs:enumeration value="sr">
-			</xs:enumeration>
-			<xs:enumeration value="sv">
-			</xs:enumeration>
-			<xs:enumeration value="sw">
-			</xs:enumeration>
-			<xs:enumeration value="tk">
-			</xs:enumeration>
-			<xs:enumeration value="tr">
-			</xs:enumeration>
-			<xs:enumeration value="ty">
-			</xs:enumeration>
-			<xs:enumeration value="uk">
-			</xs:enumeration>
-			<xs:enumeration value="ur">
-			</xs:enumeration>
-			<xs:enumeration value="uz">
-			</xs:enumeration>
-			<xs:enumeration value="vi">
-			</xs:enumeration>
-			<xs:enumeration value="yi">
-			</xs:enumeration>
-			<xs:enumeration value="zh">
-			</xs:enumeration>
-			<xs:enumeration value="cu">
-			</xs:enumeration>
-			<xs:enumeration value="eo">
-			</xs:enumeration>
-			<xs:enumeration value="la">
-			</xs:enumeration>
-			<xs:enumeration value="oc">
-			</xs:enumeration>
-			<xs:enumeration value="vo">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="MimeType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="image/gif">
-			</xs:enumeration>
-			<xs:enumeration value="image/jpeg">
-			</xs:enumeration>
-			<xs:enumeration value="image/pjpeg">
-			</xs:enumeration>
-			<xs:enumeration value="image/png">
-			</xs:enumeration>
-			<xs:enumeration value="image/tiff">
-			</xs:enumeration>
-			<xs:enumeration value="text/html">
-			</xs:enumeration>
-			<xs:enumeration value="application/pdf">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ModeOfStudyType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="FullTime">
-			</xs:enumeration>
-			<xs:enumeration value="ParTime">
-			</xs:enumeration>
-			<xs:enumeration value="Distance">
-			</xs:enumeration>
-			<xs:enumeration value="eLearning">
-			</xs:enumeration>
-			<xs:enumeration value="Another">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="ModeOfDeliveryType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="FaceToFace">
-			</xs:enumeration>
-			<xs:enumeration value="DistanceLearning">
-			</xs:enumeration>
-			<xs:enumeration value="Other">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="NFQType">
-		<xs:restriction base="xs:string"/>
-	</xs:simpleType>
-	<xs:simpleType name="PlainTextType">
-		<xs:restriction base="xs:string">
-			<xs:minLength value="1"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="PercentType">
-		<xs:restriction base="xs:decimal">
-			<xs:maxInclusive value="100"/>
-			<xs:minInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="PositiveDecimalType">
-		<xs:restriction base="xs:decimal">
-			<xs:minInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="PositiveIntegerType">
-		<xs:restriction base="xs:int">
-			<xs:minInclusive value="0"/>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="SourceGradeType">
-		<xs:restriction base="xs:string">
-			<xs:enumeration value="Recognized">
-			</xs:enumeration>
-			<xs:enumeration value="MobilityProgramme">
-			</xs:enumeration>
-			<xs:enumeration value="Another">
-			</xs:enumeration>
-		</xs:restriction>
-	</xs:simpleType>
-	<xs:simpleType name="URLType">
-		<xs:restriction base="xs:anyURI"/>
-	</xs:simpleType>
+    <xs:simpleType name="CountryType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="AD">
+            </xs:enumeration>
+            <xs:enumeration value="AE">
+            </xs:enumeration>
+            <xs:enumeration value="AF">
+            </xs:enumeration>
+            <xs:enumeration value="AG">
+            </xs:enumeration>
+            <xs:enumeration value="AL">
+            </xs:enumeration>
+            <xs:enumeration value="AM">
+            </xs:enumeration>
+            <xs:enumeration value="AO">
+            </xs:enumeration>
+            <xs:enumeration value="AR">
+            </xs:enumeration>
+            <xs:enumeration value="AT">
+            </xs:enumeration>
+            <xs:enumeration value="AU">
+            </xs:enumeration>
+            <xs:enumeration value="AZ">
+            </xs:enumeration>
+            <xs:enumeration value="BA">
+            </xs:enumeration>
+            <xs:enumeration value="BB">
+            </xs:enumeration>
+            <xs:enumeration value="BD">
+            </xs:enumeration>
+            <xs:enumeration value="BE">
+            </xs:enumeration>
+            <xs:enumeration value="BF">
+            </xs:enumeration>
+            <xs:enumeration value="BG">
+            </xs:enumeration>
+            <xs:enumeration value="BH">
+            </xs:enumeration>
+            <xs:enumeration value="BI">
+            </xs:enumeration>
+            <xs:enumeration value="BJ">
+            </xs:enumeration>
+            <xs:enumeration value="BN">
+            </xs:enumeration>
+            <xs:enumeration value="BO">
+            </xs:enumeration>
+            <xs:enumeration value="BR">
+            </xs:enumeration>
+            <xs:enumeration value="BS">
+            </xs:enumeration>
+            <xs:enumeration value="BT">
+            </xs:enumeration>
+            <xs:enumeration value="BW">
+            </xs:enumeration>
+            <xs:enumeration value="BY">
+            </xs:enumeration>
+            <xs:enumeration value="BZ">
+            </xs:enumeration>
+            <xs:enumeration value="CA">
+            </xs:enumeration>
+            <xs:enumeration value="CD">
+            </xs:enumeration>
+            <xs:enumeration value="CF">
+            </xs:enumeration>
+            <xs:enumeration value="CG">
+            </xs:enumeration>
+            <xs:enumeration value="CH">
+            </xs:enumeration>
+            <xs:enumeration value="CI">
+            </xs:enumeration>
+            <xs:enumeration value="CL">
+            </xs:enumeration>
+            <xs:enumeration value="CM">
+            </xs:enumeration>
+            <xs:enumeration value="CN">
+            </xs:enumeration>
+            <xs:enumeration value="CO">
+            </xs:enumeration>
+            <xs:enumeration value="CR">
+            </xs:enumeration>
+            <xs:enumeration value="CU">
+            </xs:enumeration>
+            <xs:enumeration value="CV">
+            </xs:enumeration>
+            <xs:enumeration value="CY">
+            </xs:enumeration>
+            <xs:enumeration value="CZ">
+            </xs:enumeration>
+            <xs:enumeration value="DE">
+            </xs:enumeration>
+            <xs:enumeration value="DJ">
+            </xs:enumeration>
+            <xs:enumeration value="DK">
+            </xs:enumeration>
+            <xs:enumeration value="DM">
+            </xs:enumeration>
+            <xs:enumeration value="DO">
+            </xs:enumeration>
+            <xs:enumeration value="DZ">
+            </xs:enumeration>
+            <xs:enumeration value="EC">
+            </xs:enumeration>
+            <xs:enumeration value="EE">
+            </xs:enumeration>
+            <xs:enumeration value="EG">
+            </xs:enumeration>
+            <xs:enumeration value="ER">
+            </xs:enumeration>
+            <xs:enumeration value="ES">
+            </xs:enumeration>
+            <xs:enumeration value="ET">
+            </xs:enumeration>
+            <xs:enumeration value="FI">
+            </xs:enumeration>
+            <xs:enumeration value="FJ">
+            </xs:enumeration>
+            <xs:enumeration value="FM">
+            </xs:enumeration>
+            <xs:enumeration value="FR">
+            </xs:enumeration>
+            <xs:enumeration value="GA">
+            </xs:enumeration>
+            <xs:enumeration value="GB">
+            </xs:enumeration>
+            <xs:enumeration value="GD">
+            </xs:enumeration>
+            <xs:enumeration value="GE">
+            </xs:enumeration>
+            <xs:enumeration value="GH">
+            </xs:enumeration>
+            <xs:enumeration value="GL">
+            </xs:enumeration>
+            <xs:enumeration value="GM">
+            </xs:enumeration>
+            <xs:enumeration value="GN">
+            </xs:enumeration>
+            <xs:enumeration value="GQ">
+            </xs:enumeration>
+            <xs:enumeration value="GR">
+            </xs:enumeration>
+            <xs:enumeration value="GT">
+            </xs:enumeration>
+            <xs:enumeration value="GW">
+            </xs:enumeration>
+            <xs:enumeration value="GY">
+            </xs:enumeration>
+            <xs:enumeration value="HN">
+            </xs:enumeration>
+            <xs:enumeration value="HR">
+            </xs:enumeration>
+            <xs:enumeration value="HT">
+            </xs:enumeration>
+            <xs:enumeration value="HU">
+            </xs:enumeration>
+            <xs:enumeration value="ID">
+            </xs:enumeration>
+            <xs:enumeration value="IE">
+            </xs:enumeration>
+            <xs:enumeration value="IL">
+            </xs:enumeration>
+            <xs:enumeration value="IN">
+            </xs:enumeration>
+            <xs:enumeration value="IQ">
+            </xs:enumeration>
+            <xs:enumeration value="IR">
+            </xs:enumeration>
+            <xs:enumeration value="IS">
+            </xs:enumeration>
+            <xs:enumeration value="IT">
+            </xs:enumeration>
+            <xs:enumeration value="JM">
+            </xs:enumeration>
+            <xs:enumeration value="JO">
+            </xs:enumeration>
+            <xs:enumeration value="JP">
+            </xs:enumeration>
+            <xs:enumeration value="KE">
+            </xs:enumeration>
+            <xs:enumeration value="KG">
+            </xs:enumeration>
+            <xs:enumeration value="KH">
+            </xs:enumeration>
+            <xs:enumeration value="KI">
+            </xs:enumeration>
+            <xs:enumeration value="KM">
+            </xs:enumeration>
+            <xs:enumeration value="KN">
+            </xs:enumeration>
+            <xs:enumeration value="KP">
+            </xs:enumeration>
+            <xs:enumeration value="KR">
+            </xs:enumeration>
+            <xs:enumeration value="KW">
+            </xs:enumeration>
+            <xs:enumeration value="KZ">
+            </xs:enumeration>
+            <xs:enumeration value="LA">
+            </xs:enumeration>
+            <xs:enumeration value="LB">
+            </xs:enumeration>
+            <xs:enumeration value="LC">
+            </xs:enumeration>
+            <xs:enumeration value="LI">
+            </xs:enumeration>
+            <xs:enumeration value="LK">
+            </xs:enumeration>
+            <xs:enumeration value="LR">
+            </xs:enumeration>
+            <xs:enumeration value="LS">
+            </xs:enumeration>
+            <xs:enumeration value="LT">
+            </xs:enumeration>
+            <xs:enumeration value="LU">
+            </xs:enumeration>
+            <xs:enumeration value="LV">
+            </xs:enumeration>
+            <xs:enumeration value="LY">
+            </xs:enumeration>
+            <xs:enumeration value="MA">
+            </xs:enumeration>
+            <xs:enumeration value="MC">
+            </xs:enumeration>
+            <xs:enumeration value="MD">
+            </xs:enumeration>
+            <xs:enumeration value="ME">
+            </xs:enumeration>
+            <xs:enumeration value="MG">
+            </xs:enumeration>
+            <xs:enumeration value="MH">
+            </xs:enumeration>
+            <xs:enumeration value="MK">
+            </xs:enumeration>
+            <xs:enumeration value="ML">
+            </xs:enumeration>
+            <xs:enumeration value="MM">
+            </xs:enumeration>
+            <xs:enumeration value="MN">
+            </xs:enumeration>
+            <xs:enumeration value="MR">
+            </xs:enumeration>
+            <xs:enumeration value="MT">
+            </xs:enumeration>
+            <xs:enumeration value="MU">
+            </xs:enumeration>
+            <xs:enumeration value="MV">
+            </xs:enumeration>
+            <xs:enumeration value="MW">
+            </xs:enumeration>
+            <xs:enumeration value="MX">
+            </xs:enumeration>
+            <xs:enumeration value="MY">
+            </xs:enumeration>
+            <xs:enumeration value="MZ">
+            </xs:enumeration>
+            <xs:enumeration value="NA">
+            </xs:enumeration>
+            <xs:enumeration value="NE">
+            </xs:enumeration>
+            <xs:enumeration value="NG">
+            </xs:enumeration>
+            <xs:enumeration value="NI">
+            </xs:enumeration>
+            <xs:enumeration value="NL">
+            </xs:enumeration>
+            <xs:enumeration value="NO">
+            </xs:enumeration>
+            <xs:enumeration value="NP">
+            </xs:enumeration>
+            <xs:enumeration value="NR">
+            </xs:enumeration>
+            <xs:enumeration value="NU">
+            </xs:enumeration>
+            <xs:enumeration value="NZ">
+            </xs:enumeration>
+            <xs:enumeration value="OM">
+            </xs:enumeration>
+            <xs:enumeration value="PA">
+            </xs:enumeration>
+            <xs:enumeration value="PE">
+            </xs:enumeration>
+            <xs:enumeration value="PG">
+            </xs:enumeration>
+            <xs:enumeration value="PH">
+            </xs:enumeration>
+            <xs:enumeration value="PK">
+            </xs:enumeration>
+            <xs:enumeration value="PL">
+            </xs:enumeration>
+            <xs:enumeration value="PR">
+            </xs:enumeration>
+            <xs:enumeration value="PS">
+            </xs:enumeration>
+            <xs:enumeration value="PT">
+            </xs:enumeration>
+            <xs:enumeration value="PW">
+            </xs:enumeration>
+            <xs:enumeration value="PY">
+            </xs:enumeration>
+            <xs:enumeration value="QA">
+            </xs:enumeration>
+            <xs:enumeration value="RO">
+            </xs:enumeration>
+            <xs:enumeration value="RS">
+            </xs:enumeration>
+            <xs:enumeration value="RU">
+            </xs:enumeration>
+            <xs:enumeration value="RW">
+            </xs:enumeration>
+            <xs:enumeration value="SA">
+            </xs:enumeration>
+            <xs:enumeration value="SB">
+            </xs:enumeration>
+            <xs:enumeration value="SC">
+            </xs:enumeration>
+            <xs:enumeration value="SD">
+            </xs:enumeration>
+            <xs:enumeration value="SE">
+            </xs:enumeration>
+            <xs:enumeration value="SG">
+            </xs:enumeration>
+            <xs:enumeration value="SI">
+            </xs:enumeration>
+            <xs:enumeration value="SK">
+            </xs:enumeration>
+            <xs:enumeration value="SL">
+            </xs:enumeration>
+            <xs:enumeration value="SM">
+            </xs:enumeration>
+            <xs:enumeration value="SN">
+            </xs:enumeration>
+            <xs:enumeration value="SO">
+            </xs:enumeration>
+            <xs:enumeration value="SR">
+            </xs:enumeration>
+            <xs:enumeration value="ST">
+            </xs:enumeration>
+            <xs:enumeration value="SV">
+            </xs:enumeration>
+            <xs:enumeration value="SY">
+            </xs:enumeration>
+            <xs:enumeration value="SZ">
+            </xs:enumeration>
+            <xs:enumeration value="TD">
+            </xs:enumeration>
+            <xs:enumeration value="TG">
+            </xs:enumeration>
+            <xs:enumeration value="TH">
+            </xs:enumeration>
+            <xs:enumeration value="TJ">
+            </xs:enumeration>
+            <xs:enumeration value="TL">
+            </xs:enumeration>
+            <xs:enumeration value="TM">
+            </xs:enumeration>
+            <xs:enumeration value="TN">
+            </xs:enumeration>
+            <xs:enumeration value="TO">
+            </xs:enumeration>
+            <xs:enumeration value="TR">
+            </xs:enumeration>
+            <xs:enumeration value="TT">
+            </xs:enumeration>
+            <xs:enumeration value="TV">
+            </xs:enumeration>
+            <xs:enumeration value="TZ">
+            </xs:enumeration>
+            <xs:enumeration value="UA">
+            </xs:enumeration>
+            <xs:enumeration value="UG">
+            </xs:enumeration>
+            <xs:enumeration value="US">
+            </xs:enumeration>
+            <xs:enumeration value="UY">
+            </xs:enumeration>
+            <xs:enumeration value="UZ">
+            </xs:enumeration>
+            <xs:enumeration value="VA">
+            </xs:enumeration>
+            <xs:enumeration value="VC">
+            </xs:enumeration>
+            <xs:enumeration value="VE">
+            </xs:enumeration>
+            <xs:enumeration value="VN">
+            </xs:enumeration>
+            <xs:enumeration value="VU">
+            </xs:enumeration>
+            <xs:enumeration value="WS">
+            </xs:enumeration>
+            <xs:enumeration value="YE">
+            </xs:enumeration>
+            <xs:enumeration value="ZA">
+            </xs:enumeration>
+            <xs:enumeration value="ZM">
+            </xs:enumeration>
+            <xs:enumeration value="ZW">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="CourseUnitTypeType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Compulsory">
+            </xs:enumeration>
+            <xs:enumeration value="Optional">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="DateType">
+        <xs:restriction base="xs:date"/>
+    </xs:simpleType>
+    <xs:simpleType name="ECTSGradingScaleType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="A">
+            </xs:enumeration>
+            <xs:enumeration value="B">
+            </xs:enumeration>
+            <xs:enumeration value="C">
+            </xs:enumeration>
+            <xs:enumeration value="D">
+            </xs:enumeration>
+            <xs:enumeration value="E">
+            </xs:enumeration>
+            <xs:enumeration value="FX">
+            </xs:enumeration>
+            <xs:enumeration value="F">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="EmailAddressType">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <xs:simpleType name="EHEAFrameworkType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="FirstCycle">
+            </xs:enumeration>
+            <xs:enumeration value="SecondCycle">
+            </xs:enumeration>
+            <xs:enumeration value="ThirdCycle">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="EmptyType">
+        <xs:restriction base="xs:string">
+            <xs:maxLength value="0"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="GenderType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Female">
+            </xs:enumeration>
+            <xs:enumeration value="Male">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ImageMimeType">
+        <xs:restriction base="gd:MimeType">
+            <xs:enumeration value="image/gif">
+            </xs:enumeration>
+            <xs:enumeration value="image/jpeg">
+            </xs:enumeration>
+            <xs:enumeration value="image/pjpeg">
+            </xs:enumeration>
+            <xs:enumeration value="image/png">
+            </xs:enumeration>
+            <xs:enumeration value="image/tiff">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ISCED1997Type">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="0">
+            </xs:enumeration>
+            <xs:enumeration value="1">
+            </xs:enumeration>
+            <xs:enumeration value="2">
+            </xs:enumeration>
+            <xs:enumeration value="3">
+            </xs:enumeration>
+            <xs:enumeration value="4">
+            </xs:enumeration>
+            <xs:enumeration value="5A">
+            </xs:enumeration>
+            <xs:enumeration value="5B">
+            </xs:enumeration>
+            <xs:enumeration value="6">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ISCED2011Type">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="0">
+            </xs:enumeration>
+            <xs:enumeration value="1">
+            </xs:enumeration>
+            <xs:enumeration value="2">
+            </xs:enumeration>
+            <xs:enumeration value="3">
+            </xs:enumeration>
+            <xs:enumeration value="4">
+            </xs:enumeration>
+            <xs:enumeration value="5">
+            </xs:enumeration>
+            <xs:enumeration value="6">
+            </xs:enumeration>
+            <xs:enumeration value="7">
+            </xs:enumeration>
+            <xs:enumeration value="8">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="LanguageType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="ab">
+            </xs:enumeration>
+            <xs:enumeration value="af">
+            </xs:enumeration>
+            <xs:enumeration value="an">
+            </xs:enumeration>
+            <xs:enumeration value="ar">
+            </xs:enumeration>
+            <xs:enumeration value="as">
+            </xs:enumeration>
+            <xs:enumeration value="az">
+            </xs:enumeration>
+            <xs:enumeration value="be">
+            </xs:enumeration>
+            <xs:enumeration value="bg">
+            </xs:enumeration>
+            <xs:enumeration value="bn">
+            </xs:enumeration>
+            <xs:enumeration value="bo">
+            </xs:enumeration>
+            <xs:enumeration value="br">
+            </xs:enumeration>
+            <xs:enumeration value="bs">
+            </xs:enumeration>
+            <xs:enumeration value="ca">
+            </xs:enumeration>
+            <xs:enumeration value="ce">
+            </xs:enumeration>
+            <xs:enumeration value="co">
+            </xs:enumeration>
+            <xs:enumeration value="cs">
+            </xs:enumeration>
+            <xs:enumeration value="cy">
+            </xs:enumeration>
+            <xs:enumeration value="da">
+            </xs:enumeration>
+            <xs:enumeration value="de">
+            </xs:enumeration>
+            <xs:enumeration value="el">
+            </xs:enumeration>
+            <xs:enumeration value="en">
+            </xs:enumeration>
+            <xs:enumeration value="es">
+            </xs:enumeration>
+            <xs:enumeration value="et">
+            </xs:enumeration>
+            <xs:enumeration value="eu">
+            </xs:enumeration>
+            <xs:enumeration value="fa">
+            </xs:enumeration>
+            <xs:enumeration value="fi">
+            </xs:enumeration>
+            <xs:enumeration value="fj">
+            </xs:enumeration>
+            <xs:enumeration value="fo">
+            </xs:enumeration>
+            <xs:enumeration value="fr">
+            </xs:enumeration>
+            <xs:enumeration value="fy">
+            </xs:enumeration>
+            <xs:enumeration value="ga">
+            </xs:enumeration>
+            <xs:enumeration value="gd">
+            </xs:enumeration>
+            <xs:enumeration value="gl">
+            </xs:enumeration>
+            <xs:enumeration value="gv">
+            </xs:enumeration>
+            <xs:enumeration value="grc">
+            </xs:enumeration>
+            <xs:enumeration value="gsw">
+            </xs:enumeration>
+            <xs:enumeration value="he">
+            </xs:enumeration>
+            <xs:enumeration value="hi">
+            </xs:enumeration>
+            <xs:enumeration value="hr">
+            </xs:enumeration>
+            <xs:enumeration value="ht">
+            </xs:enumeration>
+            <xs:enumeration value="hu">
+            </xs:enumeration>
+            <xs:enumeration value="hy">
+            </xs:enumeration>
+            <xs:enumeration value="id">
+            </xs:enumeration>
+            <xs:enumeration value="is">
+            </xs:enumeration>
+            <xs:enumeration value="it">
+            </xs:enumeration>
+            <xs:enumeration value="ja">
+            </xs:enumeration>
+            <xs:enumeration value="jv">
+            </xs:enumeration>
+            <xs:enumeration value="ka">
+            </xs:enumeration>
+            <xs:enumeration value="kg">
+            </xs:enumeration>
+            <xs:enumeration value="ko">
+            </xs:enumeration>
+            <xs:enumeration value="ku">
+            </xs:enumeration>
+            <xs:enumeration value="kw">
+            </xs:enumeration>
+            <xs:enumeration value="ky">
+            </xs:enumeration>
+            <xs:enumeration value="lb">
+            </xs:enumeration>
+            <xs:enumeration value="li">
+            </xs:enumeration>
+            <xs:enumeration value="ln">
+            </xs:enumeration>
+            <xs:enumeration value="lt">
+            </xs:enumeration>
+            <xs:enumeration value="lv">
+            </xs:enumeration>
+            <xs:enumeration value="mg">
+            </xs:enumeration>
+            <xs:enumeration value="mk">
+            </xs:enumeration>
+            <xs:enumeration value="mn">
+            </xs:enumeration>
+            <xs:enumeration value="mo">
+            </xs:enumeration>
+            <xs:enumeration value="ms">
+            </xs:enumeration>
+            <xs:enumeration value="mt">
+            </xs:enumeration>
+            <xs:enumeration value="my">
+            </xs:enumeration>
+            <xs:enumeration value="nb">
+            </xs:enumeration>
+            <xs:enumeration value="ne">
+            </xs:enumeration>
+            <xs:enumeration value="nl">
+            </xs:enumeration>
+            <xs:enumeration value="nn">
+            </xs:enumeration>
+            <xs:enumeration value="no">
+            </xs:enumeration>
+            <xs:enumeration value="pl">
+            </xs:enumeration>
+            <xs:enumeration value="pt">
+            </xs:enumeration>
+            <xs:enumeration value="rm">
+            </xs:enumeration>
+            <xs:enumeration value="ro">
+            </xs:enumeration>
+            <xs:enumeration value="ru">
+            </xs:enumeration>
+            <xs:enumeration value="sc">
+            </xs:enumeration>
+            <xs:enumeration value="se">
+            </xs:enumeration>
+            <xs:enumeration value="sk">
+            </xs:enumeration>
+            <xs:enumeration value="sl">
+            </xs:enumeration>
+            <xs:enumeration value="so">
+            </xs:enumeration>
+            <xs:enumeration value="sq">
+            </xs:enumeration>
+            <xs:enumeration value="sr">
+            </xs:enumeration>
+            <xs:enumeration value="sv">
+            </xs:enumeration>
+            <xs:enumeration value="sw">
+            </xs:enumeration>
+            <xs:enumeration value="tk">
+            </xs:enumeration>
+            <xs:enumeration value="tr">
+            </xs:enumeration>
+            <xs:enumeration value="ty">
+            </xs:enumeration>
+            <xs:enumeration value="uk">
+            </xs:enumeration>
+            <xs:enumeration value="ur">
+            </xs:enumeration>
+            <xs:enumeration value="uz">
+            </xs:enumeration>
+            <xs:enumeration value="vi">
+            </xs:enumeration>
+            <xs:enumeration value="yi">
+            </xs:enumeration>
+            <xs:enumeration value="zh">
+            </xs:enumeration>
+            <xs:enumeration value="cu">
+            </xs:enumeration>
+            <xs:enumeration value="eo">
+            </xs:enumeration>
+            <xs:enumeration value="la">
+            </xs:enumeration>
+            <xs:enumeration value="oc">
+            </xs:enumeration>
+            <xs:enumeration value="vo">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="MimeType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="image/gif">
+            </xs:enumeration>
+            <xs:enumeration value="image/jpeg">
+            </xs:enumeration>
+            <xs:enumeration value="image/pjpeg">
+            </xs:enumeration>
+            <xs:enumeration value="image/png">
+            </xs:enumeration>
+            <xs:enumeration value="image/tiff">
+            </xs:enumeration>
+            <xs:enumeration value="text/html">
+            </xs:enumeration>
+            <xs:enumeration value="application/pdf">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ModeOfStudyType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="FullTime">
+            </xs:enumeration>
+            <xs:enumeration value="ParTime">
+            </xs:enumeration>
+            <xs:enumeration value="Distance">
+            </xs:enumeration>
+            <xs:enumeration value="eLearning">
+            </xs:enumeration>
+            <xs:enumeration value="Another">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ModeOfDeliveryType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="FaceToFace">
+            </xs:enumeration>
+            <xs:enumeration value="DistanceLearning">
+            </xs:enumeration>
+            <xs:enumeration value="Other">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="NFQType">
+        <xs:restriction base="xs:string"/>
+    </xs:simpleType>
+    <xs:simpleType name="PlainTextType">
+        <xs:restriction base="xs:string">
+            <xs:minLength value="1"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PercentType">
+        <xs:restriction base="xs:decimal">
+            <xs:maxInclusive value="100"/>
+            <xs:minInclusive value="0"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PositiveDecimalType">
+        <xs:restriction base="xs:decimal">
+            <xs:minInclusive value="0"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PositiveIntegerType">
+        <xs:restriction base="xs:int">
+            <xs:minInclusive value="0"/>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SourceGradeType">
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Recognized">
+            </xs:enumeration>
+            <xs:enumeration value="MobilityProgramme">
+            </xs:enumeration>
+            <xs:enumeration value="Another">
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="URLType">
+        <xs:restriction base="xs:anyURI"/>
+    </xs:simpleType>
  
  
  
  
- <!-- Complex types -->
+    <!-- Complex types -->
   
- <xs:complexType name="CountryTextCodeType">
-   <xs:simpleContent>
-     <xs:extension base="gd:PlainTextType">
-       <xs:attribute name="country" type="gd:CountryType" use="optional">
-       </xs:attribute>
-     </xs:extension>
-   </xs:simpleContent>
- </xs:complexType>
+    <xs:complexType name="CountryTextCodeType">
+        <xs:simpleContent>
+            <xs:extension base="gd:PlainTextType">
+                <xs:attribute name="country" type="gd:CountryType" use="optional">
+                </xs:attribute>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
  
  
-	<xs:complexType name="AdditionalInformationType"> 
-		<xs:sequence>
-			<xs:element name="SpecificInformation" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="OtherSources" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="AdditionalInformationType"> 
+        <xs:sequence>
+            <xs:element name="SpecificInformation" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="OtherSources" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
  
-	<xs:complexType name="AddressType">
-		<xs:sequence>
-			<xs:element name="Line" type="gd:PlainTextType" maxOccurs="unbounded">
-			</xs:element>
-			<xs:element name="City" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="StateOrRegion" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="PostalCode" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="Country" type="gd:CountryTextCodeType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="AddressType">
+        <xs:sequence>
+            <xs:element name="Line" type="gd:PlainTextType" maxOccurs="unbounded">
+            </xs:element>
+            <xs:element name="City" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="StateOrRegion" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="PostalCode" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="Country" type="gd:CountryTextCodeType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
 
-	<xs:complexType name="AttachedFileDataType">
-		<xs:sequence>
-			<xs:element name="Description" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="Mime" type="gd:MimeType">
-			</xs:element>
-			<xs:element name="Data" type="xs:base64Binary">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="AttachedFileDataType">
+        <xs:sequence>
+            <xs:element name="Description" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="Mime" type="gd:MimeType">
+            </xs:element>
+            <xs:element name="Data" type="xs:base64Binary">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
  
-	<xs:complexType name="AttachedFileURLType">
-		<xs:sequence>
-			<xs:element name="Description" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="Mime" type="gd:MimeType">
-			</xs:element>
-			<xs:element name="URL" type="gd:URLType">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="AttachedFileURLType">
+        <xs:sequence>
+            <xs:element name="Description" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="Mime" type="gd:MimeType">
+            </xs:element>
+            <xs:element name="URL" type="gd:URLType">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
  
-	<xs:complexType name="AttachedImageDataType">
-		<xs:sequence>
-			<xs:element name="Description" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="Mime" type="gd:ImageMimeType">
-			</xs:element>
-			<xs:element name="Data" type="xs:base64Binary">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="AttachedImageDataType">
+        <xs:sequence>
+            <xs:element name="Description" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="Mime" type="gd:ImageMimeType">
+            </xs:element>
+            <xs:element name="Data" type="xs:base64Binary">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
  
-	<xs:complexType name="AttachedImageURLType">
-		<xs:sequence>
-			<xs:element name="Description" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="Mime" type="gd:ImageMimeType">
-			</xs:element>
-			<xs:element name="URL" type="gd:URLType">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="AttachedImageURLType">
+        <xs:sequence>
+            <xs:element name="Description" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="Mime" type="gd:ImageMimeType">
+            </xs:element>
+            <xs:element name="URL" type="gd:URLType">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
  
-	<xs:complexType name="AttachedType">
-		<xs:choice>
-			<xs:element name="FileData" type="gd:AttachedFileDataType">
-			</xs:element>
-			<xs:element name="FileURI" type="gd:AttachedFileURLType">
-			</xs:element>
-			<xs:element name="ImageData" type="gd:AttachedImageDataType">
-			</xs:element>
-			<xs:element name="ImageURI" type="gd:AttachedImageURLType">
-			</xs:element>
-		</xs:choice>
-		<xs:attribute name="attachedID" type="xs:ID" use="required">
-		</xs:attribute>
-	</xs:complexType>
+    <xs:complexType name="AttachedType">
+        <xs:choice>
+            <xs:element name="FileData" type="gd:AttachedFileDataType">
+            </xs:element>
+            <xs:element name="FileURI" type="gd:AttachedFileURLType">
+            </xs:element>
+            <xs:element name="ImageData" type="gd:AttachedImageDataType">
+            </xs:element>
+            <xs:element name="ImageURI" type="gd:AttachedImageURLType">
+            </xs:element>
+        </xs:choice>
+        <xs:attribute name="attachedID" type="xs:ID" use="required">
+        </xs:attribute>
+    </xs:complexType>
  
  
-	<xs:complexType name="AttachmentsType">
-		<xs:sequence>
-			<xs:element name="Attached" type="gd:AttachedType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="AttachmentsType">
+        <xs:sequence>
+            <xs:element name="Attached" type="gd:AttachedType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
  
-	<xs:complexType name="CertificationOfTheSupplementType">
-		<xs:sequence>
-			<xs:element name="CertificationDate" type="gd:DateType" minOccurs="0">
-			</xs:element>
-			<xs:element name="OfficialsCertifying" type="gd:OfficialsCertifyingType" minOccurs="0">
-			</xs:element>
-			<xs:element name="OfficialStamp" type="gd:OfficialStampType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="ContactInformationType">
-		<xs:sequence>
-			<xs:element name="Address" type="gd:AddressType" minOccurs="0">
-			</xs:element>
-			<xs:element name="PhoneNumber" type="gd:PlainTextType" minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-			<xs:element name="Email" type="gd:EmailAddressType" minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-			<xs:element name="WebSite" type="gd:URLType" minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
-		<xs:sequence>
-			<xs:element name="MobilityProgramme" type="gd:MobilityProgrammeType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="CourseStructureDiagramType">
-		<xs:sequence>
-			<xs:element name="CoursesGroups" type="gd:CoursesGroupsType" minOccurs="0">
-			</xs:element>
-			<xs:element name="CoursesUnits" type="gd:CoursesUnitsType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="CoursesUnitsType">
-		<xs:sequence>
-			<xs:element name="CourseUnit" type="gd:CourseUnitType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="CourseUnitLanguagesOfInstructionType">
-		<xs:sequence>
-			<xs:element name="Language" type="gd:CourseUnitLanguageOfInstructionType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="CourseUnitStudentPerformanceType">
-		<xs:sequence>
-			<xs:element name="LocalGrade" type="gd:LocalGradeType">
-			</xs:element>
-			<xs:element name="ECTSGrade" type="gd:ECTSGradingScaleType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="CertificationOfTheSupplementType">
+        <xs:sequence>
+            <xs:element name="CertificationDate" type="gd:DateType" minOccurs="0">
+            </xs:element>
+            <xs:element name="OfficialsCertifying" type="gd:OfficialsCertifyingType" minOccurs="0">
+            </xs:element>
+            <xs:element name="OfficialStamp" type="gd:OfficialStampType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="ContactInformationType">
+        <xs:sequence>
+            <xs:element name="Address" type="gd:AddressType" minOccurs="0">
+            </xs:element>
+            <xs:element name="PhoneNumber" type="gd:PlainTextType" minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+            <xs:element name="Email" type="gd:EmailAddressType" minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+            <xs:element name="WebSite" type="gd:URLType" minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
+        <xs:sequence>
+            <xs:element name="MobilityProgramme" type="gd:MobilityProgrammeType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="CourseStructureDiagramType">
+        <xs:sequence>
+            <xs:element name="CoursesGroups" type="gd:CoursesGroupsType" minOccurs="0">
+            </xs:element>
+            <xs:element name="CoursesUnits" type="gd:CoursesUnitsType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="CoursesUnitsType">
+        <xs:sequence>
+            <xs:element name="CourseUnit" type="gd:CourseUnitType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="CourseUnitLanguagesOfInstructionType">
+        <xs:sequence>
+            <xs:element name="Language" type="gd:CourseUnitLanguageOfInstructionType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="CourseUnitStudentPerformanceType">
+        <xs:sequence>
+            <xs:element name="LocalGrade" type="gd:LocalGradeType">
+            </xs:element>
+            <xs:element name="ECTSGrade" type="gd:ECTSGradingScaleType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
  
  
 
  
-	<xs:complexType name="CourseUnitType">
-		<xs:sequence>
-    <!--I've marked the course code as optional. Therefore, I had to remove the key that was defined for this field-->
-			<xs:element name="Code" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="ScientificArea" type="gd:PlainTextType" minOccurs="0"/>
-			<xs:element name="Title" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="Theme" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="Type" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="type" type="gd:CourseUnitTypeType" use="optional">
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="YearOfStudy" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="year" type="gd:PositiveDecimalType" use="optional">
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="Level" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="eheaFramework" type="gd:EHEAFrameworkType" use="optional">
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ECTSCredits" type="gd:PositiveDecimalType" minOccurs="0">
-			</xs:element>
-			<xs:element name="LocalCredits" type="gd:PositiveDecimalType" minOccurs="0">
-			</xs:element>
-			<xs:element name="Hours" type="gd:PositiveDecimalType" minOccurs="0">
-			</xs:element>
-			<xs:element name="LanguagesOfInstruction" type="gd:CourseUnitLanguagesOfInstructionType" minOccurs="0">
-				<xs:unique name="LanguagesOfInstructionUQ">
-					<xs:selector xpath="gd:Language"/>
-					<xs:field xpath="@language"/>
-				</xs:unique>
-			</xs:element>
-			<xs:element name="ModeOfDelivery" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="modeOfDelivery" type="gd:ModeOfDeliveryType" use="optional">
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="WorkPlacements" type="gd:CourseUnitWorkPlacementsType" minOccurs="0">
-			</xs:element>
-			<xs:element name="StudentPerformance" type="gd:CourseUnitStudentPerformanceType" minOccurs="0">
-			</xs:element>
-			<xs:element name="NameOfLecturers" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="LearningOutcomes" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="PrerequisitesAndCorequisites" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="PrerequisitesScholarshipLevel" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="PrerequisitesOtherTitles" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="RecomendedOptionalProgrammeComponents" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="CourseContents" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="RecomendedOrRequiredReading" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="PlanedLearningActivitiesAndTeachingMethod" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="AssesmentMethodsAndCriteria" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="Observations" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="groupID" type="xs:string" use="optional">
-		</xs:attribute>
-		<xs:attribute name="institutionAdministeringStudiesID" type="xs:string" use="optional" default="DEF-IAS">
-		</xs:attribute>
-		<xs:attribute name="isRequiredByTheProgramme" type="xs:boolean" default="true">
-		</xs:attribute>
- </xs:complexType>
+    <xs:complexType name="CourseUnitType">
+        <xs:sequence>
+            <!--I've marked the course code as optional. Therefore, I had to remove the key that was defined for this field-->
+            <xs:element name="Code" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="ScientificArea" type="gd:PlainTextType" minOccurs="0"/>
+            <xs:element name="Title" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="Theme" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="Type" minOccurs="0">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="gd:PlainTextType">
+                            <xs:attribute name="type" type="gd:CourseUnitTypeType" use="optional">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="YearOfStudy" minOccurs="0">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="gd:PlainTextType">
+                            <xs:attribute name="year" type="gd:PositiveDecimalType" use="optional">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="Level" minOccurs="0">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="gd:PlainTextType">
+                            <xs:attribute name="eheaFramework" type="gd:EHEAFrameworkType" use="optional">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="ECTSCredits" type="gd:PositiveDecimalType" minOccurs="0">
+            </xs:element>
+            <xs:element name="LocalCredits" type="gd:PositiveDecimalType" minOccurs="0">
+            </xs:element>
+            <xs:element name="Hours" type="gd:PositiveDecimalType" minOccurs="0">
+            </xs:element>
+            <xs:element name="LanguagesOfInstruction" type="gd:CourseUnitLanguagesOfInstructionType" minOccurs="0">
+                <xs:unique name="LanguagesOfInstructionUQ">
+                    <xs:selector xpath="gd:Language"/>
+                    <xs:field xpath="@language"/>
+                </xs:unique>
+            </xs:element>
+            <xs:element name="ModeOfDelivery" minOccurs="0">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="gd:PlainTextType">
+                            <xs:attribute name="modeOfDelivery" type="gd:ModeOfDeliveryType" use="optional">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="WorkPlacements" type="gd:CourseUnitWorkPlacementsType" minOccurs="0">
+            </xs:element>
+            <xs:element name="StudentPerformance" type="gd:CourseUnitStudentPerformanceType" minOccurs="0">
+            </xs:element>
+            <xs:element name="NameOfLecturers" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="LearningOutcomes" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="PrerequisitesAndCorequisites" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="PrerequisitesScholarshipLevel" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="PrerequisitesOtherTitles" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="RecomendedOptionalProgrammeComponents" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="CourseContents" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="RecomendedOrRequiredReading" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="PlanedLearningActivitiesAndTeachingMethod" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="AssesmentMethodsAndCriteria" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="Observations" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="groupID" type="xs:string" use="optional">
+        </xs:attribute>
+        <xs:attribute name="institutionAdministeringStudiesID" type="xs:string" use="optional" default="DEF-IAS">
+        </xs:attribute>
+        <xs:attribute name="isRequiredByTheProgramme" type="xs:boolean" default="true">
+        </xs:attribute>
+    </xs:complexType>
  
  
  
  
  
-	<xs:complexType name="CourseUnitWorkPlacementsType">
-		<xs:sequence>
-    <xs:element name="WorkPlacement" type="gd:CourseUnitWorkPlacementType" maxOccurs="unbounded">
-    </xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="CourseUnitWorkPlacementsType">
+        <xs:sequence>
+            <xs:element name="WorkPlacement" type="gd:CourseUnitWorkPlacementType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
- <xs:complexType name="CourseUnitWorkPlacementType">
-   <xs:sequence>
-     <xs:element name="CollaboratingInstitution" type="gd:PlainTextType">
-     </xs:element>
-     <xs:element name="DateFrom" type="gd:DateType" minOccurs="0">
-     </xs:element>
-     <xs:element name="DateTo" type="gd:DateType" minOccurs="0">
-     </xs:element>
-     <xs:element name="TrainingHours" type="gd:PositiveDecimalType" minOccurs="0">
-     </xs:element>
-   </xs:sequence>
- </xs:complexType>
+    <xs:complexType name="CourseUnitWorkPlacementType">
+        <xs:sequence>
+            <xs:element name="CollaboratingInstitution" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="DateFrom" type="gd:DateType" minOccurs="0">
+            </xs:element>
+            <xs:element name="DateTo" type="gd:DateType" minOccurs="0">
+            </xs:element>
+            <xs:element name="TrainingHours" type="gd:PositiveDecimalType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
  
  
-	<xs:complexType name="CourseUnitLanguageOfInstructionType">
-		<xs:simpleContent>
-			<xs:extension base="gd:PlainTextType">
-				<xs:attribute name="language" type="gd:LanguageType" use="required">
-				</xs:attribute>
-			</xs:extension>
-		</xs:simpleContent>
-	</xs:complexType>
-
-
- <!-- Root element type: GeneralDiploma -->
-
-	<xs:complexType name="GeneralDiplomaType">
-		<xs:sequence>
-			<xs:element name="InformationIdentifyingTheHolderOfTheQualification" type="gd:InformationIdentifyingTheHolderOfTheQualificationType">
-			</xs:element>
-			<xs:element name="InformationIdentifyingTheQualification" type="gd:InformationIdentifyingTheQualificationType">
-			</xs:element>
-			<xs:element name="InformationOnTheLevelOfTheQualification" type="gd:InformationOnTheLevelOfTheQualificationType" minOccurs="0">
-			</xs:element>
-   <!--Course and per-course qualifications information. We set it to optional to allow representing diplomas without course info-->
-			<xs:element name="InformationOnTheContentsAndResultsGained" type="gd:InformationOnTheContentsAndResultsGainedType" minOccurs="0">
-			</xs:element>
-			<xs:element name="InformationOnTheFunctionOfTheQualification" type="gd:InformationOnTheFunctionOfTheQualificationType" minOccurs="0">
-			</xs:element>
-			<xs:element name="AdditionalInformation" type="gd:AdditionalInformationType" minOccurs="0">
-			</xs:element>
-			<xs:element name="CertificationOfTheSupplement" type="gd:CertificationOfTheSupplementType" minOccurs="0">
-			</xs:element>
-			<xs:element name="InformationOnTheNationalHigherEducationSystem" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="Attachments" type="gd:AttachmentsType" minOccurs="0">
-			</xs:element>
-			<xs:element name="ExtensionContent" type="gd:ExtensionContentType" minOccurs="0" maxOccurs="unbounded"> 
-			</xs:element>
-			<xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="language" type="gd:LanguageType" use="required">
-		</xs:attribute>
-		<xs:attribute name="isTheOriginalLanguage" type="xs:boolean" use="required">
-		</xs:attribute>
-	</xs:complexType>
+    <xs:complexType name="CourseUnitLanguageOfInstructionType">
+        <xs:simpleContent>
+            <xs:extension base="gd:PlainTextType">
+                <xs:attribute name="language" type="gd:LanguageType" use="required">
+                </xs:attribute>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+
+
+    <!-- Root element type: GeneralDiploma -->
+
+    <xs:complexType name="GeneralDiplomaType">
+        <xs:sequence>
+            <xs:element name="InformationIdentifyingTheHolderOfTheQualification" type="gd:InformationIdentifyingTheHolderOfTheQualificationType">
+            </xs:element>
+            <xs:element name="InformationIdentifyingTheQualification" type="gd:InformationIdentifyingTheQualificationType">
+            </xs:element>
+            <xs:element name="InformationOnTheLevelOfTheQualification" type="gd:InformationOnTheLevelOfTheQualificationType" minOccurs="0">
+            </xs:element>
+            <!--Course and per-course qualifications information. We set it to optional to allow representing diplomas without course info-->
+            <xs:element name="InformationOnTheContentsAndResultsGained" type="gd:InformationOnTheContentsAndResultsGainedType" minOccurs="0">
+            </xs:element>
+            <xs:element name="InformationOnTheFunctionOfTheQualification" type="gd:InformationOnTheFunctionOfTheQualificationType" minOccurs="0">
+            </xs:element>
+            <xs:element name="AdditionalInformation" type="gd:AdditionalInformationType" minOccurs="0">
+            </xs:element>
+            <xs:element name="CertificationOfTheSupplement" type="gd:CertificationOfTheSupplementType" minOccurs="0">
+            </xs:element>
+            <xs:element name="InformationOnTheNationalHigherEducationSystem" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="Attachments" type="gd:AttachmentsType" minOccurs="0">
+            </xs:element>
+            <xs:element name="ExtensionContent" type="gd:ExtensionContentType" minOccurs="0" maxOccurs="unbounded"> 
+            </xs:element>
+            <xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="language" type="gd:LanguageType" use="required">
+        </xs:attribute>
+        <xs:attribute name="isTheOriginalLanguage" type="xs:boolean" use="required">
+        </xs:attribute>
+    </xs:complexType>
  
  
- <!-- Can hold anything as extension -->
-	<xs:complexType name="ExtensionContentType" mixed="true">
-		<xs:sequence minOccurs="0" maxOccurs="unbounded">
-			<xs:any namespace="##any" processContents="lax"/>
-		</xs:sequence>
-		<xs:attribute name="id" type="xs:string" use="optional"/>
-	</xs:complexType>
-
-
-	<xs:complexType name="FamilyNameType">
-		<xs:sequence>
-			<xs:element name="Surname" type="gd:PlainTextType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="GivenNameType">
-		<xs:sequence>
-			<xs:element name="Name" type="gd:PlainTextType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="GradingSchemeAndGradeDistributionGuidanceType">
-		<xs:sequence>
-			<xs:element name="GradingScheme" type="gd:RichTextTagType">
-			</xs:element>
-			<xs:element name="GradeDistributionGuidance" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="CoursesGroupsType">
-		<xs:sequence>
-			<xs:element name="Name" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="HeaderInformation" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="CoursesGroup" type="gd:CoursesGroupType" minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-			<xs:element name="FooterInformation" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
- <!--Allows a hierarchy of course groups, but each ID must be unique regardless the level it is defined-->
-	<xs:complexType name="CoursesGroupType">
-		<xs:sequence>
-			<xs:element name="Name" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="HeaderInformation" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="CoursesGroup" type="gd:CoursesGroupType" minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-			<xs:element name="FooterInformation" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="groupID" type="xs:string" use="required">
-		</xs:attribute>
-	</xs:complexType>
+    <!-- Can hold anything as extension -->
+    <xs:complexType name="ExtensionContentType" mixed="true">
+        <xs:sequence minOccurs="0" maxOccurs="unbounded">
+            <xs:any namespace="##any" processContents="lax"/>
+        </xs:sequence>
+        <xs:attribute name="id" type="xs:string" use="optional"/>
+    </xs:complexType>
+
+
+    <xs:complexType name="FamilyNameType">
+        <xs:sequence>
+            <xs:element name="Surname" type="gd:PlainTextType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="GivenNameType">
+        <xs:sequence>
+            <xs:element name="Name" type="gd:PlainTextType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="GradingSchemeAndGradeDistributionGuidanceType">
+        <xs:sequence>
+            <xs:element name="GradingScheme" type="gd:RichTextTagType">
+            </xs:element>
+            <xs:element name="GradeDistributionGuidance" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="CoursesGroupsType">
+        <xs:sequence>
+            <xs:element name="Name" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="HeaderInformation" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="CoursesGroup" type="gd:CoursesGroupType" minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+            <xs:element name="FooterInformation" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!--Allows a hierarchy of course groups, but each ID must be unique regardless the level it is defined-->
+    <xs:complexType name="CoursesGroupType">
+        <xs:sequence>
+            <xs:element name="Name" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="HeaderInformation" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="CoursesGroup" type="gd:CoursesGroupType" minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+            <xs:element name="FooterInformation" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="groupID" type="xs:string" use="required">
+        </xs:attribute>
+    </xs:complexType>
 
  
 
-	<xs:complexType name="InformationIdentifyingTheHolderOfTheQualificationType">
-		<xs:sequence>
-			<xs:element name="FamilyName" type="gd:FamilyNameType">
-			</xs:element>
-			<xs:element name="GivenName" type="gd:GivenNameType">
-			</xs:element>
-			<xs:element name="DateOfBirth" type="gd:DateType" minOccurs="0">
-			</xs:element>
-			<xs:element name="StudentIdentificationNumber" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="CountryOfBirth" type="gd:CountryTextCodeType" minOccurs="0">
-			</xs:element>
-			<xs:element name="PlaceOfBirth" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="Gender" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="gender" type="gd:GenderType" use="required">
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="InformationIdentifyingTheHolderOfTheQualificationType">
+        <xs:sequence>
+            <xs:element name="FamilyName" type="gd:FamilyNameType">
+            </xs:element>
+            <xs:element name="GivenName" type="gd:GivenNameType">
+            </xs:element>
+            <xs:element name="DateOfBirth" type="gd:DateType" minOccurs="0">
+            </xs:element>
+            <xs:element name="StudentIdentificationNumber" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="CountryOfBirth" type="gd:CountryTextCodeType" minOccurs="0">
+            </xs:element>
+            <xs:element name="PlaceOfBirth" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="Gender" minOccurs="0">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="gd:PlainTextType">
+                            <xs:attribute name="gender" type="gd:GenderType" use="required">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
 
  
- <!--Required at least the name of the awarding institution, institution administering studies and the name of the qualification-->
-	<xs:complexType name="InformationIdentifyingTheQualificationType">
-		<xs:sequence>
-			<xs:element name="Qualification" type="gd:QualificationType">
-			</xs:element>
-			<xs:element name="TitleConferred" type="gd:TitleConferredType" minOccurs="0">
-			</xs:element>
-			<xs:element name="MainFieldsOfStudy" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="NameAndStatusOfAwardingInstitution" type="gd:NameAndStatusOfAwardingInstitutionType">
-			</xs:element>
-			<xs:element name="NameAndStatusOfInstitutionAdministeringStudies" type="gd:NameAndStatusOfInstitutionAdministeringStudiesType">
-			</xs:element>
-			<xs:element name="LanguagesOfInstructionAndExamination" type="gd:LanguagesOfInstructionAndExaminationType" minOccurs="0">
-				<xs:unique name="LanguageOfInstructionAndExaminationUQ">
-					<xs:selector xpath="gd:Language"/>
-					<xs:field xpath="@language"/>
-				</xs:unique>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-
-	<xs:complexType name="InformationOnTheContentsAndResultsGainedType">
-		<xs:sequence>
-			<xs:element name="ModeOfStudy" minOccurs="0">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="gd:RichTextTagType">
-							<xs:attribute name="modeOfStudy" type="gd:ModeOfStudyType" use="optional">
-							</xs:attribute>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ProgrammeRequirements" type="gd:ProgrammeRequirementsType" minOccurs="0">
-			</xs:element>
-			<xs:element name="ProgrammeDetails" type="gd:ProgrammeDetailsType" minOccurs="0">
-			</xs:element>
-			<xs:element name="GradingSchemeAndGradeDistributionGuidance" type="gd:GradingSchemeAndGradeDistributionGuidanceType" minOccurs="0">
-			</xs:element>
-			<xs:element name="OverallClassificationOfTheQualification" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-
-	<xs:complexType name="InformationOnTheFunctionOfTheQualificationType">
-		<xs:sequence>
-			<xs:element name="AccessToFurtherStudy" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="ProfessionalStatus" minOccurs="0">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="gd:RichTextTagType">
-							<xs:attribute name="isRegulatedProfession" type="xs:boolean" use="optional">
-							</xs:attribute>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-
-	<xs:complexType name="InformationOnTheLevelOfTheQualificationType">
-		<xs:sequence>
-			<xs:element name="Level">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="gd:RichTextTagType">
-							<xs:attribute name="isced1997" type="gd:ISCED1997Type" use="optional">
-							</xs:attribute>
-							<xs:attribute name="isced2011" type="gd:ISCED2011Type" use="optional">
-							</xs:attribute>
-							<xs:attribute name="eheaFramework" type="gd:EHEAFrameworkType" use="optional">
-							</xs:attribute>
-							<xs:attribute name="nfq" type="gd:NFQType" use="optional">
-							</xs:attribute>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="OfficialLengthOfProgramme">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="gd:RichTextTagType">
-							<xs:attribute name="ectsCredits" type="gd:PositiveDecimalType" use="optional">
-							</xs:attribute>
-							<xs:attribute name="years" type="gd:PositiveDecimalType" use="optional">
-							</xs:attribute>
-							<xs:attribute name="semesters" type="gd:PositiveIntegerType" use="optional">
-							</xs:attribute>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="AccessRequirements" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <!--Required at least the name of the awarding institution, institution administering studies and the name of the qualification-->
+    <xs:complexType name="InformationIdentifyingTheQualificationType">
+        <xs:sequence>
+            <xs:element name="Qualification" type="gd:QualificationType">
+            </xs:element>
+            <xs:element name="TitleConferred" type="gd:TitleConferredType" minOccurs="0">
+            </xs:element>
+            <xs:element name="MainFieldsOfStudy" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="NameAndStatusOfAwardingInstitution" type="gd:NameAndStatusOfAwardingInstitutionType">
+            </xs:element>
+            <xs:element name="NameAndStatusOfInstitutionAdministeringStudies" type="gd:NameAndStatusOfInstitutionAdministeringStudiesType">
+            </xs:element>
+            <xs:element name="LanguagesOfInstructionAndExamination" type="gd:LanguagesOfInstructionAndExaminationType" minOccurs="0">
+                <xs:unique name="LanguageOfInstructionAndExaminationUQ">
+                    <xs:selector xpath="gd:Language"/>
+                    <xs:field xpath="@language"/>
+                </xs:unique>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+
+    <xs:complexType name="InformationOnTheContentsAndResultsGainedType">
+        <xs:sequence>
+            <xs:element name="ModeOfStudy" minOccurs="0">
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="gd:RichTextTagType">
+                            <xs:attribute name="modeOfStudy" type="gd:ModeOfStudyType" use="optional">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="ProgrammeRequirements" type="gd:ProgrammeRequirementsType" minOccurs="0">
+            </xs:element>
+            <xs:element name="ProgrammeDetails" type="gd:ProgrammeDetailsType" minOccurs="0">
+            </xs:element>
+            <xs:element name="GradingSchemeAndGradeDistributionGuidance" type="gd:GradingSchemeAndGradeDistributionGuidanceType" minOccurs="0">
+            </xs:element>
+            <xs:element name="OverallClassificationOfTheQualification" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+
+    <xs:complexType name="InformationOnTheFunctionOfTheQualificationType">
+        <xs:sequence>
+            <xs:element name="AccessToFurtherStudy" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="ProfessionalStatus" minOccurs="0">
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="gd:RichTextTagType">
+                            <xs:attribute name="isRegulatedProfession" type="xs:boolean" use="optional">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+
+    <xs:complexType name="InformationOnTheLevelOfTheQualificationType">
+        <xs:sequence>
+            <xs:element name="Level">
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="gd:RichTextTagType">
+                            <xs:attribute name="isced1997" type="gd:ISCED1997Type" use="optional">
+                            </xs:attribute>
+                            <xs:attribute name="isced2011" type="gd:ISCED2011Type" use="optional">
+                            </xs:attribute>
+                            <xs:attribute name="eheaFramework" type="gd:EHEAFrameworkType" use="optional">
+                            </xs:attribute>
+                            <xs:attribute name="nfq" type="gd:NFQType" use="optional">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="OfficialLengthOfProgramme">
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="gd:RichTextTagType">
+                            <xs:attribute name="ectsCredits" type="gd:PositiveDecimalType" use="optional">
+                            </xs:attribute>
+                            <xs:attribute name="years" type="gd:PositiveDecimalType" use="optional">
+                            </xs:attribute>
+                            <xs:attribute name="semesters" type="gd:PositiveIntegerType" use="optional">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="AccessRequirements" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
  
  
-	<xs:complexType name="InstitutionType">
-		<xs:sequence>
-			<xs:element name="Name" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="Status" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="Country" type="gd:CountryTextCodeType" minOccurs="0">
-			</xs:element>
-			<xs:element name="AdditionalInformation" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-			<xs:element name="ContactInformation" type="gd:ContactInformationType" minOccurs="0">
-			</xs:element>
-			<xs:element name="AttachedImageRef" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="attachedID" type="xs:IDREF" use="required">
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="nationalID" type="gd:PlainTextType" use="optional">
-		</xs:attribute>
-		<xs:attribute name="erasmusID" type="gd:PlainTextType" use="optional">
-		</xs:attribute>
-	</xs:complexType>
-
-
- <!-- Added optional boolean values to differentiate languages used for instruction and evaluation-->
-	<xs:complexType name="LanguagesOfInstructionAndExaminationType">
-		<xs:sequence>
-			<xs:element name="Language" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="gd:RichTextTagType">
-							<xs:attribute name="language" type="gd:LanguageType" use="required">
-							</xs:attribute>
-							<xs:attribute name="percent" type="gd:PercentType" use="optional">
-							</xs:attribute>
-							<xs:attribute name="instruction"  type="xs:boolean" default="true">
-							</xs:attribute>
-							<xs:attribute name="examination"  type="xs:boolean" use="optional">
-							</xs:attribute>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-
-	<xs:complexType name="LocalGradeType">
-		<xs:sequence>
-			<xs:element name="AcademicYear" type="gd:AcademicYearType" minOccurs="0">
-			</xs:element>
-			<xs:element name="DateIssued" type="gd:DateType" minOccurs="0">
-			</xs:element>
-			<xs:element name="Grade" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="Source" minOccurs="0">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="source" type="gd:SourceGradeType" use="optional">
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-
-	<xs:complexType name="MobilityProgrammeCoursesUnitsType">
-		<xs:sequence>
-			<xs:element name="CourseUnit" type="gd:MobilityProgrammeCourseUnitType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="MobilityProgrammeCourseUnitType">
-		<xs:sequence>
-			<xs:element name="Code" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="Title">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="language" type="gd:LanguageType">
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-			<xs:element name="ECTSCredits" type="gd:PositiveDecimalType" minOccurs="0">
-			</xs:element>
-			<xs:element name="AdditionalInformation" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="isInTheLearningAgreement" type="xs:boolean" default="true">
-		</xs:attribute>
-	</xs:complexType>
+    <xs:complexType name="InstitutionType">
+        <xs:sequence>
+            <xs:element name="Name" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="Status" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="Country" type="gd:CountryTextCodeType" minOccurs="0">
+            </xs:element>
+            <xs:element name="AdditionalInformation" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+            <xs:element name="ContactInformation" type="gd:ContactInformationType" minOccurs="0">
+            </xs:element>
+            <xs:element name="AttachedImageRef" minOccurs="0">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="gd:PlainTextType">
+                            <xs:attribute name="attachedID" type="xs:IDREF" use="required">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="nationalID" type="gd:PlainTextType" use="optional">
+        </xs:attribute>
+        <xs:attribute name="erasmusID" type="gd:PlainTextType" use="optional">
+        </xs:attribute>
+    </xs:complexType>
+
+
+    <!-- Added optional boolean values to differentiate languages used for instruction and evaluation-->
+    <xs:complexType name="LanguagesOfInstructionAndExaminationType">
+        <xs:sequence>
+            <xs:element name="Language" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="gd:RichTextTagType">
+                            <xs:attribute name="language" type="gd:LanguageType" use="required">
+                            </xs:attribute>
+                            <xs:attribute name="percent" type="gd:PercentType" use="optional">
+                            </xs:attribute>
+                            <xs:attribute name="instruction"  type="xs:boolean" default="true">
+                            </xs:attribute>
+                            <xs:attribute name="examination"  type="xs:boolean" use="optional">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+
+    <xs:complexType name="LocalGradeType">
+        <xs:sequence>
+            <xs:element name="AcademicYear" type="gd:AcademicYearType" minOccurs="0">
+            </xs:element>
+            <xs:element name="DateIssued" type="gd:DateType" minOccurs="0">
+            </xs:element>
+            <xs:element name="Grade" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="Source" minOccurs="0">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="gd:PlainTextType">
+                            <xs:attribute name="source" type="gd:SourceGradeType" use="optional">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+
+    <xs:complexType name="MobilityProgrammeCoursesUnitsType">
+        <xs:sequence>
+            <xs:element name="CourseUnit" type="gd:MobilityProgrammeCourseUnitType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="MobilityProgrammeCourseUnitType">
+        <xs:sequence>
+            <xs:element name="Code" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="Title">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="gd:PlainTextType">
+                            <xs:attribute name="language" type="gd:LanguageType">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="ECTSCredits" type="gd:PositiveDecimalType" minOccurs="0">
+            </xs:element>
+            <xs:element name="AdditionalInformation" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="isInTheLearningAgreement" type="xs:boolean" default="true">
+        </xs:attribute>
+    </xs:complexType>
  
  
  
-	<xs:complexType name="MobilityProgrammeType">
-		<xs:sequence>
-			<xs:element name="Type" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="FieldOfStudy" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-			<xs:element name="Country" type="gd:CountryTextCodeType">
-			</xs:element>
-			<xs:element name="ReceivingInstitutionName" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="AcademicYear" type="gd:AcademicYearType" minOccurs="0">
-			</xs:element>
-			<xs:element name="DateFrom" type="gd:DateType" minOccurs="0">
-			</xs:element>
-			<xs:element name="DateTo" type="gd:DateType" minOccurs="0">
-			</xs:element>
-			<xs:element name="CoursesUnits" type="gd:MobilityProgrammeCoursesUnitsType">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-
- <!-- Root element type: MultilingualGeneralDiploma -->
-
-	<xs:complexType name="MultilingualGeneralDiplomaType">
-		<xs:sequence>
-			<xs:element ref="gd:GeneralDiploma" minOccurs="1" maxOccurs="unbounded">
-			</xs:element>
-			<xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
- <!-- awardingInstitutionID has a default value if only one is added.
-      Schema won't validate if two are added without this attr being set-->
-	<xs:complexType name="NameAndStatusOfAwardingInstitutionType">
-		<xs:sequence>
-			<xs:element name="AwardingInstitution" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="gd:InstitutionType">
-							<xs:attribute name="awardingInstitutionID" type="xs:string" use="optional" default="DEF-IAW">
-							</xs:attribute>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
- <!-- institutionAdministeringStudiesID has a default value if only one is added.
-      Schema won't validate if two are added without this attr being set-->
-	<xs:complexType name="NameAndStatusOfInstitutionAdministeringStudiesType">
-		<xs:sequence>
-			<xs:element name="InstitutionAdministeringStudies" maxOccurs="unbounded">
-				<xs:complexType>
-					<xs:complexContent>
-						<xs:extension base="gd:InstitutionType">
-							<xs:attribute name="institutionAdministeringStudiesID" type="xs:string" use="optional" default="DEF-IAS">
-							</xs:attribute>
-						</xs:extension>
-					</xs:complexContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="OfficialCertifyingType">
-		<xs:sequence>
-			<xs:element name="FamilyName" type="gd:FamilyNameType">
-			</xs:element>
-			<xs:element name="GivenName" type="gd:GivenNameType">
-			</xs:element>
-			<xs:element name="Capacity" type="gd:PlainTextType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="awardingInstitutionID" type="xs:string" use="optional" default="DEF-IAW">
-		</xs:attribute>
-	</xs:complexType>
-
-
-	<xs:complexType name="OfficialsCertifyingType">
-		<xs:sequence>
-			<xs:element name="OfficialCertifying" type="gd:OfficialCertifyingType" maxOccurs="unbounded">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
- <!--This is intended for printed out diplomas, to set up an area where the document can be physically stamped-->
-	<xs:complexType name="OfficialStampType">
-		<xs:sequence>
-			<xs:element name="Description" type="gd:PlainTextType">
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="awardingInstitutionID" type="xs:string" use="optional" default="DEF-IAW">
-		</xs:attribute>
-	</xs:complexType>
-
-
-	<xs:complexType name="ProgrammeDetailsType">
-		<xs:sequence>
-			<xs:element name="CourseStructureDiagram" type="gd:CourseStructureDiagramType">
-			</xs:element>
-			<xs:element name="CoursesAttendedInOtherInstitutionInMobilityPrograms" type="gd:CoursesAttendedInOtherInstitutionInMobilityProgramsType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="ProgrammeRequirementsType">
-		<xs:sequence>
-			<xs:element name="Requirements" type="gd:RichTextTagType">
-			</xs:element>
-			<xs:element name="KeyLearningOutcomes" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
-
-
-	<xs:complexType name="QualificationType">
-		<xs:sequence>
-			<xs:element name="Name" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="AdditionalInformation" type="gd:RichTextTagType" minOccurs="0">
-			</xs:element>
-		</xs:sequence>
-		<xs:attribute name="localID" type="gd:PlainTextType" use="optional">
-		</xs:attribute>
-		<xs:attribute name="nationalID" type="gd:PlainTextType" use="optional">
-		</xs:attribute>
-	</xs:complexType>
-
-
-	<xs:complexType name="RichTextTagType" mixed="true">
-		<xs:choice minOccurs="0" maxOccurs="unbounded">
-			<xs:element name="Bold" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="BreakLine" type="gd:EmptyType">
-			</xs:element>
-			<xs:element name="Italic" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="Underline" type="gd:PlainTextType">
-			</xs:element>
-			<xs:element name="AttachedRef">
-				<xs:complexType>
-					<xs:simpleContent>
-						<xs:extension base="gd:PlainTextType">
-							<xs:attribute name="attachedID" type="xs:IDREF" use="required">
-							</xs:attribute>
-						</xs:extension>
-					</xs:simpleContent>
-				</xs:complexType>
-			</xs:element>
-		</xs:choice>
-	</xs:complexType>
-
-
-	<xs:complexType name="TitleConferredType">
-		<xs:sequence>
-			<xs:element name="Name" type="gd:PlainTextType">
-			</xs:element>
-		</xs:sequence>
-	</xs:complexType>
+    <xs:complexType name="MobilityProgrammeType">
+        <xs:sequence>
+            <xs:element name="Type" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="FieldOfStudy" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+            <xs:element name="Country" type="gd:CountryTextCodeType">
+            </xs:element>
+            <xs:element name="ReceivingInstitutionName" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="AcademicYear" type="gd:AcademicYearType" minOccurs="0">
+            </xs:element>
+            <xs:element name="DateFrom" type="gd:DateType" minOccurs="0">
+            </xs:element>
+            <xs:element name="DateTo" type="gd:DateType" minOccurs="0">
+            </xs:element>
+            <xs:element name="CoursesUnits" type="gd:MobilityProgrammeCoursesUnitsType">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+
+    <!-- Root element type: MultilingualGeneralDiploma -->
+
+    <xs:complexType name="MultilingualGeneralDiplomaType">
+        <xs:sequence>
+            <xs:element ref="gd:GeneralDiploma" minOccurs="1" maxOccurs="unbounded">
+            </xs:element>
+            <xs:element ref="dsig:Signature" minOccurs="0" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- awardingInstitutionID has a default value if only one is added.
+    Schema won't validate if two are added without this attr being set-->
+    <xs:complexType name="NameAndStatusOfAwardingInstitutionType">
+        <xs:sequence>
+            <xs:element name="AwardingInstitution" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="gd:InstitutionType">
+                            <xs:attribute name="awardingInstitutionID" type="xs:string" use="optional" default="DEF-IAW">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+    <!-- institutionAdministeringStudiesID has a default value if only one is added.
+    Schema won't validate if two are added without this attr being set-->
+    <xs:complexType name="NameAndStatusOfInstitutionAdministeringStudiesType">
+        <xs:sequence>
+            <xs:element name="InstitutionAdministeringStudies" maxOccurs="unbounded">
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="gd:InstitutionType">
+                            <xs:attribute name="institutionAdministeringStudiesID" type="xs:string" use="optional" default="DEF-IAS">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="OfficialCertifyingType">
+        <xs:sequence>
+            <xs:element name="FamilyName" type="gd:FamilyNameType">
+            </xs:element>
+            <xs:element name="GivenName" type="gd:GivenNameType">
+            </xs:element>
+            <xs:element name="Capacity" type="gd:PlainTextType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="awardingInstitutionID" type="xs:string" use="optional" default="DEF-IAW">
+        </xs:attribute>
+    </xs:complexType>
+
+
+    <xs:complexType name="OfficialsCertifyingType">
+        <xs:sequence>
+            <xs:element name="OfficialCertifying" type="gd:OfficialCertifyingType" maxOccurs="unbounded">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <!--This is intended for printed out diplomas, to set up an area where the document can be physically stamped-->
+    <xs:complexType name="OfficialStampType">
+        <xs:sequence>
+            <xs:element name="Description" type="gd:PlainTextType">
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="awardingInstitutionID" type="xs:string" use="optional" default="DEF-IAW">
+        </xs:attribute>
+    </xs:complexType>
+
+
+    <xs:complexType name="ProgrammeDetailsType">
+        <xs:sequence>
+            <xs:element name="CourseStructureDiagram" type="gd:CourseStructureDiagramType">
+            </xs:element>
+            <xs:element name="CoursesAttendedInOtherInstitutionInMobilityPrograms" type="gd:CoursesAttendedInOtherInstitutionInMobilityProgramsType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="ProgrammeRequirementsType">
+        <xs:sequence>
+            <xs:element name="Requirements" type="gd:RichTextTagType">
+            </xs:element>
+            <xs:element name="KeyLearningOutcomes" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+
+
+    <xs:complexType name="QualificationType">
+        <xs:sequence>
+            <xs:element name="Name" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="AdditionalInformation" type="gd:RichTextTagType" minOccurs="0">
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="localID" type="gd:PlainTextType" use="optional">
+        </xs:attribute>
+        <xs:attribute name="nationalID" type="gd:PlainTextType" use="optional">
+        </xs:attribute>
+    </xs:complexType>
+
+
+    <xs:complexType name="RichTextTagType" mixed="true">
+        <xs:choice minOccurs="0" maxOccurs="unbounded">
+            <xs:element name="Bold" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="BreakLine" type="gd:EmptyType">
+            </xs:element>
+            <xs:element name="Italic" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="Underline" type="gd:PlainTextType">
+            </xs:element>
+            <xs:element name="AttachedRef">
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="gd:PlainTextType">
+                            <xs:attribute name="attachedID" type="xs:IDREF" use="required">
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:choice>
+    </xs:complexType>
+
+
+    <xs:complexType name="TitleConferredType">
+        <xs:sequence>
+            <xs:element name="Name" type="gd:PlainTextType">
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
  
  
  
  
- <!-- Root element: GeneralDiploma -->
-
-	<xs:element name="GeneralDiploma" type="gd:GeneralDiplomaType">
-		<!--Primary Keys--> <!-- TODO: revisar estas restricciones que tengan sentido y deban seguir existiendo -->
-		<xs:key name="GroupIDPK">
-			<xs:selector xpath=".//gd:CoursesGroup"/>
-			<xs:field xpath="@groupID"/>
-		</xs:key>
-		<xs:key name="AwardingInstitutionIDPK">
-			<xs:selector xpath=".//gd:AwardingInstitution"/>
-			<xs:field xpath="@awardingInstitutionID"/>
-		</xs:key>
-		<xs:key name="InstitutionAdministeringStudiesIDPK">
-			<xs:selector xpath=".//gd:InstitutionAdministeringStudies"/>
-			<xs:field xpath="@institutionAdministeringStudiesID"/>
-		</xs:key>
-		<!--Foreign Keys-->
-		<xs:keyref name="GroupFK" refer="gd:GroupIDPK">
-			<xs:selector xpath=".//gd:CourseStructureDiagram/gd:CoursesUnits/gd:CourseUnit"/>
-			<xs:field xpath="@groupID"/>
-		</xs:keyref>
-		<xs:keyref name="AwardingInstitutionOfficialCertifyingFK" refer="gd:AwardingInstitutionIDPK">
-			<xs:selector xpath=".//gd:OfficialCertifying"/>
-			<xs:field xpath="@awardingInstitutionID"/>
-		</xs:keyref>
-		<xs:keyref name="AwardingInstitutionOfficialStampFK" refer="gd:AwardingInstitutionIDPK">
-			<xs:selector xpath=".//gd:OfficialStamp"/>
-			<xs:field xpath="@awardingInstitutionID"/>
-		</xs:keyref>
-		<xs:keyref name="InstitutionAdministeringStudiesFK" refer="gd:InstitutionAdministeringStudiesIDPK">
-			<xs:selector xpath=".//gd:ProgrammeDetails/gd:CourseStructureDiagram/gd:CoursesUnits/gd:CourseUnit"/>
-			<xs:field xpath="@institutionAdministeringStudiesID"/>
-		</xs:keyref>
-	</xs:element>
+    <!-- Root element: GeneralDiploma -->
+
+    <xs:element name="GeneralDiploma" type="gd:GeneralDiplomaType">
+        <!--Primary Keys--> <!-- TODO: revisar estas restricciones que tengan sentido y deban seguir existiendo -->
+        <xs:key name="GroupIDPK">
+            <xs:selector xpath=".//gd:CoursesGroup"/>
+            <xs:field xpath="@groupID"/>
+        </xs:key>
+        <xs:key name="AwardingInstitutionIDPK">
+            <xs:selector xpath=".//gd:AwardingInstitution"/>
+            <xs:field xpath="@awardingInstitutionID"/>
+        </xs:key>
+        <xs:key name="InstitutionAdministeringStudiesIDPK">
+            <xs:selector xpath=".//gd:InstitutionAdministeringStudies"/>
+            <xs:field xpath="@institutionAdministeringStudiesID"/>
+        </xs:key>
+        <!--Foreign Keys-->
+        <xs:keyref name="GroupFK" refer="gd:GroupIDPK">
+            <xs:selector xpath=".//gd:CourseStructureDiagram/gd:CoursesUnits/gd:CourseUnit"/>
+            <xs:field xpath="@groupID"/>
+        </xs:keyref>
+        <xs:keyref name="AwardingInstitutionOfficialCertifyingFK" refer="gd:AwardingInstitutionIDPK">
+            <xs:selector xpath=".//gd:OfficialCertifying"/>
+            <xs:field xpath="@awardingInstitutionID"/>
+        </xs:keyref>
+        <xs:keyref name="AwardingInstitutionOfficialStampFK" refer="gd:AwardingInstitutionIDPK">
+            <xs:selector xpath=".//gd:OfficialStamp"/>
+            <xs:field xpath="@awardingInstitutionID"/>
+        </xs:keyref>
+        <xs:keyref name="InstitutionAdministeringStudiesFK" refer="gd:InstitutionAdministeringStudiesIDPK">
+            <xs:selector xpath=".//gd:ProgrammeDetails/gd:CourseStructureDiagram/gd:CoursesUnits/gd:CourseUnit"/>
+            <xs:field xpath="@institutionAdministeringStudiesID"/>
+        </xs:keyref>
+    </xs:element>
  
  
- <!-- Root element: MultilingualGeneralDiploma -->
-
-	<xs:element name="MultilingualGeneralDiploma" type="gd:MultilingualGeneralDiplomaType">
-		<!--Unique Keys--> <!-- Language codes of each Diploma must be unique -->
-		<xs:unique name="GeneralDiplomaLanguageUQ">
-			<xs:selector xpath="gd:GeneralDiploma"/>
-			<xs:field xpath="@language"/>
-		</xs:unique>
-	</xs:element>
+    <!-- Root element: MultilingualGeneralDiploma -->
+
+    <xs:element name="MultilingualGeneralDiploma" type="gd:MultilingualGeneralDiplomaType">
+        <!--Unique Keys--> <!-- Language codes of each Diploma must be unique -->
+        <xs:unique name="GeneralDiplomaLanguageUQ">
+            <xs:selector xpath="gd:GeneralDiploma"/>
+            <xs:field xpath="@language"/>
+        </xs:unique>
+    </xs:element>
 </xs:schema>
 
 
diff --git a/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd b/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd
index e75c806e0..54527e0bc 100644
--- a/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd
+++ b/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd
@@ -22,288 +22,288 @@
         targetNamespace="http://www.w3.org/2000/09/xmldsig#"
         version="0.1" elementFormDefault="qualified">
 
-<!-- Basic Types Defined for Signatures -->
-
-<simpleType name="CryptoBinary">
-  <restriction base="base64Binary">
-  </restriction>
-</simpleType>
-
-<!-- Start Signature -->
-
-<element name="Signature" type="ds:SignatureType"/>
-<complexType name="SignatureType">
-  <sequence> 
-    <element ref="ds:SignedInfo"/> 
-    <element ref="ds:SignatureValue"/> 
-    <element ref="ds:KeyInfo" minOccurs="0"/> 
-    <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/>
-</complexType>
-
-  <element name="SignatureValue" type="ds:SignatureValueType"/> 
-  <complexType name="SignatureValueType">
-    <simpleContent>
-      <extension base="base64Binary">
+    <!-- Basic Types Defined for Signatures -->
+
+    <simpleType name="CryptoBinary">
+        <restriction base="base64Binary">
+        </restriction>
+    </simpleType>
+
+    <!-- Start Signature -->
+
+    <element name="Signature" type="ds:SignatureType"/>
+    <complexType name="SignatureType">
+        <sequence> 
+            <element ref="ds:SignedInfo"/> 
+            <element ref="ds:SignatureValue"/> 
+            <element ref="ds:KeyInfo" minOccurs="0"/> 
+            <element ref="ds:Object" minOccurs="0" maxOccurs="unbounded"/> 
+        </sequence>  
         <attribute name="Id" type="ID" use="optional"/>
-      </extension>
-    </simpleContent>
-  </complexType>
-
-<!-- Start SignedInfo -->
-
-<element name="SignedInfo" type="ds:SignedInfoType"/>
-<complexType name="SignedInfoType">
-  <sequence> 
-    <element ref="ds:CanonicalizationMethod"/> 
-    <element ref="ds:SignatureMethod"/> 
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>  
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
-  <complexType name="CanonicalizationMethodType" mixed="true">
-    <sequence>
-      <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-  <element name="SignatureMethod" type="ds:SignatureMethodType"/>
-  <complexType name="SignatureMethodType" mixed="true">
-    <sequence>
-      <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
-      <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
-      <!-- (0,unbounded) elements from (1,1) external namespace -->
-    </sequence>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- Start Reference -->
-
-<element name="Reference" type="ds:ReferenceType"/>
-<complexType name="ReferenceType">
-  <sequence> 
-    <element ref="ds:Transforms" minOccurs="0"/> 
-    <element ref="ds:DigestMethod"/> 
-    <element ref="ds:DigestValue"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="URI" type="anyURI" use="optional"/> 
-  <attribute name="Type" type="anyURI" use="optional"/> 
-</complexType>
-
-  <element name="Transforms" type="ds:TransformsType"/>
-  <complexType name="TransformsType">
-    <sequence>
-      <element ref="ds:Transform" maxOccurs="unbounded"/>  
-    </sequence>
-  </complexType>
-
-  <element name="Transform" type="ds:TransformType"/>
-  <complexType name="TransformType" mixed="true">
-    <choice minOccurs="0" maxOccurs="unbounded"> 
-      <any namespace="##other" processContents="lax"/>
-      <!-- (1,1) elements from (0,unbounded) namespaces -->
-      <element name="XPath" type="string"/> 
-    </choice>
-    <attribute name="Algorithm" type="anyURI" use="required"/> 
-  </complexType>
-
-<!-- End Reference -->
-
-<element name="DigestMethod" type="ds:DigestMethodType"/>
-<complexType name="DigestMethodType" mixed="true"> 
-  <sequence>
-    <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
-  </sequence>    
-  <attribute name="Algorithm" type="anyURI" use="required"/> 
-</complexType>
-
-<element name="DigestValue" type="ds:DigestValueType"/>
-<simpleType name="DigestValueType">
-  <restriction base="base64Binary"/>
-</simpleType>
-
-<!-- End SignedInfo -->
-
-<!-- Start KeyInfo -->
-
-<element name="KeyInfo" type="ds:KeyInfoType"/> 
-<complexType name="KeyInfoType" mixed="true">
-  <choice maxOccurs="unbounded">     
-    <element ref="ds:KeyName"/> 
-    <element ref="ds:KeyValue"/> 
-    <element ref="ds:RetrievalMethod"/> 
-    <element ref="ds:X509Data"/> 
-    <element ref="ds:PGPData"/> 
-    <element ref="ds:SPKIData"/>
-    <element ref="ds:MgmtData"/>
-    <any processContents="lax" namespace="##other"/>
-    <!-- (1,1) elements from (0,unbounded) namespaces -->
-  </choice>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-  <element name="KeyName" type="string"/>
-  <element name="MgmtData" type="string"/>
-
-  <element name="KeyValue" type="ds:KeyValueType"/> 
-  <complexType name="KeyValueType" mixed="true">
-   <choice>
-     <element ref="ds:DSAKeyValue"/>
-     <element ref="ds:RSAKeyValue"/>
-     <any namespace="##other" processContents="lax"/>
-   </choice>
-  </complexType>
-
-  <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> 
-  <complexType name="RetrievalMethodType">
-    <sequence>
-      <element ref="ds:Transforms" minOccurs="0"/> 
-    </sequence>  
-    <attribute name="URI" type="anyURI"/>
-    <attribute name="Type" type="anyURI" use="optional"/>
-  </complexType>
-
-<!-- Start X509Data -->
-
-<element name="X509Data" type="ds:X509DataType"/> 
-<complexType name="X509DataType">
-  <sequence maxOccurs="unbounded">
-    <choice>
-      <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
-      <element name="X509SKI" type="base64Binary"/>
-      <element name="X509SubjectName" type="string"/>
-      <element name="X509Certificate" type="base64Binary"/>
-      <element name="X509CRL" type="base64Binary"/>
-      <any namespace="##other" processContents="lax"/>
-    </choice>
-  </sequence>
-</complexType>
-
-<complexType name="X509IssuerSerialType"> 
-  <sequence> 
-    <element name="X509IssuerName" type="string"/> 
-    <element name="X509SerialNumber" type="integer"/> 
-  </sequence>
-</complexType>
-
-<!-- End X509Data -->
-
-<!-- Begin PGPData -->
-
-<element name="PGPData" type="ds:PGPDataType"/> 
-<complexType name="PGPDataType"> 
-  <choice>
-    <sequence>
-      <element name="PGPKeyID" type="base64Binary"/> 
-      <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-    <sequence>
-      <element name="PGPKeyPacket" type="base64Binary"/> 
-      <any namespace="##other" processContents="lax" minOccurs="0"
-       maxOccurs="unbounded"/>
-    </sequence>
-  </choice>
-</complexType>
-
-<!-- End PGPData -->
-
-<!-- Begin SPKIData -->
-
-<element name="SPKIData" type="ds:SPKIDataType"/> 
-<complexType name="SPKIDataType">
-  <sequence maxOccurs="unbounded">
-    <element name="SPKISexp" type="base64Binary"/>
-    <any namespace="##other" processContents="lax" minOccurs="0"/>
-  </sequence>
-</complexType> 
-
-<!-- End SPKIData -->
-
-<!-- End KeyInfo -->
-
-<!-- Start Object (Manifest, SignatureProperty) -->
-
-<element name="Object" type="ds:ObjectType"/> 
-<complexType name="ObjectType" mixed="true">
-  <sequence minOccurs="0" maxOccurs="unbounded">
-    <any namespace="##any" processContents="lax"/>
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-  <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
-  <attribute name="Encoding" type="anyURI" use="optional"/> 
-</complexType>
-
-<element name="Manifest" type="ds:ManifestType"/> 
-<complexType name="ManifestType">
-  <sequence>
-    <element ref="ds:Reference" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-<element name="SignatureProperties" type="ds:SignaturePropertiesType"/> 
-<complexType name="SignaturePropertiesType">
-  <sequence>
-    <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> 
-  </sequence>
-  <attribute name="Id" type="ID" use="optional"/> 
-</complexType>
-
-   <element name="SignatureProperty" type="ds:SignaturePropertyType"/> 
-   <complexType name="SignaturePropertyType" mixed="true">
-     <choice maxOccurs="unbounded">
-       <any namespace="##other" processContents="lax"/>
-       <!-- (1,1) elements from (1,unbounded) namespaces -->
-     </choice>
-     <attribute name="Target" type="anyURI" use="required"/> 
-     <attribute name="Id" type="ID" use="optional"/> 
-   </complexType>
-
-<!-- End Object (Manifest, SignatureProperty) -->
-
-<!-- Start Algorithm Parameters -->
-
-<simpleType name="HMACOutputLengthType">
-  <restriction base="integer"/>
-</simpleType>
-
-<!-- Start KeyValue Element-types -->
-
-<element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
-<complexType name="DSAKeyValueType">
-  <sequence>
-    <sequence minOccurs="0">
-      <element name="P" type="ds:CryptoBinary"/>
-      <element name="Q" type="ds:CryptoBinary"/>
-    </sequence>
-    <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
-    <element name="Y" type="ds:CryptoBinary"/>
-    <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
-    <sequence minOccurs="0">
-      <element name="Seed" type="ds:CryptoBinary"/>
-      <element name="PgenCounter" type="ds:CryptoBinary"/>
-    </sequence>
-  </sequence>
-</complexType>
-
-<element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
-<complexType name="RSAKeyValueType">
-  <sequence>
-    <element name="Modulus" type="ds:CryptoBinary"/> 
-    <element name="Exponent" type="ds:CryptoBinary"/> 
-  </sequence>
-</complexType> 
-
-<!-- End KeyValue Element-types -->
-
-<!-- End Signature -->
+    </complexType>
+
+    <element name="SignatureValue" type="ds:SignatureValueType"/> 
+    <complexType name="SignatureValueType">
+        <simpleContent>
+            <extension base="base64Binary">
+                <attribute name="Id" type="ID" use="optional"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+
+    <!-- Start SignedInfo -->
+
+    <element name="SignedInfo" type="ds:SignedInfoType"/>
+    <complexType name="SignedInfoType">
+        <sequence> 
+            <element ref="ds:CanonicalizationMethod"/> 
+            <element ref="ds:SignatureMethod"/> 
+            <element ref="ds:Reference" maxOccurs="unbounded"/> 
+        </sequence>  
+        <attribute name="Id" type="ID" use="optional"/> 
+    </complexType>
+
+    <element name="CanonicalizationMethod" type="ds:CanonicalizationMethodType"/> 
+    <complexType name="CanonicalizationMethodType" mixed="true">
+        <sequence>
+            <any namespace="##any" minOccurs="0" maxOccurs="unbounded"/>
+            <!-- (0,unbounded) elements from (1,1) namespace -->
+        </sequence>
+        <attribute name="Algorithm" type="anyURI" use="required"/> 
+    </complexType>
+
+    <element name="SignatureMethod" type="ds:SignatureMethodType"/>
+    <complexType name="SignatureMethodType" mixed="true">
+        <sequence>
+            <element name="HMACOutputLength" minOccurs="0" type="ds:HMACOutputLengthType"/>
+            <any namespace="##other" minOccurs="0" maxOccurs="unbounded"/>
+            <!-- (0,unbounded) elements from (1,1) external namespace -->
+        </sequence>
+        <attribute name="Algorithm" type="anyURI" use="required"/> 
+    </complexType>
+
+    <!-- Start Reference -->
+
+    <element name="Reference" type="ds:ReferenceType"/>
+    <complexType name="ReferenceType">
+        <sequence> 
+            <element ref="ds:Transforms" minOccurs="0"/> 
+            <element ref="ds:DigestMethod"/> 
+            <element ref="ds:DigestValue"/> 
+        </sequence>
+        <attribute name="Id" type="ID" use="optional"/> 
+        <attribute name="URI" type="anyURI" use="optional"/> 
+        <attribute name="Type" type="anyURI" use="optional"/> 
+    </complexType>
+
+    <element name="Transforms" type="ds:TransformsType"/>
+    <complexType name="TransformsType">
+        <sequence>
+            <element ref="ds:Transform" maxOccurs="unbounded"/>  
+        </sequence>
+    </complexType>
+
+    <element name="Transform" type="ds:TransformType"/>
+    <complexType name="TransformType" mixed="true">
+        <choice minOccurs="0" maxOccurs="unbounded"> 
+            <any namespace="##other" processContents="lax"/>
+            <!-- (1,1) elements from (0,unbounded) namespaces -->
+            <element name="XPath" type="string"/> 
+        </choice>
+        <attribute name="Algorithm" type="anyURI" use="required"/> 
+    </complexType>
+
+    <!-- End Reference -->
+
+    <element name="DigestMethod" type="ds:DigestMethodType"/>
+    <complexType name="DigestMethodType" mixed="true"> 
+        <sequence>
+            <any namespace="##other" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+        </sequence>    
+        <attribute name="Algorithm" type="anyURI" use="required"/> 
+    </complexType>
+
+    <element name="DigestValue" type="ds:DigestValueType"/>
+    <simpleType name="DigestValueType">
+        <restriction base="base64Binary"/>
+    </simpleType>
+
+    <!-- End SignedInfo -->
+
+    <!-- Start KeyInfo -->
+
+    <element name="KeyInfo" type="ds:KeyInfoType"/> 
+    <complexType name="KeyInfoType" mixed="true">
+        <choice maxOccurs="unbounded">     
+            <element ref="ds:KeyName"/> 
+            <element ref="ds:KeyValue"/> 
+            <element ref="ds:RetrievalMethod"/> 
+            <element ref="ds:X509Data"/> 
+            <element ref="ds:PGPData"/> 
+            <element ref="ds:SPKIData"/>
+            <element ref="ds:MgmtData"/>
+            <any processContents="lax" namespace="##other"/>
+            <!-- (1,1) elements from (0,unbounded) namespaces -->
+        </choice>
+        <attribute name="Id" type="ID" use="optional"/> 
+    </complexType>
+
+    <element name="KeyName" type="string"/>
+    <element name="MgmtData" type="string"/>
+
+    <element name="KeyValue" type="ds:KeyValueType"/> 
+    <complexType name="KeyValueType" mixed="true">
+        <choice>
+            <element ref="ds:DSAKeyValue"/>
+            <element ref="ds:RSAKeyValue"/>
+            <any namespace="##other" processContents="lax"/>
+        </choice>
+    </complexType>
+
+    <element name="RetrievalMethod" type="ds:RetrievalMethodType"/> 
+    <complexType name="RetrievalMethodType">
+        <sequence>
+            <element ref="ds:Transforms" minOccurs="0"/> 
+        </sequence>  
+        <attribute name="URI" type="anyURI"/>
+        <attribute name="Type" type="anyURI" use="optional"/>
+    </complexType>
+
+    <!-- Start X509Data -->
+
+    <element name="X509Data" type="ds:X509DataType"/> 
+    <complexType name="X509DataType">
+        <sequence maxOccurs="unbounded">
+            <choice>
+                <element name="X509IssuerSerial" type="ds:X509IssuerSerialType"/>
+                <element name="X509SKI" type="base64Binary"/>
+                <element name="X509SubjectName" type="string"/>
+                <element name="X509Certificate" type="base64Binary"/>
+                <element name="X509CRL" type="base64Binary"/>
+                <any namespace="##other" processContents="lax"/>
+            </choice>
+        </sequence>
+    </complexType>
+
+    <complexType name="X509IssuerSerialType"> 
+        <sequence> 
+            <element name="X509IssuerName" type="string"/> 
+            <element name="X509SerialNumber" type="integer"/> 
+        </sequence>
+    </complexType>
+
+    <!-- End X509Data -->
+
+    <!-- Begin PGPData -->
+
+    <element name="PGPData" type="ds:PGPDataType"/> 
+    <complexType name="PGPDataType"> 
+        <choice>
+            <sequence>
+                <element name="PGPKeyID" type="base64Binary"/> 
+                <element name="PGPKeyPacket" type="base64Binary" minOccurs="0"/> 
+                <any namespace="##other" processContents="lax" minOccurs="0"
+                     maxOccurs="unbounded"/>
+            </sequence>
+            <sequence>
+                <element name="PGPKeyPacket" type="base64Binary"/> 
+                <any namespace="##other" processContents="lax" minOccurs="0"
+                     maxOccurs="unbounded"/>
+            </sequence>
+        </choice>
+    </complexType>
+
+    <!-- End PGPData -->
+
+    <!-- Begin SPKIData -->
+
+    <element name="SPKIData" type="ds:SPKIDataType"/> 
+    <complexType name="SPKIDataType">
+        <sequence maxOccurs="unbounded">
+            <element name="SPKISexp" type="base64Binary"/>
+            <any namespace="##other" processContents="lax" minOccurs="0"/>
+        </sequence>
+    </complexType> 
+
+    <!-- End SPKIData -->
+
+    <!-- End KeyInfo -->
+
+    <!-- Start Object (Manifest, SignatureProperty) -->
+
+    <element name="Object" type="ds:ObjectType"/> 
+    <complexType name="ObjectType" mixed="true">
+        <sequence minOccurs="0" maxOccurs="unbounded">
+            <any namespace="##any" processContents="lax"/>
+        </sequence>
+        <attribute name="Id" type="ID" use="optional"/> 
+        <attribute name="MimeType" type="string" use="optional"/> <!-- add a grep facet -->
+        <attribute name="Encoding" type="anyURI" use="optional"/> 
+    </complexType>
+
+    <element name="Manifest" type="ds:ManifestType"/> 
+    <complexType name="ManifestType">
+        <sequence>
+            <element ref="ds:Reference" maxOccurs="unbounded"/> 
+        </sequence>
+        <attribute name="Id" type="ID" use="optional"/> 
+    </complexType>
+
+    <element name="SignatureProperties" type="ds:SignaturePropertiesType"/> 
+    <complexType name="SignaturePropertiesType">
+        <sequence>
+            <element ref="ds:SignatureProperty" maxOccurs="unbounded"/> 
+        </sequence>
+        <attribute name="Id" type="ID" use="optional"/> 
+    </complexType>
+
+    <element name="SignatureProperty" type="ds:SignaturePropertyType"/> 
+    <complexType name="SignaturePropertyType" mixed="true">
+        <choice maxOccurs="unbounded">
+            <any namespace="##other" processContents="lax"/>
+            <!-- (1,1) elements from (1,unbounded) namespaces -->
+        </choice>
+        <attribute name="Target" type="anyURI" use="required"/> 
+        <attribute name="Id" type="ID" use="optional"/> 
+    </complexType>
+
+    <!-- End Object (Manifest, SignatureProperty) -->
+
+    <!-- Start Algorithm Parameters -->
+
+    <simpleType name="HMACOutputLengthType">
+        <restriction base="integer"/>
+    </simpleType>
+
+    <!-- Start KeyValue Element-types -->
+
+    <element name="DSAKeyValue" type="ds:DSAKeyValueType"/>
+    <complexType name="DSAKeyValueType">
+        <sequence>
+            <sequence minOccurs="0">
+                <element name="P" type="ds:CryptoBinary"/>
+                <element name="Q" type="ds:CryptoBinary"/>
+            </sequence>
+            <element name="G" type="ds:CryptoBinary" minOccurs="0"/>
+            <element name="Y" type="ds:CryptoBinary"/>
+            <element name="J" type="ds:CryptoBinary" minOccurs="0"/>
+            <sequence minOccurs="0">
+                <element name="Seed" type="ds:CryptoBinary"/>
+                <element name="PgenCounter" type="ds:CryptoBinary"/>
+            </sequence>
+        </sequence>
+    </complexType>
+
+    <element name="RSAKeyValue" type="ds:RSAKeyValueType"/>
+    <complexType name="RSAKeyValueType">
+        <sequence>
+            <element name="Modulus" type="ds:CryptoBinary"/> 
+            <element name="Exponent" type="ds:CryptoBinary"/> 
+        </sequence>
+    </complexType> 
+
+    <!-- End KeyValue Element-types -->
+
+    <!-- End Signature -->
 
 </schema>
diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java
index 89f5adbed..3d0aa4d45 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeProvidersMapTestCase.java
@@ -15,120 +15,121 @@ import eu.stork.peps.auth.commons.PersonalAttributeList;
 

 /**

  * The AttributeSource's Test Case.

- * 

- * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)

- * 

+ *

+ * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos

+ * (ilias@aegean.gr)

+ *

  * @version $Revision: $, $Date: $

  */

 public class AttributeProvidersMapTestCase {

 

-	@Test

-	public void testObjectOK1() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(source) ) {

-			outcome = true;

-		}

-

-		assertTrue(outcome);

-	}

-

-	@Test

-	public void testObjectOK2() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(source) ) {

-			if ( map.get(source)!=null ) {

-				outcome = true;

-			}

-		}

-

-		assertTrue(outcome);

-	}

-

-	@Test

-	public void testObjectOK3() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(target) ) {

-			outcome = true;

-		}

-

-		assertTrue(outcome);

-	}

-

-	@Test

-	public void testObjectOK4() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(target) ) {

-			if ( map.get(target)!=null ) {

-				outcome = true;

-			}

-		}

-

-		assertTrue(outcome);

-	}

-

-	@Test

-	public void testObjectNOK1() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final AttributeSource target = new AttributeSource(new Country("ID1", "Name 1"), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(target) ) {

-			outcome = true;

-		}

-

-		assertFalse(outcome);

-	}

-

-	@Test

-	public void testObjectNOK2() {

-		final IAttributeProvidersMap map = new AttributeProvidersMap();

-		final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

-		final AttributeSource target = new AttributeSource(new AttributeProvider("ID2", "Name 1", null), "URL");

-		final IPersonalAttributeList pal = new PersonalAttributeList();

-		boolean outcome = false;

-

-		//Add a single item

-		map.put(source, pal);

-

-		if ( map.containsKey(target) ) {

-			outcome = true;

-		}

-

-		assertFalse(outcome);

-	}

+    @Test

+    public void testObjectOK1() {

+        final IAttributeProvidersMap map = new AttributeProvidersMap();

+        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

+        final IPersonalAttributeList pal = new PersonalAttributeList();

+        boolean outcome = false;

+

+        //Add a single item

+        map.put(source, pal);

+

+        if (map.containsKey(source)) {

+            outcome = true;

+        }

+

+        assertTrue(outcome);

+    }

+

+    @Test

+    public void testObjectOK2() {

+        final IAttributeProvidersMap map = new AttributeProvidersMap();

+        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

+        final IPersonalAttributeList pal = new PersonalAttributeList();

+        boolean outcome = false;

+

+        //Add a single item

+        map.put(source, pal);

+

+        if (map.containsKey(source)) {

+            if (map.get(source) != null) {

+                outcome = true;

+            }

+        }

+

+        assertTrue(outcome);

+    }

+

+    @Test

+    public void testObjectOK3() {

+        final IAttributeProvidersMap map = new AttributeProvidersMap();

+        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

+        final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

+        final IPersonalAttributeList pal = new PersonalAttributeList();

+        boolean outcome = false;

+

+        //Add a single item

+        map.put(source, pal);

+

+        if (map.containsKey(target)) {

+            outcome = true;

+        }

+

+        assertTrue(outcome);

+    }

+

+    @Test

+    public void testObjectOK4() {

+        final IAttributeProvidersMap map = new AttributeProvidersMap();

+        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

+        final AttributeSource target = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

+        final IPersonalAttributeList pal = new PersonalAttributeList();

+        boolean outcome = false;

+

+        //Add a single item

+        map.put(source, pal);

+

+        if (map.containsKey(target)) {

+            if (map.get(target) != null) {

+                outcome = true;

+            }

+        }

+

+        assertTrue(outcome);

+    }

+

+    @Test

+    public void testObjectNOK1() {

+        final IAttributeProvidersMap map = new AttributeProvidersMap();

+        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

+        final AttributeSource target = new AttributeSource(new Country("ID1", "Name 1"), "URL");

+        final IPersonalAttributeList pal = new PersonalAttributeList();

+        boolean outcome = false;

+

+        //Add a single item

+        map.put(source, pal);

+

+        if (map.containsKey(target)) {

+            outcome = true;

+        }

+

+        assertFalse(outcome);

+    }

+

+    @Test

+    public void testObjectNOK2() {

+        final IAttributeProvidersMap map = new AttributeProvidersMap();

+        final AttributeSource source = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL");

+        final AttributeSource target = new AttributeSource(new AttributeProvider("ID2", "Name 1", null), "URL");

+        final IPersonalAttributeList pal = new PersonalAttributeList();

+        boolean outcome = false;

+

+        //Add a single item

+        map.put(source, pal);

+

+        if (map.containsKey(target)) {

+            outcome = true;

+        }

+

+        assertFalse(outcome);

+    }

 }

diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeSourceTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeSourceTestCase.java
index e0f685ade..a3fb6468f 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeSourceTestCase.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeSourceTestCase.java
@@ -11,78 +11,80 @@ import eu.stork.peps.auth.commons.Country;
 

 /**

  * The AttributeSource's Test Case.

- * 

- * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos (ilias@aegean.gr)

- * 

+ *

+ * @author Stelios Lelis (stelios.lelis@aegean.gr), Elias Pastos

+ * (ilias@aegean.gr)

+ *

  * @version $Revision: $, $Date: $

  */

 public final class AttributeSourceTestCase {

-	private final AttributeSource ap1 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1");

-	private final AttributeSource ap2 = new AttributeSource(new AttributeProvider("ID2", "Name 2", null), "URL2");

-	private final AttributeSource ap3 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL2");

-	private final AttributeSource ap4 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL1");

-	private final AttributeSource ap5 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1");

-

-	private final AttributeSource c1 = new AttributeSource(new Country("ID1", "Name 1"), "URL1");

-	private final AttributeSource c2 = new AttributeSource(new Country("ID2", "Name 2"), "URL2");

-	private final AttributeSource c3 = new AttributeSource(new Country("ID1", "Name 2"), "URL2");

-	private final AttributeSource c4 = new AttributeSource(new Country("ID1", "Name 2"), "URL1");

-	private final AttributeSource c5 = new AttributeSource(new Country("ID1", "Name 1"), "URL1");

-

-	@Test

-	public void testNotEquals1() {

-		assertFalse(ap1.equals(ap2));

-	}

-

-	@Test

-	public void testNotEquals2() {

-		assertFalse(ap1.equals(c1));

-	}

-

-	@Test

-	public void testNotEquals3() {

-		assertFalse(c1.equals(c2));

-	}

-

-	@Test

-	public void testEquals1() {

-		assertTrue(ap1.equals(ap3));

-	}

-

-	@Test

-	public void testEquals2() {

-		assertTrue(ap1.equals(ap4));

-	}

-

-	@Test

-	public void testEquals3() {

-		assertTrue(ap1.equals(ap5));

-	}

-

-	@Test

-	public void testEquals4() {

-		assertTrue(c1.equals(c3));

-	}

-

-	@Test

-	public void testEquals5() {

-		assertTrue(c1.equals(c4));

-	}

-

-	@Test

-	public void testEquals6() {

-		assertTrue(c1.equals(c5));

-	}

-

-	@Test

-	public void testEquals7() {

-		final Object obj = ap5;

-		assertTrue(ap1.equals(obj));

-	}

-

-	@Test

-	public void testEquals8() {

-		final Object obj = c5;

-		assertTrue(c1.equals(obj));

-	}

+

+    private final AttributeSource ap1 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1");

+    private final AttributeSource ap2 = new AttributeSource(new AttributeProvider("ID2", "Name 2", null), "URL2");

+    private final AttributeSource ap3 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL2");

+    private final AttributeSource ap4 = new AttributeSource(new AttributeProvider("ID1", "Name 2", null), "URL1");

+    private final AttributeSource ap5 = new AttributeSource(new AttributeProvider("ID1", "Name 1", null), "URL1");

+

+    private final AttributeSource c1 = new AttributeSource(new Country("ID1", "Name 1"), "URL1");

+    private final AttributeSource c2 = new AttributeSource(new Country("ID2", "Name 2"), "URL2");

+    private final AttributeSource c3 = new AttributeSource(new Country("ID1", "Name 2"), "URL2");

+    private final AttributeSource c4 = new AttributeSource(new Country("ID1", "Name 2"), "URL1");

+    private final AttributeSource c5 = new AttributeSource(new Country("ID1", "Name 1"), "URL1");

+

+    @Test

+    public void testNotEquals1() {

+        assertFalse(ap1.innerEquals(ap2));

+    }

+

+    @Test

+    public void testNotEquals2() {

+        assertFalse(ap1.innerEquals(c1));

+    }

+

+    @Test

+    public void testNotEquals3() {

+        assertFalse(c1.innerEquals(c2));

+    }

+

+    @Test

+    public void testEquals1() {

+        assertTrue(ap1.innerEquals(ap3));

+    }

+

+    @Test

+    public void testEquals2() {

+        assertTrue(ap1.innerEquals(ap4));

+    }

+

+    @Test

+    public void testEquals3() {

+        assertTrue(ap1.innerEquals(ap5));

+    }

+

+    @Test

+    public void testEquals4() {

+        assertTrue(c1.innerEquals(c3));

+    }

+

+    @Test

+    public void testEquals5() {

+        assertTrue(c1.innerEquals(c4));

+    }

+

+    @Test

+    public void testEquals6() {

+        assertTrue(c1.innerEquals(c5));

+    }

+

+    @Test

+    public void testEquals7() {

+        final Object obj = ap5;

+        assertTrue(ap1.equals(obj));

+    }

+

+    @Test

+    public void testEquals8() {

+        final Object obj = c5;

+        assertTrue(c1.equals(obj));

+    }

 }

diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java
index 77fc4b9c2..524a7446c 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/AttributeUtilTestCase.java
@@ -31,507 +31,507 @@ import eu.stork.peps.auth.commons.PersonalAttributeList;
 
 /**
  * The AttributeUtil's Test Case.
- * 
+ *
  * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com
- * 
+ * luis.felix@multicert.com
+ *
  * @version $Revision: $, $Date: $
  */
 public final class AttributeUtilTestCase {
-  
-  /**
-   * Empty String to be used on the tests.
-   */
-  private static final String EMPTY_STRING = "";
-  
-  /**
-   * Tuple value sample to be used on the tests.
-   */
-  private static final String[] TUPLE_STRING = new String[] { "age", "true",
-    "[18]", "Available" };
-  
-  /**
-   * Complex value to be used on escape/unescape tests.
-   */
-  private static final String COMPLEX_VAL = "postalCode=4100,"
-    + "apartmentNumber=A,state=Porto,countryCodeAddress=PT,streetNumber=379,"
-    + "streetName=Avenida Sidonio Pais,town=Porto,";
-  
-  /**
-   * Escaped Complex value to be used on escape/unescape tests.
-   */
-  private static final String ESC_COMPLEX_VAL = "postalCode=4100%44"
-    + "apartmentNumber=A%44state=Porto%44countryCodeAddress=PT%44"
-    + "streetNumber=379%44streetName=Avenida Sidonio Pais%44town=Porto%44";
-  
-  /**
-   * Simple value to be used on escape/unescape tests.
-   */
-  private static final String SIMPLE_VAL = "Avenida da Boavista, Porto";
-  
-  /**
-   * Escaped simple value to be used on escape/unescape tests.
-   */
-  private static final String ESC_SIMPLE_VAL = "Avenida da Boavista%44 Porto";
-  
-  /**
-   * Simple text to be used on escape/unescape tests. Must match the escaped
-   * text.
-   */
-  private static final String SIMPLE_TEXT = "John Doe";
-  
-  /**
-   * Tests the {@link AttributeUtil#escape(String)} method for the given complex
-   * attribute value (canonical address' example attribute value).
-   */
-  @Test
-  public void testEscapeSpecialCharsComplexVal() {
-    assertEquals(AttributeUtil.escape(COMPLEX_VAL), ESC_COMPLEX_VAL);
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#escape(String)} method for the given
-   * attribute value.
-   */
-  @Test
-  public void testEscapeSpecialCharsVal() {
-    assertEquals(AttributeUtil.escape(SIMPLE_VAL), ESC_SIMPLE_VAL);
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#escape(String)} method for the given simple
-   * text: no special characters to escape.
-   */
-  @Test
-  public void testEscapeNormalChars() {
-    assertEquals(AttributeUtil.escape(SIMPLE_TEXT), SIMPLE_TEXT);
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#unescape(String)} method for the given
-   * escape complex attribute value (canonical address' example attribute
-   * value).
-   */
-  @Test
-  public void testUnescapeSpecialCharsComplexVal() {
-    assertEquals(AttributeUtil.unescape(ESC_COMPLEX_VAL), COMPLEX_VAL);
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#escape(String)} method for the given escape
-   * attribute value.
-   */
-  @Test
-  public void testUnescapeSpecialCharsVal() {
-    assertEquals(AttributeUtil.unescape(ESC_SIMPLE_VAL), SIMPLE_VAL);
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#escape(String)} method for the given simple
-   * text: no special characters to unescape.
-   */
-  @Test
-  public void testUnescapeNormalChars() {
-    assertEquals(AttributeUtil.unescape(SIMPLE_TEXT), SIMPLE_TEXT);
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
-   * method for the given empty string.
-   */
-  @Test
-  public void testAppendIfNotNullEmptyStr() {
-    final StringBuilder strBuilder = new StringBuilder(SIMPLE_TEXT);
-    AttributeUtil.appendIfNotNull(strBuilder, EMPTY_STRING);
-    assertEquals(strBuilder.toString(), SIMPLE_TEXT);
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
-   * method for the given string.
-   */
-  @Test
-  public void testAppendIfNotNullStr() {
-    final StringBuilder strBuilder = new StringBuilder();
-    AttributeUtil.appendIfNotNull(strBuilder, SIMPLE_TEXT);
-    assertEquals(strBuilder.toString(), SIMPLE_TEXT);
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
-   * method for the given null value.
-   */
-  @Test
-  public void testAppendIfNotNull() {
-    final StringBuilder strBuilder = new StringBuilder();
-    AttributeUtil.appendIfNotNull(strBuilder, null);
-    assertEquals(strBuilder.toString(), EMPTY_STRING);
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#listToString(List, String)} method for the
-   * given List with two values.
-   */
-  @Test
-  public void testListToStringTwoVals() {
-    final List<String> vals = new ArrayList<String>();
-    vals.add(SIMPLE_VAL);
-    vals.add(SIMPLE_TEXT);
-    
-    final StringBuilder strBuilder = new StringBuilder();
-    strBuilder.append(ESC_SIMPLE_VAL);
-    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-    strBuilder.append(SIMPLE_TEXT);
-    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-    
-    assertEquals(
-      AttributeUtil.listToString(vals,
-        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#listToString(List, String)} method for the
-   * given List with one values.
-   */
-  @Test
-  public void testListToStringOneVal() {
-    final List<String> vals = new ArrayList<String>();
-    vals.add(SIMPLE_VAL);
-    
-    final StringBuilder strBuilder = new StringBuilder();
-    strBuilder.append(ESC_SIMPLE_VAL);
-    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-    
-    assertEquals(
-      AttributeUtil.listToString(vals,
-        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#listToString(List, String)} method for the
-   * given List with one value.
-   */
-  @Test
-  public void testListToStringEmptyVal() {
-    final List<String> vals = new ArrayList<String>();
-    
-    final StringBuilder strBuilder = new StringBuilder();
-    
-    assertEquals(
-      AttributeUtil.listToString(vals,
-        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method
-   * for the given Map with one value.
-   */
-  @Test
-  public void testMapToStringOneVal() {
-    final Map<String, String> vals = new HashMap<String, String>();
-    vals.put("CanonicalAddress", COMPLEX_VAL);
-    
-    final StringBuilder strBuilder = new StringBuilder();
-    strBuilder.append("CanonicalAddress=");
-    strBuilder.append(ESC_COMPLEX_VAL);
-    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-    
-    assertEquals(AttributeUtil.mapToString(vals,
-      PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method
-   * for the given empty Map.
-   */
-  @Test
-  public void testMapToStringEmptyVal() {
-    final Map<String, String> vals = new HashMap<String, String>();
-    
-    final StringBuilder strBuilder = new StringBuilder();
-    
-    assertEquals(AttributeUtil.mapToString(vals,
-      PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
-   * invalid List.
-   */
-  @Test
-  public void testIsValidValueInvalidList() {
-    final StringBuilder strBuilder = new StringBuilder();
-    strBuilder.append(ESC_SIMPLE_VAL);
-    strBuilder.append("]");
-    assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
-   * null value.
-   */
-  @Test
-  public void testIsValidValueNullList() {
-    assertFalse(AttributeUtil.isValidValue(null));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
-   * empty List.
-   */
-  @Test
-  public void testIsValidValueEmptyList() {
-    assertTrue(AttributeUtil.isValidValue("[]"));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
-   * empty List.
-   */
-  @Test
-  public void testIsValidValueEmptyCommaList() {
-    assertTrue(AttributeUtil.isValidValue("[,]"));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
-   * one simple value List.
-   */
-  @Test
-  public void testIsValidValueOneValueList() {
-    final StringBuilder strBuilder = new StringBuilder();
-    strBuilder.append("[");
-    strBuilder.append(ESC_SIMPLE_VAL);
-    strBuilder.append("]");
-    assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
-   * one simple value List.
-   */
-  @Test
-  public void testIsValidValueOneValueCommaList() {
-    final StringBuilder strBuilder = new StringBuilder();
-    strBuilder.append("[");
-    strBuilder.append(ESC_SIMPLE_VAL);
-    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-    strBuilder.append("]");
-    assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
-   * one complex value List.
-   */
-  @Test
-  public void testIsValidValueOneComplexValueList() {
-    final StringBuilder strBuilder = new StringBuilder();
-    strBuilder.append("[");
-    strBuilder.append(ESC_COMPLEX_VAL);
-    strBuilder.append("]");
-    assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
-   * one complex value List.
-   */
-  @Test
-  public void testIsValidValueOneComplexValueCommaList() {
-    final StringBuilder strBuilder = new StringBuilder();
-    strBuilder.append("[");
-    strBuilder.append(ESC_COMPLEX_VAL);
-    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-    strBuilder.append("]");
-    assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
-   * multi value List.
-   */
-  @Test
-  public void testIsValidValueMultiValueList() {
-    final StringBuilder strBuilder = new StringBuilder();
-    strBuilder.append("[");
-    strBuilder.append(ESC_SIMPLE_VAL);
-    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-    strBuilder.append(SIMPLE_TEXT);
-    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-    strBuilder.append("]");
-    assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
-   * invalid multi value List.
-   */
-  @Test
-  public void testIsValidValueInvalidMultiValueList() {
-    final StringBuilder strBuilder = new StringBuilder();
-    strBuilder.append(ESC_SIMPLE_VAL);
-    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-    strBuilder.append(SIMPLE_TEXT);
-    strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
-    strBuilder.append("]");
-    assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
-   * true type.
-   */
-  @Test
-  public void testIsValidTypetrue() {
-    assertTrue(AttributeUtil.isValidType("true"));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
-   * True type.
-   */
-  @Test
-  public void testIsValidTypeTrue() {
-    assertTrue(AttributeUtil.isValidType("True"));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
-   * TRUE type.
-   */
-  @Test
-  public void testIsValidTypeTRUE() {
-    assertTrue(AttributeUtil.isValidType("TRUE"));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
-   * invalid type.
-   */
-  @Test
-  public void testIsValidTypeInvalidType() {
-    assertFalse(AttributeUtil.isValidType("str"));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
-   * false type.
-   */
-  @Test
-  public void testIsValidTypefalse() {
-    assertTrue(AttributeUtil.isValidType("false"));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
-   * False type.
-   */
-  @Test
-  public void testIsValidTypeFalse() {
-    assertTrue(AttributeUtil.isValidType("False"));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
-   * FALSE type.
-   */
-  @Test
-  public void testIsValidTypeFALSEVal() {
-    assertTrue(AttributeUtil.isValidType("False"));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#isValidType(String)} method for the given
-   * null.
-   */
-  @Test
-  public void testIsValidTypeNullVal() {
-    assertFalse(AttributeUtil.isValidType(null));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
-   * given valid tuple.
-   */
-  @Test
-  public void testHasValidTuples() {
-    assertTrue(AttributeUtil.hasValidTuples(TUPLE_STRING));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
-   * given invalid tuple. 
-   */
-  @Test
-  public void testHasValidTuplesInvalid() {
-    final String[] tuple = new String[]{"name", "type"};
-    assertFalse(AttributeUtil.hasValidTuples(tuple));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
-   * given invalid tuple with valid size.
-   */
-  @Test
-  public void testHasValidTuplesSameSizeInvalidValues() {
-    final String[] tuple = new String[] { "age", "type", "[18]", "Available"};
-    assertFalse(AttributeUtil.hasValidTuples(tuple));
-  }
-  
-  /**
-   * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
-   * given null value.
-   */
-  @Test
-  public void testHasValidTuplesNull() {
-    assertFalse(AttributeUtil.hasValidTuples(null));
-  }
-  
-  /**
-   * Tests the
-   * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
-   * method for the given attribute list..
-   */
-  @Test
-  public void testCheckMandatoryAttributes() {
-    final IPersonalAttributeList attrList = new PersonalAttributeList();
-    attrList.populate("isAgeOver:true:[18,]:Available;");
-    assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
-    
-  }
-  
-  /**
-   * Tests the
-   * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
-   * method for the given null value.
-   */
-  @Test(expected = NullPointerException.class)
-  public void testCheckMandatoryAttributesNullAttrList() {
-    assertTrue(AttributeUtil.checkMandatoryAttributes(null));
-  }
-  
-  /**
-   * Tests the
-   * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
-   * method for the given empty attribute list.
-   */
-  @Test
-  public void testCheckMandatoryAttributesEmptyAttrList() {
-    final IPersonalAttributeList attrList = new PersonalAttributeList();
-    assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
-  }
-  
-  /**
-   * Tests the
-   * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
-   * method for the given attribute list (missing mandatory attribute).
-   */
-  @Test
-  public void testCheckMandatoryAttributesMissingAttr() {
-    final IPersonalAttributeList attrList = new PersonalAttributeList();
-    attrList.populate("isAgeOver:true:[]:NotAvailable;");
-    assertFalse(AttributeUtil.checkMandatoryAttributes(attrList));
-  }
-  
+
+    /**
+     * Empty String to be used on the tests.
+     */
+    private static final String EMPTY_STRING = "";
+
+    /**
+     * Tuple value sample to be used on the tests.
+     */
+    private static final String[] TUPLE_STRING = new String[]{"age", "true",
+        "[18]", "Available"};
+
+    /**
+     * Complex value to be used on escape/unescape tests.
+     */
+    private static final String COMPLEX_VAL = "postalCode=4100,"
+            + "apartmentNumber=A,state=Porto,countryCodeAddress=PT,streetNumber=379,"
+            + "streetName=Avenida Sidonio Pais,town=Porto,";
+
+    /**
+     * Escaped Complex value to be used on escape/unescape tests.
+     */
+    private static final String ESC_COMPLEX_VAL = "postalCode=4100%44"
+            + "apartmentNumber=A%44state=Porto%44countryCodeAddress=PT%44"
+            + "streetNumber=379%44streetName=Avenida Sidonio Pais%44town=Porto%44";
+
+    /**
+     * Simple value to be used on escape/unescape tests.
+     */
+    private static final String SIMPLE_VAL = "Avenida da Boavista, Porto";
+
+    /**
+     * Escaped simple value to be used on escape/unescape tests.
+     */
+    private static final String ESC_SIMPLE_VAL = "Avenida da Boavista%44 Porto";
+
+    /**
+     * Simple text to be used on escape/unescape tests. Must match the escaped
+     * text.
+     */
+    private static final String SIMPLE_TEXT = "John Doe";
+
+    /**
+     * Tests the {@link AttributeUtil#escape(String)} method for the given
+     * complex attribute value (canonical address' example attribute value).
+     */
+    @Test
+    public void testEscapeSpecialCharsComplexVal() {
+        assertEquals(AttributeUtil.escape(COMPLEX_VAL), ESC_COMPLEX_VAL);
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#escape(String)} method for the given
+     * attribute value.
+     */
+    @Test
+    public void testEscapeSpecialCharsVal() {
+        assertEquals(AttributeUtil.escape(SIMPLE_VAL), ESC_SIMPLE_VAL);
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#escape(String)} method for the given
+     * simple text: no special characters to escape.
+     */
+    @Test
+    public void testEscapeNormalChars() {
+        assertEquals(AttributeUtil.escape(SIMPLE_TEXT), SIMPLE_TEXT);
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#unescape(String)} method for the given
+     * escape complex attribute value (canonical address' example attribute
+     * value).
+     */
+    @Test
+    public void testUnescapeSpecialCharsComplexVal() {
+        assertEquals(AttributeUtil.unescape(ESC_COMPLEX_VAL), COMPLEX_VAL);
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#escape(String)} method for the given
+     * escape attribute value.
+     */
+    @Test
+    public void testUnescapeSpecialCharsVal() {
+        assertEquals(AttributeUtil.unescape(ESC_SIMPLE_VAL), SIMPLE_VAL);
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#escape(String)} method for the given
+     * simple text: no special characters to unescape.
+     */
+    @Test
+    public void testUnescapeNormalChars() {
+        assertEquals(AttributeUtil.unescape(SIMPLE_TEXT), SIMPLE_TEXT);
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
+     * method for the given empty string.
+     */
+    @Test
+    public void testAppendIfNotNullEmptyStr() {
+        final StringBuilder strBuilder = new StringBuilder(SIMPLE_TEXT);
+        AttributeUtil.appendIfNotNull(strBuilder, EMPTY_STRING);
+        assertEquals(strBuilder.toString(), SIMPLE_TEXT);
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
+     * method for the given string.
+     */
+    @Test
+    public void testAppendIfNotNullStr() {
+        final StringBuilder strBuilder = new StringBuilder();
+        AttributeUtil.appendIfNotNull(strBuilder, SIMPLE_TEXT);
+        assertEquals(strBuilder.toString(), SIMPLE_TEXT);
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#appendIfNotNull(StringBuilder, Object)}
+     * method for the given null value.
+     */
+    @Test
+    public void testAppendIfNotNull() {
+        final StringBuilder strBuilder = new StringBuilder();
+        AttributeUtil.appendIfNotNull(strBuilder, null);
+        assertEquals(strBuilder.toString(), EMPTY_STRING);
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#listToString(List, String)} method for the
+     * given List with two values.
+     */
+    @Test
+    public void testListToStringTwoVals() {
+        final List<String> vals = new ArrayList<String>();
+        vals.add(SIMPLE_VAL);
+        vals.add(SIMPLE_TEXT);
+
+        final StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append(ESC_SIMPLE_VAL);
+        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+        strBuilder.append(SIMPLE_TEXT);
+        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+
+        assertEquals(
+                AttributeUtil.listToString(vals,
+                        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#listToString(List, String)} method for the
+     * given List with one values.
+     */
+    @Test
+    public void testListToStringOneVal() {
+        final List<String> vals = new ArrayList<String>();
+        vals.add(SIMPLE_VAL);
+
+        final StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append(ESC_SIMPLE_VAL);
+        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+
+        assertEquals(
+                AttributeUtil.listToString(vals,
+                        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#listToString(List, String)} method for the
+     * given List with one value.
+     */
+    @Test
+    public void testListToStringEmptyVal() {
+        final List<String> vals = new ArrayList<String>();
+
+        final StringBuilder strBuilder = new StringBuilder();
+
+        assertEquals(
+                AttributeUtil.listToString(vals,
+                        PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method
+     * for the given Map with one value.
+     */
+    @Test
+    public void testMapToStringOneVal() {
+        final Map<String, String> vals = new HashMap<String, String>();
+        vals.put("CanonicalAddress", COMPLEX_VAL);
+
+        final StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append("CanonicalAddress=");
+        strBuilder.append(ESC_COMPLEX_VAL);
+        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+
+        assertEquals(AttributeUtil.mapToString(vals,
+                PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#mapToString(java.util.Map, String)} method
+     * for the given empty Map.
+     */
+    @Test
+    public void testMapToStringEmptyVal() {
+        final Map<String, String> vals = new HashMap<String, String>();
+
+        final StringBuilder strBuilder = new StringBuilder();
+
+        assertEquals(AttributeUtil.mapToString(vals,
+                PEPSValues.ATTRIBUTE_VALUE_SEP.toString()), strBuilder.toString());
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
+     * invalid List.
+     */
+    @Test
+    public void testIsValidValueInvalidList() {
+        final StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append(ESC_SIMPLE_VAL);
+        strBuilder.append("]");
+        assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
+     * null value.
+     */
+    @Test
+    public void testIsValidValueNullList() {
+        assertFalse(AttributeUtil.isValidValue(null));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
+     * empty List.
+     */
+    @Test
+    public void testIsValidValueEmptyList() {
+        assertTrue(AttributeUtil.isValidValue("[]"));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
+     * empty List.
+     */
+    @Test
+    public void testIsValidValueEmptyCommaList() {
+        assertTrue(AttributeUtil.isValidValue("[,]"));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
+     * one simple value List.
+     */
+    @Test
+    public void testIsValidValueOneValueList() {
+        final StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append("[");
+        strBuilder.append(ESC_SIMPLE_VAL);
+        strBuilder.append("]");
+        assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
+     * one simple value List.
+     */
+    @Test
+    public void testIsValidValueOneValueCommaList() {
+        final StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append("[");
+        strBuilder.append(ESC_SIMPLE_VAL);
+        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+        strBuilder.append("]");
+        assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
+     * one complex value List.
+     */
+    @Test
+    public void testIsValidValueOneComplexValueList() {
+        final StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append("[");
+        strBuilder.append(ESC_COMPLEX_VAL);
+        strBuilder.append("]");
+        assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
+     * one complex value List.
+     */
+    @Test
+    public void testIsValidValueOneComplexValueCommaList() {
+        final StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append("[");
+        strBuilder.append(ESC_COMPLEX_VAL);
+        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+        strBuilder.append("]");
+        assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
+     * multi value List.
+     */
+    @Test
+    public void testIsValidValueMultiValueList() {
+        final StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append("[");
+        strBuilder.append(ESC_SIMPLE_VAL);
+        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+        strBuilder.append(SIMPLE_TEXT);
+        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+        strBuilder.append("]");
+        assertTrue(AttributeUtil.isValidValue(strBuilder.toString()));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidValue(String)} method for the given
+     * invalid multi value List.
+     */
+    @Test
+    public void testIsValidValueInvalidMultiValueList() {
+        final StringBuilder strBuilder = new StringBuilder();
+        strBuilder.append(ESC_SIMPLE_VAL);
+        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+        strBuilder.append(SIMPLE_TEXT);
+        strBuilder.append(PEPSValues.ATTRIBUTE_VALUE_SEP.toString());
+        strBuilder.append("]");
+        assertFalse(AttributeUtil.isValidValue(strBuilder.toString()));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
+     * true type.
+     */
+    @Test
+    public void testIsValidTypetrue() {
+        assertTrue(AttributeUtil.isValidType("true"));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
+     * True type.
+     */
+    @Test
+    public void testIsValidTypeTrue() {
+        assertTrue(AttributeUtil.isValidType("True"));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
+     * TRUE type.
+     */
+    @Test
+    public void testIsValidTypeTRUE() {
+        assertTrue(AttributeUtil.isValidType("TRUE"));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
+     * invalid type.
+     */
+    @Test
+    public void testIsValidTypeInvalidType() {
+        assertFalse(AttributeUtil.isValidType("str"));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
+     * false type.
+     */
+    @Test
+    public void testIsValidTypefalse() {
+        assertTrue(AttributeUtil.isValidType("false"));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
+     * False type.
+     */
+    @Test
+    public void testIsValidTypeFalse() {
+        assertTrue(AttributeUtil.isValidType("False"));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
+     * FALSE type.
+     */
+    @Test
+    public void testIsValidTypeFALSEVal() {
+        assertTrue(AttributeUtil.isValidType("False"));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#isValidType(String)} method for the given
+     * null.
+     */
+    @Test
+    public void testIsValidTypeNullVal() {
+        assertFalse(AttributeUtil.isValidType(null));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
+     * given valid tuple.
+     */
+    @Test
+    public void testHasValidTuples() {
+        assertTrue(AttributeUtil.hasValidTuples(TUPLE_STRING));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
+     * given invalid tuple.
+     */
+    @Test
+    public void testHasValidTuplesInvalid() {
+        final String[] tuple = new String[]{"name", "type"};
+        assertFalse(AttributeUtil.hasValidTuples(tuple));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
+     * given invalid tuple with valid size.
+     */
+    @Test
+    public void testHasValidTuplesSameSizeInvalidValues() {
+        final String[] tuple = new String[]{"age", "type", "[18]", "Available"};
+        assertFalse(AttributeUtil.hasValidTuples(tuple));
+    }
+
+    /**
+     * Tests the {@link AttributeUtil#hasValidTuples(String[])} method for the
+     * given null value.
+     */
+    @Test
+    public void testHasValidTuplesNull() {
+        assertFalse(AttributeUtil.hasValidTuples(null));
+    }
+
+    /**
+     * Tests the
+     * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
+     * method for the given attribute list..
+     */
+    @Test
+    public void testCheckMandatoryAttributes() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList();
+        attrList.populate("isAgeOver:true:[18,]:Available;");
+        assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
+
+    }
+
+    /**
+     * Tests the
+     * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
+     * method for the given null value.
+     */
+    @Test(expected = NullPointerException.class)
+    public void testCheckMandatoryAttributesNullAttrList() {
+        assertTrue(AttributeUtil.checkMandatoryAttributes(null));
+    }
+
+    /**
+     * Tests the
+     * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
+     * method for the given empty attribute list.
+     */
+    @Test
+    public void testCheckMandatoryAttributesEmptyAttrList() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList();
+        assertTrue(AttributeUtil.checkMandatoryAttributes(attrList));
+    }
+
+    /**
+     * Tests the
+     * {@link AttributeUtil#checkMandatoryAttributes(IPersonalAttributeList)}
+     * method for the given attribute list (missing mandatory attribute).
+     */
+    @Test
+    public void testCheckMandatoryAttributesMissingAttr() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList();
+        attrList.populate("isAgeOver:true:[]:NotAvailable;");
+        assertFalse(AttributeUtil.checkMandatoryAttributes(attrList));
+    }
+
 }
diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
index fc6e65f70..f2383c07a 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
@@ -11,7 +11,6 @@
 package eu.stork.peps.tests;

 

 import java.io.File;

-import java.io.FileNotFoundException;

 import java.io.FileOutputStream;

 import java.io.StringWriter;

 

@@ -35,8 +34,7 @@ import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.R
 /**

  * @author Advania Examples on how to use the jaxb marshaller. The classes are created from the

  *         StorkcomplexAttributes.xsd schema located in resources.

- * @version $Revision: 1.00 $, $Date: 2014-17-02 11:15:00 $ 

- *

+ * @version $Revision: 1.00 $, $Date: 2014-17-02 11:15:00 $

  */

 

 public class ComplexAttributesMarshalling {

@@ -65,59 +63,48 @@ public class ComplexAttributesMarshalling {
         rptObject.setLegalForm("Yet another type of person");

     }

 

-	/**

+    /**

      * Test marshalling canonical address <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-	 *  <canonicalResidenceAddress xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion">

+     * <canonicalResidenceAddress xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion">

      * <countryCodeAddress>IS</countryCodeAddress> <state>Reykjavik</state> <municipalityCode>RVK</municipalityCode>

      * <town>Reykjavik</town> <postalCode>101</postalCode> <streetName>Laugavegur</streetName>

      * <streetNumber>1</streetNumber> <apartmentNumber>10</apartmentNumber> </canonicalResidenceAddress>

-	 */

-	@Test

-	public void testMarshallCanonicalResidencAddress() 

-	{

-		try 

-		{

-		    final CanonicalAddressType object = new CanonicalAddressType();

-		    object.setApartmentNumber("10");

-		    object.setCountryCodeAddress("IS");

-		    object.setMunicipalityCode("RVK");

-		    object.setPostalCode("101");

-		    object.setState("Reykjavik");

-		    object.setStreetName("Laugavegur");

-		    object.setStreetNumber("1");

-		    object.setTown("Reykjavik");

-

-		    final JAXBContext context = JAXBContext.newInstance(CanonicalAddressType.class);

-		    final Marshaller m = context.createMarshaller();

-		    m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);

-		    final ObjectFactory objf = new ObjectFactory();

-			

-		    m.marshal(objf.createCanonicalResidenceAddress(object), new FileOutputStream("CanonicalAddressType.xml"));		    

-			m.marshal(objf.createCanonicalResidenceAddress(object), System.out);

-		}

+     */

+    @Test

+    public void testMarshallCanonicalResidencAddress() {

+        try {

+            final CanonicalAddressType object = new CanonicalAddressType();

+            object.setApartmentNumber("10");

+            object.setCountryCodeAddress("IS");

+            object.setMunicipalityCode("RVK");

+            object.setPostalCode("101");

+            object.setState("Reykjavik");

+            object.setStreetName("Laugavegur");

+            object.setStreetNumber("1");

+            object.setTown("Reykjavik");

+

+            final JAXBContext context = JAXBContext.newInstance(CanonicalAddressType.class);

+            final Marshaller m = context.createMarshaller();

+            m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);

+            final ObjectFactory objf = new ObjectFactory();

+

+            m.marshal(objf.createCanonicalResidenceAddress(object), new FileOutputStream("CanonicalAddressType.xml"));

+            m.marshal(objf.createCanonicalResidenceAddress(object), System.out);

+        }

         catch ( Exception e ) {

-			e.printStackTrace();

+            e.printStackTrace();

         }

     }

 

     @Test

     public void testForDiana() {

         initMandateValues();

-			

+

         try {

             // Create the marshallers'

 

             final JAXBContext mandateTypeContext = JAXBContext.newInstance(MandateType.class);

             final Marshaller mandateMarshaller = mandateTypeContext.createMarshaller();

-            final Unmarshaller mandateUnmarshaller = mandateTypeContext.createUnmarshaller();

-

-            // final JAXBContext MandateContentTypecontext = JAXBContext.newInstance(MandateContentType.class);

-            // final Marshaller mandM = MandateContentTypecontext.createMarshaller();

-            //

-            // final JAXBContext RepresentationPersonTypecontext =

-            // JAXBContext.newInstance(RepresentationPersonType.class);

-            // final Marshaller repM = RepresentationPersonTypecontext.createMarshaller();

-            //

 

             final ObjectFactory objf = new ObjectFactory();

             MandateType mandate = new MandateType();

@@ -135,54 +122,21 @@ public class ComplexAttributesMarshalling {
             mandate.setRepresented(represented);

 

             MandateContentType mandateContent1 = new MandateContentType();

-            // OriginalMandateType omt1 = new OriginalMandateType();

-            // omt1.setMimeType("text/plain");

-            // omt1.setValue("Chief executive officer".getBytes());

             mandateContent1.setOriginalMandate("Chief executive officer".getBytes());

             mandateContent1.setOriginalMandateType("text/plain");

             MandateContentType mandateContent2 = new MandateContentType();

-            // mandateContent2.setOriginalMandate(omt1);

             mandateContent2.setOriginalMandate("Chief executive officer2".getBytes());

             mandateContent2.setOriginalMandateType("text/plain");

             mandate.getMandateContent().add(mandateContent1);

             mandate.getMandateContent().add(mandateContent2);

 

-            // create a hashmap

-            // HashMap<String, String> complexMandate = new HashMap<String, String>();

-

             // marshall the mandatecontent

             StringWriter sw = new StringWriter();

             mandateMarshaller.marshal(objf.createMandate(mandate), sw);

 

             System.out.print(sw.toString());

 

-            // add it to the hashmap

-            // complexMandate.put("representative", sw.toString());

-            // sw.flush();

-            //

-            // // continue with the rest of the objects.

-            // repM.marshal(objf.createRepresentationPerson(rpObject), sw);

-            // System.out.print(sw.toString());

-            // complexMandate.put("representative", sw.toString());

-            // sw.flush();

-            //

-            // MandateType mandateType = new MandateType();

-            //

-            // repM.marshal(objf.createRepresentationPerson(rptObject), sw);

-            // System.out.print(sw.toString());

-            // complexMandate.put("represented", sw.toString());

-            // sw.flush();

-            //

-            // // add the complex values to the attr.list.

-            // PersonalAttribute pal = new PersonalAttribute();

-            //

-            // pal.setName("mandateContent");

-            // pal.setIsRequired(pal.isRequired());

-            // pal.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());

-            // pal.setComplexValue(complexMandate);

-            //

-            // System.out.println(pal.toString());

-		}

+        }

         catch ( JAXBException e ) {

             e.printStackTrace();

         }

@@ -210,91 +164,83 @@ public class ComplexAttributesMarshalling {
             StringWriter sw = new StringWriter();

             m.marshal(objf.createMandate(object), sw);

 

-	}

+        }

         catch ( Exception e ) {

             e.printStackTrace();

         }

     }

 

-	/**

+    /**

      * Test unmarshalling canonical address <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

-	 *  <canonicalResidenceAddress xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion">

+     * <canonicalResidenceAddress xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion">

      * <countryCodeAddress>IS</countryCodeAddress> <state>Reykjavik</state> <municipalityCode>RVK</municipalityCode>

      * <town>Reykjavik</town> <postalCode>101</postalCode> <streetName>Laugavegur</streetName>

      * <streetNumber>1</streetNumber> <apartmentNumber>10</apartmentNumber> </canonicalResidenceAddress>

-	 */

-	@Test

-	public void testUnmarshallCanonicalAddress() 

-	{

-	    JAXBContext uContext;

-		try 

-		{

-			uContext = JAXBContext.newInstance(CanonicalAddressType.class);

-		    final Unmarshaller u = uContext.createUnmarshaller();

-			final File file = new File("CanonicalAddressType.xml");			

-		    

-			final JAXBElement<CanonicalAddressType> root = u.unmarshal(new StreamSource(file), CanonicalAddressType.class);

-			final CanonicalAddressType foo = root.getValue();

-    

-		    final String A = foo.getStreetName();

-		    final String B = foo.getStreetNumber();

-		 

-		    System.out.println("Streetname: " + A);

-		    System.out.println("Streetnumber: " + B);

-

-		} 

-		catch (final JAXBException e) 

-		{

-			e.printStackTrace();

-		}

-	}

-

-	/**

+     */

+    @Test

+    public void testUnmarshallCanonicalAddress() {

+        JAXBContext uContext;

+        try {

+            uContext = JAXBContext.newInstance(CanonicalAddressType.class);

+            final Unmarshaller u = uContext.createUnmarshaller();

+            final File file = new File("CanonicalAddressType.xml");

+

+            final JAXBElement<CanonicalAddressType> root = u.unmarshal(new StreamSource(file),

+                                                                       CanonicalAddressType.class);

+            final CanonicalAddressType foo = root.getValue();

+

+            final String A = foo.getStreetName();

+            final String B = foo.getStreetNumber();

+

+            System.out.println("Streetname: " + A);

+            System.out.println("Streetnumber: " + B);

+

+        }

+        catch ( final JAXBException e ) {

+            e.printStackTrace();

+        }

+    }

+

+    /**

      * Test marshalling has bank account <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <hasAccountInBank

      * xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion"> <bankName>Arion</bankName> <AQAA>3</AQAA> </hasAccountInBank>

-	 */

-	@Test

-	public void testMarshallHasBankAccount()

-	{

-		try 

-		{

-			final HasAccountInBankType object = new HasAccountInBankType();

-			object.setAQAA(3);

-			object.setBankName("Arion Bank");

-					final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);

-			final Marshaller m = context.createMarshaller();

-		    final ObjectFactory o = new ObjectFactory();

-			m.marshal(o.createHasAccountInBank(object), new FileOutputStream ("hasbankaccount.xml"));

-			m.marshal(o.createHasAccountInBank(object), System.out);

-			

-		}

-        catch (FileNotFoundException e) {

-            e.printStackTrace();

+     */

+    @Test

+    public void testMarshallHasBankAccount() {

+        try {

+            final HasAccountInBankType object = new HasAccountInBankType();

+            object.setAQAA(3);

+            object.setBankName("Arion Bank");

+            final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);

+            final Marshaller m = context.createMarshaller();

+            final ObjectFactory o = new ObjectFactory();

+            m.marshal(o.createHasAccountInBank(object), new FileOutputStream("hasbankaccount.xml"));

+            m.marshal(o.createHasAccountInBank(object), System.out);

 

-        }catch ( Exception e ) {

-			e.printStackTrace();

-			

-		}

-	}

+        }

+        catch ( Exception e ) {

+            e.printStackTrace();

+        }

+    }

 

-	/**

+    /**

      * Test unmarshalling has bank account <?xml version="1.0" encoding="UTF-8" standalone="yes"?> <hasAccountInBank

      * xmlns="urn:eu:stork:names:tc:STORK:1.0:assertion"> <bankName>Arion</bankName> <AQAA>3</AQAA> </hasAccountInBank>

-	 */

-	@Test

-	public void testUnmarshallHasBankAccount()

-	{

-		try 

-		{

-			final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);

-			final Unmarshaller um = context.createUnmarshaller();

-			final File file = new File("hasbankaccount.xml");			

-			final JAXBElement<HasAccountInBankType> root = um.unmarshal(new StreamSource(file), HasAccountInBankType.class);

-			final HasAccountInBankType foo = root.getValue();

-			System.out.println(foo.getBankName());

-		} catch (final JAXBException e) {

-			e.printStackTrace();

-		}

-	}

-	

+     */

+    @Test

+    public void testUnmarshallHasBankAccount() {

+        try {

+            final JAXBContext context = JAXBContext.newInstance(HasAccountInBankType.class);

+            final Unmarshaller um = context.createUnmarshaller();

+            final File file = new File("hasbankaccount.xml");

+            final JAXBElement<HasAccountInBankType> root = um.unmarshal(new StreamSource(file),

+                                                                        HasAccountInBankType.class);

+            final HasAccountInBankType foo = root.getValue();

+            System.out.println(foo.getBankName());

+        }

+        catch ( final JAXBException e ) {

+            e.printStackTrace();

+        }

+    }

+

 }

diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
index f6cacd67b..6c9a17ddc 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/DateUtilTestCase.java
@@ -19,7 +19,6 @@ import java.util.Properties;
 import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 import eu.stork.peps.auth.commons.DateUtil;
@@ -28,269 +27,268 @@ import eu.stork.peps.auth.commons.exceptions.SecurityPEPSException;
 
 /**
  * The PersonalAttribute's Test Case.
- * 
+ *
  * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * luis.felix@multicert.com, hugo.magalhaes@multicert.com,
+ * paulo.ribeiro@multicert.com
  * @version $Revision: 1.2 $, $Date: 2010-11-17 05:17:03 $
  */
 public final class DateUtilTestCase {
-  
-  /**
-   * Stork Format date.
-   */
-  private static final String FORMAT = "yyyyMMdd";
-  
-  /**
-   * Expected 10 value.
-   */
-  private static final int TEN = 10;
-  
-  /**
-   * Expected 11 value.
-   */
-  private static final int ELEVEN = 11;
-  
-  /**
-   * The testing Date ("current" date).
-   */
-  private static final DateTime TESTDATE = new DateTime(2011, 10, 10, 15, 20,
-    0, 0);
-  
-  /**
-   * Init DateUtilTestCase class.
-   */
-  @BeforeClass
-  public static void runsBeforeTheTestSuite() {
-    final Properties configs = new Properties();
-    configs.setProperty("invalidAgeDateValue.code", "35");
-    configs.setProperty("invalidAttributeValue.code", "34");
-    configs
-      .setProperty(
-        "invalidAttributeValue.message",
-        "Unexpected or invalid content was encountered within a "
-        + "<saml:Attribute> or <saml:AttributeValue> element.");
-    PEPSUtil.createInstance(configs);
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given year against
-   * the testDate: 2011-10-10 15:20:00.0. Must return 10.
-   */
-  @Test
-  public void calculateAgeFromYear() {
-    Assert.assertTrue(TEN == DateUtil.calculateAge("2000", TESTDATE, FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given year and month
-   * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
-   */
-  @Test
-  public void calculateAgeFromEarlyMonth() {
-    Assert.assertTrue(ELEVEN == DateUtil.calculateAge("200001", TESTDATE,
-      FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given year and month
-   * against the testDate: 2011-10-10 15:20:00.0. Must return 10.
-   */
-  @Test
-  public void calculateAgeFromSameMonth() {
-    Assert.assertTrue(TEN == DateUtil.calculateAge("200010", TESTDATE, FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given year and month
-   * against the testDate: 2011-10-10 15:20:00.0. Must return 10.
-   */
-  @Test
-  public void calculateAgeFromLaterMonth() {
-    Assert.assertTrue(TEN == DateUtil.calculateAge("200011", TESTDATE, FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given full date
-   * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
-   */
-  @Test
-  public void calculateAgeFromEarlyFullDate() {
-    Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20000101", TESTDATE,
-      FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given full date
-   * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
-   */
-  @Test
-  public void calculateAgeFromSameDay() {
-    Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20001010", TESTDATE,
-      FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given full date
-   * against the testDate: 2011-10-10 15:20:00.0. Must return 10.
-   */
-  @Test
-  public void calculateAgeFromLaterFullDate() {
-    Assert.assertTrue(TEN == DateUtil
-      .calculateAge("20001011", TESTDATE, FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given full date
-   * against the testDate: 2011-10-10 15:20:00.0. Must return a
-   * SecurityPEPSException exception.
-   */
-  @Test(expected = SecurityPEPSException.class)
-  public void calculateAgeFromInvalidDate() {
-    DateUtil.calculateAge("200", TESTDATE, FORMAT);
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given full date
-   * against the testDate: 2011-10-10 15:20:00.0. Must return a
-   * SecurityPEPSException exception.
-   */
-  @Test(expected = SecurityPEPSException.class)
-  public void calculateAgeFromInvalidMonth() {
-    DateUtil.calculateAge("200013", TESTDATE, FORMAT);
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given full date
-   * against the testDate: 2011-10-10 15:20:00.0. Must return a
-   * SecurityPEPSException exception.
-   */
-  @Test(expected = SecurityPEPSException.class)
-  public void calculateAgeFromInvalidDay() {
-    DateUtil.calculateAge("20000230", TESTDATE, FORMAT);
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given full date
-   * against the testDate: 2011-10-10 15:20:00.0. Must return a
-   * SecurityPEPSException exception.
-   */
-  @Test(expected = SecurityPEPSException.class)
-  public void calculateAgeFromNullDate() {
-    DateUtil.calculateAge(null, TESTDATE, FORMAT);
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given full date
-   * against the testDate: 2011-10-10 15:20:00.0. Must return a
-   * SecurityPEPSException exception.
-   */
-  @Test(expected = SecurityPEPSException.class)
-  public void calculateAgeFromNullCurDate() {
-    DateUtil.calculateAge("2000", null, FORMAT);
-  }
-  
-  /**
-   * Tests the {@link DateUtil#calculateAge} method for the given full date
-   * against the testDate: 2011-10-10 15:20:00.0. Must return a
-   * SecurityPEPSException exception.
-   */
-  @Test(expected = SecurityPEPSException.class)
-  public void calculateAgeFromNullFormat() {
-    DateUtil.calculateAge("2000", TESTDATE, null);
-  }
-  
-  /**
-   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
-   * Must return true
-   */
-  @Test
-  public void isValidFormatDateFromYear() {
-    Assert.assertTrue(DateUtil.isValidFormatDate("2000", FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#isValidFormatDate} method for the given year and
-   * month. Must return true.
-   */
-  @Test
-  public void isValidFormatDateFromMonth() {
-    Assert.assertTrue(DateUtil.isValidFormatDate("200001", FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
-   * Must return false.
-   */
-  @Test
-  public void isValidFormatDate() {
-    Assert.assertTrue(DateUtil.isValidFormatDate("20000101", FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
-   * Must return false.
-   */
-  @Test
-  public void isValidFormatDateInvalidYear() {
-    Assert.assertFalse(DateUtil.isValidFormatDate("200", FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
-   * Must return false.
-   */
-  @Test
-  public void isValidFormatDateInvalidMonth() {
-    Assert.assertFalse(DateUtil.isValidFormatDate("200013", FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
-   * Must return false.
-   */
-  @Test
-  public void isValidFormatDateInvalidDate() {
-    Assert.assertFalse(DateUtil.isValidFormatDate("20010229", FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
-   * Must return false.
-   */
-  @Test
-  public void isValidFormatDateNullDate() {
-    Assert.assertFalse(DateUtil.isValidFormatDate(null, FORMAT));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
-   * Must return false.
-   */
-  @Test
-  public void isValidFormatDateNullFormat() {
-    Assert.assertFalse(DateUtil.isValidFormatDate("2000", null));
-  }
-  
-  /**
-   * Tests the {@link DateUtil#currentTimeStamp()} method for the current
-   * TimeStamp (TS). Must return true.
-   */
-  @Test
-  public void testCurrentTimeStampBefore() {
-    Timestamp ts = DateUtil.currentTimeStamp();
-    Assert.assertNotSame(ts, DateUtil.currentTimeStamp());
-  }
-  
-  /**
-   * Tests the {@link DateUtil#currentTimeStamp()} method for the current
-   * TimeStamp (TS). Must return true.
-   */
-  @Test
-  @Ignore
-  public void testCurrentTimeStampAfter() {
-    Timestamp ts = DateUtil.currentTimeStamp();
-    Assert.assertEquals(DateUtil.currentTimeStamp(), ts);
-  }
-  
+
+    /**
+     * Stork Format date.
+     */
+    private static final String FORMAT = "yyyyMMdd";
+
+    /**
+     * Expected 10 value.
+     */
+    private static final int TEN = 10;
+
+    /**
+     * Expected 11 value.
+     */
+    private static final int ELEVEN = 11;
+
+    /**
+     * The testing Date ("current" date).
+     */
+    private static final DateTime TESTDATE = new DateTime(2011, 10, 10, 15, 20,
+            0, 0);
+
+    /**
+     * Init DateUtilTestCase class.
+     */
+    @BeforeClass
+    public static void runsBeforeTheTestSuite() {
+        final Properties configs = new Properties();
+        configs.setProperty("invalidAgeDateValue.code", "35");
+        configs.setProperty("invalidAttributeValue.code", "34");
+        configs
+                .setProperty(
+                        "invalidAttributeValue.message",
+                        "Unexpected or invalid content was encountered within a "
+                        + "<saml:Attribute> or <saml:AttributeValue> element.");
+        PEPSUtil.createInstance(configs);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given year against
+     * the testDate: 2011-10-10 15:20:00.0. Must return 10.
+     */
+    @Test
+    public void calculateAgeFromYear() {
+        Assert.assertTrue(TEN == DateUtil.calculateAge("2000", TESTDATE, FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given year and
+     * month against the testDate: 2011-10-10 15:20:00.0. Must return 11.
+     */
+    @Test
+    public void calculateAgeFromEarlyMonth() {
+        Assert.assertTrue(ELEVEN == DateUtil.calculateAge("200001", TESTDATE,
+                FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given year and
+     * month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
+     */
+    @Test
+    public void calculateAgeFromSameMonth() {
+        Assert.assertTrue(TEN == DateUtil.calculateAge("200010", TESTDATE, FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given year and
+     * month against the testDate: 2011-10-10 15:20:00.0. Must return 10.
+     */
+    @Test
+    public void calculateAgeFromLaterMonth() {
+        Assert.assertTrue(TEN == DateUtil.calculateAge("200011", TESTDATE, FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
+     */
+    @Test
+    public void calculateAgeFromEarlyFullDate() {
+        Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20000101", TESTDATE,
+                FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return 11.
+     */
+    @Test
+    public void calculateAgeFromSameDay() {
+        Assert.assertTrue(ELEVEN == DateUtil.calculateAge("20001010", TESTDATE,
+                FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return 10.
+     */
+    @Test
+    public void calculateAgeFromLaterFullDate() {
+        Assert.assertTrue(TEN == DateUtil
+                .calculateAge("20001011", TESTDATE, FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromInvalidDate() {
+        DateUtil.calculateAge("200", TESTDATE, FORMAT);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromInvalidMonth() {
+        DateUtil.calculateAge("200013", TESTDATE, FORMAT);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromInvalidDay() {
+        DateUtil.calculateAge("20000230", TESTDATE, FORMAT);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromNullDate() {
+        DateUtil.calculateAge(null, TESTDATE, FORMAT);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromNullCurDate() {
+        DateUtil.calculateAge("2000", null, FORMAT);
+    }
+
+    /**
+     * Tests the {@link DateUtil#calculateAge} method for the given full date
+     * against the testDate: 2011-10-10 15:20:00.0. Must return a
+     * SecurityPEPSException exception.
+     */
+    @Test(expected = SecurityPEPSException.class)
+    public void calculateAgeFromNullFormat() {
+        DateUtil.calculateAge("2000", TESTDATE, null);
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return true
+     */
+    @Test
+    public void isValidFormatDateFromYear() {
+        Assert.assertTrue(DateUtil.isValidFormatDate("2000", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year
+     * and month. Must return true.
+     */
+    @Test
+    public void isValidFormatDateFromMonth() {
+        Assert.assertTrue(DateUtil.isValidFormatDate("200001", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDate() {
+        Assert.assertTrue(DateUtil.isValidFormatDate("20000101", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDateInvalidYear() {
+        Assert.assertFalse(DateUtil.isValidFormatDate("200", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDateInvalidMonth() {
+        Assert.assertFalse(DateUtil.isValidFormatDate("200013", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDateInvalidDate() {
+        Assert.assertFalse(DateUtil.isValidFormatDate("20010229", FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDateNullDate() {
+        Assert.assertFalse(DateUtil.isValidFormatDate(null, FORMAT));
+    }
+
+    /**
+     * Tests the {@link DateUtil#isValidFormatDate} method for the given year.
+     * Must return false.
+     */
+    @Test
+    public void isValidFormatDateNullFormat() {
+        Assert.assertFalse(DateUtil.isValidFormatDate("2000", null));
+    }
+
+    /**
+     * Tests the {@link DateUtil#currentTimeStamp()} method for the current
+     * TimeStamp (TS). Must return true.
+     */
+    @Test
+    public void testCurrentTimeStampBefore() {
+        Timestamp ts = DateUtil.currentTimeStamp();
+        Assert.assertNotSame(ts, DateUtil.currentTimeStamp());
+    }
+
+    /**
+     * Tests the {@link DateUtil#currentTimeStamp()} method for the current
+     * TimeStamp (TS). Must return true.
+     */
+    @Test
+    public void testCurrentTimeStampAfter() {
+        Timestamp ts = DateUtil.currentTimeStamp();
+        Assert.assertEquals(DateUtil.currentTimeStamp(), ts);
+    }
+
 }
diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java
index d4841ed43..95c1f4594 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PEPSUtilTestCase.java
@@ -36,518 +36,518 @@ import eu.stork.peps.auth.commons.exceptions.InvalidParameterPEPSException;
 
 /**
  * The PEPSUtil's Test Case.
- * 
+ *
  * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com
- * 
+ * luis.felix@multicert.com
+ *
  * @version $Revision: $, $Date: $
  */
 public final class PEPSUtilTestCase {
-  
-  /**
-   * Message example.
-   */
-  private static final String MESSAGE_SAMPLE = "003002 - Authentication Failed";
-  
-  /**
-   * Error message example.
-   */
-  private static final String ERROR_MESSAGE_SAMPLE = "Authentication Failed";
-  
-  /**
-   * Error code example.
-   */
-  private static final String ERROR_CODE_SAMPLE = "003002";
-  
-  /**
-   * Properties values for testing proposes.
-   */
-  private static final Properties CONFIGS1 = new Properties();
-  
-  /**
-   * Properties values for testing proposes.
-   */
-  private static final Properties CONFIGS2 = new Properties();
-  
-  /**
-   * The empty string value: "".
-   */
-  private static final String EMPTY_STRING = "";
-  
-  /**
-   * The empty byte value: [].
-   */
-  private static final byte[] EMPTY_BYTE = new byte[] {};
-  
-  /**
-   * The empty byte hash value.
-   */
-  private static final byte[] EMPTY_HASH_BYTE = new byte[] { -49, -125, -31,
-    53, 126, -17, -72, -67, -15, 84, 40, 80, -42, 109, -128, 7, -42, 32, -28,
-    5, 11, 87, 21, -36, -125, -12, -87, 33, -45, 108, -23, -50, 71, -48, -47,
-    60, 93, -123, -14, -80, -1, -125, 24, -46, -121, 126, -20, 47, 99, -71, 49,
-    -67, 71, 65, 122, -127, -91, 56, 50, 122, -7, 39, -38, 62 };
-  
-  /**
-   * The SAML example byte[] value.
-   */
-  private static final byte[] SAML_BYTE_SAMPLE = new byte[] { 60, 115, 97, 109,
-    108, 62, 46, 46, 46, 60, 47, 115, 97, 109, 108 };
-  
-  /**
-   * The SAML's Base64 example value.
-   */
-  private static final String SAML_BASE64_SAMPLE = "PHNhbWw+Li4uPC9zYW1s";
-  
-  /**
-   * The SAML's Base64 byte[] example value.
-   */
-  private static byte[] SAML_BASE64_BYTE_SAMPLE = new byte[] { 80, 72, 78, 104,
-    98, 87, 119, 43, 76, 105, 52, 117, 80, 67, 57, 122, 89, 87, 49, 115 };
-  
-  /**
-   * The SAML's Base64 Hash byte[] example value.
-   */
-  private static byte[] HASH_BYTE_SAMPLE = new byte[] { 67, 38, 11, 115, 49,
-    -5, 54, -85, 38, 43, -99, 96, 71, -41, 50, -96, 71, -86, 90, -97, 66, -67,
-    90, 101, 30, 82, -13, 60, -106, -72, -103, -75, 19, 2, -107, 107, -6, -56,
-    34, -111, -44, -57, -26, -5, 33, 78, -1, 30, 21, 74, -26, 118, -46, -12,
-    -102, 12, -56, 30, -59, -104, -21, -42, -103, 82 };
-  
-  /**
-   * Init PEPSUtilTestCase class.
-   */
-  @BeforeClass
-  public static void runsBeforeTheTestSuite() {
-    
-    CONFIGS1.setProperty("max.attrList.size", "20000");
-    CONFIGS1.setProperty("attrList.code", "202005");
-    CONFIGS1.setProperty("attrList.message", "invalid.attrList.parameter");
-    
-    CONFIGS1.setProperty("max.qaaLevel.size", "1");
-    CONFIGS1.setProperty("max.spUrl.size", "inv");
-    CONFIGS1.setProperty("validation.active", "true");
-    CONFIGS1.setProperty("hashDigest.className",
-      "org.bouncycastle.crypto.digests.SHA512Digest");
-    CONFIGS1.setProperty("invalidAgeDateValue.code", "35");
-    CONFIGS1.setProperty("invalidAttributeValue.code", "34");
-    CONFIGS1.setProperty("invalidAttributeValue.message",
-      "Unexpected or invalid content was encountered within a "
-        + "<saml:Attribute> or <saml:AttributeValue> element.");
-  }
-   
-  /**
-   * Tests the {@link PEPSUtil#createInstance(Properties)} method for the given
-   * properties object.
-   */
-  @Test
-  public void testCreateInstance() {
-    Assert.assertNotNull(PEPSUtil.createInstance(CONFIGS2));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getConfigs()}.
-   */
-  @Test
-  public void testGetConfigs() {
-    final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
-    assertEquals(pepsUtils.getConfigs(), CONFIGS1);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getConfigs()}.
-   */
-  @Test
-  public void testGetConfigsDifferent() {
-    final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
-    assertNotSame(pepsUtils.getConfigs(), CONFIGS2);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getConfig(String)} method for the given existing
-   * config.
-   */
-  @Test
-  public void testGetConfigExists() {
-    assertEquals(PEPSUtil.getConfig("hashDigest.className"),
-      "org.bouncycastle.crypto.digests.SHA512Digest");
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getConfig(String)} method for the given not
-   * existing config.
-   */
-  @Test
-  public void testGetConfigNoExists() {
-    assertNull(PEPSUtil.getConfig("doesnt.exists"));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getConfig(String)} method for the given null
-   * value.
-   */
-  @Test(expected = NullPointerException.class)
-  public void testGetConfigNull() {
-    assertNull(PEPSUtil.getConfig(null));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
-   * given param values.
-   */
-  @Test
-  public void testIsValidParameterExists() {
-    assertTrue(PEPSUtil.isValidParameter("qaaLevel", "1"));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
-   * given param values.
-   */
-  @Test
-  public void testIsValidParameterExistsGreat() {
-    assertFalse(PEPSUtil.isValidParameter("qaaLevel", "12"));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
-   * given param values.
-   */
-  @Test
-  public void testIsValidParameterExistsIvalidConf() {
-    assertFalse(PEPSUtil
-      .isValidParameter("spUrl", "http://localhost:8080/SP/"));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
-   * given param values.
-   */
-  @Test
-  public void testIsValidParameterNotExists() {
-    assertFalse(PEPSUtil.isValidParameter("doesntexists",
-      "http://localhost:8080/SP/"));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
-   * given param values.
-   */
-  @Test
-  public void testIsValidParameterNullParamName() {
-    assertFalse(PEPSUtil.isValidParameter(null, "http://localhost:8080/SP/"));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for the
-   * given param values.
-   */
-  @Test
-  public void testIsValidParameterNullParamValue() {
-    assertFalse(PEPSUtil.isValidParameter("spUrl", null));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method
-   * for the given object values.
-   */
-  @Test
-  public void testValidateParameterValid() {
-    final IPersonalAttributeList persAttrList = new PersonalAttributeList();
-    persAttrList.populate("isAgeOver:true:[15,]:Available;");
-    PEPSUtil.validateParameter("ServiceProviderAction",
-      PEPSParameters.ATTRIBUTE_LIST.toString(), persAttrList);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#validateParameter(String, String, Object)} method
-   * for the given string values.
-   */
-  @Test(expected = InvalidParameterPEPSException.class)
-  public void testValidateParameterNull() {
-    PEPSUtil.validateParameter("ServiceProviderAction",
-      PEPSParameters.ATTRIBUTE_LIST.toString(), null);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#validateParameter(String, String, String)} method
-   * for the given string values.
-   * 
-   * The tested class just invokes
-   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
-   * so further tests will be later.
-   */
-  @Test
-  public void testValidateParameter() {
-    PEPSUtil.validateParameter("ServiceProviderAction",
-      PEPSParameters.ATTRIBUTE_LIST.toString(),
-      "isAgeOver:true:[15,]:Available;");
-  }
-  
-  /**
-   * Tests the
-   * {@link PEPSUtil#validateParameter(String, String, String, PEPSErrors)}
-   * method for the given string value and {@link PEPSErrors} enum.
-   * 
-   * The tested class just invokes
-   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
-   * so further tests will be later.
-   */
-  @Test
-  public void testValidateParameterPEPSErrors() {
-    PEPSUtil.validateParameter("CountrySelectorAction",
-      PEPSParameters.ATTRIBUTE_LIST.toString(),
-      "isAgeOver:true:[15,]:Available;",
-      PEPSErrors.SP_COUNTRY_SELECTOR_INVALID_ATTR);
-  }
-  
-  /**
-   * Tests the
-   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
-   * method for the given string values.
-   */
-  @Test
-  public void testValidateParameterValidParams() {
-    PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "1",
-      "qaaLevel.code", "qaaLevel.message");
-  }
-  
-  /**
-   * Tests the
-   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
-   * method for the given string values.
-   */
-  @Test(expected = InvalidParameterPEPSException.class)
-  public void testValidateParameterInvalidParamValue() {
-    PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "10",
-      "qaaLevel.code", "qaaLevel.message");
-  }
-  
-  /**
-   * Tests the
-   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
-   * method for the given string values.
-   */
-  @Test(expected = InvalidParameterPEPSException.class)
-  public void testValidateParameterInvalidParamName() {
-    PEPSUtil.validateParameter("ServiceProviderAction", "doesnt.exists", "1",
-      "qaaLevel.code", "qaaLevel.message");
-  }
-  
-  /**
-   * Tests the
-   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
-   * method for the given string values.
-   */
-  @Test(expected = InvalidParameterPEPSException.class)
-  public void testValidateParameterNullParamName() {
-    PEPSUtil.validateParameter("ServiceProviderAction", null, "1",
-      "qaaLevel.code", "qaaLevel.message");
-  }
-  
-  /**
-   * Tests the
-   * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
-   * method for the given string values.
-   */
-  @Test(expected = InvalidParameterPEPSException.class)
-  public void testValidateParameterNullParamValue() {
-    PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", null,
-      "qaaLevel.code", "qaaLevel.message");
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
-   * string value.
-   */
-  @Test
-  public void testEncodeSAMLToken() {
-    assertEquals(PEPSUtil.encodeSAMLToken(SAML_BYTE_SAMPLE), SAML_BASE64_SAMPLE);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
-   * null.
-   */
-  @Test(expected = NullPointerException.class)
-  public void testEncodeSAMLTokenNull() {
-    assertNotSame(PEPSUtil.encodeSAMLToken(null), SAML_BASE64_SAMPLE);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
-   * empty byte[] value.
-   */
-  @Test
-  public void testEncodeSAMLTokenEmpty() {
-    assertEquals(PEPSUtil.encodeSAMLToken(EMPTY_BYTE), EMPTY_STRING);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
-   * byte[] value.
-   */
-  @Test
-  public void testDecodeSAMLToken() {
-    assertArrayEquals(PEPSUtil.decodeSAMLToken(SAML_BASE64_SAMPLE),
-      SAML_BYTE_SAMPLE);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
-   * null value.
-   */
-  @Test(expected = NullPointerException.class)
-  public void testDecodeSAMLTokenNull() {
-    assertNotSame(PEPSUtil.decodeSAMLToken(null), SAML_BYTE_SAMPLE);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
-   * empty string value.
-   */
-  @Test(expected = StringIndexOutOfBoundsException.class)
-  public void testDecodeSAMLTokenEmpty() {
-    assertTrue(PEPSUtil.decodeSAMLToken(EMPTY_STRING) == EMPTY_BYTE);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
-   * byte[] value.
-   */
-  @Test
-  public void testHashPersonalToken() {
-    assertArrayEquals(PEPSUtil.hashPersonalToken(SAML_BASE64_BYTE_SAMPLE),
-      HASH_BYTE_SAMPLE);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
-   * null value.
-   */
-  @Test(expected = InternalErrorPEPSException.class)
-  public void testHashPersonalTokenNull() {
-    assertNull(PEPSUtil.hashPersonalToken(null));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
-   * empty value.
-   */
-  @Test
-  public void testHashPersonalTokenEmpty() {
-    assertArrayEquals(PEPSUtil.hashPersonalToken(EMPTY_BYTE), EMPTY_HASH_BYTE);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
-   * correct message.
-   */
-  @Test
-  public void testGetStorkErrorCodeExists() {
-    assertEquals(PEPSUtil.getStorkErrorCode(MESSAGE_SAMPLE), ERROR_CODE_SAMPLE);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
-   * invalid message.
-   */
-  @Test
-  public void testGetStorkErrorCodeNoExists() {
-    assertNull(PEPSUtil.getStorkErrorCode(ERROR_MESSAGE_SAMPLE));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
-   * empty message.
-   */
-  @Test
-  public void testGetStorkErrorCodeEmpty() {
-    assertNull(PEPSUtil.getStorkErrorCode(EMPTY_STRING));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
-   * null message.
-   */
-  @Test
-  public void testGetStorkErrorCodeNull() {
-    assertNull(PEPSUtil.getStorkErrorCode(null));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
-   * invalid message.
-   */
-  @Test
-  public void testGetStorkErrorCodeWithSepFake() {
-    assertNull(PEPSUtil.getStorkErrorCode("-"));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
-   * invalid message.
-   */
-  @Test
-  public void testGetStorkErrorCodeWithSepAndCodeFake() {
-    assertNull(PEPSUtil.getStorkErrorCode("000001 -"));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
-   * given correct message.
-   */
-  @Test
-  public void testGetStorkErrorMessageExists() {
-    assertEquals(PEPSUtil.getStorkErrorMessage(MESSAGE_SAMPLE),
-      ERROR_MESSAGE_SAMPLE);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
-   * given invalid message.
-   */
-  @Test
-  public void testGetStorkErrorMessageNoExists() {
-    assertEquals(PEPSUtil.getStorkErrorMessage(ERROR_MESSAGE_SAMPLE),
-      ERROR_MESSAGE_SAMPLE);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
-   * given empty message.
-   */
-  @Test
-  public void testGetStorkErrorMessageEmpty() {
-    assertEquals(PEPSUtil.getStorkErrorMessage(EMPTY_STRING),
-      EMPTY_STRING);
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
-   * given null message.
-   */
-  @Test
-  public void testGetStorkErrorMessageNull() {
-    assertNull(PEPSUtil.getStorkErrorMessage(null));
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
-   * given invalid message.
-   */
-  @Test
-  public void testGetStorkErrorMessageWithSepFake() {
-    assertEquals(PEPSUtil.getStorkErrorMessage("-"),"-");
-  }
-  
-  /**
-   * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
-   * given invalid message.
-   */
-  @Test
-  public void testGetStorkErrorMessageWithSepAndCodeFake() {
-    assertEquals(PEPSUtil.getStorkErrorMessage("000001 -"),"000001 -");
-  }
-  
+
+    /**
+     * Message example.
+     */
+    private static final String MESSAGE_SAMPLE = "003002 - Authentication Failed";
+
+    /**
+     * Error message example.
+     */
+    private static final String ERROR_MESSAGE_SAMPLE = "Authentication Failed";
+
+    /**
+     * Error code example.
+     */
+    private static final String ERROR_CODE_SAMPLE = "003002";
+
+    /**
+     * Properties values for testing proposes.
+     */
+    private static final Properties CONFIGS1 = new Properties();
+
+    /**
+     * Properties values for testing proposes.
+     */
+    private static final Properties CONFIGS2 = new Properties();
+
+    /**
+     * The empty string value: "".
+     */
+    private static final String EMPTY_STRING = "";
+
+    /**
+     * The empty byte value: [].
+     */
+    private static final byte[] EMPTY_BYTE = new byte[]{};
+
+    /**
+     * The empty byte hash value.
+     */
+    private static final byte[] EMPTY_HASH_BYTE = new byte[]{-49, -125, -31,
+        53, 126, -17, -72, -67, -15, 84, 40, 80, -42, 109, -128, 7, -42, 32, -28,
+        5, 11, 87, 21, -36, -125, -12, -87, 33, -45, 108, -23, -50, 71, -48, -47,
+        60, 93, -123, -14, -80, -1, -125, 24, -46, -121, 126, -20, 47, 99, -71, 49,
+        -67, 71, 65, 122, -127, -91, 56, 50, 122, -7, 39, -38, 62};
+
+    /**
+     * The SAML example byte[] value.
+     */
+    private static final byte[] SAML_BYTE_SAMPLE = new byte[]{60, 115, 97, 109,
+        108, 62, 46, 46, 46, 60, 47, 115, 97, 109, 108};
+
+    /**
+     * The SAML's Base64 example value.
+     */
+    private static final String SAML_BASE64_SAMPLE = "PHNhbWw+Li4uPC9zYW1s";
+
+    /**
+     * The SAML's Base64 byte[] example value.
+     */
+    private static byte[] SAML_BASE64_BYTE_SAMPLE = new byte[]{80, 72, 78, 104,
+        98, 87, 119, 43, 76, 105, 52, 117, 80, 67, 57, 122, 89, 87, 49, 115};
+
+    /**
+     * The SAML's Base64 Hash byte[] example value.
+     */
+    private static byte[] HASH_BYTE_SAMPLE = new byte[]{67, 38, 11, 115, 49,
+        -5, 54, -85, 38, 43, -99, 96, 71, -41, 50, -96, 71, -86, 90, -97, 66, -67,
+        90, 101, 30, 82, -13, 60, -106, -72, -103, -75, 19, 2, -107, 107, -6, -56,
+        34, -111, -44, -57, -26, -5, 33, 78, -1, 30, 21, 74, -26, 118, -46, -12,
+        -102, 12, -56, 30, -59, -104, -21, -42, -103, 82};
+
+    /**
+     * Init PEPSUtilTestCase class.
+     */
+    @BeforeClass
+    public static void runsBeforeTheTestSuite() {
+
+        CONFIGS1.setProperty("max.attrList.size", "20000");
+        CONFIGS1.setProperty("attrList.code", "202005");
+        CONFIGS1.setProperty("attrList.message", "invalid.attrList.parameter");
+
+        CONFIGS1.setProperty("max.qaaLevel.size", "1");
+        CONFIGS1.setProperty("max.spUrl.size", "inv");
+        CONFIGS1.setProperty("validation.active", "true");
+        CONFIGS1.setProperty("hashDigest.className",
+                "org.bouncycastle.crypto.digests.SHA512Digest");
+        CONFIGS1.setProperty("invalidAgeDateValue.code", "35");
+        CONFIGS1.setProperty("invalidAttributeValue.code", "34");
+        CONFIGS1.setProperty("invalidAttributeValue.message",
+                "Unexpected or invalid content was encountered within a "
+                + "<saml:Attribute> or <saml:AttributeValue> element.");
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#createInstance(Properties)} method for the
+     * given properties object.
+     */
+    @Test
+    public void testCreateInstance() {
+        Assert.assertNotNull(PEPSUtil.createInstance(CONFIGS2));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getConfigs()}.
+     */
+    @Test
+    public void testGetConfigs() {
+        final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
+        assertEquals(pepsUtils.getConfigs(), CONFIGS1);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getConfigs()}.
+     */
+    @Test
+    public void testGetConfigsDifferent() {
+        final PEPSUtil pepsUtils = PEPSUtil.createInstance(CONFIGS1);
+        assertNotSame(pepsUtils.getConfigs(), CONFIGS2);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getConfig(String)} method for the given
+     * existing config.
+     */
+    @Test
+    public void testGetConfigExists() {
+        assertEquals(PEPSUtil.getConfig("hashDigest.className"),
+                "org.bouncycastle.crypto.digests.SHA512Digest");
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getConfig(String)} method for the given not
+     * existing config.
+     */
+    @Test
+    public void testGetConfigNoExists() {
+        assertNull(PEPSUtil.getConfig("doesnt.exists"));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getConfig(String)} method for the given null
+     * value.
+     */
+    @Test(expected = NullPointerException.class)
+    public void testGetConfigNull() {
+        assertNull(PEPSUtil.getConfig(null));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
+     * the given param values.
+     */
+    @Test
+    public void testIsValidParameterExists() {
+        assertTrue(PEPSUtil.isValidParameter("qaaLevel", "1"));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
+     * the given param values.
+     */
+    @Test
+    public void testIsValidParameterExistsGreat() {
+        assertFalse(PEPSUtil.isValidParameter("qaaLevel", "12"));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
+     * the given param values.
+     */
+    @Test
+    public void testIsValidParameterExistsIvalidConf() {
+        assertFalse(PEPSUtil
+                .isValidParameter("spUrl", "http://localhost:8080/SP/"));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
+     * the given param values.
+     */
+    @Test
+    public void testIsValidParameterNotExists() {
+        assertFalse(PEPSUtil.isValidParameter("doesntexists",
+                "http://localhost:8080/SP/"));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
+     * the given param values.
+     */
+    @Test
+    public void testIsValidParameterNullParamName() {
+        assertFalse(PEPSUtil.isValidParameter(null, "http://localhost:8080/SP/"));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#isValidParameter(String, String)} method for
+     * the given param values.
+     */
+    @Test
+    public void testIsValidParameterNullParamValue() {
+        assertFalse(PEPSUtil.isValidParameter("spUrl", null));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#validateParameter(String, String, Object)}
+     * method for the given object values.
+     */
+    @Test
+    public void testValidateParameterValid() {
+        final IPersonalAttributeList persAttrList = new PersonalAttributeList();
+        persAttrList.populate("isAgeOver:true:[15,]:Available;");
+        PEPSUtil.validateParameter("ServiceProviderAction",
+                PEPSParameters.ATTRIBUTE_LIST.toString(), persAttrList);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#validateParameter(String, String, Object)}
+     * method for the given string values.
+     */
+    @Test(expected = InvalidParameterPEPSException.class)
+    public void testValidateParameterNull() {
+        PEPSUtil.validateParameter("ServiceProviderAction",
+                PEPSParameters.ATTRIBUTE_LIST.toString(), null);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#validateParameter(String, String, String)}
+     * method for the given string values.
+     *
+     * The tested class just invokes
+     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
+     * so further tests will be later.
+     */
+    @Test
+    public void testValidateParameter() {
+        PEPSUtil.validateParameter("ServiceProviderAction",
+                PEPSParameters.ATTRIBUTE_LIST.toString(),
+                "isAgeOver:true:[15,]:Available;");
+    }
+
+    /**
+     * Tests the
+     * {@link PEPSUtil#validateParameter(String, String, String, PEPSErrors)}
+     * method for the given string value and {@link PEPSErrors} enum.
+     *
+     * The tested class just invokes
+     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
+     * so further tests will be later.
+     */
+    @Test
+    public void testValidateParameterPEPSErrors() {
+        PEPSUtil.validateParameter("CountrySelectorAction",
+                PEPSParameters.ATTRIBUTE_LIST.toString(),
+                "isAgeOver:true:[15,]:Available;",
+                PEPSErrors.SP_COUNTRY_SELECTOR_INVALID_ATTR);
+    }
+
+    /**
+     * Tests the
+     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
+     * method for the given string values.
+     */
+    @Test
+    public void testValidateParameterValidParams() {
+        PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "1",
+                "qaaLevel.code", "qaaLevel.message");
+    }
+
+    /**
+     * Tests the
+     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
+     * method for the given string values.
+     */
+    @Test(expected = InvalidParameterPEPSException.class)
+    public void testValidateParameterInvalidParamValue() {
+        PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", "10",
+                "qaaLevel.code", "qaaLevel.message");
+    }
+
+    /**
+     * Tests the
+     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
+     * method for the given string values.
+     */
+    @Test(expected = InvalidParameterPEPSException.class)
+    public void testValidateParameterInvalidParamName() {
+        PEPSUtil.validateParameter("ServiceProviderAction", "doesnt.exists", "1",
+                "qaaLevel.code", "qaaLevel.message");
+    }
+
+    /**
+     * Tests the
+     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
+     * method for the given string values.
+     */
+    @Test(expected = InvalidParameterPEPSException.class)
+    public void testValidateParameterNullParamName() {
+        PEPSUtil.validateParameter("ServiceProviderAction", null, "1",
+                "qaaLevel.code", "qaaLevel.message");
+    }
+
+    /**
+     * Tests the
+     * {@link PEPSUtil#validateParameter(String, String, String, String, String)}
+     * method for the given string values.
+     */
+    @Test(expected = InvalidParameterPEPSException.class)
+    public void testValidateParameterNullParamValue() {
+        PEPSUtil.validateParameter("ServiceProviderAction", "qaaLevel", null,
+                "qaaLevel.code", "qaaLevel.message");
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
+     * string value.
+     */
+    @Test
+    public void testEncodeSAMLToken() {
+        assertEquals(PEPSUtil.encodeSAMLToken(SAML_BYTE_SAMPLE), SAML_BASE64_SAMPLE);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
+     * null.
+     */
+    @Test(expected = NullPointerException.class)
+    public void testEncodeSAMLTokenNull() {
+        assertNotSame(PEPSUtil.encodeSAMLToken(null), SAML_BASE64_SAMPLE);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#encodeSAMLToken(byte[])} method for the given
+     * empty byte[] value.
+     */
+    @Test
+    public void testEncodeSAMLTokenEmpty() {
+        assertEquals(PEPSUtil.encodeSAMLToken(EMPTY_BYTE), EMPTY_STRING);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
+     * byte[] value.
+     */
+    @Test
+    public void testDecodeSAMLToken() {
+        assertArrayEquals(PEPSUtil.decodeSAMLToken(SAML_BASE64_SAMPLE),
+                SAML_BYTE_SAMPLE);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
+     * null value.
+     */
+    @Test(expected = NullPointerException.class)
+    public void testDecodeSAMLTokenNull() {
+        assertNotSame(PEPSUtil.decodeSAMLToken(null), SAML_BYTE_SAMPLE);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#decodeSAMLToken(byte[])} method for the given
+     * empty string value.
+     */
+    @Test(expected = StringIndexOutOfBoundsException.class)
+    public void testDecodeSAMLTokenEmpty() {
+        assertTrue(PEPSUtil.decodeSAMLToken(EMPTY_STRING) == EMPTY_BYTE);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
+     * byte[] value.
+     */
+    @Test
+    public void testHashPersonalToken() {
+        assertArrayEquals(PEPSUtil.hashPersonalToken(SAML_BASE64_BYTE_SAMPLE),
+                HASH_BYTE_SAMPLE);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
+     * null value.
+     */
+    @Test(expected = InternalErrorPEPSException.class)
+    public void testHashPersonalTokenNull() {
+        assertNull(PEPSUtil.hashPersonalToken(null));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#hashPersonalToken(byte[])} method for the given
+     * empty value.
+     */
+    @Test
+    public void testHashPersonalTokenEmpty() {
+        assertArrayEquals(PEPSUtil.hashPersonalToken(EMPTY_BYTE), EMPTY_HASH_BYTE);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
+     * correct message.
+     */
+    @Test
+    public void testGetStorkErrorCodeExists() {
+        assertEquals(PEPSUtil.getStorkErrorCode(MESSAGE_SAMPLE), ERROR_CODE_SAMPLE);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
+     * invalid message.
+     */
+    @Test
+    public void testGetStorkErrorCodeNoExists() {
+        assertNull(PEPSUtil.getStorkErrorCode(ERROR_MESSAGE_SAMPLE));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
+     * empty message.
+     */
+    @Test
+    public void testGetStorkErrorCodeEmpty() {
+        assertNull(PEPSUtil.getStorkErrorCode(EMPTY_STRING));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
+     * null message.
+     */
+    @Test
+    public void testGetStorkErrorCodeNull() {
+        assertNull(PEPSUtil.getStorkErrorCode(null));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
+     * invalid message.
+     */
+    @Test
+    public void testGetStorkErrorCodeWithSepFake() {
+        assertNull(PEPSUtil.getStorkErrorCode("-"));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorCode(String)} method for the given
+     * invalid message.
+     */
+    @Test
+    public void testGetStorkErrorCodeWithSepAndCodeFake() {
+        assertNull(PEPSUtil.getStorkErrorCode("000001 -"));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
+     * given correct message.
+     */
+    @Test
+    public void testGetStorkErrorMessageExists() {
+        assertEquals(PEPSUtil.getStorkErrorMessage(MESSAGE_SAMPLE),
+                ERROR_MESSAGE_SAMPLE);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
+     * given invalid message.
+     */
+    @Test
+    public void testGetStorkErrorMessageNoExists() {
+        assertEquals(PEPSUtil.getStorkErrorMessage(ERROR_MESSAGE_SAMPLE),
+                ERROR_MESSAGE_SAMPLE);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
+     * given empty message.
+     */
+    @Test
+    public void testGetStorkErrorMessageEmpty() {
+        assertEquals(PEPSUtil.getStorkErrorMessage(EMPTY_STRING),
+                EMPTY_STRING);
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
+     * given null message.
+     */
+    @Test
+    public void testGetStorkErrorMessageNull() {
+        assertNull(PEPSUtil.getStorkErrorMessage(null));
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
+     * given invalid message.
+     */
+    @Test
+    public void testGetStorkErrorMessageWithSepFake() {
+        assertEquals(PEPSUtil.getStorkErrorMessage("-"), "-");
+    }
+
+    /**
+     * Tests the {@link PEPSUtil#getStorkErrorMessage(String)} method for the
+     * given invalid message.
+     */
+    @Test
+    public void testGetStorkErrorMessageWithSepAndCodeFake() {
+        assertEquals(PEPSUtil.getStorkErrorMessage("000001 -"), "000001 -");
+    }
+
 }
diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java
index 7052b320a..7800e78b5 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeListTestCase.java
@@ -22,726 +22,756 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
 import eu.stork.peps.auth.commons.PersonalAttribute;
 import eu.stork.peps.auth.commons.PersonalAttributeList;
 import eu.stork.peps.auth.commons.STORKStatusCode;
 
 /**
  * The PersonalAttributeList's Test Case.
- * 
+ *
  * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * luis.felix@multicert.com, hugo.magalhaes@multicert.com,
+ * paulo.ribeiro@multicert.com
  * @version $Revision: 1.5 $, $Date: 2010-11-17 05:17:02 $
  */
 public final class PersonalAttributeListTestCase {
-  
-  /**
-   * isAgeOver constant value.
-   */
-  private static final String ISAGEOVER_CONS = "isAgeOver";
-  
-  /**
-   * 1 constant value.
-   */
-  private static final int ONE_CONS = 1;
-  
-  /**
-   * 2 constant value.
-   */
-  private static final int TWO_CONS = 2;
-  
-  /**
-   * An empty attribute.
-   */
-  @SuppressWarnings("unused")
-  private static final PersonalAttributeList EMPTY_ATTR_LIST =
-    new PersonalAttributeList(0);
-  
-  /**
-   * An attribute with a complex value (canonicalResidenceAddress).
-   */
-  private static PersonalAttribute complexAttrValue = null;
-  
-  /**
-   * Simple attribute value list string.
-   */
-  private static final String SIMPLE_ATTRLIST =
-    "isAgeOver:true:[15,]:Available;";
-  
-  /**
-   * Simple attribute value list string.
-   */
-  private static final String SIMPLE_ATTRLIST2 =
-    "isAgeOver:true:[18,]:Available;";
-  
-  /**
-   * Simple attribute value list string.
-   */
-  private static final String SIMPLE_ATTRLIST3 = 
-    "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
-  
-  /**
-   * Simple attribute value list string.
-   */
-  private static final String SIMPLE_ATTRLIST3_REVERSE = 
-    "isAgeOver:true:[18,]:Available;isAgeOver:true:[15,]:Available;";
-  /**
-   * Simple attribute value list string.
-   */
-  private static final String COMPLEX_ATTRLIST =
-    "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=Ed. B,"
-    + "state=Porto,countryCodeAddress=PT,streetNumber=379,"
-    + "streetName=Avenida Sidonio Pais,town=Porto,]:Available;";
-  /**
-   * Mix attribute list string.
-   */
-  private static final String STR_MIX_ATTR_LIST =
-    "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:["
-    + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
-    + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:"
-    + "Available;";
-  
-  /**
-   * Mix attribute list 2 string.
-   */
-  private static final String STR_MIX_ATTR_LIST2 =
-    "isAgeOver:true:[15,]:Available;canonicalResidenceAddress:true:["
-    + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
-    + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto,]:Available;"
-    + "mandateContent:true:["
-    + "isJoint=\"isjoint\",typeOfPower=\"power\",ValidTo=\"validto\",validfrom=\"validfrom\",AQAA=\"3\",isChained=\"ischained\",]:"
-    + "Available;";
-  
-  /**
-   * Attribute List example.
-   */
-  @SuppressWarnings({ "serial" })
-  private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute(
-    "age", true, new ArrayList<String>() {
-      {
-        add("15");
-      }
-    }, STORKStatusCode.STATUS_AVAILABLE.toString());
-  
-  /**
-   * Init PersonalAttributeListTestCase class.
-   */
-  @SuppressWarnings("serial")
-  @BeforeClass
-  public static void runsBeforeTheTestSuite() {
-    final Map<String, String> values = new HashMap<String, String>() {
-      {
-        put("countryCodeAddress", "PT");
-        put("state", "Porto");
-        put("town", "Porto");
-        put("postalCode", "4100");
-        put("streetName", "Avenida Sidonio Pais");
-        put("streetNumber", "379");
-        put("apartmentNumber", "Ed. B");
-      }
-    };
-    
-    complexAttrValue =
-      new PersonalAttribute("canonicalResidenceAddress", true, values,
-        STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-  }
-  
-  /**
-   * Testing Personal Attribute List add method. Personal Attribute list must be
-   * size 1 - Simple attribute.
-   */
-  @Test
-  public void testAddSimpleAttr() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.add(ATTR_VALUE);
-    Assert.assertTrue(attrList.size() == 1);
-  }
-  
-  /**
-   * Testing Personal Attribute List add method. Personal Attribute list must be
-   * size 1 - Complex attribute.
-   */
-  @Test
-  public void testAddCompleAttr() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.add(complexAttrValue);
-    Assert.assertTrue(attrList.size() == 1);
-  }
-  
-  /**
-   * Testing Personal Attribute List add method. Personal Attribute list must be
-   * size 0 - no attribute.
-   */
-  @Test
-  public void testAddNull() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.add(null);
-    Assert.assertTrue(attrList.size() == 0);
-  }
-  
-  /**
-   * Testing Personal Attribute List add method. Same attribute name added
-   * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added
-   * twice.
-   */
-  @SuppressWarnings("serial")
-  @Test
-  public void testAddSameAttrName() {
-    final PersonalAttribute attrValueUnder =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("15");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-    final PersonalAttribute attrValueOver =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("18");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.add(attrValueUnder);
-    attrList.add(attrValueOver);
-    Assert.assertTrue(attrList.size() == 2);
-  }
-  
-  /**
-   * Testing Personal Attribute List add method. Same attribute name added
-   * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added
-   * twice.
-   */
-  @SuppressWarnings("serial")
-  @Test
-  public void testAddSameAttrNameEmpty() {
-    final PersonalAttribute attrValueUnder =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("15");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-    final PersonalAttribute attrValueOver =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.add(attrValueUnder);
-    attrList.add(attrValueOver);
-    Assert.assertTrue(attrList.size() == 2);
-  }
-  
-  /**
-   * Testing Personal Attribute List put method. Personal Attribute list must be
-   * size 1 - Simple Value.
-   */
-  @Test
-  public void testPutSimpleAttr() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.put(ATTR_VALUE.getName(), ATTR_VALUE);
-    Assert.assertTrue(attrList.size() == 1);
-  }
-  
-  /**
-   * Testing Personal Attribute List put method. Personal Attribute list must be
-   * size 1 - Complex Value.
-   */
-  @Test
-  public void testPutComplexAttr() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.put(ATTR_VALUE.getName(), complexAttrValue);
-    Assert.assertTrue(attrList.size() == 1);
-  }
-  
-  /**
-   * Testing Personal Attribute List put method. Personal Attribute list must be
-   * size 0 - no attribute.
-   */
-  @Test
-  public void testPutNull() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.put("", null);
-    Assert.assertTrue(attrList.size() == 0);
-  }
-  
-  /**
-   * Testing Personal Attribute List put method. Personal Attribute list must be
-   * size 2 - IsAgeOver attribute added twice.
-   */
-  @SuppressWarnings("serial")
-  @Test
-  public void testPutSameAttrName() {
-    final PersonalAttribute attrValueUnder =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("15");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-    final PersonalAttribute attrValueOver =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("18");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.put(attrValueUnder.getName(), attrValueUnder);
-    attrList.put(attrValueOver.getName(), attrValueOver);
-    Assert.assertTrue(attrList.size() == 2);
-  }
-  
-  /**
-   * Testing Personal Attribute List put method. Personal Attribute list must be
-   * size 2 - IsAgeOver attribute added twice.
-   */
-  @SuppressWarnings("serial")
-  @Test
-  public void testPutSameAttrNameEmpty() {
-    final PersonalAttribute attrValueUnder =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("15");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-    final PersonalAttribute attrValueOver =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.put(attrValueUnder.getName(), attrValueUnder);
-    attrList.put(attrValueOver.getName(), attrValueOver);
-    Assert.assertTrue(attrList.size() == 2);
-  }
-  
-  /**
-   * Testing Personal Attribute List get method. Personal Attribute list must be
-   * size 1 - Simple attribute.
-   */
-  @Test
-  public void testGetSimpleAttr() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.add(ATTR_VALUE);
-    Assert.assertEquals(ATTR_VALUE, attrList.get(ATTR_VALUE.getName()));
-  }
-  
-  /**
-   * Testing Personal Attribute List add method. Personal Attribute list must be
-   * size 1 - Complex attribute.
-   */
-  @Test
-  public void testGetCompleAttr() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.add(complexAttrValue);
-    Assert.assertEquals(complexAttrValue.toString(),
-      attrList.get(complexAttrValue.getName()).toString());
-  }
-  
-  /**
-   * Testing Personal Attribute List get method. Personal Attribute list must be
-   * size 2 - IsAgeOver attribute.
-   */
-  @SuppressWarnings("serial")
-  @Test
-  public void testGetIsAgeOverAttr() {
-    final PersonalAttribute attrValueUnder =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("15");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-    final PersonalAttribute attrValueOver =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("18");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.add(attrValueUnder);
-    attrList.add(attrValueOver);
-    Assert.assertEquals(SIMPLE_ATTRLIST,
-      attrList.get(attrValueUnder.getName()).toString());
-    Assert.assertEquals(SIMPLE_ATTRLIST2,
-      attrList.get(attrValueOver.getName()).toString());
-  }
-  
-  /**
-   * Testing Personal Attribute List populate method. Personal Attribute list
-   * must be size 1 - Simple attribute.
-   */
-  @Test
-  public void testPopulateSimpleAttr() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.populate(SIMPLE_ATTRLIST);
-    Assert.assertTrue(attrList.size() == 1);
-  }
-  
-  /**
-   * Testing Personal Attribute List populate method. Personal Attribute list
-   * must be size 1 - Complex attribute.
-   */
-  @Test
-  public void testPopulateComplexAttr() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.populate(COMPLEX_ATTRLIST);
-    Assert.assertTrue(attrList.size() == 1);
-  }
-  
-  /**
-   * Testing Personal Attribute List populate method. Personal Attribute list
-   * must be size 1 - Simple and Complex attribute.
-   */
-  @Test
-  public void testPopulateMixAttrs() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.populate(STR_MIX_ATTR_LIST);
-    Assert.assertTrue(attrList.size() == 2);
-  }
-  
-  /**
-   * Testing Personal Attribute List toString method using add.
-   */
-  @SuppressWarnings("serial")
-  @Test
-  public void testToStringFromAdd() {
-    final PersonalAttribute attrValueUnder =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("15");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-    final PersonalAttribute attrValueOver =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("18");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.add(attrValueUnder);
-    attrList.add(attrValueOver);
-    Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
-  }
-  
-  /**
-   * Testing Personal Attribute List toString method using put.
-   * 
-   */
-  @SuppressWarnings("serial")
-  @Test
-  public void testToStringFromPut() {
-    final PersonalAttribute attrValueUnder =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("15");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-    final PersonalAttribute attrValueOver =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("18");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.put(attrValueUnder.getName(), attrValueUnder);
-    attrList.put(attrValueOver.getName(), attrValueOver);
-    Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
-  }
-  
-  /**
-   * Testing Personal Attribute List toString method using populate.
-   */
-  @Test
-  public void testToStringFromSimplePopulate() {
-    final String strAttrList = "isAgeOver:true";
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.populate(strAttrList);
-    Assert.assertEquals("isAgeOver:true:[]:;", attrList.toString());
-  }
-  
-  /**
-   * Testing Personal Attribute List toString method using populate.
-   */
-  @Test
-  public void testToStringFromPopulate() {
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.populate(SIMPLE_ATTRLIST3);
-    Assert.assertEquals(SIMPLE_ATTRLIST3_REVERSE, attrList.toString());
-  }
-  
-  /**
-   * Testing Personal Attribute List populate method, with invalid values.
-   */
-  @Test
-  public void testPopulateWithInvalidValuesFormat() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate("name:type:values:status;");
-    Assert.assertEquals(pal, new PersonalAttributeList());
-  }
-  
-  /**
-   * Testing Personal Attribute List populate method, with invalid format.
-   */
-  @Test
-  public void testPopulateWithInvalidFormat() {
-    
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate("name:type::status;");
-    Assert.assertEquals(pal, new PersonalAttributeList());
-  }
-  
-  /**
-   * Testing Personal Attribute List clone method using add.
-   */
-  @SuppressWarnings("serial")
-  @Test
-  public void testCloneFromAdd() {
-    final PersonalAttribute attrValueUnder =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("15");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    
-    final PersonalAttribute attrValueOver =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("18");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.add(attrValueUnder);
-    attrList.add(attrValueOver);
-    Assert.assertNotSame(attrList, attrList.clone());
-  }
-  
-  /**
-   * Testing Personal Attribute List clone method using put.
-   */
-  @SuppressWarnings("serial")
-  @Test
-  public void testCloneFromPut() {
-    final PersonalAttribute attrValueUnder =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("15");
-        }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+    /**
+     * isAgeOver constant value.
+     */
+    private static final String ISAGEOVER_CONS = "isAgeOver";
+
+    /**
+     * 1 constant value.
+     */
+    private static final int ONE_CONS = 1;
+
+    /**
+     * 2 constant value.
+     */
+    private static final int TWO_CONS = 2;
+
+    /**
+     * An empty attribute.
+     */
+    @SuppressWarnings("unused")
+    private static final IPersonalAttributeList EMPTY_ATTR_LIST
+            = new PersonalAttributeList(0);
+
+    /**
+     * An attribute with a complex value (canonicalResidenceAddress).
+     */
+    private static PersonalAttribute complexAttrValue = null;
+
+    /**
+     * Simple attribute value list string.
+     */
+    private static final String SIMPLE_ATTRLIST
+            = "isAgeOver:true:[15]:Available;";
+
+    /**
+     * Simple attribute value list string.
+     */
+    private static final String SIMPLE_ATTRLIST2
+            = "isAgeOver:true:[18]:Available;";
+
+    /**
+     * Simple attribute value list string.
+     */
+    private static final String SIMPLE_ATTRLIST3
+            = "isAgeOver:true:[15]:Available;isAgeOver:true:[18]:Available;";
     
-    final PersonalAttribute attrValueOver =
-      new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
-        {
-          add("18");
+    /**
+     * Simple attribute value list string.
+     */
+    private static final String SIMPLE_ATTRLIST4
+            = "isAgeOver:true:[15,18]:Available;";
+
+    /**
+     * Simple attribute value list string.
+     */
+    private static final String SIMPLE_ATTRLIST3_REVERSE
+            = "isAgeOver:true:[18]:Available;isAgeOver:true:[15]:Available;";
+    /**
+     * Simple attribute value list string.
+     */
+    private static final String COMPLEX_ATTRLIST
+            = "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=Ed. B,"
+            + "state=Porto,countryCodeAddress=PT,streetNumber=379,"
+            + "streetName=Avenida Sidonio Pais,town=Porto]:Available;";
+    /**
+     * Mix attribute list string.
+     */
+    private static final String STR_MIX_ATTR_LIST
+            = "isAgeOver:true:[15]:Available;canonicalResidenceAddress:true:["
+            + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
+            + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto]:"
+            + "Available;";
+
+    /**
+     * Mix attribute list 2 string.
+     */
+    private static final String STR_MIX_ATTR_LIST2
+            = "isAgeOver:true:[15]:Available;canonicalResidenceAddress:true:["
+            + "postalCode=4100,apartmentNumber=Ed.B,state=Porto,countryCodeAddress=PT,"
+            + "streetNumber=379,streetName=Avenida Sidonio Pais,town=Porto]:Available;"
+            + "mandateContent:true:["
+            + "isJoint=\"isjoint\",typeOfPower=\"power\",ValidTo=\"validto\",validfrom=\"validfrom\",AQAA=\"3\",isChained=\"ischained\",]:"
+            + "Available;";
+
+    /**
+     * Attribute List example.
+     */
+    @SuppressWarnings({"serial"})
+    private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute(
+            "age", true, new ArrayList<String>() {
+                {
+                    add("15");
+                }
+            }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+    /**
+     * Init PersonalAttributeListTestCase class.
+     */
+    @SuppressWarnings("serial")
+    @BeforeClass
+    public static void runsBeforeTheTestSuite() {
+        final Map<String, String> values = new HashMap<String, String>() {
+            {
+                put("countryCodeAddress", "PT");
+                put("state", "Porto");
+                put("town", "Porto");
+                put("postalCode", "4100");
+                put("streetName", "Avenida Sidonio Pais");
+                put("streetNumber", "379");
+                put("apartmentNumber", "Ed. B");
+            }
+        };
+
+        complexAttrValue
+                = new PersonalAttribute("canonicalResidenceAddress", true, values,
+                        STORKStatusCode.STATUS_AVAILABLE.toString());
+
+    }
+
+    /**
+     * Testing Personal Attribute List add method. Personal Attribute list must
+     * be size 1 - Simple attribute.
+     */
+    @Test
+    public void testAddSimpleAttr() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.add(ATTR_VALUE);
+        Assert.assertTrue(attrList.size() == 1);
+    }
+
+    /**
+     * Testing Personal Attribute List add method. Personal Attribute list must
+     * be size 1 - Complex attribute.
+     */
+    @Test
+    public void testAddCompleAttr() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.add(complexAttrValue);
+        Assert.assertTrue(attrList.size() == 1);
+    }
+
+    /**
+     * Testing Personal Attribute List add method. Personal Attribute list must
+     * be size 0 - no attribute.
+     */
+    @Test
+    public void testAddNull() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.add(null);
+        Assert.assertTrue(attrList.size() == 0);
+    }
+
+    /**
+     * Testing Personal Attribute List add method. Same attribute name added
+     * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added
+     * twice.
+     */
+    @SuppressWarnings("serial")
+    @Test
+    public void testAddSameAttrName() {
+        final PersonalAttribute attrValueUnder
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("15");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final PersonalAttribute attrValueOver
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("18");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.add(attrValueUnder);
+        attrList.add(attrValueOver);
+        System.out.println();
+        Assert.assertTrue(attrList.get(attrValueOver.getName()).getValue().size() == 2);
+    }
+
+    /**
+     * Testing Personal Attribute List add method. Same attribute name added
+     * twice. Personal Attribute list must be size 2 - IsAgeOver attribute added
+     * twice.
+     */
+    @SuppressWarnings("serial")
+    @Test
+    public void testAddSameAttrNameEmpty() {
+        final PersonalAttribute attrValueUnder
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("15");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final PersonalAttribute attrValueOver
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.add(attrValueUnder);
+        attrList.add(attrValueOver);
+        Assert.assertTrue(attrList.size() == 1);
+        Assert.assertTrue(attrList.get(attrValueOver.getName()).getValue().size() == 2);
+    }
+
+    /**
+     * Testing Personal Attribute List put method. Personal Attribute list must
+     * be size 1 - Simple Value.
+     */
+    @Test
+    public void testPutSimpleAttr() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.put(ATTR_VALUE.getName(), ATTR_VALUE);
+        Assert.assertTrue(attrList.size() == 1);
+    }
+
+    /**
+     * Testing Personal Attribute List put method. Personal Attribute list must
+     * be size 1 - Complex Value.
+     */
+    @Test
+    public void testPutComplexAttr() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.put(ATTR_VALUE.getName(), complexAttrValue);
+        Assert.assertTrue(attrList.size() == 1);
+    }
+
+    /**
+     * Testing Personal Attribute List put method. Personal Attribute list must
+     * be size 0 - no attribute.
+     */
+    @Test(expected = NullPointerException.class)
+    public void testPutNull() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.put("", null);
+        Assert.assertTrue(attrList.size() == 0);
+    }
+
+    /**
+     * Testing Personal Attribute List put method. Personal Attribute list must
+     * be size 2 - IsAgeOver attribute added twice.
+     */
+    @SuppressWarnings("serial")
+    @Test
+    public void testPutSameAttrName() {
+        final PersonalAttribute attrValueUnder
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("15");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final PersonalAttribute attrValueOver
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("18");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.put(attrValueUnder.getName(), attrValueUnder);
+        attrList.put(attrValueOver.getName(), attrValueOver);
+        Assert.assertTrue(attrList.size() == 1);
+        Assert.assertTrue(attrList.get(attrValueOver.getName()).getValue().size() == 2);
+    }
+
+    /**
+     * Testing Personal Attribute List put method. Personal Attribute list must
+     * be size 2 - IsAgeOver attribute added twice.
+     */
+    @SuppressWarnings("serial")
+    @Test
+    public void testPutSameAttrNameEmpty() {
+        final PersonalAttribute attrValueUnder
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("15");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final PersonalAttribute attrValueOver
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.put(attrValueUnder.getName(), attrValueUnder);
+        attrList.put(attrValueOver.getName(), attrValueOver);
+        Assert.assertTrue(attrList.size() == 1);
+        Assert.assertTrue(attrList.get(attrValueOver.getName()).getValue().size() == 2);
+    }
+
+    /**
+     * Testing Personal Attribute List get method. Personal Attribute list must
+     * be size 1 - Simple attribute.
+     */
+    @Test
+    public void testGetSimpleAttr() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.add(ATTR_VALUE);
+        Assert.assertEquals(ATTR_VALUE, attrList.get(ATTR_VALUE.getName()));
+    }
+
+    /**
+     * Testing Personal Attribute List add method. Personal Attribute list must
+     * be size 1 - Complex attribute.
+     */
+    @Test
+    public void testGetCompleAttr() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.add(complexAttrValue);
+        Assert.assertEquals(complexAttrValue.toString(),
+                attrList.get(complexAttrValue.getName()).toString());
+    }
+
+    /**
+     * Testing Personal Attribute List get method. Personal Attribute list must
+     * be size 2 - IsAgeOver attribute.
+     */
+    @SuppressWarnings("serial")
+    @Test
+    public void testGetIsAgeOverAttr() {
+        final PersonalAttribute attrValueUnder
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("15");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final PersonalAttribute attrValueOver
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("18");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.add(attrValueUnder);
+        attrList.add(attrValueOver);
+        Assert.assertNotEquals(SIMPLE_ATTRLIST,
+                attrList.get(attrValueUnder.getName()).toString());
+        Assert.assertNotEquals(SIMPLE_ATTRLIST2,
+                attrList.get(attrValueOver.getName()).toString());
+        Assert.assertEquals(SIMPLE_ATTRLIST4,
+                attrList.get(attrValueOver.getName()).toString());
+    }
+
+    /**
+     * Testing Personal Attribute List populate method. Personal Attribute list
+     * must be size 1 - Simple attribute.
+     */
+    @Test
+    public void testPopulateSimpleAttr() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.populate(SIMPLE_ATTRLIST);
+        Assert.assertTrue(attrList.size() == 1);
+    }
+
+    /**
+     * Testing Personal Attribute List populate method. Personal Attribute list
+     * must be size 1 - Complex attribute.
+     */
+    @Test
+    public void testPopulateComplexAttr() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.populate(COMPLEX_ATTRLIST);
+        Assert.assertTrue(attrList.size() == 1);
+    }
+
+    /**
+     * Testing Personal Attribute List populate method. Personal Attribute list
+     * must be size 1 - Simple and Complex attribute.
+     */
+    @Test
+    public void testPopulateMixAttrs() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.populate(STR_MIX_ATTR_LIST);
+        Assert.assertTrue(attrList.size() == 2);
+        //Assert.assertTrue(attrList.get(attrValueOver.getName()).getValue().size() == 2);
+    }
+
+    /**
+     * Testing Personal Attribute List toString method using add.
+     */
+    @SuppressWarnings("serial")
+    @Test
+    public void testToStringFromAdd() {
+        final PersonalAttribute attrValueUnder
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("15");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final PersonalAttribute attrValueOver
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("18");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.add(attrValueUnder);
+        attrList.add(attrValueOver);
+        Assert.assertEquals(SIMPLE_ATTRLIST4, attrList.toString());
+    }
+
+    /**
+     * Testing Personal Attribute List toString method using put.
+     *
+     */
+    @SuppressWarnings("serial")
+    @Test
+    public void testToStringFromPut() {
+        final PersonalAttribute attrValueUnder
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("15");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final PersonalAttribute attrValueOver
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("18");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.put(attrValueUnder.getName(), attrValueUnder);
+        attrList.put(attrValueOver.getName(), attrValueOver);
+        Assert.assertEquals(SIMPLE_ATTRLIST4, attrList.toString());
+    }
+
+    /**
+     * Testing Personal Attribute List toString method using populate.
+     */
+    @Test
+    public void testToStringFromSimplePopulate() {
+        final String strAttrList = "isAgeOver:true";
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.populate(strAttrList);
+        Assert.assertEquals("isAgeOver:true:[]:;", attrList.toString());
+    }
+
+    /**
+     * Testing Personal Attribute List toString method using populate.
+     */
+    @Test
+    public void testToStringFromPopulate() {
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.populate(SIMPLE_ATTRLIST3);
+        Assert.assertEquals(SIMPLE_ATTRLIST4, attrList.toString());
+    }
+
+    /**
+     * Testing Personal Attribute List populate method, with invalid values.
+     */
+    @Test
+    public void testPopulateWithInvalidValuesFormat() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate("name:type:values:status;");
+        Assert.assertEquals(pal, new PersonalAttributeList());
+    }
+
+    /**
+     * Testing Personal Attribute List populate method, with invalid format.
+     */
+    @Test
+    public void testPopulateWithInvalidFormat() {
+
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate("name:type::status;");
+        Assert.assertEquals(pal, new PersonalAttributeList());
+    }
+
+    /**
+     * Testing Personal Attribute List clone method using add.
+     */
+    @SuppressWarnings("serial")
+    @Test
+    public void testCloneFromAdd() {
+        final PersonalAttribute attrValueUnder
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("15");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final PersonalAttribute attrValueOver
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("18");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.add(attrValueUnder);
+        attrList.add(attrValueOver);
+        Assert.assertNotSame(attrList, attrList.clone());
+    }
+
+    /**
+     * Testing Personal Attribute List clone method using put.
+     */
+    @SuppressWarnings("serial")
+    @Test
+    public void testCloneFromPut() {
+        final PersonalAttribute attrValueUnder
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("15");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+        final PersonalAttribute attrValueOver
+                = new PersonalAttribute(ISAGEOVER_CONS, true, new ArrayList<String>() {
+                    {
+                        add("18");
+                    }
+                }, STORKStatusCode.STATUS_AVAILABLE.toString());
+        final IPersonalAttributeList attrList = new PersonalAttributeList(1);
+        attrList.put(attrValueUnder.getName(), attrValueUnder);
+        attrList.put(attrValueOver.getName(), attrValueOver);
+        Assert.assertNotSame(attrList, attrList.clone());
+    }
+
+    /**
+     * Testing Personal Attribute List clone method using populate.
+     */
+    @Test
+    public void testCloneFromPopulate() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(SIMPLE_ATTRLIST3);
+        Assert.assertNotSame(pal, pal.clone());
+    }
+
+    /**
+     * Testing Personal Attribute List iterator.
+     */
+    @Test
+    public void testIterator() {
+        final String strAttrList
+                = "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(strAttrList);
+        final Iterator<PersonalAttribute> itAttr = pal.iterator();
+        while (itAttr.hasNext()) {
+            final PersonalAttribute attr = itAttr.next();
+            Assert.assertEquals(ISAGEOVER_CONS, attr.getName());
         }
-      }, STORKStatusCode.STATUS_AVAILABLE.toString());
-    final PersonalAttributeList attrList = new PersonalAttributeList(1);
-    attrList.put(attrValueUnder.getName(), attrValueUnder);
-    attrList.put(attrValueOver.getName(), attrValueOver);
-    Assert.assertNotSame(attrList, attrList.clone());
-  }
-  
-  /**
-   * Testing Personal Attribute List clone method using populate.
-   */
-  @Test
-  public void testCloneFromPopulate() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(SIMPLE_ATTRLIST3);
-    Assert.assertNotSame(pal, pal.clone());
-  }
-  
-  /**
-   * Testing Personal Attribute List iterator.
-   */
-  @Test
-  public void testIterator() {
-    final String strAttrList =
-      "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(strAttrList);
-    final Iterator<PersonalAttribute> itAttr = pal.iterator();
-    while (itAttr.hasNext()) {
-      final PersonalAttribute attr = itAttr.next();
-      Assert.assertEquals(ISAGEOVER_CONS, attr.getName());
-    }
-  }
-  
-  /**
-   * Testing Personal Attribute List's GetOptionalAttributes method with empty attribute list.
-   */
-  @Test
-  public void testGetOptionalAttributesWithEmptyList() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
-  }
-  
-  /**
-   * Testing Personal Attribute List's GetOptionalAttributes method without optional attributes.
-   */
-  @Test
-  public void testGetOptionalAttributesWithoutOptional() {
-    final String strAttrList =
-      "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(strAttrList);
-    Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
-  }
-  
-  /**
-   * Testing Personal Attribute List's GetOptionalAttributes method with one optional attribute.
-   */
-  @Test
-  public void testGetOptionalAttributesWithOneOptional() {
-    final String strAttrList =
-      "age:false:[]:;isAgeOver:true:[15,]:;isAgeOver:true:[18,]:;";
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(strAttrList);
-    Assert.assertTrue(pal.getOptionalAttributes().size() == ONE_CONS);
-  }
-  
-  /**
-   * Testing Personal Attribute List's GetOptionalAttributes method with two optional attribute.
-   */
-  @Test
-  public void testGetOptionalAttributesWithOnlyOptional() {
-    final String strAttrList =
-      "age:false:[]:;isAgeOver:false:[18,]:;";
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(strAttrList);
-    Assert.assertTrue(pal.getOptionalAttributes().size() == TWO_CONS);
-  }
-  
-  /**
-   * Testing Personal Attribute List's getMandatoryAttributes method with empty attribute list.
-   */
-  @Test
-  public void testGetMandatoryAttributesWithEmptyList() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
-  }
-  
-  /**
-   * Testing Personal Attribute List's getMandatoryAttributes method without mandatory attributes.
-   */
-  @Test
-  public void testGetMandatoryAttributesWithoutMandatory() {
-    final String strAttrList =
-      "isAgeOver:false:[15,]:Available;isAgeOver:false:[18,]:Available;";
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(strAttrList);
-    Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
-  }
-  
-  /**
-   * Testing Personal Attribute List's GetMandatoryAttributes method with one mandatory attribute.
-   */
-  @Test
-  public void testGetMandatoryAttributesWithOneMandatory() {
-    final String strAttrList =
-      "age:true:[]:;isAgeOver:false:[15,]:;isAgeOver:false:[18,]:;";
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(strAttrList);
-    Assert.assertTrue(pal.getMandatoryAttributes().size() == ONE_CONS);
-  }
-  
-  /**
-   * Testing Personal Attribute List's GetMandatoryAttributes method with two mandatory attribute.
-   */
-  @Test
-  public void testGetMandatoryAttributesWithOnlyMandatory() {
-    final String strAttrList =
-      "age:true:[]:;isAgeOver:true:[18,]:;";
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(strAttrList);
-    Assert.assertTrue(pal.getMandatoryAttributes().size() == TWO_CONS);
-  }
-  
-  /**
-   * Testing Personal Attribute List's getSimpleValueAttributes method with empty attribute list.
-   */
-  @Test
-  public void testGetSimpleValueAttributesWithEmptyList() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
-  }
-  
-  /**
-   * Testing Personal Attribute List's getSimpleValueAttributes() method without simple attributes.
-   */
-  @Test
-  public void testGetSimpleValueAttributesWithoutSimple() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(COMPLEX_ATTRLIST);
-    Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
-  }
-  
-  /**
-   * Testing Personal Attribute List's getSimpleValueAttributes() method with one simple attribute.
-   */
-  @Test
-  public void testGetSimpleValueAttributesWithOneSimple() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(STR_MIX_ATTR_LIST);
-    Assert.assertTrue(pal.getSimpleValueAttributes().size() == ONE_CONS);
-  }
-  
-  /**
-   * Testing Personal Attribute List's GetMandatoryAttributes method with two simple attribute.
-   */
-  @Test
-  public void testGetSimpleValueAttributesWithOnlySimple() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(SIMPLE_ATTRLIST3);
-    Assert.assertTrue(pal.getSimpleValueAttributes().size() == TWO_CONS);
-  }
-  
-  /**
-   * Testing Personal Attribute List's getComplexValueAttributes method with empty attribute list.
-   */
-  @Test
-  public void testGetComplexAttributesWithEmptyList() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    Assert.assertTrue(pal.getComplexAttributes().isEmpty());
-  }
-  
-  /**
-   * Testing Personal Attribute List's getComplexAttributes() method without complex attributes.
-   */
-  @Test
-  public void testGetComplexAttributesWithoutSimple() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(SIMPLE_ATTRLIST2);
-    Assert.assertTrue(pal.getComplexAttributes().isEmpty());
-  }
-  
-  /**
-   * Testing Personal Attribute List's getComplexAttributes() method with one complex attribute.
-   */
-  @Test
-  public void testGetComplexAttributesWithOneComplex() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(STR_MIX_ATTR_LIST);
-    Assert.assertTrue(pal.getComplexAttributes().size() == ONE_CONS);
-  }
-  
-  /**
-   * Testing Personal Attribute List's GetMandatoryAttributes method with only two Complex attribute.
-   */
-  @Test
-  public void testGetComplexAttributesWithOnlyComplex() {
-    final PersonalAttributeList pal = new PersonalAttributeList();
-    pal.populate(STR_MIX_ATTR_LIST2);
-    Assert.assertTrue(pal.getComplexAttributes().size() == TWO_CONS);
-  }
+    }
+
+    /**
+     * Testing Personal Attribute List's GetOptionalAttributes method with empty
+     * attribute list.
+     */
+    @Test
+    public void testGetOptionalAttributesWithEmptyList() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
+    }
+
+    /**
+     * Testing Personal Attribute List's GetOptionalAttributes method without
+     * optional attributes.
+     */
+    @Test
+    public void testGetOptionalAttributesWithoutOptional() {
+        final String strAttrList
+                = "isAgeOver:true:[15,]:Available;isAgeOver:true:[18,]:Available;";
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(strAttrList);
+        Assert.assertTrue(pal.getOptionalAttributes().isEmpty());
+    }
+
+    /**
+     * Testing Personal Attribute List's GetOptionalAttributes method with one
+     * optional attribute.
+     */
+    @Test
+    public void testGetOptionalAttributesWithOneOptional() {
+        final String strAttrList
+                = "age:false:[]:;isAgeOver:true:[15,]:;isAgeOver:true:[18,]:;";
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(strAttrList);
+        Assert.assertTrue(pal.getOptionalAttributes().size() == ONE_CONS);
+    }
+
+    /**
+     * Testing Personal Attribute List's GetOptionalAttributes method with two
+     * optional attribute.
+     */
+    @Test
+    public void testGetOptionalAttributesWithOnlyOptional() {
+        final String strAttrList
+                = "age:false:[]:;isAgeOver:false:[18,]:;";
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(strAttrList);
+        Assert.assertTrue(pal.getOptionalAttributes().size() == TWO_CONS);
+    }
+
+    /**
+     * Testing Personal Attribute List's getMandatoryAttributes method with
+     * empty attribute list.
+     */
+    @Test
+    public void testGetMandatoryAttributesWithEmptyList() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
+    }
+
+    /**
+     * Testing Personal Attribute List's getMandatoryAttributes method without
+     * mandatory attributes.
+     */
+    @Test
+    public void testGetMandatoryAttributesWithoutMandatory() {
+        final String strAttrList
+                = "isAgeOver:false:[15,]:Available;isAgeOver:false:[18,]:Available;";
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(strAttrList);
+        Assert.assertTrue(pal.getMandatoryAttributes().isEmpty());
+    }
+
+    /**
+     * Testing Personal Attribute List's GetMandatoryAttributes method with one
+     * mandatory attribute.
+     */
+    @Test
+    public void testGetMandatoryAttributesWithOneMandatory() {
+        final String strAttrList
+                = "age:true:[]:;isAgeOver:false:[15,]:;isAgeOver:false:[18,]:;";
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(strAttrList);
+        Assert.assertTrue(pal.getMandatoryAttributes().size() == ONE_CONS);
+    }
+
+    /**
+     * Testing Personal Attribute List's GetMandatoryAttributes method with two
+     * mandatory attribute.
+     */
+    @Test
+    public void testGetMandatoryAttributesWithOnlyMandatory() {
+        final String strAttrList
+                = "age:true:[]:;isAgeOver:true:[18,]:;";
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(strAttrList);
+        Assert.assertTrue(pal.getMandatoryAttributes().size() == TWO_CONS);
+    }
+
+    /**
+     * Testing Personal Attribute List's getSimpleValueAttributes method with
+     * empty attribute list.
+     */
+    @Test
+    public void testGetSimpleValueAttributesWithEmptyList() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
+    }
+
+    /**
+     * Testing Personal Attribute List's getSimpleValueAttributes() method
+     * without simple attributes.
+     */
+    @Test
+    public void testGetSimpleValueAttributesWithoutSimple() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(COMPLEX_ATTRLIST);
+        Assert.assertTrue(pal.getSimpleValueAttributes().isEmpty());
+    }
+
+    /**
+     * Testing Personal Attribute List's getSimpleValueAttributes() method with
+     * one simple attribute.
+     */
+    @Test
+    public void testGetSimpleValueAttributesWithOneSimple() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(STR_MIX_ATTR_LIST);
+        Assert.assertTrue(pal.getSimpleValueAttributes().size() == ONE_CONS);
+    }
+
+    /**
+     * Testing Personal Attribute List's GetMandatoryAttributes method with two
+     * simple attribute.
+     */
+    @Test
+    public void testGetSimpleValueAttributesWithOnlySimple() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(SIMPLE_ATTRLIST3);
+        Assert.assertTrue(pal.getSimpleValueAttributes().size() == ONE_CONS);
+    }
+
+    /**
+     * Testing Personal Attribute List's getComplexValueAttributes method with
+     * empty attribute list.
+     */
+    @Test
+    public void testGetComplexAttributesWithEmptyList() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        Assert.assertTrue(pal.getComplexAttributes().isEmpty());
+    }
+
+    /**
+     * Testing Personal Attribute List's getComplexAttributes() method without
+     * complex attributes.
+     */
+    @Test
+    public void testGetComplexAttributesWithoutSimple() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(SIMPLE_ATTRLIST2);
+        Assert.assertTrue(pal.getComplexAttributes().isEmpty());
+    }
+
+    /**
+     * Testing Personal Attribute List's getComplexAttributes() method with one
+     * complex attribute.
+     */
+    @Test
+    public void testGetComplexAttributesWithOneComplex() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(STR_MIX_ATTR_LIST);
+        Assert.assertTrue(pal.getComplexAttributes().size() == ONE_CONS);
+    }
+
+    /**
+     * Testing Personal Attribute List's GetMandatoryAttributes method with only
+     * two Complex attribute.
+     */
+    @Test
+    public void testGetComplexAttributesWithOnlyComplex() {
+        final IPersonalAttributeList pal = new PersonalAttributeList();
+        pal.populate(STR_MIX_ATTR_LIST2);
+        Assert.assertTrue(pal.getComplexAttributes().size() == TWO_CONS);
+    }
 
 }
diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java
index 458d510e0..82676ccf0 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/PersonalAttributeTestCase.java
@@ -17,8 +17,6 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.Assert;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -27,156 +25,167 @@ import eu.stork.peps.auth.commons.STORKStatusCode;
 
 /**
  * The PersonalAttribute's Test Case.
- * 
+ *
  * @author ricardo.ferreira@multicert.com, renato.portela@multicert.com,
- *         luis.felix@multicert.com, hugo.magalhaes@multicert.com,
- *         paulo.ribeiro@multicert.com
+ * luis.felix@multicert.com, hugo.magalhaes@multicert.com,
+ * paulo.ribeiro@multicert.com
  * @version $Revision: 1.4 $, $Date: 2010-11-17 05:17:03 $
  */
 public final class PersonalAttributeTestCase {
-  
-  /**
-   * An empty attribute.
-   */
-  private static final PersonalAttribute EMPTYATTR = new PersonalAttribute();
-  
-  /**
-   * An attribute with a complex value (canonicalResidenceAddress).
-   */
-  private static PersonalAttribute complexAttrValue = null;
-  
-  /**
-   * An attribute with a simple value (age).
-   */
-  @SuppressWarnings("serial")
-  private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute(
-    "age", true, new ArrayList<String>() {
-      {
-        add("15");
-      }
-    }, STORKStatusCode.STATUS_AVAILABLE.toString());
-  
-  /**
-   * Init PersonalAttributeTestCase class.
-   */
-  @SuppressWarnings("serial")
-  @BeforeClass
-  public static void runsBeforeTheTestSuite() {
-    final Map<String, String> values = new HashMap<String, String>() {
-      {
-        put("countryCodeAddress", "PT");
-        put("state", "Porto");
-        put("town", "Porto");
-        put("postalCode", "4100");
-        put("streetName", "Avenida Sidonio Pais");
-        put("streetNumber", "379");
-        put("apartmentNumber", "B");
-      }
-    };
-    
-    complexAttrValue =
-      new PersonalAttribute("canonicalResidenceAddress", true, values,
-        STORKStatusCode.STATUS_AVAILABLE.toString());
+
+    /**
+     * An empty attribute.
+     */
+    private static final PersonalAttribute EMPTYATTR = new PersonalAttribute();
+
+    /**
+     * An attribute with a complex value (canonicalResidenceAddress).
+     */
+    private static PersonalAttribute complexAttrValue = null;
+
+    /**
+     * An attribute with a simple value (age).
+     */
+    @SuppressWarnings("serial")
+    private static final PersonalAttribute ATTR_VALUE = new PersonalAttribute(
+            "age", true, new ArrayList<String>() {
+                {
+                    add("15");
+                }
+            }, STORKStatusCode.STATUS_AVAILABLE.toString());
+
+    /**
+     * Init PersonalAttributeTestCase class.
+     */
+    @SuppressWarnings("serial")
+    @BeforeClass
+    public static void runsBeforeTheTestSuite() {
+        final Map<String, String> values = new HashMap<String, String>() {
+            {
+                put("countryCodeAddress", "PT");
+                put("state", "Porto");
+                put("town", "Porto");
+                put("postalCode", "4100");
+                put("streetName", "Avenida Sidonio Pais");
+                put("streetNumber", "379");
+                put("apartmentNumber", "B");
+            }
+        };
+
+        complexAttrValue
+                = new PersonalAttribute("canonicalResidenceAddress", true, values,
+                        STORKStatusCode.STATUS_AVAILABLE.toString());
+
+    }
+
+    /**
+     * Tests the {@link PersonalAttribute#toString()} method for the given
+     * simple attribute value. Values must match.
+     */
+    @Test
+    public void testToStringValues() {
+      final String attrVal = ATTR_VALUE.toString();
+        assert "age:true:[15]:Available;".equals(attrVal);
+    }
+
+    /**
+     * Tests the {@link PersonalAttribute#toString()} method for the given
+     * complex attribute value. Values must match.
+     */
+    @Test
+    public void testToStringComplexValues() {
+      //We are testing normal attribute Canonical address, only one value!
+      final Map<String,String> complexAttrVal = complexAttrValue.getComplexValue();
+      final boolean testResult = containsKeyAndValue(complexAttrVal, "postalCode", "4100") &&
+        containsKeyAndValue(complexAttrVal, "apartmentNumber", "B") &&
+        containsKeyAndValue(complexAttrVal, "state", "Porto") &&
+        containsKeyAndValue(complexAttrVal, "countryCodeAddress", "PT") &&
+        containsKeyAndValue(complexAttrVal, "streetNumber", "379") &&
+        containsKeyAndValue(complexAttrVal, "streetName", "Avenida Sidonio Pais") &&
+        containsKeyAndValue(complexAttrVal, "town", "Porto");
+      assert  testResult;
+    }
     
-  }
-  
-  /**
-   * Tests the {@link PersonalAttribute#toString()} method for the given simple
-   * attribute value. Values must match.
-   */
-  @Test
-  public void testToStringValues() {
-    Assert.assertEquals("age:true:[15,]:Available;", ATTR_VALUE.toString());
-  }
-  
-  /**
-   * Tests the {@link PersonalAttribute#toString()} method for the given complex
-   * attribute value. Values must match.
-   */
-  @Test
-  public void testToStringComplexValues() {
-    Assert.assertEquals(
-      "canonicalResidenceAddress:true:[postalCode=4100,apartmentNumber=B,"
-        + "state=Porto,countryCodeAddress=PT,streetNumber=379,"
-        + "streetName=Avenida Sidonio Pais,town=Porto,]:Available;",
-      complexAttrValue.toString());
-  }
-  
-  /**
-   * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given
-   * empty attribute. Must return true.
-   */
-  @Test
-  public void testToIsEmptyStatusWithNull() {
-    Assert.assertTrue(EMPTYATTR.isEmptyStatus());
-  }
-  
-  /**
-   * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given
-   * new attribute. Must return true.
-   */
-  @Test
-  public void testToIsEmptyStatusWithEmptyString() {
-    final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
-    attr.setStatus("");
-    Assert.assertTrue(attr.isEmptyStatus());
-  }
-  
-  /**
-   * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given
-   * empty attribute. Must return true.
-   */
-  @Test
-  public void testToIsEmptyValueWithNull() {
-    final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
-    attr.setValue(null);
-    Assert.assertTrue(attr.isEmptyValue());
-  }
-  
-  /**
-   * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given
-   * empty attribute. Must return true.
-   */
-  @Test
-  public void testToIsEmptyValue() {
-    Assert.assertTrue(EMPTYATTR.isEmptyValue());
-  }
-  
-  /**
-   * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the
-   * given empty attribute. Must return true.
-   */
-  @Test
-  public void testToIsEmptyComplexValueWithNull() {
-    final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
-    attr.setComplexValue(null);
-    Assert.assertTrue(attr.isEmptyComplexValue());
-  }
-  
-  /**
-   * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the
-   * given empty attribute. Must return true.
-   */
-  @Test
-  public void testToIsEmptyComplexValueWithEmptyComplexValue() {
-    Assert.assertTrue(EMPTYATTR.isEmptyComplexValue());
-  }
-  
-  /**
-   * Tests the {@link PersonalAttribute#clone()} method for the given attribute.
-   * Must return true.
-   */
-  @Test
-  public void testCloneToComplexValue() {
-    Assert.assertNotSame(complexAttrValue, complexAttrValue.clone());
-  }
-  
-  /**
-   * Tests the {@link PersonalAttribute#clone()} method for the given attribute.
-   * Must return true.
-   */
-  @Test
-  public void testCloneToValue() {
-    Assert.assertNotSame(ATTR_VALUE, ATTR_VALUE.clone());
-  }
+    private boolean containsKeyAndValue(final Map<String,String> complexAttrVal, final String key, final String expectedValue) {
+      final boolean res = complexAttrVal.containsKey(key) && complexAttrVal.get(key).equals(expectedValue);
+      return res;
+    }
+
+    /**
+     * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given
+     * empty attribute. Must return true.
+     */
+    @Test
+    public void testToIsEmptyStatusWithNull() {
+        assert EMPTYATTR.isEmptyStatus();
+    }
+
+    /**
+     * Tests the {@link PersonalAttribute#isEmptyStatus()} method for the given
+     * new attribute. Must return true.
+     */
+    @Test
+    public void testToIsEmptyStatusWithEmptyString() {
+        final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
+        attr.setStatus("");
+        assert attr.isEmptyStatus();
+    }
+
+    /**
+     * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given
+     * empty attribute. Must return true.
+     */
+    @Test
+    public void testToIsEmptyValueWithNull() {
+        final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
+        attr.setValue(null);
+        assert attr.isEmptyValue();
+    }
+
+    /**
+     * Tests the {@link PersonalAttribute#isEmptyValue()} method for the given
+     * empty attribute. Must return true.
+     */
+    @Test
+    public void testToIsEmptyValue() {
+      assert EMPTYATTR.isEmptyValue();
+    }
+
+    /**
+     * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the
+     * given empty attribute. Must return true.
+     */
+    @Test
+    public void testToIsEmptyComplexValueWithNull() {
+        final PersonalAttribute attr = (PersonalAttribute) EMPTYATTR.clone();
+        attr.setComplexValue(null);
+        assert attr.isEmptyComplexValue();
+    }
+
+    /**
+     * Tests the {@link PersonalAttribute#isEmptyComplexValue()} method for the
+     * given empty attribute. Must return true.
+     */
+    @Test
+    public void testToIsEmptyComplexValueWithEmptyComplexValue() {
+      assert EMPTYATTR.isEmptyComplexValue();
+    }
+
+    /**
+     * Tests the {@link PersonalAttribute#clone()} method for the given
+     * attribute. Must return true.
+     */
+    @Test
+    public void testCloneToComplexValue() {
+      assert (complexAttrValue.getComplexValue().toString().equals(complexAttrValue.getComplexValue().toString()) && !complexAttrValue.equals(complexAttrValue.clone()));
+    }
+
+    /**
+     * Tests the {@link PersonalAttribute#clone()} method for the given
+     * attribute. Must return true.
+     */
+    @Test
+    public void testCloneToValue() {
+        assert !ATTR_VALUE.equals(ATTR_VALUE.clone());
+    }
 }
diff --git a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/package-info.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/package-info.java
index 452602210..37841dd03 100644
--- a/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/package-info.java
+++ b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/package-info.java
@@ -2,4 +2,3 @@
  * This package provides all JUnit test classes.

  */

 package eu.stork.peps.tests;

-

diff --git a/id/server/stork2-commons/src/test/resources/log4j.xml b/id/server/stork2-commons/src/test/resources/log4j.xml
index 0ad2ea9a4..2bba8b69f 100644
--- a/id/server/stork2-commons/src/test/resources/log4j.xml
+++ b/id/server/stork2-commons/src/test/resources/log4j.xml
@@ -2,18 +2,18 @@
 <!DOCTYPE log4j:configuration SYSTEM "log4j.dtd">
 
 <log4j:configuration xmlns:log4j="http://jakarta.apache.org/log4j/">
-	<appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
-		<param name="File" value="stork-commons.log" />
-		<param name="DatePattern" value="'.'yyyy-MM-dd" />
-		<param name="Append" value="true" />
-		<layout class="org.apache.log4j.PatternLayout">
-			<param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
-		</layout>
-	</appender>
+    <appender name="MainLogger" class="org.apache.log4j.DailyRollingFileAppender">
+        <param name="File" value="stork-commons.log" />
+        <param name="DatePattern" value="'.'yyyy-MM-dd" />
+        <param name="Append" value="true" />
+        <layout class="org.apache.log4j.PatternLayout">
+            <param name="ConversionPattern" value="%d{HH:mm:ss:SSS} - %p - %C{1} - %m%n" />
+        </layout>
+    </appender>
 
-	<root>
-		<priority value="info" />
-		<appender-ref ref="MainLogger" />
-	</root>
+    <root>
+        <priority value="info" />
+        <appender-ref ref="MainLogger" />
+    </root>
 
 </log4j:configuration>
diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 36df747e4..ee4a61f3a 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -13,11 +13,10 @@
 	<name>STORKSAMLEngine</name>

 	<properties>

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

-		<saml.version>1.4.0</saml.version>

+		<saml.version>1.5.1</saml.version>

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

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

-		<commons.version>1.4.0</commons.version>

-		<opensaml.version>2.6.2</opensaml.version>

+		<commons.version>1.5.1</commons.version>

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

 		<repositoryPath>${basedir}/../../../repository</repositoryPath>

 	</properties>

@@ -48,14 +47,14 @@
 		<dependency>

 			<groupId>eu.stork</groupId>

 			<artifactId>Commons</artifactId>

-			<version>${commons.version}</version>

-<!-- 			<exclusions>

-				<exclusion>

-					<groupId>org.bouncycastle</groupId>

-					<artifactId>bcprov-jdk16</artifactId>				

-				</exclusion>

-			</exclusions> -->

+			<version>1.5.1</version>

 		</dependency>

+		

+		<dependency>

+			<groupId>org.opensaml</groupId>

+			<artifactId>xmltooling</artifactId>

+        </dependency>

+		

 

 		<dependency>

 			<groupId>org.opensaml</groupId>

@@ -88,11 +87,6 @@
 			</exclusions>

 		</dependency>

 

-        <dependency>

-            <groupId>org.opensaml</groupId>

-            <artifactId>xmltooling</artifactId>

-            </dependency>

-

 		<dependency>

 			<groupId>org.slf4j</groupId>

 			<artifactId>slf4j-api</artifactId>

@@ -106,10 +100,9 @@
 			<groupId>org.slf4j</groupId>

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

 		</dependency>

-<!-- 		<dependency>

+<!--		<dependency>

 			<groupId>org.slf4j</groupId>

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

-			<version>1.7.6</version>

 		</dependency> -->

 		<dependency>

 			<groupId>org.slf4j</groupId>

@@ -153,30 +146,9 @@
 						<skip>true</skip>

 					</configuration>

 				</plugin>

-										

 			</plugins>

 		</pluginManagement>

 		<plugins>

-		

-<!-- 		           	 <plugin>

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

-            		<artifactId>properties-maven-plugin</artifactId>

-            		<version>1.0-alpha-2</version>

-            		<executions>

-                		<execution>

-                    		<phase>initialize</phase>

-                    		<goals>

-                        		<goal>read-project-properties</goal>

-                    		</goals>

-                    		<configuration>

-    	                   		<files>

-		                            <file>${basedir}/../../../moa-id.properties</file>

-      		                  </files>

-          		          </configuration>

-              		  </execution>

-            		</executions>

-        		</plugin> -->

-		

 			<plugin>

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

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

diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
index 26635e337..1dcaf4c95 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngine.java
@@ -64,10 +64,8 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
 import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
 
 /**
- * Class that wraps the operations over SAML tokens, both generation and
- * validation of SAML requests and SAML responses. Compliant with "OASIS Secure
- * Assertion Markup Language (SAML) 2.0, May 2005", but taking into account
- * STORK specific requirements.
+ * Class that wraps the operations over SAML tokens, both generation and validation of SAML requests and SAML responses. Compliant with "OASIS Secure Assertion Markup Language (SAML) 2.0, May 2005",
+ * but taking into account STORK specific requirements.
  * 
  * @author fjquevedo
  * @author iinigo
@@ -85,8 +83,7 @@ public class SAMLEngine {
 	private static Map<String, Map<String, Object>> instances;
 
 	/** The logger. */
-	private static final Logger LOG = LoggerFactory.getLogger(SAMLEngine.class
-			.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(SAMLEngine.class.getName());
 
 	/** The Constant MODULE_SIGN_CONF. */
 	private static final String MODULE_SIGN_CONF = "SignatureConf";
@@ -100,7 +97,14 @@ public class SAMLEngine {
 	/** The Constant SAML_ENGINE_FILE_CONF. */
 	private static final String SAML_ENGINE_FILE_CONF = "fileConfiguration";
 
-	/** The codification of characters. */
+	/**
+	 * Additional trust store for HW signing
+	 */
+	private static final String HW_TRUST_STORE_CONF = "softTrustStoreConfig";
+
+	/**
+	 * The codification of characters.
+	 */
 	private static final String CHARACTER_ENCODING = "UTF-8";
 
 	/** The SAML core. */
@@ -109,7 +113,6 @@ public class SAMLEngine {
 	/** The Module of Signature. */
 	private SAMLEngineSignI signer;
 
-
 	/** Initializes the SAML engine. */
 	/** Configure Document Builder Factory. */
 
@@ -134,23 +137,16 @@ public class SAMLEngine {
 	}
 
 	/**
-	 * Method that initializes the basic services for the SAML Engine, like the
-	 * OpenSAML library and the BouncyCastle provider.
+	 * Method that initializes the basic services for the SAML Engine, like the OpenSAML library and the BouncyCastle provider.
 	 */
 	private static void startUp() {
 
 		LOG.info("SAMLEngine: Initialize OpenSAML");
 
-
-
-/* Commented because it makes a problems with PVP2 MOA-ID
-		try {
-			DefaultBootstrap.bootstrap();
-		} catch (ConfigurationException e) {
-			LOG.error("Problem initializing the OpenSAML library.");
-			throw new STORKSAMLEngineRuntimeException(e);
-		}
-*/
+		/*
+		 * Commented because it makes a problems with PVP2 MOA-ID try { DefaultBootstrap.bootstrap(); } catch (ConfigurationException e) { LOG.error("Problem initializing the OpenSAML library.");
+		 * throw new STORKSAMLEngineRuntimeException(e); }
+		 */
 
 		LOG.debug("Read all file configurations. (instances of SAMLEngine)");
 		try {
@@ -162,8 +158,7 @@ public class SAMLEngine {
 
 		LOG.debug("Create all instances of saml engine. (instances of SAMLEngine)");
 		try {
-			instances = ConfigurationCreator
-					.createConfiguration(instanceConfigs);
+			instances = ConfigurationCreator.createConfiguration(instanceConfigs);
 		} catch (STORKSAMLEngineException e) {
 			LOG.error("Error initializing instances from Stork SAML engine.");
 			throw new STORKSAMLEngineRuntimeException(e);
@@ -173,12 +168,13 @@ public class SAMLEngine {
 	/**
 	 * Instantiates a new SAML engine.
 	 * 
-	 * @param nameInstance the name instance
+	 * @param nameInstance
+	 *            the name instance
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	protected SAMLEngine(final String nameInstance)
-			throws STORKSAMLEngineException {
+	protected SAMLEngine(final String nameInstance) throws STORKSAMLEngineException {
 		LOG.info("Loading Specific Configuration.");
 
 		LOG.debug("Create intance of saml messages.");
@@ -187,8 +183,7 @@ public class SAMLEngine {
 
 		if (instance == null || instance.isEmpty()) {
 			LOG.error("Instance: " + nameInstance + " not exist.");
-			throw new STORKSAMLEngineException("Instance: " + nameInstance
-					+ " not exist.");
+			throw new STORKSAMLEngineException("Instance: " + nameInstance + " not exist.");
 		}
 
 		Properties properties = (Properties) instance.get(SAML_ENGINE_CONF);
@@ -200,12 +195,10 @@ public class SAMLEngine {
 
 		samlCore = new STORKSAMLCore(properties);
 
-		final HashMap<String, String> propertiesSign = (HashMap<String, String>) instance
-				.get(MODULE_SIGN_CONF);
+		final HashMap<String, String> propertiesSign = (HashMap<String, String>) instance.get(MODULE_SIGN_CONF);
 
 		LOG.debug("Loading Module of sign.");
-		signer = SignModuleFactory.getInstance(propertiesSign
-				.get(SAML_ENGINE_SIGN_CLASS));
+		signer = SignModuleFactory.getInstance(propertiesSign.get(SAML_ENGINE_SIGN_CLASS));
 
 		try {
 			LOG.info("Initialize module of sign.");
@@ -213,8 +206,7 @@ public class SAMLEngine {
 			LOG.info("Load cryptographic service provider of module of sign.");
 			signer.loadCryptServiceProvider();
 		} catch (SAMLEngineException e) {
-			LOG.error("Error create signature module: "
-					+ propertiesSign.get(SAML_ENGINE_FILE_CONF));
+			LOG.error("Error create signature module: " + propertiesSign.get(SAML_ENGINE_FILE_CONF));
 			LOG.info("Exception" + e);
 			throw new STORKSAMLEngineException(e);
 		}
@@ -239,30 +231,28 @@ public class SAMLEngine {
 	}
 
 	/**
-	 * Method that transform the received SAML object into a byte array
-	 * representation.
+	 * Method that transform the received SAML object into a byte array representation.
 	 * 
-	 * @param samlToken the SAML token.
+	 * @param samlToken
+	 *            the SAML token.
 	 * 
 	 * @return the byte[] of the SAML token.
 	 * 
-	 * @throws SAMLEngineException the SAML engine exception
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
 	 */
-	private byte[] marshall(final XMLObject samlToken)
-			throws SAMLEngineException {
+	private byte[] marshall(final XMLObject samlToken) throws SAMLEngineException {
 
 		try {
 			javax.xml.parsers.DocumentBuilder docBuilder = null;
 
-			final MarshallerFactory marshallerFactory = Configuration
-					.getMarshallerFactory();
+			final MarshallerFactory marshallerFactory = Configuration.getMarshallerFactory();
 
 			final Marshaller marshaller;
 			if (samlToken.getElementQName().toString().endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
 				marshaller = new CustomAttributeQueryMarshaller();
 			else
-				marshaller = marshallerFactory
-				.getMarshaller(samlToken);
+				marshaller = marshallerFactory.getMarshaller(samlToken);
 
 			docBuilder = dbf.newDocumentBuilder();
 
@@ -274,13 +264,12 @@ public class SAMLEngine {
 			final DOMSource domSource = new DOMSource(doc);
 			final StringWriter writer = new StringWriter();
 			final StreamResult result = new StreamResult(writer);
-			final TransformerFactory transFactory = TransformerFactory
-					.newInstance();
+			final TransformerFactory transFactory = TransformerFactory.newInstance();
 			Transformer transformer;
 
 			transformer = transFactory.newTransformer();
 			transformer.transform(domSource, result);
-			LOG.debug("SAML request \n"+ writer.toString());
+			LOG.debug("SAML request \n" + writer.toString());
 			return writer.toString().getBytes(CHARACTER_ENCODING);
 
 		} catch (ParserConfigurationException e) {
@@ -304,14 +293,15 @@ public class SAMLEngine {
 	/**
 	 * Method that signs a SAML Token.
 	 * 
-	 * @param tokenSaml the token SAML
+	 * @param tokenSaml
+	 *            the token SAML
 	 * 
 	 * @return the SAML object sign
 	 * 
-	 * @throws SAMLEngineException the SAML engine exception
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
 	 */
-	private SignableSAMLObject sign(final SignableSAMLObject tokenSaml)
-			throws SAMLEngineException {
+	private SignableSAMLObject sign(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
 		LOG.debug("Sign SamlToken.");
 		signer.sign(tokenSaml);
 		return tokenSaml;
@@ -320,31 +310,32 @@ public class SAMLEngine {
 	/**
 	 * Sign and transform to byte array.
 	 * 
-	 * @param samlToken the SAML token
+	 * @param samlToken
+	 *            the SAML token
 	 * 
 	 * @return the byte[] of the SAML token
 	 * 
-	 * @throws SAMLEngineException the SAML engine exception
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
 	 */
-	protected final byte[] signAndMarshall(final SignableSAMLObject samlToken)
-			throws SAMLEngineException {
+	protected final byte[] signAndMarshall(final SignableSAMLObject samlToken) throws SAMLEngineException {
 		LOG.debug("Marshall Saml Token.");
 		SignableSAMLObject signElement = sign(samlToken);
 		return marshall(signElement);
 	}
 
 	/**
-	 * Method that unmarshalls a SAML Object from a byte array representation to
-	 * an XML Object.
+	 * Method that unmarshalls a SAML Object from a byte array representation to an XML Object.
 	 * 
-	 * @param samlToken Byte array representation of a SAML Object
+	 * @param samlToken
+	 *            Byte array representation of a SAML Object
 	 * 
 	 * @return XML Object (superclass of SAMLObject)
 	 * 
-	 * @throws SAMLEngineException the SAML engine exception
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
 	 */
-	protected final XMLObject unmarshall(final byte[] samlToken)
-			throws SAMLEngineException {
+	protected final XMLObject unmarshall(final byte[] samlToken) throws SAMLEngineException {
 		try {
 			// Get parser pool manager
 			final BasicParserPool ppMgr = new BasicParserPool();
@@ -358,12 +349,12 @@ public class SAMLEngine {
 
 			// Parse SAMLToken
 			Document document = ppMgr.parse(new ByteArrayInputStream(samlToken));
-			if (document != null){
+			if (document != null) {
 				final Element root = document.getDocumentElement();
 				// Get appropriate unmarshaller
 				final UnmarshallerFactory unmarshallerFact = Configuration.getUnmarshallerFactory();
 				// Unmarshall using the SAML Token root element
-				if (unmarshallerFact != null && root != null){
+				if (unmarshallerFact != null && root != null) {
 					final Unmarshaller unmarshaller;
 					if (root.getLocalName().equals(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
 						unmarshaller = new CustomAttributeQueryUnmarshaller();
@@ -371,7 +362,7 @@ public class SAMLEngine {
 						unmarshaller = unmarshallerFact.getUnmarshaller(root);
 					try {
 						return unmarshaller.unmarshall(root);
-					} catch (NullPointerException e){
+					} catch (NullPointerException e) {
 						LOG.error("Error element tag incomplet or null.");
 						throw new SAMLEngineException("NullPointerException", e);
 					}
@@ -398,14 +389,15 @@ public class SAMLEngine {
 	/**
 	 * Method that validates an XML Signature contained in a SAML Token.
 	 * 
-	 * @param samlToken the SAML token
+	 * @param samlToken
+	 *            the SAML token
 	 * 
 	 * @return the SAML object
 	 * 
-	 * @throws SAMLEngineException the SAML engine exception
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
 	 */
-	protected final SAMLObject validateSignature(
-			final SignableSAMLObject samlToken) throws SAMLEngineException {
+	protected final SAMLObject validateSignature(final SignableSAMLObject samlToken) throws SAMLEngineException {
 
 		LOG.info("Validate Signature");
 		signer.validateSignature(samlToken);
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngineUtils.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngineUtils.java
index 1efbb8b32..3cc323c96 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngineUtils.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/SAMLEngineUtils.java
@@ -96,72 +96,37 @@ public final class SAMLEngineUtils {
 	private static SecureRandomIdentifierGenerator generator;
 
 	/** The Constant LOG. */
-	private static final Logger LOG = LoggerFactory
-			.getLogger(SAMLEngineUtils.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(SAMLEngineUtils.class.getName());
 
 	/**
 	 * Method that generates a random value according to NCName grammar.
 	 * 
-	 * NCName ::= NCNameStartChar NCNameChar* NCNameChar ::= NameChar - ':'
-	 * NCNameStartChar ::= Letter | '_' NameStartChar ::= ":" | [A-Z] | "_" |
-	 * [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] | [#x370-#x37D] |
-	 * [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] |
-	 * [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF]
-	 * NameChar ::= NameStartChar | "-" | "." | [0-9] | #xB7 | [#x0300-#x036F] |
-	 * [#x203F-#x2040] Name ::= NameStartChar (NameChar)* Letter ::= BaseChar |
-	 * Ideographic BaseChar ::= [#x0041-#x005A] | [#x0061-#x007A] |
-	 * [#x00C0-#x00D6] | [#x00D8-#x00F6] | [#x00F8-#x00FF] | [#x0100-#x0131] |
-	 * [#x0134-#x013E] | [#x0141-#x0148] | [#x014A-#x017E] | [#x0180-#x01C3] |
-	 * [#x01CD-#x01F0] | [#x01F4-#x01F5] | [#x01FA-#x0217] | [#x0250-#x02A8] |
-	 * [#x02BB-#x02C1] | #x0386 | [#x0388-#x038A] | #x038C | [#x038E-#x03A1] |
-	 * [#x03A3-#x03CE] | [#x03D0-#x03D6] | #x03DA | #x03DC | #x03DE | #x03E0 |
-	 * [#x03E2-#x03F3] | [#x0401-#x040C] | [#x040E-#x044F] | [#x0451-#x045C] |
-	 * [#x045E-#x0481] | [#x0490-#x04C4] | [#x04C7-#x04C8] | [#x04CB-#x04CC] |
-	 * [#x04D0-#x04EB] | [#x04EE-#x04F5] | [#x04F8-#x04F9] | [#x0531-#x0556] |
-	 * #x0559 | [#x0561-#x0586] | [#x05D0-#x05EA] | [#x05F0-#x05F2] |
-	 * [#x0621-#x063A] | [#x0641-#x064A] | [#x0671-#x06B7] | [#x06BA-#x06BE] |
-	 * [#x06C0-#x06CE] | [#x06D0-#x06D3] | #x06D5 | [#x06E5-#x06E6] |
-	 * [#x0905-#x0939] | #x093D | [#x0958-#x0961] | [#x0985-#x098C] |
-	 * [#x098F-#x0990] | [#x0993-#x09A8] | [#x09AA-#x09B0] | #x09B2 |
-	 * [#x09B6-#x09B9] | [#x09DC-#x09DD] | [#x09DF-#x09E1] | [#x09F0-#x09F1] |
-	 * [#x0A05-#x0A0A] | [#x0A0F-#x0A10] | [#x0A13-#x0A28] | [#x0A2A-#x0A30] |
-	 * [#x0A32-#x0A33] | [#x0A35-#x0A36] | [#x0A38-#x0A39] | [#x0A59-#x0A5C] |
-	 * #x0A5E | [#x0A72-#x0A74] | [#x0A85-#x0A8B] | #x0A8D | [#x0A8F-#x0A91] |
-	 * [#x0A93-#x0AA8] | [#x0AAA-#x0AB0] | [#x0AB2-#x0AB3] | [#x0AB5-#x0AB9] |
-	 * #x0ABD | #x0AE0 | [#x0B05-#x0B0C] | [#x0B0F-#x0B10] | [#x0B13-#x0B28] |
-	 * [#x0B2A-#x0B30] | [#x0B32-#x0B33] | [#x0B36-#x0B39] | #x0B3D |
-	 * [#x0B5C-#x0B5D] | [#x0B5F-#x0B61] | [#x0B85-#x0B8A] | [#x0B8E-#x0B90] |
-	 * [#x0B92-#x0B95] | [#x0B99-#x0B9A] | #x0B9C | [#x0B9E-#x0B9F] |
-	 * [#x0BA3-#x0BA4] | [#x0BA8-#x0BAA] | [#x0BAE-#x0BB5] | [#x0BB7-#x0BB9] |
-	 * [#x0C05-#x0C0C] | [#x0C0E-#x0C10] | [#x0C12-#x0C28] | [#x0C2A-#x0C33] |
-	 * [#x0C35-#x0C39] | [#x0C60-#x0C61] | [#x0C85-#x0C8C] | [#x0C8E-#x0C90] |
-	 * [#x0C92-#x0CA8] | [#x0CAA-#x0CB3] | [#x0CB5-#x0CB9] | #x0CDE |
-	 * [#x0CE0-#x0CE1] | [#x0D05-#x0D0C] | [#x0D0E-#x0D10] | [#x0D12-#x0D28] |
-	 * [#x0D2A-#x0D39] | [#x0D60-#x0D61] | [#x0E01-#x0E2E] | #x0E30 |
-	 * [#x0E32-#x0E33] | [#x0E40-#x0E45] | [#x0E81-#x0E82] | #x0E84 |
-	 * [#x0E87-#x0E88] | #x0E8A | #x0E8D | [#x0E94-#x0E97] | [#x0E99-#x0E9F] |
-	 * [#x0EA1-#x0EA3] | #x0EA5 | #x0EA7 | [#x0EAA-#x0EAB] | [#x0EAD-#x0EAE] |
-	 * #x0EB0 | [#x0EB2-#x0EB3] | #x0EBD | [#x0EC0-#x0EC4] | [#x0F40-#x0F47] |
-	 * [#x0F49-#x0F69] | [#x10A0-#x10C5] | [#x10D0-#x10F6] | #x1100 |
-	 * [#x1102-#x1103] | [#x1105-#x1107] | #x1109 | [#x110B-#x110C] |
-	 * [#x110E-#x1112] | #x113C | #x113E | #x1140 | #x114C | #x114E | #x1150 |
-	 * [#x1154-#x1155] | #x1159 | [#x115F-#x1161] | #x1163 | #x1165 | #x1167 |
-	 * #x1169 | [#x116D-#x116E] | [#x1172-#x1173] | #x1175 | #x119E | #x11A8 |
-	 * #x11AB | [#x11AE-#x11AF] | [#x11B7-#x11B8] | #x11BA | [#x11BC-#x11C2] |
-	 * #x11EB | #x11F0 | #x11F9 | [#x1E00-#x1E9B] | [#x1EA0-#x1EF9] |
-	 * [#x1F00-#x1F15] | [#x1F18-#x1F1D] | [#x1F20-#x1F45] | [#x1F48-#x1F4D] |
-	 * [#x1F50-#x1F57] | #x1F59 | #x1F5B | #x1F5D | [#x1F5F-#x1F7D] |
-	 * [#x1F80-#x1FB4] | [#x1FB6-#x1FBC] | #x1FBE | [#x1FC2-#x1FC4] |
-	 * [#x1FC6-#x1FCC] | [#x1FD0-#x1FD3] | [#x1FD6-#x1FDB] | [#x1FE0-#x1FEC] |
-	 * [#x1FF2-#x1FF4] | [#x1FF6-#x1FFC] | #x2126 | [#x212A-#x212B] | #x212E |
-	 * [#x2180-#x2182] | [#x3041-#x3094] | [#x30A1-#x30FA] | [#x3105-#x312C] |
-	 * [#xAC00-#xD7A3] Ideographic ::= [#x4E00-#x9FA5] | #x3007 |
+	 * NCName ::= NCNameStartChar NCNameChar* NCNameChar ::= NameChar - ':' NCNameStartChar ::= Letter | '_' NameStartChar ::= ":" | [A-Z] | "_" | [a-z] | [#xC0-#xD6] | [#xD8-#xF6] | [#xF8-#x2FF] |
+	 * [#x370-#x37D] | [#x37F-#x1FFF] | [#x200C-#x200D] | [#x2070-#x218F] | [#x2C00-#x2FEF] | [#x3001-#xD7FF] | [#xF900-#xFDCF] | [#xFDF0-#xFFFD] | [#x10000-#xEFFFF] NameChar ::= NameStartChar | "-" |
+	 * "." | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040] Name ::= NameStartChar (NameChar)* Letter ::= BaseChar | Ideographic BaseChar ::= [#x0041-#x005A] | [#x0061-#x007A] | [#x00C0-#x00D6] |
+	 * [#x00D8-#x00F6] | [#x00F8-#x00FF] | [#x0100-#x0131] | [#x0134-#x013E] | [#x0141-#x0148] | [#x014A-#x017E] | [#x0180-#x01C3] | [#x01CD-#x01F0] | [#x01F4-#x01F5] | [#x01FA-#x0217] |
+	 * [#x0250-#x02A8] | [#x02BB-#x02C1] | #x0386 | [#x0388-#x038A] | #x038C | [#x038E-#x03A1] | [#x03A3-#x03CE] | [#x03D0-#x03D6] | #x03DA | #x03DC | #x03DE | #x03E0 | [#x03E2-#x03F3] |
+	 * [#x0401-#x040C] | [#x040E-#x044F] | [#x0451-#x045C] | [#x045E-#x0481] | [#x0490-#x04C4] | [#x04C7-#x04C8] | [#x04CB-#x04CC] | [#x04D0-#x04EB] | [#x04EE-#x04F5] | [#x04F8-#x04F9] |
+	 * [#x0531-#x0556] | #x0559 | [#x0561-#x0586] | [#x05D0-#x05EA] | [#x05F0-#x05F2] | [#x0621-#x063A] | [#x0641-#x064A] | [#x0671-#x06B7] | [#x06BA-#x06BE] | [#x06C0-#x06CE] | [#x06D0-#x06D3] |
+	 * #x06D5 | [#x06E5-#x06E6] | [#x0905-#x0939] | #x093D | [#x0958-#x0961] | [#x0985-#x098C] | [#x098F-#x0990] | [#x0993-#x09A8] | [#x09AA-#x09B0] | #x09B2 | [#x09B6-#x09B9] | [#x09DC-#x09DD] |
+	 * [#x09DF-#x09E1] | [#x09F0-#x09F1] | [#x0A05-#x0A0A] | [#x0A0F-#x0A10] | [#x0A13-#x0A28] | [#x0A2A-#x0A30] | [#x0A32-#x0A33] | [#x0A35-#x0A36] | [#x0A38-#x0A39] | [#x0A59-#x0A5C] | #x0A5E |
+	 * [#x0A72-#x0A74] | [#x0A85-#x0A8B] | #x0A8D | [#x0A8F-#x0A91] | [#x0A93-#x0AA8] | [#x0AAA-#x0AB0] | [#x0AB2-#x0AB3] | [#x0AB5-#x0AB9] | #x0ABD | #x0AE0 | [#x0B05-#x0B0C] | [#x0B0F-#x0B10] |
+	 * [#x0B13-#x0B28] | [#x0B2A-#x0B30] | [#x0B32-#x0B33] | [#x0B36-#x0B39] | #x0B3D | [#x0B5C-#x0B5D] | [#x0B5F-#x0B61] | [#x0B85-#x0B8A] | [#x0B8E-#x0B90] | [#x0B92-#x0B95] | [#x0B99-#x0B9A] |
+	 * #x0B9C | [#x0B9E-#x0B9F] | [#x0BA3-#x0BA4] | [#x0BA8-#x0BAA] | [#x0BAE-#x0BB5] | [#x0BB7-#x0BB9] | [#x0C05-#x0C0C] | [#x0C0E-#x0C10] | [#x0C12-#x0C28] | [#x0C2A-#x0C33] | [#x0C35-#x0C39] |
+	 * [#x0C60-#x0C61] | [#x0C85-#x0C8C] | [#x0C8E-#x0C90] | [#x0C92-#x0CA8] | [#x0CAA-#x0CB3] | [#x0CB5-#x0CB9] | #x0CDE | [#x0CE0-#x0CE1] | [#x0D05-#x0D0C] | [#x0D0E-#x0D10] | [#x0D12-#x0D28] |
+	 * [#x0D2A-#x0D39] | [#x0D60-#x0D61] | [#x0E01-#x0E2E] | #x0E30 | [#x0E32-#x0E33] | [#x0E40-#x0E45] | [#x0E81-#x0E82] | #x0E84 | [#x0E87-#x0E88] | #x0E8A | #x0E8D | [#x0E94-#x0E97] |
+	 * [#x0E99-#x0E9F] | [#x0EA1-#x0EA3] | #x0EA5 | #x0EA7 | [#x0EAA-#x0EAB] | [#x0EAD-#x0EAE] | #x0EB0 | [#x0EB2-#x0EB3] | #x0EBD | [#x0EC0-#x0EC4] | [#x0F40-#x0F47] | [#x0F49-#x0F69] |
+	 * [#x10A0-#x10C5] | [#x10D0-#x10F6] | #x1100 | [#x1102-#x1103] | [#x1105-#x1107] | #x1109 | [#x110B-#x110C] | [#x110E-#x1112] | #x113C | #x113E | #x1140 | #x114C | #x114E | #x1150 |
+	 * [#x1154-#x1155] | #x1159 | [#x115F-#x1161] | #x1163 | #x1165 | #x1167 | #x1169 | [#x116D-#x116E] | [#x1172-#x1173] | #x1175 | #x119E | #x11A8 | #x11AB | [#x11AE-#x11AF] | [#x11B7-#x11B8] |
+	 * #x11BA | [#x11BC-#x11C2] | #x11EB | #x11F0 | #x11F9 | [#x1E00-#x1E9B] | [#x1EA0-#x1EF9] | [#x1F00-#x1F15] | [#x1F18-#x1F1D] | [#x1F20-#x1F45] | [#x1F48-#x1F4D] | [#x1F50-#x1F57] | #x1F59 |
+	 * #x1F5B | #x1F5D | [#x1F5F-#x1F7D] | [#x1F80-#x1FB4] | [#x1FB6-#x1FBC] | #x1FBE | [#x1FC2-#x1FC4] | [#x1FC6-#x1FCC] | [#x1FD0-#x1FD3] | [#x1FD6-#x1FDB] | [#x1FE0-#x1FEC] | [#x1FF2-#x1FF4] |
+	 * [#x1FF6-#x1FFC] | #x2126 | [#x212A-#x212B] | #x212E | [#x2180-#x2182] | [#x3041-#x3094] | [#x30A1-#x30FA] | [#x3105-#x312C] | [#xAC00-#xD7A3] Ideographic ::= [#x4E00-#x9FA5] | #x3007 |
 	 * [#x3021-#x3029]
 	 * 
 	 * @return Random ID value
 	 */
 
-	//Initialization of a generator of identifiers for all token SAML.
+	// Initialization of a generator of identifiers for all token SAML.
 	static {
 		loadRandomIdentifierGenerator();
 	}
@@ -169,7 +134,8 @@ public final class SAMLEngineUtils {
 	/**
 	 * Load random identifier generator.
 	 *
-	 *@throws STORKSAMLEngineRuntimeException the STORKSAML engine runtime exception
+	 * @throws STORKSAMLEngineRuntimeException
+	 *             the STORKSAML engine runtime exception
 	 */
 	private static void loadRandomIdentifierGenerator() {
 		try {
@@ -184,49 +150,48 @@ public final class SAMLEngineUtils {
 	/**
 	 * Creates the SAML object.
 	 * 
-	 * @param qname the QName
+	 * @param qname
+	 *            the QName
 	 * 
 	 * @return the XML object
 	 */
 	public static XMLObject createSamlObject(final QName qname) {
-		if (qname.toString().endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
-		{
+		if (qname.toString().endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
 			CustomAttributeQueryBuilder builder = new CustomAttributeQueryBuilder();
 			return builder.buildObject(qname);
-		}
-		else
-		{
-			return Configuration.getBuilderFactory().getBuilder(qname).buildObject(
-					qname);
+		} else {
+			return Configuration.getBuilderFactory().getBuilder(qname).buildObject(qname);
 		}
 	}
 
 	/**
 	 * Creates the SAML object.
 	 * 
-	 * @param qname the quality name
-	 * @param qname1 the qname1
+	 * @param qname
+	 *            the quality name
+	 * @param qname1
+	 *            the qname1
 	 * 
 	 * @return the xML object
 	 */
-	public static XMLObject createSamlObject(final QName qname,
-			final QName qname1) {
-		return Configuration.getBuilderFactory().getBuilder(qname1)
-				.buildObject(qname, qname1);
+	public static XMLObject createSamlObject(final QName qname, final QName qname1) {
+		return Configuration.getBuilderFactory().getBuilder(qname1).buildObject(qname, qname1);
 	}
 
 	/**
 	 * Encode value with an specific algorithm.
 	 * 
-	 * @param value the value
-	 * @param alg the algorithm
+	 * @param value
+	 *            the value
+	 * @param alg
+	 *            the algorithm
 	 * 
 	 * @return the string
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public static String encode(final String value, final String alg)
-			throws STORKSAMLEngineException {
+	public static String encode(final String value, final String alg) throws STORKSAMLEngineException {
 		LOG.debug("Encode value with  " + alg + " algorithm.");
 		byte[] buffer;
 		final StringBuffer hash = new StringBuffer("");
@@ -257,16 +222,18 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate assertion.
 	 * 
-	 * @param version the version
-	 * @param identifier the identifier
-	 * @param issueInstant the issue instant
-	 * @param issuer the issuer
+	 * @param version
+	 *            the version
+	 * @param identifier
+	 *            the identifier
+	 * @param issueInstant
+	 *            the issue instant
+	 * @param issuer
+	 *            the issuer
 	 * 
 	 * @return the assertion
 	 */
-	public static Assertion generateAssertion(final SAMLVersion version,
-			final String identifier, final DateTime issueInstant,
-			final Issuer issuer) {
+	public static Assertion generateAssertion(final SAMLVersion version, final String identifier, final DateTime issueInstant, final Issuer issuer) {
 		final AssertionBuilder assertionBuilder = new AssertionBuilder();
 		final Assertion assertion = assertionBuilder.buildObject();
 		assertion.setVersion(version);
@@ -280,16 +247,16 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate authentication statement.
 	 * 
-	 * @param authnInstant the authentication instant
-	 * @param authnContext the authentication context
+	 * @param authnInstant
+	 *            the authentication instant
+	 * @param authnContext
+	 *            the authentication context
 	 * 
 	 * @return the authentication statement
 	 */
-	public static AuthnStatement generateAthnStatement(final DateTime authnInstant,
-			final AuthnContext authnContext) {
+	public static AuthnStatement generateAthnStatement(final DateTime authnInstant, final AuthnContext authnContext) {
 		// <saml:AuthnStatement>
-		final AuthnStatement authnStatement = (AuthnStatement) SAMLEngineUtils
-				.createSamlObject(AuthnStatement.DEFAULT_ELEMENT_NAME);
+		final AuthnStatement authnStatement = (AuthnStatement) SAMLEngineUtils.createSamlObject(AuthnStatement.DEFAULT_ELEMENT_NAME);
 		authnStatement.setAuthnInstant(authnInstant);
 		authnStatement.setAuthnContext(authnContext);
 		return authnStatement;
@@ -298,51 +265,45 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate attribute from a list of values.
 	 *
-	 * @param name the name of the attribute.
-	 * @param status the status of the parameter: "Available", "NotAvailable" or
-	 * "Withheld".
-	 * @param values the value of the attribute.
-	 * @param isHashing the is hashing with "SHA-512" algorithm.
+	 * @param name
+	 *            the name of the attribute.
+	 * @param status
+	 *            the status of the parameter: "Available", "NotAvailable" or "Withheld".
+	 * @param values
+	 *            the value of the attribute.
+	 * @param isHashing
+	 *            the is hashing with "SHA-512" algorithm.
 	 * @return the attribute
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public static Attribute generateAttrComplex(final String name,
-			final String status, final Map<String, String> values,
-			final boolean isHashing) throws STORKSAMLEngineException {
+	public static Attribute generateAttrComplex(final String name, final String status, final Map<String, String> values, final boolean isHashing) throws STORKSAMLEngineException {
 		LOG.debug("Generate attribute complex: " + name);
-		final Attribute attribute = (Attribute) SAMLEngineUtils
-				.createSamlObject(Attribute.DEFAULT_ELEMENT_NAME);
+		final Attribute attribute = (Attribute) SAMLEngineUtils.createSamlObject(Attribute.DEFAULT_ELEMENT_NAME);
 
 		attribute.setName(name);
 		attribute.setNameFormat(Attribute.URI_REFERENCE);
-		attribute.getUnknownAttributes().put(
-				new QName(SAMLCore.STORK10_NS.getValue(), "AttributeStatus",
-						SAMLCore.STORK10_PREFIX.getValue()), status);
+		attribute.getUnknownAttributes().put(new QName(SAMLCore.STORK10_NS.getValue(), "AttributeStatus", SAMLCore.STORK10_PREFIX.getValue()), status);
 
 		if (!values.isEmpty()) {
 			LOG.debug("Add attribute values.");
 			// Create an attribute that contains all XSAny elements.
-			final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(
-					AttributeValue.DEFAULT_ELEMENT_NAME, XSAny.TYPE_NAME);
-			final Iterator<Entry<String, String>> iterator = values.entrySet()
-					.iterator();
+			final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSAny.TYPE_NAME);
+			final Iterator<Entry<String, String>> iterator = values.entrySet().iterator();
 			while (iterator.hasNext()) {
 				final Map.Entry<String, String> pairs = iterator.next();
 				final String value = pairs.getValue();
 
 				if (StringUtils.isNotBlank(value)) {
 					// Create the attribute statement
-					final XSAny attrValueSimple = (XSAny) SAMLEngineUtils
-							.createSamlObject(new QName(SAMLCore.STORK10_NS.getValue(),
-									pairs.getKey().toString(),
-									SAMLCore.STORK10_PREFIX.getValue()), XSAny.TYPE_NAME);
+					final XSAny attrValueSimple = (XSAny) SAMLEngineUtils.createSamlObject(new QName(SAMLCore.STORK10_NS.getValue(), pairs.getKey().toString(), SAMLCore.STORK10_PREFIX.getValue()),
+							XSAny.TYPE_NAME);
 					// if it's necessary encode the information.
 					if (isHashing) {
-						attrValueSimple
-						.setTextContent(encode(value, SHA_512));
+						attrValueSimple.setTextContent(encode(value, SHA_512));
 					} else {
 						attrValueSimple.setTextContent(value);
-					}		    
+					}
 					attrValue.getUnknownXMLObjects().add(attrValueSimple);
 					attribute.getAttributeValues().add(attrValue);
 				}
@@ -359,8 +320,7 @@ public final class SAMLEngineUtils {
 	 */
 	public static Extensions generateExtension() {
 		final ExtensionsBuilder extensionsBuilder = new ExtensionsBuilder();
-		return extensionsBuilder.buildObject(
-				"urn:oasis:names:tc:SAML:2.0:protocol", "Extensions", "saml2p");
+		return extensionsBuilder.buildObject("urn:oasis:names:tc:SAML:2.0:protocol", "Extensions", "saml2p");
 	}
 
 	/**
@@ -369,8 +329,7 @@ public final class SAMLEngineUtils {
 	 * @return the issuer
 	 */
 	public static Issuer generateIssuer() {
-		return (Issuer) SAMLEngineUtils
-				.createSamlObject(Issuer.DEFAULT_ELEMENT_NAME);
+		return (Issuer) SAMLEngineUtils.createSamlObject(Issuer.DEFAULT_ELEMENT_NAME);
 	}
 
 	/**
@@ -379,8 +338,7 @@ public final class SAMLEngineUtils {
 	 * @return the key info
 	 */
 	public static KeyInfo generateKeyInfo() {
-		return (KeyInfo) SAMLEngineUtils
-				.createSamlObject(KeyInfo.DEFAULT_ELEMENT_NAME);
+		return (KeyInfo) SAMLEngineUtils.createSamlObject(KeyInfo.DEFAULT_ELEMENT_NAME);
 	}
 
 	/**
@@ -389,25 +347,24 @@ public final class SAMLEngineUtils {
 	 * @return the name id
 	 */
 	public static NameID generateNameID() {
-		return (NameID) SAMLEngineUtils
-				.createSamlObject(NameID.DEFAULT_ELEMENT_NAME);
+		return (NameID) SAMLEngineUtils.createSamlObject(NameID.DEFAULT_ELEMENT_NAME);
 	}
 
 	/**
 	 * Generate name id.
 	 * 
-	 * @param nameQualifier the name qualifier
-	 * @param format the format
-	 * @param spNameQualifier the sP name qualifier
+	 * @param nameQualifier
+	 *            the name qualifier
+	 * @param format
+	 *            the format
+	 * @param spNameQualifier
+	 *            the sP name qualifier
 	 * 
 	 * @return the name id
 	 */
-	public static NameID generateNameID(final String nameQualifier,
-			final String format, final String spNameQualifier) {
+	public static NameID generateNameID(final String nameQualifier, final String format, final String spNameQualifier) {
 		// <saml:NameID>
-		final NameID nameId = (NameID) Configuration.getBuilderFactory()
-				.getBuilder(NameID.DEFAULT_ELEMENT_NAME).buildObject(
-						NameID.DEFAULT_ELEMENT_NAME);
+		final NameID nameId = (NameID) Configuration.getBuilderFactory().getBuilder(NameID.DEFAULT_ELEMENT_NAME).buildObject(NameID.DEFAULT_ELEMENT_NAME);
 		// optional
 		nameId.setNameQualifier(nameQualifier);
 		// optional
@@ -429,18 +386,18 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate the quality authentication assurance level.
 	 * 
-	 * @param qaal the level of quality authentication assurance.
+	 * @param qaal
+	 *            the level of quality authentication assurance.
 	 * 
 	 * @return the quality authentication assurance attribute
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public static QAAAttribute generateQAAAttribute(final int qaal)
-			throws STORKSAMLEngineException {
+	public static QAAAttribute generateQAAAttribute(final int qaal) throws STORKSAMLEngineException {
 		LOG.debug("Generate QAAAttribute.");
 
-		final QAAAttribute qaaAttribute = (QAAAttribute) SAMLEngineUtils
-				.createSamlObject(QAAAttribute.DEF_ELEMENT_NAME);
+		final QAAAttribute qaaAttribute = (QAAAttribute) SAMLEngineUtils.createSamlObject(QAAAttribute.DEF_ELEMENT_NAME);
 		qaaAttribute.setQaaLevel(String.valueOf(qaal));
 		return qaaAttribute;
 	}
@@ -448,20 +405,21 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate requested attribute.
 	 * 
-	 * @param name the name
-	 * @param friendlyName the friendly name
-	 * @param isRequired the is required
-	 * @param value the value
+	 * @param name
+	 *            the name
+	 * @param friendlyName
+	 *            the friendly name
+	 * @param isRequired
+	 *            the is required
+	 * @param value
+	 *            the value
 	 * 
 	 * @return the requested attribute
 	 */
-	public static RequestedAttribute generateReqAuthnAttributeSimple(
-			final String name, final String friendlyName,
-			final String isRequired, final List<String> value) {
+	public static RequestedAttribute generateReqAuthnAttributeSimple(final String name, final String friendlyName, final String isRequired, final List<String> value) {
 		LOG.debug("Generate the requested attribute.");
 
-		final RequestedAttribute requested = (RequestedAttribute) SAMLEngineUtils
-				.createSamlObject(RequestedAttribute.DEF_ELEMENT_NAME);
+		final RequestedAttribute requested = (RequestedAttribute) SAMLEngineUtils.createSamlObject(RequestedAttribute.DEF_ELEMENT_NAME);
 		requested.setName(name);
 		requested.setNameFormat(RequestedAttribute.URI_REFERENCE);
 
@@ -473,26 +431,22 @@ public final class SAMLEngineUtils {
 		if (!value.isEmpty()) {
 			for (int nextValue = 0; nextValue < value.size(); nextValue++) {
 				final String valor = value.get(nextValue);
-				if (StringUtils.isNotBlank(valor)) {			
+				if (StringUtils.isNotBlank(valor)) {
 
-					if(!name.equals("http://www.stork.gov.eu/1.0/signedDoc")){
+					if (!name.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
 
 						// Create the attribute statement
-						final XSAny attrValue = (XSAny) SAMLEngineUtils
-								.createSamlObject(
-										new QName(SAMLCore.STORK10_NS.getValue(),
-												"AttributeValue",
-												SAMLCore.STORK10_PREFIX.getValue()),
-												XSAny.TYPE_NAME);
+						final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(new QName(SAMLCore.STORK10_NS.getValue(), "AttributeValue", SAMLCore.STORK10_PREFIX.getValue()),
+								XSAny.TYPE_NAME);
 
 						attrValue.setTextContent(valor.trim());
 						requested.getAttributeValues().add(attrValue);
 
-					}else{		    	
+					} else {
 
 						DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
-						domFactory.setNamespaceAware(true); 		 
-						Document document = null;				
+						domFactory.setNamespaceAware(true);
+						Document document = null;
 						DocumentBuilder builder;
 
 						// Parse the signedDoc value into an XML DOM Document
@@ -501,7 +455,7 @@ public final class SAMLEngineUtils {
 							InputStream is;
 							is = new ByteArrayInputStream(valor.trim().getBytes(UTF_8));
 							document = builder.parse(is);
-							is.close();						
+							is.close();
 						} catch (SAXException e1) {
 							LOG.error("SAX Error while parsing signModule attribute", e1);
 							throw new STORKSAMLEngineRuntimeException(e1);
@@ -517,31 +471,21 @@ public final class SAMLEngineUtils {
 						}
 
 						// Create the XML statement(this will be overwritten with the previous DOM structure)
-						final XSAny xmlValue = (XSAny) SAMLEngineUtils
-								.createSamlObject(
-										new QName(SAMLCore.STORK10_NS.getValue(),
-												"XMLValue",
-												SAMLCore.STORK10_PREFIX.getValue()),
-												XSAny.TYPE_NAME);	
-
-						//Set the signedDoc XML content to this element
+						final XSAny xmlValue = (XSAny) SAMLEngineUtils.createSamlObject(new QName(SAMLCore.STORK10_NS.getValue(), "XMLValue", SAMLCore.STORK10_PREFIX.getValue()), XSAny.TYPE_NAME);
+
+						// Set the signedDoc XML content to this element
 						xmlValue.setDOM(document.getDocumentElement());
 
 						// Create the attribute statement
-						final XSAny attrValue = (XSAny) SAMLEngineUtils
-								.createSamlObject(
-										new QName(SAMLCore.STORK10_NS.getValue(),
-												"AttributeValue",
-												SAMLCore.STORK10_PREFIX.getValue()),
-												XSAny.TYPE_NAME);	
-
-						//Add previous signedDocXML to the AttributeValue Element
+						final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(new QName(SAMLCore.STORK10_NS.getValue(), "AttributeValue", SAMLCore.STORK10_PREFIX.getValue()),
+								XSAny.TYPE_NAME);
+
+						// Add previous signedDocXML to the AttributeValue Element
 						attrValue.getUnknownXMLObjects().add(xmlValue);
 
-						requested.getAttributeValues().add(attrValue);		    	
+						requested.getAttributeValues().add(attrValue);
 					}
 
-
 				}
 			}
 		}
@@ -552,18 +496,19 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate response.
 	 * 
-	 * @param version the version
-	 * @param identifier the identifier
-	 * @param issueInstant the issue instant
-	 * @param status the status
+	 * @param version
+	 *            the version
+	 * @param identifier
+	 *            the identifier
+	 * @param issueInstant
+	 *            the issue instant
+	 * @param status
+	 *            the status
 	 * 
 	 * @return the response
 	 */
-	public static Response generateResponse(final SAMLVersion version,
-			final String identifier, final DateTime issueInstant,
-			final Status status) {
-		final Response response = (Response) SAMLEngineUtils
-				.createSamlObject(Response.DEFAULT_ELEMENT_NAME);
+	public static Response generateResponse(final SAMLVersion version, final String identifier, final DateTime issueInstant, final Status status) {
+		final Response response = (Response) SAMLEngineUtils.createSamlObject(Response.DEFAULT_ELEMENT_NAME);
 		response.setID(identifier);
 		response.setIssueInstant(issueInstant);
 		response.setStatus(status);
@@ -571,20 +516,20 @@ public final class SAMLEngineUtils {
 	}
 
 	/**
-	 * Method that generates a SAML Authentication Request basing on the
-	 * provided information.
+	 * Method that generates a SAML Authentication Request basing on the provided information.
 	 * 
-	 * @param identifier the identifier
-	 * @param version the version
-	 * @param issueInstant the issue instant
+	 * @param identifier
+	 *            the identifier
+	 * @param version
+	 *            the version
+	 * @param issueInstant
+	 *            the issue instant
 	 * 
 	 * @return the authentication request
 	 */
-	public static AuthnRequest generateSAMLAuthnRequest(final String identifier,
-			final SAMLVersion version, final DateTime issueInstant) {
+	public static AuthnRequest generateSAMLAuthnRequest(final String identifier, final SAMLVersion version, final DateTime issueInstant) {
 		LOG.debug("Generate basic authentication request.");
-		final AuthnRequest authnRequest = (AuthnRequest) SAMLEngineUtils
-				.createSamlObject(AuthnRequest.DEFAULT_ELEMENT_NAME);
+		final AuthnRequest authnRequest = (AuthnRequest) SAMLEngineUtils.createSamlObject(AuthnRequest.DEFAULT_ELEMENT_NAME);
 
 		authnRequest.setID(identifier);
 		authnRequest.setVersion(version);
@@ -592,11 +537,9 @@ public final class SAMLEngineUtils {
 		return authnRequest;
 	}
 
-	public static CustomAttributeQuery generateSAMLAttrQueryRequest(final String identifier,
-			final SAMLVersion version, final DateTime issueInstant) {
+	public static CustomAttributeQuery generateSAMLAttrQueryRequest(final String identifier, final SAMLVersion version, final DateTime issueInstant) {
 		LOG.debug("Generate attribute query request.");
-		final CustomAttributeQuery attrQueryRequest = (CustomAttributeQuery) SAMLEngineUtils
-				.createSamlObject(CustomAttributeQuery.DEFAULT_ELEMENT_NAME);
+		final CustomAttributeQuery attrQueryRequest = (CustomAttributeQuery) SAMLEngineUtils.createSamlObject(CustomAttributeQuery.DEFAULT_ELEMENT_NAME);
 
 		attrQueryRequest.setID(identifier);
 		attrQueryRequest.setVersion(version);
@@ -604,12 +547,9 @@ public final class SAMLEngineUtils {
 		return attrQueryRequest;
 	}
 
-	public static LogoutRequest generateSAMLLogoutRequest(final String identifier,
-			final SAMLVersion version, final DateTime issueInstant) {
+	public static LogoutRequest generateSAMLLogoutRequest(final String identifier, final SAMLVersion version, final DateTime issueInstant) {
 		LOG.debug("Generate logout request.");
-		final LogoutRequest logoutRequest = (LogoutRequest)SAMLEngineUtils.
-				createSamlObject(LogoutRequest.DEFAULT_ELEMENT_NAME);
-
+		final LogoutRequest logoutRequest = (LogoutRequest) SAMLEngineUtils.createSamlObject(LogoutRequest.DEFAULT_ELEMENT_NAME);
 
 		logoutRequest.setID(identifier);
 		logoutRequest.setVersion(version);
@@ -617,12 +557,9 @@ public final class SAMLEngineUtils {
 		return logoutRequest;
 	}
 
-	public static LogoutResponse generateSAMLLogoutResponse(final String identifier,
-			final SAMLVersion version, final DateTime issueInstant, 
-			final Status status, final String inResponseTo) {
+	public static LogoutResponse generateSAMLLogoutResponse(final String identifier, final SAMLVersion version, final DateTime issueInstant, final Status status, final String inResponseTo) {
 		LOG.debug("Generate logout response.");
-		final LogoutResponse logoutResponse = (LogoutResponse)SAMLEngineUtils.
-				createSamlObject(LogoutResponse.DEFAULT_ELEMENT_NAME);
+		final LogoutResponse logoutResponse = (LogoutResponse) SAMLEngineUtils.createSamlObject(LogoutResponse.DEFAULT_ELEMENT_NAME);
 
 		logoutResponse.setInResponseTo(inResponseTo);
 		logoutResponse.setStatus(status);
@@ -635,18 +572,18 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate service provider application.
 	 * 
-	 * @param spApplication the service provider application
+	 * @param spApplication
+	 *            the service provider application
 	 * 
 	 * @return the sP application
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public static SPApplication generateSPApplication(final String spApplication)
-			throws STORKSAMLEngineException {
+	public static SPApplication generateSPApplication(final String spApplication) throws STORKSAMLEngineException {
 		LOG.debug("Generate SPApplication.");
 
-		final SPApplication applicationAttr = (SPApplication) SAMLEngineUtils
-				.createSamlObject(SPApplication.DEF_ELEMENT_NAME);
+		final SPApplication applicationAttr = (SPApplication) SAMLEngineUtils.createSamlObject(SPApplication.DEF_ELEMENT_NAME);
 		applicationAttr.setSPApplication(spApplication);
 		return applicationAttr;
 	}
@@ -654,18 +591,18 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate service provider country.
 	 * 
-	 * @param spCountry the service provider country
+	 * @param spCountry
+	 *            the service provider country
 	 * 
 	 * @return the service provider country
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public static SPCountry generateSPCountry(final String spCountry)
-			throws STORKSAMLEngineException {
+	public static SPCountry generateSPCountry(final String spCountry) throws STORKSAMLEngineException {
 		LOG.debug("Generate SPApplication.");
 
-		final SPCountry countryAttribute = (SPCountry) SAMLEngineUtils
-				.createSamlObject(SPCountry.DEF_ELEMENT_NAME);
+		final SPCountry countryAttribute = (SPCountry) SAMLEngineUtils.createSamlObject(SPCountry.DEF_ELEMENT_NAME);
 		countryAttribute.setSPCountry(spCountry);
 		return countryAttribute;
 	}
@@ -673,18 +610,18 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate service provider institution.
 	 * 
-	 * @param spInstitution the service provider institution
+	 * @param spInstitution
+	 *            the service provider institution
 	 * 
 	 * @return the service provider institution
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public static SPInstitution generateSPInstitution(final String spInstitution)
-			throws STORKSAMLEngineException {
+	public static SPInstitution generateSPInstitution(final String spInstitution) throws STORKSAMLEngineException {
 		LOG.debug("Generate SPInstitution.");
 
-		final SPInstitution institutionAttr = (SPInstitution) SAMLEngineUtils
-				.createSamlObject(SPInstitution.DEF_ELEMENT_NAME);
+		final SPInstitution institutionAttr = (SPInstitution) SAMLEngineUtils.createSamlObject(SPInstitution.DEF_ELEMENT_NAME);
 		institutionAttr.setSPInstitution(spInstitution);
 		return institutionAttr;
 	}
@@ -692,18 +629,18 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate service provider sector.
 	 * 
-	 * @param spSector the service provider sector
+	 * @param spSector
+	 *            the service provider sector
 	 * 
 	 * @return the service provider sector
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public static SPSector generateSPSector(final String spSector)
-			throws STORKSAMLEngineException {
+	public static SPSector generateSPSector(final String spSector) throws STORKSAMLEngineException {
 		LOG.debug("Generate SPSector.");
 
-		final SPSector sectorAttribute = (SPSector) SAMLEngineUtils
-				.createSamlObject(SPSector.DEF_ELEMENT_NAME);
+		final SPSector sectorAttribute = (SPSector) SAMLEngineUtils.createSamlObject(SPSector.DEF_ELEMENT_NAME);
 		sectorAttribute.setSPSector(spSector);
 		return sectorAttribute;
 	}
@@ -711,13 +648,13 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate status.
 	 * 
-	 * @param statusCode the status code
+	 * @param statusCode
+	 *            the status code
 	 * 
 	 * @return the status
 	 */
 	public static Status generateStatus(final StatusCode statusCode) {
-		final Status status = (Status) SAMLEngineUtils
-				.createSamlObject(Status.DEFAULT_ELEMENT_NAME);
+		final Status status = (Status) SAMLEngineUtils.createSamlObject(Status.DEFAULT_ELEMENT_NAME);
 		status.setStatusCode(statusCode);
 		return status;
 	}
@@ -725,13 +662,13 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate status code.
 	 * 
-	 * @param value the value
+	 * @param value
+	 *            the value
 	 * 
 	 * @return the status code
 	 */
 	public static StatusCode generateStatusCode(final String value) {
-		final StatusCode statusCode = (StatusCode) SAMLEngineUtils
-				.createSamlObject(StatusCode.DEFAULT_ELEMENT_NAME);
+		final StatusCode statusCode = (StatusCode) SAMLEngineUtils.createSamlObject(StatusCode.DEFAULT_ELEMENT_NAME);
 		statusCode.setValue(value);
 		return statusCode;
 	}
@@ -739,13 +676,13 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate status message.
 	 * 
-	 * @param message the message
+	 * @param message
+	 *            the message
 	 * 
 	 * @return the status message
 	 */
 	public static StatusMessage generateStatusMessage(final String message) {
-		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
-				.createSamlObject(StatusMessage.DEFAULT_ELEMENT_NAME);
+		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.createSamlObject(StatusMessage.DEFAULT_ELEMENT_NAME);
 		statusMessage.setMessage(message);
 		return statusMessage;
 	}
@@ -756,24 +693,22 @@ public final class SAMLEngineUtils {
 	 * @return the subject
 	 */
 	public static Subject generateSubject() {
-		return (Subject) SAMLEngineUtils
-				.createSamlObject(Subject.DEFAULT_ELEMENT_NAME);
+		return (Subject) SAMLEngineUtils.createSamlObject(Subject.DEFAULT_ELEMENT_NAME);
 	}
 
 	/**
 	 * Generate subject confirmation.
 	 * 
-	 * @param method the method
-	 * @param data the data
+	 * @param method
+	 *            the method
+	 * @param data
+	 *            the data
 	 * 
 	 * @return the subject confirmation
 	 */
-	public static SubjectConfirmation generateSubjectConfirmation(
-			final String method, final SubjectConfirmationData data) {	
-		final SubjectConfirmation subjectConf = (SubjectConfirmation) Configuration
-				.getBuilderFactory().getBuilder(
-						SubjectConfirmation.DEFAULT_ELEMENT_NAME).buildObject(
-								SubjectConfirmation.DEFAULT_ELEMENT_NAME);
+	public static SubjectConfirmation generateSubjectConfirmation(final String method, final SubjectConfirmationData data) {
+		final SubjectConfirmation subjectConf = (SubjectConfirmation) Configuration.getBuilderFactory().getBuilder(SubjectConfirmation.DEFAULT_ELEMENT_NAME)
+				.buildObject(SubjectConfirmation.DEFAULT_ELEMENT_NAME);
 
 		subjectConf.setMethod(method);
 
@@ -785,17 +720,17 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate subject confirmation data.
 	 * 
-	 * @param notOnOrAfter the not on or after
-	 * @param recipient the recipient
-	 * @param inResponseTo the in response to
+	 * @param notOnOrAfter
+	 *            the not on or after
+	 * @param recipient
+	 *            the recipient
+	 * @param inResponseTo
+	 *            the in response to
 	 * 
 	 * @return the subject confirmation data
 	 */
-	public static SubjectConfirmationData generateSubjectConfirmationData(
-			final DateTime notOnOrAfter, final String recipient,
-			final String inResponseTo) {
-		final SubjectConfirmationData subjectConfData = (SubjectConfirmationData) SAMLEngineUtils
-				.createSamlObject(SubjectConfirmationData.DEFAULT_ELEMENT_NAME);
+	public static SubjectConfirmationData generateSubjectConfirmationData(final DateTime notOnOrAfter, final String recipient, final String inResponseTo) {
+		final SubjectConfirmationData subjectConfData = (SubjectConfirmationData) SAMLEngineUtils.createSamlObject(SubjectConfirmationData.DEFAULT_ELEMENT_NAME);
 		subjectConfData.setNotOnOrAfter(notOnOrAfter);
 		subjectConfData.setRecipient(recipient);
 		subjectConfData.setInResponseTo(inResponseTo);
@@ -805,13 +740,13 @@ public final class SAMLEngineUtils {
 	/**
 	 * Generate subject locality.
 	 * 
-	 * @param address the address
+	 * @param address
+	 *            the address
 	 * 
 	 * @return the subject locality
 	 */
 	public static SubjectLocality generateSubjectLocality(final String address) {
-		final SubjectLocality subjectLocality = (SubjectLocality) SAMLEngineUtils
-				.createSamlObject(SubjectLocality.DEFAULT_ELEMENT_NAME);
+		final SubjectLocality subjectLocality = (SubjectLocality) SAMLEngineUtils.createSamlObject(SubjectLocality.DEFAULT_ELEMENT_NAME);
 		subjectLocality.setAddress(address);
 		return subjectLocality;
 	}
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java
index 6bdf7b320..7bf5d5ca8 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/STORKSAMLEngine.java
@@ -175,10 +175,8 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
 import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
 
 /**
- * Class that wraps the operations over SAML tokens, both generation and
- * validation of SAML STORK requests and SAML STORK responses. Complaint with
- * "OASIS Secure Assertion Markup Language (SAML) 2.0, May 2005", but taking
- * into account STORK specific requirements.
+ * Class that wraps the operations over SAML tokens, both generation and validation of SAML STORK requests and SAML STORK responses. Complaint with
+ * "OASIS Secure Assertion Markup Language (SAML) 2.0, May 2005", but taking into account STORK specific requirements.
  * 
  * @author fjquevedo
  * @author iinigo
@@ -186,26 +184,25 @@ import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
 public final class STORKSAMLEngine extends SAMLEngine {
 
 	/** The Constant LOG. */
-	private static final Logger LOG = LoggerFactory
-	.getLogger(STORKSAMLEngine.class.getName());
+	private static final Logger LOG = LoggerFactory.getLogger(STORKSAMLEngine.class.getName());
+
+	private static final String ATTRIBUTE_EMPTY_LITERAL = "Attribute name is null or empty.";
 
-    private static final String ATTRIBUTE_EMPTY_LITERAL = "Attribute name is null or empty.";
 	/**
 	 * Gets the single instance of STORKSAMLEngine.
 	 * 
-	 * @param nameInstance the name instance
+	 * @param nameInstance
+	 *            the name instance
 	 * 
 	 * @return single instance of STORKSAMLEngine
 	 */
-	public static synchronized STORKSAMLEngine getInstance(
-			final String nameInstance) {
+	public static synchronized STORKSAMLEngine getInstance(final String nameInstance) {
 		STORKSAMLEngine engine = null;
 		LOG.info("Get instance: " + nameInstance);
 		try {
 			engine = new STORKSAMLEngine(nameInstance.trim());
 		} catch (Exception e) {
-			LOG.error("Error getting instance: " + nameInstance);
-            e.printStackTrace();
+			LOG.error("Error get instance: " + nameInstance);
 		}
 		return engine;
 	}
@@ -213,130 +210,79 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Instantiate a new STORKSAML engine.
 	 * 
-	 * @param nameInstance the name instance
+	 * @param nameInstance
+	 *            the name instance
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private STORKSAMLEngine(final String nameInstance)
-	throws STORKSAMLEngineException {
+	private STORKSAMLEngine(final String nameInstance) throws STORKSAMLEngineException {
 		// Initialization OpenSAML.
 		super(nameInstance);
 		LOG.info("Register STORK objects provider.");
-		Configuration.registerObjectProvider(QAAAttribute.DEF_ELEMENT_NAME,
-				new QAAAttributeBuilder(), new QAAAttributeMarshaller(),
-				new QAAAttributeUnmarshaller());
-
-		Configuration.registerObjectProvider(EIDSectorShare.DEF_ELEMENT_NAME,
-				new EIDSectorShareBuilder(), new EIDSectorShareMarshaller(),
-				new EIDSectorShareUnmarshaller());
-
-		Configuration.registerObjectProvider(
-				EIDCrossSectorShare.DEF_ELEMENT_NAME,
-				new EIDCrossSectorShareBuilder(),
-				new EIDCrossSectorShareMarshaller(),
-				new EIDCrossSectorShareUnmarshaller());
-
-		Configuration.registerObjectProvider(
-				EIDCrossBorderShare.DEF_ELEMENT_NAME,
-				new EIDCrossBorderShareBuilder(),
-				new EIDCrossBorderShareMarshaller(),
-				new EIDCrossBorderShareUnmarshaller());
-
-		Configuration.registerObjectProvider(SPSector.DEF_ELEMENT_NAME,
-				new SPSectorBuilder(), new SPSectorMarshaller(),
-				new SPSectorUnmarshaller());
-
-		Configuration.registerObjectProvider(SPInstitution.DEF_ELEMENT_NAME,
-				new SPInstitutionBuilder(), new SPInstitutionMarshaller(),
-				new SPInstitutionUnmarshaller());
-
-		Configuration.registerObjectProvider(SPApplication.DEF_ELEMENT_NAME,
-				new SPApplicationBuilder(), new SPApplicationMarshaller(),
-				new SPApplicationUnmarshaller());
-
-		Configuration.registerObjectProvider(SPCountry.DEF_ELEMENT_NAME,
-				new SPCountryBuilder(), new SPCountryMarshaller(),
-				new SPCountryUnmarshaller());
-
-		Configuration.registerObjectProvider(XSAny.TYPE_NAME,
-				new XSAnyBuilder(), new XSAnyMarshaller(),
-				new XSAnyUnmarshaller());
-
-		Configuration.registerObjectProvider(
-				RequestedAttribute.DEF_ELEMENT_NAME,
-				new RequestedAttributeBuilder(),
-				new RequestedAttributeMarshaller(),
-				new RequestedAttributeUnmarshaller());
-
-		Configuration.registerObjectProvider(
-				RequestedAttributes.DEF_ELEMENT_NAME,
-				new RequestedAttributesBuilder(),
-				new RequestedAttributesMarshaller(),
-				new RequestedAttributesUnmarshaller());
-
-		Configuration.registerObjectProvider(
-				AuthenticationAttributes.DEF_ELEMENT_NAME,
-				new AuthenticationAttributesBuilder(),
-				new AuthenticationAttributesMarshaller(),
+		Configuration.registerObjectProvider(QAAAttribute.DEF_ELEMENT_NAME, new QAAAttributeBuilder(), new QAAAttributeMarshaller(), new QAAAttributeUnmarshaller());
+
+		Configuration.registerObjectProvider(EIDSectorShare.DEF_ELEMENT_NAME, new EIDSectorShareBuilder(), new EIDSectorShareMarshaller(), new EIDSectorShareUnmarshaller());
+
+		Configuration.registerObjectProvider(EIDCrossSectorShare.DEF_ELEMENT_NAME, new EIDCrossSectorShareBuilder(), new EIDCrossSectorShareMarshaller(), new EIDCrossSectorShareUnmarshaller());
+
+		Configuration.registerObjectProvider(EIDCrossBorderShare.DEF_ELEMENT_NAME, new EIDCrossBorderShareBuilder(), new EIDCrossBorderShareMarshaller(), new EIDCrossBorderShareUnmarshaller());
+
+		Configuration.registerObjectProvider(SPSector.DEF_ELEMENT_NAME, new SPSectorBuilder(), new SPSectorMarshaller(), new SPSectorUnmarshaller());
+
+		Configuration.registerObjectProvider(SPInstitution.DEF_ELEMENT_NAME, new SPInstitutionBuilder(), new SPInstitutionMarshaller(), new SPInstitutionUnmarshaller());
+
+		Configuration.registerObjectProvider(SPApplication.DEF_ELEMENT_NAME, new SPApplicationBuilder(), new SPApplicationMarshaller(), new SPApplicationUnmarshaller());
+
+		Configuration.registerObjectProvider(SPCountry.DEF_ELEMENT_NAME, new SPCountryBuilder(), new SPCountryMarshaller(), new SPCountryUnmarshaller());
+
+		Configuration.registerObjectProvider(XSAny.TYPE_NAME, new XSAnyBuilder(), new XSAnyMarshaller(), new XSAnyUnmarshaller());
+
+		Configuration.registerObjectProvider(RequestedAttribute.DEF_ELEMENT_NAME, new RequestedAttributeBuilder(), new RequestedAttributeMarshaller(), new RequestedAttributeUnmarshaller());
+
+		Configuration.registerObjectProvider(RequestedAttributes.DEF_ELEMENT_NAME, new RequestedAttributesBuilder(), new RequestedAttributesMarshaller(), new RequestedAttributesUnmarshaller());
+
+		Configuration.registerObjectProvider(AuthenticationAttributes.DEF_ELEMENT_NAME, new AuthenticationAttributesBuilder(), new AuthenticationAttributesMarshaller(),
 				new AuthenticationAttributesUnmarshaller());
 
-		Configuration.registerObjectProvider(
-				VIDPAuthenticationAttributes.DEF_ELEMENT_NAME,
-				new VIDPAuthenticationAttributesBuilder(),
-				new VIDPAuthenticationAttributesMarshaller(),
+		Configuration.registerObjectProvider(VIDPAuthenticationAttributes.DEF_ELEMENT_NAME, new VIDPAuthenticationAttributesBuilder(), new VIDPAuthenticationAttributesMarshaller(),
 				new VIDPAuthenticationAttributesUnmarshaller());
 
-		Configuration.registerObjectProvider(
-				CitizenCountryCode.DEF_ELEMENT_NAME,
-				new CitizenCountryCodeBuilder(),
-				new CitizenCountryCodeMarshaller(),
-				new CitizenCountryCodeUnmarshaller());
+		Configuration.registerObjectProvider(CitizenCountryCode.DEF_ELEMENT_NAME, new CitizenCountryCodeBuilder(), new CitizenCountryCodeMarshaller(), new CitizenCountryCodeUnmarshaller());
 
-		Configuration.registerObjectProvider(
-				SPID.DEF_ELEMENT_NAME,
-				new SPIDBuilder(),
-				new SPIDMarshaller(),
-				new SPIDUnmarshaller());
+		Configuration.registerObjectProvider(SPID.DEF_ELEMENT_NAME, new SPIDBuilder(), new SPIDMarshaller(), new SPIDUnmarshaller());
 
-		Configuration.registerObjectProvider(
-				SPInformation.DEF_ELEMENT_NAME,
-				new SPInformationBuilder(),
-				new SPInformationMarshaller(),
-				new SPInformationUnmarshaller());
+		Configuration.registerObjectProvider(SPInformation.DEF_ELEMENT_NAME, new SPInformationBuilder(), new SPInformationMarshaller(), new SPInformationUnmarshaller());
 
 		LOG.info("Register STORK object validators.");
-		final ValidatorSuite validatorSuite = new ValidatorSuite(
-				QAAAttribute.DEF_LOCAL_NAME);
+		final ValidatorSuite validatorSuite = new ValidatorSuite(QAAAttribute.DEF_LOCAL_NAME);
 
-		validatorSuite.registerValidator(QAAAttribute.DEF_ELEMENT_NAME,
-				new QAAAttributeSchemaValidator());
+		validatorSuite.registerValidator(QAAAttribute.DEF_ELEMENT_NAME, new QAAAttributeSchemaValidator());
 		final Extensions extensions = SAMLEngineUtils.generateExtension();
-		validatorSuite.registerValidator(extensions.getElementQName(),
-				new ExtensionsSchemaValidator());
+		validatorSuite.registerValidator(extensions.getElementQName(), new ExtensionsSchemaValidator());
 
-		Configuration.registerValidatorSuite(
-				"stork:QualityAuthenticationAssuranceLevel", validatorSuite);
+		Configuration.registerValidatorSuite("stork:QualityAuthenticationAssuranceLevel", validatorSuite);
 
 	}
 
 	/**
 	 * Generate authentication response base.
 	 * 
-	 * @param status the status
-	 * @param assertConsumerURL the assert consumer URL.
-	 * @param inResponseTo the in response to
+	 * @param status
+	 *            the status
+	 * @param assertConsumerURL
+	 *            the assert consumer URL.
+	 * @param inResponseTo
+	 *            the in response to
 	 * 
 	 * @return the response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private Response genAuthnRespBase(final Status status,
-			final String assertConsumerURL, final String inResponseTo)
-	throws STORKSAMLEngineException {
+	private Response genAuthnRespBase(final Status status, final String assertConsumerURL, final String inResponseTo) throws STORKSAMLEngineException {
 		LOG.debug("Generate Authentication Response base.");
-		final Response response = SAMLEngineUtils.generateResponse(
-				SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(),
-				SAMLEngineUtils.getCurrentTime(), status);
+		final Response response = SAMLEngineUtils.generateResponse(SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(), SAMLEngineUtils.getCurrentTime(), status);
 
 		// Set name Spaces
 		this.setNameSpaces(response);
@@ -358,30 +304,29 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		response.setInResponseTo(inResponseTo.trim());
 
 		// Optional STORK
-		response.setConsent(super.getSamlCoreProperties()
-				.getConsentAuthnResponse());
+		response.setConsent(super.getSamlCoreProperties().getConsentAuthnResponse());
 
 		return response;
 	}
-	
+
 	/**
 	 * Generate attribute query response base.
 	 * 
-	 * @param status the status
-	 * @param destinationURL the assert consumer URL.
-	 * @param inResponseTo the in response to
+	 * @param status
+	 *            the status
+	 * @param destinationURL
+	 *            the assert consumer URL.
+	 * @param inResponseTo
+	 *            the in response to
 	 * 
 	 * @return the response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private Response genAttrQueryRespBase(final Status status,
-			final String destinationURL, final String inResponseTo)
-	throws STORKSAMLEngineException {
+	private Response genAttrQueryRespBase(final Status status, final String destinationURL, final String inResponseTo) throws STORKSAMLEngineException {
 		LOG.debug("Generate Attribute query Response base.");
-		final Response response = SAMLEngineUtils.generateResponse(
-				SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(),
-				SAMLEngineUtils.getCurrentTime(), status);
+		final Response response = SAMLEngineUtils.generateResponse(SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(), SAMLEngineUtils.getCurrentTime(), status);
 
 		// Set name Spaces
 		this.setNameSpaces(response);
@@ -403,8 +348,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		response.setInResponseTo(inResponseTo.trim());
 
 		// Optional STORK
-		response.setConsent(super.getSamlCoreProperties()
-				.getConsentAuthnResponse());
+		response.setConsent(super.getSamlCoreProperties().getConsentAuthnResponse());
 
 		return response;
 	}
@@ -412,20 +356,24 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Generate assertion.
 	 * 
-	 * @param ipAddress the IP address.
-	 * @param assertConsumerURL the assert consumer URL.
-	 * @param inResponseTo the in response to
-	 * @param issuer the issuer
-	 * @param notOnOrAfter the not on or after
+	 * @param ipAddress
+	 *            the IP address.
+	 * @param assertConsumerURL
+	 *            the assert consumer URL.
+	 * @param inResponseTo
+	 *            the in response to
+	 * @param issuer
+	 *            the issuer
+	 * @param notOnOrAfter
+	 *            the not on or after
 	 * 
 	 * @return the assertion
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private Assertion generateAssertion(final String ipAddress,
-			final String assertConsumerURL, final String inResponseTo,
-			final String issuer, final DateTime notOnOrAfter)
-	throws STORKSAMLEngineException {
+	private Assertion generateAssertion(final String ipAddress, final String assertConsumerURL, final String inResponseTo, final String issuer, final DateTime notOnOrAfter)
+			throws STORKSAMLEngineException {
 		LOG.info("Generate Assertion.");
 
 		// Mandatory STORK
@@ -434,64 +382,46 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		issuerAssertion.setValue(super.getSamlCoreProperties().getResponder());
 
 		// Format Entity Optional STORK
-		issuerAssertion.setFormat(super.getSamlCoreProperties()
-				.getFormatEntity());
+		issuerAssertion.setFormat(super.getSamlCoreProperties().getFormatEntity());
 
-		final Assertion assertion = SAMLEngineUtils.generateAssertion(
-				SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(),
-				SAMLEngineUtils.getCurrentTime(), issuerAssertion);
+		final Assertion assertion = SAMLEngineUtils.generateAssertion(SAMLVersion.VERSION_20, SAMLEngineUtils.generateNCName(), SAMLEngineUtils.getCurrentTime(), issuerAssertion);
 
 		final Subject subject = SAMLEngineUtils.generateSubject();
 
-		// Mandatory STORK verified
-		// String format = NameID.UNSPECIFIED
-		// specification: 'SAML:2.0' exist
-		// opensaml: "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
-		// opensaml  "urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified"
-		final String format = "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified";
+		final String format = super.getSamlCoreProperties().getFormat();
 
 		final String nameQualifier = "";
-
 		LOG.debug("Generate NameID");
-		final NameID nameId = SAMLEngineUtils.generateNameID(super
-				.getSamlCoreProperties().getResponder(), format, nameQualifier);
+		final NameID nameId = SAMLEngineUtils.generateNameID(super.getSamlCoreProperties().getResponder(), format, nameQualifier);
 		nameId.setValue(format);
 		subject.setNameID(nameId);
 
 		// Mandatory if urn:oasis:names:tc:SAML:2.0:cm:bearer.
 		// Optional in other case.
 		LOG.debug("Generate SubjectConfirmationData.");
-		final SubjectConfirmationData dataBearer = SAMLEngineUtils
-		.generateSubjectConfirmationData(SAMLEngineUtils
-				.getCurrentTime(), assertConsumerURL, inResponseTo);
+		final SubjectConfirmationData dataBearer = SAMLEngineUtils.generateSubjectConfirmationData(SAMLEngineUtils.getCurrentTime(), assertConsumerURL, inResponseTo);
 
 		// Mandatory if urn:oasis:names:tc:SAML:2.0:cm:bearer.
 		// Optional in other case.
 		LOG.debug("Generate SubjectConfirmation");
-		final SubjectConfirmation subjectConf = SAMLEngineUtils
-		.generateSubjectConfirmation(SubjectConfirmation.METHOD_BEARER,
-				dataBearer);
+		final SubjectConfirmation subjectConf = SAMLEngineUtils.generateSubjectConfirmation(SubjectConfirmation.METHOD_BEARER, dataBearer);
 
 		final ArrayList<SubjectConfirmation> listSubjectConf = new ArrayList<SubjectConfirmation>();
 		listSubjectConf.add(subjectConf);
 
-		for (final Iterator<SubjectConfirmation> iter = listSubjectConf
-				.iterator(); iter.hasNext();) {
+		for (final Iterator<SubjectConfirmation> iter = listSubjectConf.iterator(); iter.hasNext();) {
 			final SubjectConfirmation element = iter.next();
 
 			if (SubjectConfirmation.METHOD_BEARER.equals(element.getMethod())) {
 				// ipAddress Mandatory if method is Bearer.
 
 				if (StringUtils.isBlank(ipAddress)) {
-					throw new STORKSAMLEngineException(
-							"ipAddress is null or empty");
+					throw new STORKSAMLEngineException("ipAddress is null or empty");
 				}
-				element.getSubjectConfirmationData().setAddress(
-						ipAddress.trim());
+				element.getSubjectConfirmationData().setAddress(ipAddress.trim());
 			}
 
-			element.getSubjectConfirmationData()
-			.setRecipient(assertConsumerURL);
+			element.getSubjectConfirmationData().setRecipient(assertConsumerURL);
 			element.getSubjectConfirmationData().setNotOnOrAfter(notOnOrAfter);
 		}
 
@@ -503,248 +433,215 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		// Conditions that MUST be evaluated when assessing the validity of
 		// and/or when using the assertion.
-		final Conditions conditions = this.generateConditions(SAMLEngineUtils
-				.getCurrentTime(), notOnOrAfter, issuer);
+		final Conditions conditions = this.generateConditions(SAMLEngineUtils.getCurrentTime(), notOnOrAfter, issuer);
 
 		assertion.setConditions(conditions);
 
 		LOG.debug("Generate stork Authentication Statement.");
-		final AuthnStatement storkAuthnStat = this
-		.generateStorkAuthStatement(ipAddress);
+		final AuthnStatement storkAuthnStat = this.generateStorkAuthStatement(ipAddress);
 		assertion.getAuthnStatements().add(storkAuthnStat);
 
 		return assertion;
 	}
 
-    private String getAttributeName(final PersonalAttribute attribute) throws STORKSAMLEngineException {
-        if (StringUtils.isBlank(attribute.getName())) {
-            LOG.error(ATTRIBUTE_EMPTY_LITERAL);
-            throw new STORKSAMLEngineException(ATTRIBUTE_EMPTY_LITERAL);
-        }
-
-        final String attributeName = super.getSamlCoreProperties()
-                .getProperty(attribute.getName());
-
-        if (StringUtils.isBlank(attributeName)) {
-            LOG.error("Attribute name: {} it is not known.", attribute
-                    .getName());
-            throw new STORKSAMLEngineException("Attribute name: "
-                    + attribute.getName() + " it is not known.");
-        }
-        return attributeName;
-    }
+	private String getAttributeName(final PersonalAttribute attribute) throws STORKSAMLEngineException {
+		if (StringUtils.isBlank(attribute.getName())) {
+			LOG.error(ATTRIBUTE_EMPTY_LITERAL);
+			throw new STORKSAMLEngineException(ATTRIBUTE_EMPTY_LITERAL);
+		}
+
+		final String attributeName = super.getSamlCoreProperties().getProperty(attribute.getName());
+
+		if (StringUtils.isBlank(attributeName)) {
+			LOG.error("Attribute name: {} it is not known.", attribute.getName());
+			throw new STORKSAMLEngineException("Attribute name: " + attribute.getName() + " it is not known.");
+		}
+		return attributeName;
+	}
+
 	/**
 	 * Generate attribute statement.
 	 * 
-	 * @param personalAttrList the personal attribute list
-	 * @param isHashing the is hashing
+	 * @param personalAttrList
+	 *            the personal attribute list
+	 * @param isHashing
+	 *            the is hashing
 	 * 
 	 * @return the attribute statement
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 * @throws IOException
 	 */
-	private AttributeStatement generateAttributeStatement(
-			final IPersonalAttributeList personalAttrList,
-			final boolean isHashing) throws STORKSAMLEngineException {
+	private AttributeStatement generateAttributeStatement(final IPersonalAttributeList personalAttrList, final boolean isHashing) throws STORKSAMLEngineException {
 		LOG.debug("Generate attribute statement");
 
-		final AttributeStatement attrStatement = (AttributeStatement) SAMLEngineUtils
-		.createSamlObject(AttributeStatement.DEFAULT_ELEMENT_NAME);
+		final AttributeStatement attrStatement = (AttributeStatement) SAMLEngineUtils.createSamlObject(AttributeStatement.DEFAULT_ELEMENT_NAME);
 
 		for (PersonalAttribute attribute : personalAttrList) {
 
-            String attributeName = getAttributeName(attribute);
+			String attributeName = getAttributeName(attribute);
 
 			// Verification that only one value it's permitted, simple or
 			// complex, not both.
 
 			final boolean simpleNull = (attribute.getValue() == null);
-			final boolean simpleEmpty = (simpleNull || (!simpleNull && attribute
-					.getValue().isEmpty()));
+			final boolean simpleEmpty = (simpleNull || (!simpleNull && attribute.getValue().isEmpty()));
 
 			final boolean complexNull = (attribute.getComplexValue() == null);
-			final boolean complexEmpty = (complexNull || (!complexNull && attribute
-					.getComplexValue().isEmpty()));
+			final boolean complexEmpty = (complexNull || (!complexNull && attribute.getComplexValue().isEmpty()));
 
 			if ((!simpleEmpty && !complexEmpty)) {
-				throw new STORKSAMLEngineException(
-						"Attribute name: "
-						+ attribute.getName()
-						+ " must be contain one value, simple or complex value.");
+				throw new STORKSAMLEngineException("Attribute name: " + attribute.getName() + " must be contain one value, simple or complex value.");
 			} else {
 
 				if (!simpleEmpty) {
-					attrStatement.getAttributes().add(
-							this.generateAttrSimple(attributeName, attribute
-									.getStatus(), attribute.getValue(),
-									isHashing));
+					attrStatement.getAttributes().add(this.generateAttrSimple(attributeName, attribute.getStatus(), attribute.getValue(), isHashing));
 				} else if (!complexEmpty) {
-					attrStatement.getAttributes().add(
-							SAMLEngineUtils.generateAttrComplex(attributeName,
-									attribute.getStatus(), attribute
-									.getComplexValue(), isHashing));
+					attrStatement.getAttributes().add(SAMLEngineUtils.generateAttrComplex(attributeName, attribute.getStatus(), attribute.getComplexValue(), isHashing));
 				} else if (!simpleNull) {
-					attrStatement.getAttributes().add(
-							this.generateAttrSimple(attributeName, attribute
-									.getStatus(), new ArrayList<String>(),
-									isHashing));
+					attrStatement.getAttributes().add(this.generateAttrSimple(attributeName, attribute.getStatus(), new ArrayList<String>(), isHashing));
 				} else {
 					// Add attribute complex.
-					attrStatement.getAttributes().add(
-							SAMLEngineUtils.generateAttrComplex(attributeName,
-									attribute.getStatus(),
-									new HashMap<String, String>(), isHashing));
+					attrStatement.getAttributes().add(SAMLEngineUtils.generateAttrComplex(attributeName, attribute.getStatus(), new HashMap<String, String>(), isHashing));
 				}
 			}
 		}
 		return attrStatement;
 	}
-    private XSAny createAttributeValueForSignedDoc(final String value, final boolean isHashing) throws STORKSAMLEngineException {
-        DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
-        domFactory.setNamespaceAware(true);
-        Document document = null;
-        DocumentBuilder builder;
-
-        // Parse the signedDoc value into an XML DOM Document
-        try {
-            builder = domFactory.newDocumentBuilder();
-            InputStream is;
-            is = new ByteArrayInputStream(value.trim().getBytes("UTF-8"));
-            document = builder.parse(is);
-            is.close();
-        } catch (SAXException e1) {
-            LOG.error("SAX Error while parsing signModule attribute", e1);
-            throw new STORKSAMLEngineRuntimeException(e1);
-        } catch (ParserConfigurationException e2) {
-            LOG.error("Parser Configuration Error while parsing signModule attribute", e2);
-            throw new STORKSAMLEngineRuntimeException(e2);
-        } catch (UnsupportedEncodingException e3) {
-            LOG.error("Unsupported encoding Error while parsing signModule attribute", e3);
-            throw new STORKSAMLEngineRuntimeException(e3);
-        } catch (IOException e4) {
-            LOG.error("IO Error while parsing signModule attribute", e4);
-            throw new STORKSAMLEngineRuntimeException(e4);
-        }
-
-        // Create the attribute statement
-        final XSAny xmlValue = (XSAny) SAMLEngineUtils
-                .createSamlObject(
-                        AttributeValue.DEFAULT_ELEMENT_NAME,
-                        XSAny.TYPE_NAME);
-
-        //Set the signedDoc XML content to this element
-        xmlValue.setDOM(document.getDocumentElement());
-
-        // Create the attribute statement
-        final XSAny attrValue = (XSAny) SAMLEngineUtils
-                .createSamlObject(
-                        AttributeValue.DEFAULT_ELEMENT_NAME,
-                        XSAny.TYPE_NAME);
-
-        //Add previous signedDocXML to the AttributeValue Element
-
-        // if it's necessary encode the information.
-        if (!isHashing) {
-            attrValue.getUnknownXMLObjects().add(xmlValue);
-        }
-        return attrValue;
-    }
-
-    private XSAny createAttributeValueForNonSignedDoc(final String value, final boolean isHashing) throws STORKSAMLEngineException {
-        // Create the attribute statement
-        final XSAny attrValue = (XSAny) SAMLEngineUtils
-                .createSamlObject(
-                        AttributeValue.DEFAULT_ELEMENT_NAME,
-                        XSAny.TYPE_NAME);
-        // if it's necessary encode the information.
-        if (isHashing) {
-            attrValue.setTextContent(SAMLEngineUtils.encode(value, SAMLEngineUtils.SHA_512));
-        } else {
-            attrValue.setTextContent(value);
-        }
-        return attrValue;
-    }
+
+	private XSAny createAttributeValueForSignedDoc(final String value, final boolean isHashing) throws STORKSAMLEngineException {
+		DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance();
+		domFactory.setNamespaceAware(true);
+		Document document = null;
+		DocumentBuilder builder;
+
+		// Parse the signedDoc value into an XML DOM Document
+		try {
+			builder = domFactory.newDocumentBuilder();
+			InputStream is;
+			is = new ByteArrayInputStream(value.trim().getBytes("UTF-8"));
+			document = builder.parse(is);
+			is.close();
+		} catch (SAXException e1) {
+			LOG.error("SAX Error while parsing signModule attribute", e1);
+			throw new STORKSAMLEngineRuntimeException(e1);
+		} catch (ParserConfigurationException e2) {
+			LOG.error("Parser Configuration Error while parsing signModule attribute", e2);
+			throw new STORKSAMLEngineRuntimeException(e2);
+		} catch (UnsupportedEncodingException e3) {
+			LOG.error("Unsupported encoding Error while parsing signModule attribute", e3);
+			throw new STORKSAMLEngineRuntimeException(e3);
+		} catch (IOException e4) {
+			LOG.error("IO Error while parsing signModule attribute", e4);
+			throw new STORKSAMLEngineRuntimeException(e4);
+		}
+
+		// Create the attribute statement
+		final XSAny xmlValue = (XSAny) SAMLEngineUtils.createSamlObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSAny.TYPE_NAME);
+
+		// Set the signedDoc XML content to this element
+		xmlValue.setDOM(document.getDocumentElement());
+
+		// Create the attribute statement
+		final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSAny.TYPE_NAME);
+
+		// Add previous signedDocXML to the AttributeValue Element
+
+		// if it's necessary encode the information.
+		if (!isHashing) {
+			attrValue.getUnknownXMLObjects().add(xmlValue);
+		}
+		return attrValue;
+	}
+
+	private XSAny createAttributeValueForNonSignedDoc(final String value, final boolean isHashing) throws STORKSAMLEngineException {
+		// Create the attribute statement
+		final XSAny attrValue = (XSAny) SAMLEngineUtils.createSamlObject(AttributeValue.DEFAULT_ELEMENT_NAME, XSAny.TYPE_NAME);
+		// if it's necessary encode the information.
+		if (isHashing) {
+			attrValue.setTextContent(SAMLEngineUtils.encode(value, SAMLEngineUtils.SHA_512));
+		} else {
+			attrValue.setTextContent(value);
+		}
+		return attrValue;
+	}
 
 	/**
 	 * Generate attribute from a list of values.
 	 * 
-	 * @param name the name of the attribute.
-	 * @param values the value of the attribute.
-	 * @param isHashing the is hashing with "SHA-512" algorithm.
-	 * @param status the status of the parameter: "Available", "NotAvailable" or
-	 *            "Withheld".
+	 * @param name
+	 *            the name of the attribute.
+	 * @param values
+	 *            the value of the attribute.
+	 * @param isHashing
+	 *            the is hashing with "SHA-512" algorithm.
+	 * @param status
+	 *            the status of the parameter: "Available", "NotAvailable" or "Withheld".
 	 * 
 	 * @return the attribute
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-    private Attribute generateAttrSimple(final String name,
-                                         final String status, final List<String> values,
-                                         final boolean isHashing) throws STORKSAMLEngineException {
-        LOG.debug("Generate attribute simple: " + name);
-        final Attribute attribute = (Attribute) SAMLEngineUtils
-                .createSamlObject(Attribute.DEFAULT_ELEMENT_NAME);
-
-        attribute.setName(name);
-        attribute.setNameFormat(Attribute.URI_REFERENCE);
-
-        attribute.getUnknownAttributes().put(
-                new QName(SAMLCore.STORK10_NS.getValue(), "AttributeStatus",
-                        SAMLCore.STORK10_PREFIX.getValue()), status);
-
-        if (values != null) {
-            LOG.debug("Add attribute values.");
-            for (int i = 0; i < values.size(); i++) {
-                final String value = values.get(i);
-                if (StringUtils.isNotBlank(value)) {
-                    XSAny attrValue = null;
-                    if (!name.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
-                        // Create the attribute statement
-                        attrValue = createAttributeValueForNonSignedDoc(value, isHashing);
-
-                    } else {
-                        attrValue = createAttributeValueForSignedDoc(value, isHashing);
-                        attribute.getAttributeValues().add(attrValue);
-                    }
-                    attribute.getAttributeValues().add(attrValue);
-                }
-            }
-        }
-        return attribute;
-    }
+	private Attribute generateAttrSimple(final String name, final String status, final List<String> values, final boolean isHashing) throws STORKSAMLEngineException {
+		LOG.debug("Generate attribute simple: " + name);
+		final Attribute attribute = (Attribute) SAMLEngineUtils.createSamlObject(Attribute.DEFAULT_ELEMENT_NAME);
+
+		attribute.setName(name);
+		attribute.setNameFormat(Attribute.URI_REFERENCE);
+
+		attribute.getUnknownAttributes().put(new QName(SAMLCore.STORK10_NS.getValue(), "AttributeStatus", SAMLCore.STORK10_PREFIX.getValue()), status);
+
+		if (values != null) {
+			LOG.debug("Add attribute values.");
+			for (int i = 0; i < values.size(); i++) {
+				final String value = values.get(i);
+				if (StringUtils.isNotBlank(value)) {
+					XSAny attrValue = null;
+					if (!name.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
+						// Create the attribute statement
+						attrValue = createAttributeValueForNonSignedDoc(value, isHashing);
+
+					} else {
+						attrValue = createAttributeValueForSignedDoc(value, isHashing);
+						attribute.getAttributeValues().add(attrValue);
+					}
+					attribute.getAttributeValues().add(attrValue);
+				}
+			}
+		}
+		return attribute;
+	}
 
 	/**
-	 * Generate conditions that MUST be evaluated when assessing the validity of
-	 * and/or when using the assertion.
+	 * Generate conditions that MUST be evaluated when assessing the validity of and/or when using the assertion.
 	 * 
-	 * @param notBefore the not before
-	 * @param notOnOrAfter the not on or after
-	 * @param audienceURI the audience URI.
+	 * @param notBefore
+	 *            the not before
+	 * @param notOnOrAfter
+	 *            the not on or after
+	 * @param audienceURI
+	 *            the audience URI.
 	 * 
 	 * @return the conditions
 	 */
-	private Conditions generateConditions(final DateTime notBefore,
-			final DateTime notOnOrAfter, final String audienceURI) {
+	private Conditions generateConditions(final DateTime notBefore, final DateTime notOnOrAfter, final String audienceURI) {
 		LOG.debug("Generate conditions.");
-		final Conditions conditions = (Conditions) SAMLEngineUtils
-		.createSamlObject(Conditions.DEFAULT_ELEMENT_NAME);
+		final Conditions conditions = (Conditions) SAMLEngineUtils.createSamlObject(Conditions.DEFAULT_ELEMENT_NAME);
 		conditions.setNotBefore(notBefore);
 		conditions.setNotOnOrAfter(notOnOrAfter);
 
-		final AudienceRestriction restrictions = (AudienceRestriction) SAMLEngineUtils
-		.createSamlObject(AudienceRestriction.DEFAULT_ELEMENT_NAME);
+		final AudienceRestriction restrictions = (AudienceRestriction) SAMLEngineUtils.createSamlObject(AudienceRestriction.DEFAULT_ELEMENT_NAME);
 
-		final Audience audience = (Audience) SAMLEngineUtils
-		.createSamlObject(Audience.DEFAULT_ELEMENT_NAME);
+		final Audience audience = (Audience) SAMLEngineUtils.createSamlObject(Audience.DEFAULT_ELEMENT_NAME);
 		audience.setAudienceURI(audienceURI);
 
 		restrictions.getAudiences().add(audience);
 		conditions.getAudienceRestrictions().add(restrictions);
 
 		if (super.getSamlCoreProperties().isOneTimeUse()) {
-			final OneTimeUse oneTimeUse = (OneTimeUse) SAMLEngineUtils
-			.createSamlObject(OneTimeUse.DEFAULT_ELEMENT_NAME);
+			final OneTimeUse oneTimeUse = (OneTimeUse) SAMLEngineUtils.createSamlObject(OneTimeUse.DEFAULT_ELEMENT_NAME);
 			conditions.getConditions().add(oneTimeUse);
 		}
 		return conditions;
@@ -753,14 +650,15 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Generate personal attribute list.
 	 * 
-	 * @param assertion the assertion
+	 * @param assertion
+	 *            the assertion
 	 * 
 	 * @return the personal attribute list
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private IPersonalAttributeList generatePersonalAttributeList(
-			final Assertion assertion) throws STORKSAMLEngineException {
+	private IPersonalAttributeList generatePersonalAttributeList(final Assertion assertion) throws STORKSAMLEngineException {
 		LOG.debug("Generate personal attribute list from XMLObject.");
 		final List<XMLObject> listExtensions = assertion.getOrderedChildren();
 
@@ -778,8 +676,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		if (!find) {
 			LOG.error("Error: AttributeStatement it's not present.");
-			throw new STORKSAMLEngineException(
-			"AttributeStatement it's not present.");
+			throw new STORKSAMLEngineException("AttributeStatement it's not present.");
 		}
 
 		final List<Attribute> reqAttrs = requestedAttr.getAttributes();
@@ -794,88 +691,70 @@ public final class STORKSAMLEngine extends SAMLEngine {
 			final PersonalAttribute personalAttribute = new PersonalAttribute();
 
 			attributeName = attribute.getName();
-			personalAttribute.setName(attributeName.substring(attributeName
-					.lastIndexOf('/') + 1));
+			personalAttribute.setName(attributeName.substring(attributeName.lastIndexOf('/') + 1));
 
-			personalAttribute.setStatus(attribute.getUnknownAttributes().get(
-					new QName(SAMLCore.STORK10_NS.getValue(),
-							"AttributeStatus", SAMLCore.STORK10_PREFIX
-							.getValue())));
+			personalAttribute.setStatus(attribute.getUnknownAttributes().get(new QName(SAMLCore.STORK10_NS.getValue(), "AttributeStatus", SAMLCore.STORK10_PREFIX.getValue())));
 
 			final ArrayList<String> simpleValues = new ArrayList<String>();
 			final HashMap<String, String> multiValues = new HashMap<String, String>();
 
 			final List<XMLObject> values = attribute.getOrderedChildren();
-			
-						
+
 			// Process the values.
 			for (int nextValue = 0; nextValue < values.size(); nextValue++) {
 
 				final XMLObject xmlObject = values.get(nextValue);
 
 				if (xmlObject instanceof XSStringImpl) {
-					
+
 					simpleValues.add(((XSStringImpl) xmlObject).getValue());
 
 				} else if (xmlObject instanceof XSAnyImpl) {
 
 					if (attributeName.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
 
-						final XSAnyImpl xmlString = (XSAnyImpl) values
-								.get(nextValue);
+						final XSAnyImpl xmlString = (XSAnyImpl) values.get(nextValue);
 
-						TransformerFactory transFactory = TransformerFactory
-								.newInstance();
+						TransformerFactory transFactory = TransformerFactory.newInstance();
 						Transformer transformer = null;
 						try {
 							transformer = transFactory.newTransformer();
-							transformer.setOutputProperty(
-									OutputKeys.OMIT_XML_DECLARATION, "yes");
+							transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
 						} catch (TransformerConfigurationException e) {
-                            LOG.error("Error transformer configuration exception", e);
+							LOG.error("Error transformer configuration exception", e);
 						}
 						StringWriter buffer = new StringWriter();
 						try {
-                            if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0 ){
-                                transformer.transform(new DOMSource(xmlString
-                                        .getUnknownXMLObjects().get(0).getDOM()),
-                                        new StreamResult(buffer));
-                            }
+							if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0) {
+								transformer.transform(new DOMSource(xmlString.getUnknownXMLObjects().get(0).getDOM()), new StreamResult(buffer));
+							}
 						} catch (TransformerException e) {
-                            LOG.error("Error transformer exception", e);
+							LOG.error("Error transformer exception", e);
 						}
 						String str = buffer.toString();
 
 						simpleValues.add(str);
 
-					} else if (isComplex(xmlObject))
-					{
+					} else if (isComplex(xmlObject)) {
 						LOG.info(attributeName + " found");
 						// Process complex value.
 						final XSAnyImpl complexValue = (XSAnyImpl) xmlObject;
 
-						for (int nextComplexValue = 0; nextComplexValue < complexValue
-								.getUnknownXMLObjects().size(); nextComplexValue++) {
+						for (int nextComplexValue = 0; nextComplexValue < complexValue.getUnknownXMLObjects().size(); nextComplexValue++) {
 
-							final XSAnyImpl simple = (XSAnyImpl) complexValue
-									.getUnknownXMLObjects().get(
-											nextComplexValue);
+							final XSAnyImpl simple = (XSAnyImpl) complexValue.getUnknownXMLObjects().get(nextComplexValue);
 
-							multiValues.put(simple.getElementQName()
-									.getLocalPart(), simple.getTextContent());
+							multiValues.put(simple.getElementQName().getLocalPart(), simple.getTextContent());
 						}
 
-					} 					
-					else {
+					} else {
 						// Process simple value.
-						simpleValues.add(((XSAnyImpl) xmlObject)
-								.getTextContent());
+						simpleValues.add(((XSAnyImpl) xmlObject).getTextContent());
 					}
 
 				} else {
 					LOG.error("Error: attribute value it's unknown.");
-					throw new STORKSAMLEngineException(
-							"Attribute value it's unknown.");
+					throw new STORKSAMLEngineException("Attribute value it's unknown.");
 				}
 			}
 
@@ -890,24 +769,21 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Generate stork authentication request.
 	 * 
-	 * @param request the request that contain all parameters for generate an
-	 *            authentication request.
+	 * @param request
+	 *            the request that contain all parameters for generate an authentication request.
 	 * 
 	 * @return the STORK authentication request that has been processed.
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAuthnRequest generateSTORKAuthnRequest(
-			final STORKAuthnRequest request) throws STORKSAMLEngineException {
+	public STORKAuthnRequest generateSTORKAuthnRequest(final STORKAuthnRequest request) throws STORKSAMLEngineException {
 		LOG.info("Generate SAMLAuthnRequest.");
 
 		// Validate Parameters mandatories
 		validateParamAuthnReq(request);
 
-		final AuthnRequest authnRequestAux = SAMLEngineUtils
-		.generateSAMLAuthnRequest(SAMLEngineUtils.generateNCName(),
-				SAMLVersion.VERSION_20, SAMLEngineUtils
-				.getCurrentTime());
+		final AuthnRequest authnRequestAux = SAMLEngineUtils.generateSAMLAuthnRequest(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime());
 
 		// Set name spaces.
 		setNameSpaces(authnRequestAux);
@@ -918,14 +794,12 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		// Add parameter Mandatory STORK
 		authnRequestAux.setIsPassive(Boolean.FALSE);
 
-		authnRequestAux.setAssertionConsumerServiceURL(request
-				.getAssertionConsumerServiceURL());
+		authnRequestAux.setAssertionConsumerServiceURL(request.getAssertionConsumerServiceURL());
 
 		authnRequestAux.setProviderName(request.getProviderName());
 
 		// Add protocol binding
-		authnRequestAux.setProtocolBinding(super.getSamlCoreProperties()
-				.getProtocolBinding());
+		authnRequestAux.setProtocolBinding(super.getSamlCoreProperties().getProtocolBinding());
 
 		// Add parameter optional STORK
 		// Destination is mandatory if the destination is a C-PEPS
@@ -935,36 +809,32 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		}
 
 		// Consent is optional. Set from SAMLEngine.xml - consent.
-		authnRequestAux.setConsent(super.getSamlCoreProperties()
-				.getConsentAuthnRequest());
+		authnRequestAux.setConsent(super.getSamlCoreProperties().getConsentAuthnRequest());
 
 		final Issuer issuer = SAMLEngineUtils.generateIssuer();
-		
-		if(request.getIssuer()!=null){
+
+		if (request.getIssuer() != null) {
 			issuer.setValue(request.getIssuer());
-        } else {
+		} else {
 			issuer.setValue(super.getSamlCoreProperties().getRequester());
-        }
+		}
 
 		// Optional STORK
-		final String formatEntity = super.getSamlCoreProperties()
-		.getFormatEntity();
+		final String formatEntity = super.getSamlCoreProperties().getFormatEntity();
 		if (StringUtils.isNotBlank(formatEntity)) {
 			issuer.setFormat(formatEntity);
 		}
 
 		authnRequestAux.setIssuer(issuer);
-		
+
 		// Generate stork extensions.
-		final Extensions storkExtensions = this
-		.generateSTORKExtensions(request);
+		final Extensions storkExtensions = this.generateSTORKExtensions(request);
 		// add the extensions to the SAMLAuthnRequest
 		authnRequestAux.setExtensions(storkExtensions);
 
 		// the result contains an authentication request token (byte[]),
 		// identifier of the token, and all parameters from the request.
-		final STORKAuthnRequest authRequest = processExtensions(authnRequestAux
-				.getExtensions());
+		final STORKAuthnRequest authRequest = processExtensions(authnRequestAux.getExtensions());
 
 		try {
 			authRequest.setTokenSaml(super.signAndMarshall(authnRequestAux));
@@ -975,8 +845,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		authRequest.setSamlId(authnRequestAux.getID());
 		authRequest.setDestination(authnRequestAux.getDestination());
-		authRequest.setAssertionConsumerServiceURL(authnRequestAux
-				.getAssertionConsumerServiceURL());
+		authRequest.setAssertionConsumerServiceURL(authnRequestAux.getAssertionConsumerServiceURL());
 
 		authRequest.setProviderName(authnRequestAux.getProviderName());
 		authRequest.setIssuer(authnRequestAux.getIssuer().getValue());
@@ -987,19 +856,22 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Generate stork authentication response.
 	 * 
-	 * @param request the request
-	 * @param responseAuthReq the response authentication request
-	 * @param ipAddress the IP address
-	 * @param isHashing the is hashing
+	 * @param request
+	 *            the request
+	 * @param responseAuthReq
+	 *            the response authentication request
+	 * @param ipAddress
+	 *            the IP address
+	 * @param isHashing
+	 *            the is hashing
 	 * 
 	 * @return the sTORK authentication response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAuthnResponse generateSTORKAuthnResponse(
-			final STORKAuthnRequest request,
-			final STORKAuthnResponse responseAuthReq, final String ipAddress,
-			final boolean isHashing) throws STORKSAMLEngineException {
+	public STORKAuthnResponse generateSTORKAuthnResponse(final STORKAuthnRequest request, final STORKAuthnResponse responseAuthReq, final String ipAddress, final boolean isHashing)
+			throws STORKSAMLEngineException {
 		LOG.info("generateSTORKAuthnResponse");
 
 		// Validate parameters
@@ -1007,36 +879,28 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		// Mandatory SAML
 		LOG.debug("Generate StatusCode");
-		final StatusCode statusCode = SAMLEngineUtils
-		.generateStatusCode(StatusCode.SUCCESS_URI);
+		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(StatusCode.SUCCESS_URI);
 
 		LOG.debug("Generate Status");
 		final Status status = SAMLEngineUtils.generateStatus(statusCode);
 
 		LOG.debug("Generate StatusMessage");
-		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
-		.generateStatusMessage(StatusCode.SUCCESS_URI);
+		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(StatusCode.SUCCESS_URI);
 
 		status.setStatusMessage(statusMessage);
 
 		LOG.debug("Generate Response");
 
 		// RESPONSE
-		final Response response = genAuthnRespBase(status, request
-				.getAssertionConsumerServiceURL(), request.getSamlId());
+		final Response response = genAuthnRespBase(status, request.getAssertionConsumerServiceURL(), request.getSamlId());
 
 		DateTime notOnOrAfter = new DateTime();
 
-		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
-				.getTimeNotOnOrAfter());
+		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
 
-		final Assertion assertion = this.generateAssertion(ipAddress, request
-				.getAssertionConsumerServiceURL(), request.getSamlId(), request
-				.getIssuer(), notOnOrAfter);
+		final Assertion assertion = this.generateAssertion(ipAddress, request.getAssertionConsumerServiceURL(), request.getSamlId(), request.getIssuer(), notOnOrAfter);
 
-		final AttributeStatement attrStatement = this
-		.generateAttributeStatement(responseAuthReq
-				.getPersonalAttributeList(), isHashing);
+		final AttributeStatement attrStatement = this.generateAttributeStatement(responseAuthReq.getPersonalAttributeList(), isHashing);
 
 		assertion.getAttributeStatements().add(attrStatement);
 
@@ -1054,23 +918,26 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		}
 		return authresponse;
 	}
-	
+
 	/**
 	 * Generate stork authentication response.
 	 * 
-	 * @param request the request
-	 * @param responseAuthReq the response authentication request
-	 * @param ipAddress the IP address
-	 * @param isHashing the is hashing
+	 * @param request
+	 *            the request
+	 * @param responseAuthReq
+	 *            the response authentication request
+	 * @param ipAddress
+	 *            the IP address
+	 * @param isHashing
+	 *            the is hashing
 	 * 
 	 * @return the sTORK authentication response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAuthnResponse generateSTORKAuthnResponseAfterQuery(
-			final STORKAuthnRequest request,
-			final STORKAuthnResponse responseAuthReq, final String ipAddress,
-			final boolean isHashing, List<STORKAttrQueryResponse> res) throws STORKSAMLEngineException {
+	public STORKAuthnResponse generateSTORKAuthnResponseAfterQuery(final STORKAuthnRequest request, final STORKAuthnResponse responseAuthReq, final String ipAddress, final boolean isHashing,
+			List<STORKAttrQueryResponse> res) throws STORKSAMLEngineException {
 		LOG.info("generateSTORKAuthnResponse");
 
 		// Validate parameters
@@ -1078,52 +945,40 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		// Mandatory SAML
 		LOG.debug("Generate StatusCode");
-		final StatusCode statusCode = SAMLEngineUtils
-		.generateStatusCode(StatusCode.SUCCESS_URI);
+		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(StatusCode.SUCCESS_URI);
 
 		LOG.debug("Generate Status");
 		final Status status = SAMLEngineUtils.generateStatus(statusCode);
 
 		LOG.debug("Generate StatusMessage");
-		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
-		.generateStatusMessage(StatusCode.SUCCESS_URI);
+		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(StatusCode.SUCCESS_URI);
 
 		status.setStatusMessage(statusMessage);
 
 		LOG.debug("Generate Response");
 
 		// RESPONSE
-		final Response response = genAuthnRespBase(status, request
-				.getAssertionConsumerServiceURL(), request.getSamlId());
+		final Response response = genAuthnRespBase(status, request.getAssertionConsumerServiceURL(), request.getSamlId());
 
 		DateTime notOnOrAfter = new DateTime();
 
-		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
-				.getTimeNotOnOrAfter());
+		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
 
-		final Assertion assertion = this.generateAssertion(ipAddress, request
-				.getAssertionConsumerServiceURL(), request.getSamlId(), request
-				.getIssuer(), notOnOrAfter);
+		final Assertion assertion = this.generateAssertion(ipAddress, request.getAssertionConsumerServiceURL(), request.getSamlId(), request.getIssuer(), notOnOrAfter);
 
-		final AttributeStatement attrStatement = this
-		.generateAttributeStatement(responseAuthReq
-				.getPersonalAttributeList(), isHashing);
+		final AttributeStatement attrStatement = this.generateAttributeStatement(responseAuthReq.getPersonalAttributeList(), isHashing);
 
 		assertion.getAttributeStatements().add(attrStatement);
 
 		// Add assertions
 		response.getAssertions().add(assertion);
 		// Check for response queries
-		if (res != null && res.size() > 0)
-		{
-			//Iterate through them
-			for (int i = 0; i < res.size(); i++)
-			{
-				//If response contains multiple assertions iterate through them as well
-				if (res.get(i).getAssertions().size() > 1)
-				{
-					for (int j = 0; j < res.get(i).getAssertions().size(); j++)
-					{
+		if (res != null && res.size() > 0) {
+			// Iterate through them
+			for (int i = 0; i < res.size(); i++) {
+				// If response contains multiple assertions iterate through them as well
+				if (res.get(i).getAssertions().size() > 1) {
+					for (int j = 0; j < res.get(i).getAssertions().size(); j++) {
 						Assertion tempAssertion = res.get(i).getAssertions().get(j);
 						tempAssertion.setParent(response);
 						response.getAssertions().add(tempAssertion);
@@ -1151,26 +1006,28 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Generate stork authentication response fail.
 	 * 
-	 * @param request the request
-	 * @param response the response
-	 * @param ipAddress the IP address
-	 * @param isHashing the is hashing
+	 * @param request
+	 *            the request
+	 * @param response
+	 *            the response
+	 * @param ipAddress
+	 *            the IP address
+	 * @param isHashing
+	 *            the is hashing
 	 * 
 	 * @return the sTORK authentication response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAuthnResponse generateSTORKAuthnResponseFail(
-			final STORKAuthnRequest request, final STORKAuthnResponse response,
-			final String ipAddress, final boolean isHashing)
-	throws STORKSAMLEngineException {
+	public STORKAuthnResponse generateSTORKAuthnResponseFail(final STORKAuthnRequest request, final STORKAuthnResponse response, final String ipAddress, final boolean isHashing)
+			throws STORKSAMLEngineException {
 		LOG.info("generateSTORKAuthnResponseFail");
 
 		validateParamResponseFail(request, response);
 
 		// Mandatory
-		final StatusCode statusCode = SAMLEngineUtils
-		.generateStatusCode(response.getStatusCode());
+		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(response.getStatusCode());
 
 		// Mandatory SAML
 		LOG.debug("Generate StatusCode.");
@@ -1182,8 +1039,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		// - http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported
 
 		if (StringUtils.isNotBlank(response.getSubStatusCode())) {
-			final StatusCode newStatusCode = SAMLEngineUtils
-			.generateStatusCode(response.getSubStatusCode());
+			final StatusCode newStatusCode = SAMLEngineUtils.generateStatusCode(response.getSubStatusCode());
 			statusCode.setStatusCode(newStatusCode);
 		}
 
@@ -1191,25 +1047,20 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		final Status status = SAMLEngineUtils.generateStatus(statusCode);
 
 		if (StringUtils.isNotBlank(response.getMessage())) {
-			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
-			.generateStatusMessage(response.getMessage());
+			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(response.getMessage());
 
 			status.setStatusMessage(statusMessage);
 		}
 
 		LOG.debug("Generate Response.");
 		// RESPONSE
-		final Response responseFail = genAuthnRespBase(status, request
-				.getAssertionConsumerServiceURL(), request.getSamlId());
+		final Response responseFail = genAuthnRespBase(status, request.getAssertionConsumerServiceURL(), request.getSamlId());
 
 		DateTime notOnOrAfter = new DateTime();
 
-		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
-				.getTimeNotOnOrAfter());
+		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
 
-		final Assertion assertion = this.generateAssertion(ipAddress, request
-				.getAssertionConsumerServiceURL(), request.getSamlId(), request
-				.getIssuer(), notOnOrAfter);
+		final Assertion assertion = this.generateAssertion(ipAddress, request.getAssertionConsumerServiceURL(), request.getSamlId(), request.getIssuer(), notOnOrAfter);
 
 		responseFail.getAssertions().add(assertion);
 
@@ -1226,41 +1077,36 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		}
 		return storkResponse;
 	}
-	
+
 	/**
 	 * Generate stork attribute query request.
 	 * 
-	 * @param request the request that contain all parameters for generate an
-	 *            attribute query request.
+	 * @param request
+	 *            the request that contain all parameters for generate an attribute query request.
 	 * 
 	 * @return the STORK attribute query request that has been processed.
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAttrQueryRequest generateSTORKAttrQueryRequest(
-			final STORKAttrQueryRequest request) throws STORKSAMLEngineException {
+	public STORKAttrQueryRequest generateSTORKAttrQueryRequest(final STORKAttrQueryRequest request) throws STORKSAMLEngineException {
 		LOG.info("Generate STORKAttrQueryRequest.");
 
 		// Validate Parameters mandatories
 		validateParamAttrQueryReq(request);
 
-		//final AttributeQuery attrQueryRequestAux = SAMLEngineUtils
-		final CustomAttributeQuery attrQueryRequestAux = SAMLEngineUtils
-		.generateSAMLAttrQueryRequest(SAMLEngineUtils.generateNCName(),
-				SAMLVersion.VERSION_20, SAMLEngineUtils
-				.getCurrentTime());
+		final CustomAttributeQuery attrQueryRequestAux = SAMLEngineUtils.generateSAMLAttrQueryRequest(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime());
 
 		// Set name spaces.
 		setNameSpaces(attrQueryRequestAux);
 
-		
 		// Add parameter optional STORK
 		// Destination is mandatory if the destination is a C-PEPS
 		// The application must to know if the destination is a C-PEPS.
 		if (StringUtils.isNotBlank(request.getDestination())) {
 			attrQueryRequestAux.setDestination(request.getDestination());
 		}
-		
+
 		// Add parameter optional STORK
 		// Consumer URL is needed if using HTTP-Post
 		if (StringUtils.isNotBlank(request.getAssertionConsumerServiceURL())) {
@@ -1268,44 +1114,40 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		}
 
 		// Consent is optional. Set from SAMLEngine.xml - consent.
-		attrQueryRequestAux.setConsent(super.getSamlCoreProperties()
-				.getConsentAuthnRequest());
+		attrQueryRequestAux.setConsent(super.getSamlCoreProperties().getConsentAuthnRequest());
 
 		final Issuer issuer = SAMLEngineUtils.generateIssuer();
-		
-		//Set the subject - needed for attribute query validation
+
+		// Set the subject - needed for attribute query validation
 		Subject subject = SAMLEngineUtils.generateSubject();
 		SubjectConfirmationBuilder builder = new SubjectConfirmationBuilder();
-		SubjectConfirmation subjectConfirmation = builder.buildObject();		
+		SubjectConfirmation subjectConfirmation = builder.buildObject();
 		subjectConfirmation.setMethod("urn:oasis:names:tc:SAML:2.0:cm:bearer");
 		subject.getSubjectConfirmations().add(subjectConfirmation);
 		attrQueryRequestAux.setSubject(subject);
-		
-		if(request.getIssuer()!=null){
+
+		if (request.getIssuer() != null) {
 			issuer.setValue(request.getIssuer());
-        } else {
+		} else {
 			issuer.setValue(super.getSamlCoreProperties().getRequester());
-        }
+		}
 
 		// Optional STORK
-		final String formatEntity = super.getSamlCoreProperties()
-		.getFormatEntity();
+		final String formatEntity = super.getSamlCoreProperties().getFormatEntity();
 		if (StringUtils.isNotBlank(formatEntity)) {
 			issuer.setFormat(formatEntity);
 		}
 
 		attrQueryRequestAux.setIssuer(issuer);
-		
+
 		// Generate stork extensions.
-		final Extensions storkExtensions = this
-		.generateSTORKAttrExtensions(request);
+		final Extensions storkExtensions = this.generateSTORKAttrExtensions(request);
 		// add the extensions to the SAMLAuthnRequest
 		attrQueryRequestAux.setExtensions(storkExtensions);
 
 		// the result contains an authentication request token (byte[]),
 		// identifier of the token, and all parameters from the request.
-		final STORKAttrQueryRequest attrQueryRequest = processAttrExtensions(attrQueryRequestAux
-				.getExtensions());
+		final STORKAttrQueryRequest attrQueryRequest = processAttrExtensions(attrQueryRequestAux.getExtensions());
 
 		try {
 			attrQueryRequest.setTokenSaml(super.signAndMarshall(attrQueryRequestAux));
@@ -1321,22 +1163,25 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		return attrQueryRequest;
 	}
-	
+
 	/**
 	 * Generate stork attribute query response.
 	 * 
-	 * @param request the request
-	 * @param responseAttrQueryRes the response authentication request
-	 * @param ipAddress the IP address
-	 * @param isHashing the hashing of values
+	 * @param request
+	 *            the request
+	 * @param responseAttrQueryRes
+	 *            the response authentication request
+	 * @param ipAddress
+	 *            the IP address
+	 * @param isHashing
+	 *            the hashing of values
 	 * 
 	 * @return the sTORK authentication response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAttrQueryResponse generateSTORKAttrQueryResponse(
-			final STORKAttrQueryRequest request, 
-			final STORKAttrQueryResponse responseAttrQueryRes, final String ipAddress,
+	public STORKAttrQueryResponse generateSTORKAttrQueryResponse(final STORKAttrQueryRequest request, final STORKAttrQueryResponse responseAttrQueryRes, final String ipAddress,
 			final String destinationUrl, final boolean isHashing) throws STORKSAMLEngineException {
 		LOG.info("generateSTORKAttrQueryResponse");
 
@@ -1345,35 +1190,28 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		// Mandatory SAML
 		LOG.debug("Generate StatusCode");
-		final StatusCode statusCode = SAMLEngineUtils
-		.generateStatusCode(StatusCode.SUCCESS_URI);
+		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(StatusCode.SUCCESS_URI);
 
 		LOG.debug("Generate Status");
 		final Status status = SAMLEngineUtils.generateStatus(statusCode);
 
 		LOG.debug("Generate StatusMessage");
-		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
-		.generateStatusMessage(StatusCode.SUCCESS_URI);
+		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(StatusCode.SUCCESS_URI);
 
 		status.setStatusMessage(statusMessage);
 
 		LOG.debug("Generate Response");
 
 		// RESPONSE
-		final Response response = genAuthnRespBase(status, destinationUrl,
-				request.getSamlId());
+		final Response response = genAuthnRespBase(status, destinationUrl, request.getSamlId());
 
 		DateTime notOnOrAfter = new DateTime();
 
-		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
-				.getTimeNotOnOrAfter());
+		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
 
-		final Assertion assertion = this.generateAssertion(ipAddress, ""
-				,request.getSamlId(), request.getIssuer(), notOnOrAfter);
+		final Assertion assertion = this.generateAssertion(ipAddress, "", request.getSamlId(), request.getIssuer(), notOnOrAfter);
 
-		final AttributeStatement attrStatement = this
-		.generateAttributeStatement(responseAttrQueryRes
-				.getPersonalAttributeList(), isHashing);
+		final AttributeStatement attrStatement = this.generateAttributeStatement(responseAttrQueryRes.getPersonalAttributeList(), isHashing);
 
 		assertion.getAttributeStatements().add(attrStatement);
 
@@ -1391,24 +1229,28 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		}
 		return attrQueryResponse;
 	}
-	
+
 	/**
-	 * Generate stork attribute query response from multiple assertions 
-	 * 
-	 * @param request the request
-	 * @param responseAttrQueryRes the response to the query request
-	 * @param responses the responses to include in the response (aggregation)
-	 * @param ipAddress the IP address
-	 * @param isHashing the hashing of values
+	 * Generate stork attribute query response from multiple assertions
+	 * 
+	 * @param request
+	 *            the request
+	 * @param responseAttrQueryRes
+	 *            the response to the query request
+	 * @param responses
+	 *            the responses to include in the response (aggregation)
+	 * @param ipAddress
+	 *            the IP address
+	 * @param isHashing
+	 *            the hashing of values
 	 * 
 	 * @return the sTORK attribute query response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAttrQueryResponse generateSTORKAttrQueryResponseWithAssertions(
-			final STORKAttrQueryRequest request, final STORKAttrQueryResponse responseAttrQueryRes,
-			final List<STORKAttrQueryResponse> responses, final String ipAddress,
-			final String destinationUrl, final boolean isHashing) throws STORKSAMLEngineException {
+	public STORKAttrQueryResponse generateSTORKAttrQueryResponseWithAssertions(final STORKAttrQueryRequest request, final STORKAttrQueryResponse responseAttrQueryRes,
+			final List<STORKAttrQueryResponse> responses, final String ipAddress, final String destinationUrl, final boolean isHashing) throws STORKSAMLEngineException {
 		LOG.info("generateSTORKAttrQueryResponse");
 
 		// Validate parameters
@@ -1416,44 +1258,35 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		// Mandatory SAML
 		LOG.debug("Generate StatusCode");
-		final StatusCode statusCode = SAMLEngineUtils
-		.generateStatusCode(StatusCode.SUCCESS_URI);
+		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(StatusCode.SUCCESS_URI);
 
 		LOG.debug("Generate Status");
 		final Status status = SAMLEngineUtils.generateStatus(statusCode);
 
 		LOG.debug("Generate StatusMessage");
-		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
-		.generateStatusMessage(StatusCode.SUCCESS_URI);
+		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(StatusCode.SUCCESS_URI);
 
 		status.setStatusMessage(statusMessage);
 
 		LOG.debug("Generate Response");
 
 		// RESPONSE
-		final Response response = genAuthnRespBase(status, destinationUrl,
-				request.getSamlId());
+		final Response response = genAuthnRespBase(status, destinationUrl, request.getSamlId());
 
 		DateTime notOnOrAfter = new DateTime();
 
-		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
-				.getTimeNotOnOrAfter());
+		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
 
-		final Assertion assertion = this.generateAssertion(ipAddress, ""
-				,request.getSamlId(), request.getIssuer(), notOnOrAfter);
+		final Assertion assertion = this.generateAssertion(ipAddress, "", request.getSamlId(), request.getIssuer(), notOnOrAfter);
 
-		final AttributeStatement attrStatement = this
-		.generateAttributeStatement(responseAttrQueryRes
-				.getPersonalAttributeList(), isHashing);
+		final AttributeStatement attrStatement = this.generateAttributeStatement(responseAttrQueryRes.getPersonalAttributeList(), isHashing);
 
 		assertion.getAttributeStatements().add(attrStatement);
 
 		// Add the assertions from the former Query responses
 		response.getAssertions().add(assertion);
-		if (responses != null && responses.size() > 0)
-		{
-			for (int i = 0; i < responses.size(); i++)
-			{
+		if (responses != null && responses.size() > 0) {
+			for (int i = 0; i < responses.size(); i++) {
 				Assertion tempAssertion = responses.get(i).getAssertion();
 				tempAssertion.setParent(response);
 				response.getAssertions().add(tempAssertion);
@@ -1471,30 +1304,32 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		}
 		return attrQueryResponse;
 	}
-	
+
 	/**
 	 * Generate stork attribute query response fail.
 	 * 
-	 * @param request the request
-	 * @param response the response
-	 * @param ipAddress the IP address
-	 * @param isHashing the is hashing
+	 * @param request
+	 *            the request
+	 * @param response
+	 *            the response
+	 * @param ipAddress
+	 *            the IP address
+	 * @param isHashing
+	 *            the is hashing
 	 * 
 	 * @return the STORK attribute query response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAttrQueryResponse generateSTORKAttrQueryResponseFail(
-			final STORKAttrQueryRequest request, final STORKAttrQueryResponse response,
-			final String ipAddress, final String destinationUrl, final boolean isHashing)
-	throws STORKSAMLEngineException {
+	public STORKAttrQueryResponse generateSTORKAttrQueryResponseFail(final STORKAttrQueryRequest request, final STORKAttrQueryResponse response, final String ipAddress, final String destinationUrl,
+			final boolean isHashing) throws STORKSAMLEngineException {
 		LOG.info("generateSTORKAttrQueryResponseFail");
 
 		validateParamAttrQueryResponseFail(request, response);
 
 		// Mandatory
-		final StatusCode statusCode = SAMLEngineUtils
-		.generateStatusCode(response.getStatusCode());
+		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(response.getStatusCode());
 
 		// Mandatory SAML
 		LOG.debug("Generate StatusCode.");
@@ -1506,8 +1341,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		// - http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported
 
 		if (StringUtils.isNotBlank(response.getSubStatusCode())) {
-			final StatusCode newStatusCode = SAMLEngineUtils
-			.generateStatusCode(response.getSubStatusCode());
+			final StatusCode newStatusCode = SAMLEngineUtils.generateStatusCode(response.getSubStatusCode());
 			statusCode.setStatusCode(newStatusCode);
 		}
 
@@ -1515,25 +1349,20 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		final Status status = SAMLEngineUtils.generateStatus(statusCode);
 
 		if (StringUtils.isNotBlank(response.getMessage())) {
-			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
-			.generateStatusMessage(response.getMessage());
+			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(response.getMessage());
 
 			status.setStatusMessage(statusMessage);
 		}
 
 		LOG.debug("Generate Response.");
 		// RESPONSE
-		final Response responseFail = genAuthnRespBase(status, destinationUrl,
-				request.getSamlId());
+		final Response responseFail = genAuthnRespBase(status, destinationUrl, request.getSamlId());
 
 		DateTime notOnOrAfter = new DateTime();
 
-		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties()
-				.getTimeNotOnOrAfter());
+		notOnOrAfter = notOnOrAfter.plusSeconds(super.getSamlCoreProperties().getTimeNotOnOrAfter());
 
-		final Assertion assertion = this.generateAssertion(ipAddress, "", 
-				request.getSamlId(), request
-				.getIssuer(), notOnOrAfter);
+		final Assertion assertion = this.generateAssertion(ipAddress, "", request.getSamlId(), request.getIssuer(), notOnOrAfter);
 
 		responseFail.getAssertions().add(assertion);
 
@@ -1550,67 +1379,59 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		}
 		return storkResponse;
 	}
-	
+
 	/**
 	 * Generate stork logout request.
 	 * 
-	 * @param request the request that contain all parameters for generate an
-	 *            logout request.
+	 * @param request
+	 *            the request that contain all parameters for generate an logout request.
 	 * 
 	 * @return the STORK logout request that has been processed.
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKLogoutRequest generateSTORKLogoutRequest(
-			final STORKLogoutRequest request) throws STORKSAMLEngineException {
+	public STORKLogoutRequest generateSTORKLogoutRequest(final STORKLogoutRequest request) throws STORKSAMLEngineException {
 		LOG.info("Generate STORKLogoutRequest.");
 
 		// Validate Parameters mandatories
 		validateParamLogoutReq(request);
 
-		final LogoutRequest logoutRequestAux = SAMLEngineUtils
-			.generateSAMLLogoutRequest(SAMLEngineUtils.generateNCName(),
-					SAMLVersion.VERSION_20, SAMLEngineUtils
-					.getCurrentTime());
+		final LogoutRequest logoutRequestAux = SAMLEngineUtils.generateSAMLLogoutRequest(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime());
 
 		// Set name spaces.
 		setNameSpaces(logoutRequestAux);
 
-		
 		// Add parameter optional STORK
 		// Destination is mandatory if the destination is a C-PEPS
 		// The application must to know if the destination is a C-PEPS.
 		if (StringUtils.isNotBlank(request.getDestination())) {
 			logoutRequestAux.setDestination(request.getDestination());
 		}
-				
+
 		// Consent is optional. Set from SAMLEngine.xml - consent.
-		logoutRequestAux.setConsent(super.getSamlCoreProperties()
-				.getConsentAuthnRequest());
+		logoutRequestAux.setConsent(super.getSamlCoreProperties().getConsentAuthnRequest());
 
 		final Issuer issuer = SAMLEngineUtils.generateIssuer();
-		
-		
-		if(request.getIssuer()!=null){
+
+		if (request.getIssuer() != null) {
 			issuer.setValue(request.getIssuer());
-        } else {
+		} else {
 			issuer.setValue(super.getSamlCoreProperties().getRequester());
-        }
+		}
 
 		// Optional STORK
-		final String formatEntity = super.getSamlCoreProperties()
-		.getFormatEntity();
+		final String formatEntity = super.getSamlCoreProperties().getFormatEntity();
 		if (StringUtils.isNotBlank(formatEntity)) {
 			issuer.setFormat(formatEntity);
 		}
 
 		logoutRequestAux.setIssuer(issuer);
-		
+
 		// Set the name ID
 		final NameID newNameID = SAMLEngineUtils.generateNameID();
-		newNameID.setValue(request.getSpProvidedId());		
+		newNameID.setValue(request.getSpProvidedId());
 		logoutRequestAux.setNameID(newNameID);
-		
 
 		// the result contains an authentication request token (byte[]),
 		// identifier of the token, and all parameters from the request.
@@ -1630,79 +1451,70 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		return logoutRequest;
 	}
-	
 
 	/**
 	 * Generate stork logout response.
-	 * @param request the request thats being responded to
-	 * @param response the tesponse that contain all parameters for generate an
-	 *            logout request.
+	 * 
+	 * @param request
+	 *            the request thats being responded to
+	 * @param response
+	 *            the tesponse that contain all parameters for generate an logout request.
 	 * 
 	 * @return the STORK logout response that has been processed.
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKLogoutResponse generateSTORKLogoutResponse(
-			final STORKLogoutRequest request, 
-			final STORKLogoutResponse response) throws STORKSAMLEngineException {
+	public STORKLogoutResponse generateSTORKLogoutResponse(final STORKLogoutRequest request, final STORKLogoutResponse response) throws STORKSAMLEngineException {
 		LOG.info("Generate STORKLogoutResponse.");
 
 		// Validate Parameters mandatories
 		validateParamLogoutRes(request, response);
-		
+
 		// Mandatory SAML
 		LOG.debug("Generate StatusCode");
-		final StatusCode statusCode = SAMLEngineUtils
-		.generateStatusCode(StatusCode.SUCCESS_URI);
+		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(StatusCode.SUCCESS_URI);
 
 		LOG.debug("Generate Status");
 		final Status status = SAMLEngineUtils.generateStatus(statusCode);
 
 		LOG.debug("Generate StatusMessage");
-		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
-		.generateStatusMessage(StatusCode.SUCCESS_URI);
+		final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(StatusCode.SUCCESS_URI);
 
 		status.setStatusMessage(statusMessage);
 
-		final LogoutResponse logoutResponseAux= SAMLEngineUtils
-			.generateSAMLLogoutResponse(SAMLEngineUtils.generateNCName(),
-					SAMLVersion.VERSION_20, SAMLEngineUtils
-					.getCurrentTime(), status, request.getSamlId());
+		final LogoutResponse logoutResponseAux = SAMLEngineUtils.generateSAMLLogoutResponse(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime(), status,
+				request.getSamlId());
 
 		// Set name spaces.
 		setNameSpaces(logoutResponseAux);
 
-		
 		// Add parameter optional STORK
 		// Destination is mandatory if the destination is a C-PEPS
 		// The application must to know if the destination is a C-PEPS.
 		if (StringUtils.isNotBlank(response.getDestination())) {
 			logoutResponseAux.setDestination(response.getDestination());
 		}
-				
+
 		// Consent is optional. Set from SAMLEngine.xml - consent.
-		logoutResponseAux.setConsent(super.getSamlCoreProperties()
-				.getConsentAuthnRequest());
+		logoutResponseAux.setConsent(super.getSamlCoreProperties().getConsentAuthnRequest());
 
 		final Issuer issuer = SAMLEngineUtils.generateIssuer();
-		
-		
-		if(response.getIssuer()!=null){
+
+		if (response.getIssuer() != null) {
 			issuer.setValue(response.getIssuer());
-        } else {
+		} else {
 			issuer.setValue(super.getSamlCoreProperties().getRequester());
-        }
+		}
 
 		// Optional STORK
-		final String formatEntity = super.getSamlCoreProperties()
-		.getFormatEntity();
+		final String formatEntity = super.getSamlCoreProperties().getFormatEntity();
 		if (StringUtils.isNotBlank(formatEntity)) {
 			issuer.setFormat(formatEntity);
 		}
 
 		logoutResponseAux.setIssuer(issuer);
-		
-		
+
 		// the result contains an authentication request token (byte[]),
 		// identifier of the token, and all parameters from the request.
 		final STORKLogoutResponse logoutResponse = new STORKLogoutResponse();
@@ -1722,28 +1534,26 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		return logoutResponse;
 	}
-	
+
 	/**
 	 * Generate failed stork logout response.
 	 * 
-	 * @param response the response that contain all parameters for generate an
-	 *            logout request.
+	 * @param response
+	 *            the response that contain all parameters for generate an logout request.
 	 * 
 	 * @return the STORK logout response that has been processed.
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKLogoutResponse generateSTORKLogoutResponseFail(
-			final STORKLogoutRequest request, 
-			final STORKLogoutResponse response ) throws STORKSAMLEngineException {
+	public STORKLogoutResponse generateSTORKLogoutResponseFail(final STORKLogoutRequest request, final STORKLogoutResponse response) throws STORKSAMLEngineException {
 		LOG.info("Generate STORKLogoutResponse.");
 
 		// Validate Parameters mandatories
 		validateParamLogoutResFail(request, response);
-		
+
 		// Mandatory
-		final StatusCode statusCode = SAMLEngineUtils
-		.generateStatusCode(response.getStatusCode());
+		final StatusCode statusCode = SAMLEngineUtils.generateStatusCode(response.getStatusCode());
 
 		// Mandatory SAML
 		LOG.debug("Generate StatusCode.");
@@ -1755,8 +1565,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		// - http://www.stork.gov.eu/saml20/statusCodes/QAANotSupported
 
 		if (StringUtils.isNotBlank(response.getSubStatusCode())) {
-			final StatusCode newStatusCode = SAMLEngineUtils
-			.generateStatusCode(response.getSubStatusCode());
+			final StatusCode newStatusCode = SAMLEngineUtils.generateStatusCode(response.getSubStatusCode());
 			statusCode.setStatusCode(newStatusCode);
 		}
 
@@ -1764,51 +1573,43 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		final Status status = SAMLEngineUtils.generateStatus(statusCode);
 
 		if (StringUtils.isNotBlank(response.getStatusMessage())) {
-			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils
-			.generateStatusMessage(response.getStatusMessage());
+			final StatusMessage statusMessage = (StatusMessage) SAMLEngineUtils.generateStatusMessage(response.getStatusMessage());
 
 			status.setStatusMessage(statusMessage);
 		}
 
-		final LogoutResponse logoutResponseAux= SAMLEngineUtils
-			.generateSAMLLogoutResponse(SAMLEngineUtils.generateNCName(),
-					SAMLVersion.VERSION_20, SAMLEngineUtils
-					.getCurrentTime(), status, request.getSamlId());
+		final LogoutResponse logoutResponseAux = SAMLEngineUtils.generateSAMLLogoutResponse(SAMLEngineUtils.generateNCName(), SAMLVersion.VERSION_20, SAMLEngineUtils.getCurrentTime(), status,
+				request.getSamlId());
 
 		// Set name spaces.
 		setNameSpaces(logoutResponseAux);
 
-		
 		// Add parameter optional STORK
 		// Destination is mandatory if the destination is a C-PEPS
 		// The application must to know if the destination is a C-PEPS.
 		if (StringUtils.isNotBlank(response.getDestination())) {
 			logoutResponseAux.setDestination(response.getDestination());
 		}
-				
+
 		// Consent is optional. Set from SAMLEngine.xml - consent.
-		logoutResponseAux.setConsent(super.getSamlCoreProperties()
-				.getConsentAuthnRequest());
+		logoutResponseAux.setConsent(super.getSamlCoreProperties().getConsentAuthnRequest());
 
 		final Issuer issuer = SAMLEngineUtils.generateIssuer();
-		
-		
-		if(response.getIssuer()!=null){
+
+		if (response.getIssuer() != null) {
 			issuer.setValue(response.getIssuer());
-        } else {
+		} else {
 			issuer.setValue(super.getSamlCoreProperties().getRequester());
-        }
+		}
 
 		// Optional STORK
-		final String formatEntity = super.getSamlCoreProperties()
-		.getFormatEntity();
+		final String formatEntity = super.getSamlCoreProperties().getFormatEntity();
 		if (StringUtils.isNotBlank(formatEntity)) {
 			issuer.setFormat(formatEntity);
 		}
 
 		logoutResponseAux.setIssuer(issuer);
-		
-		
+
 		// the result contains an authentication request token (byte[]),
 		// identifier of the token, and all parameters from the request.
 		final STORKLogoutResponse logoutResponse = new STORKLogoutResponse();
@@ -1832,25 +1633,22 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Generate stork authentication statement for the authentication statement.
 	 * 
-	 * @param ipAddress the IP address
+	 * @param ipAddress
+	 *            the IP address
 	 * 
 	 * @return the authentication statement
 	 */
 	private AuthnStatement generateStorkAuthStatement(final String ipAddress) {
 		LOG.debug("Generate stork authenticate statement.");
-		final SubjectLocality subjectLocality = SAMLEngineUtils
-		.generateSubjectLocality(ipAddress);
+		final SubjectLocality subjectLocality = SAMLEngineUtils.generateSubjectLocality(ipAddress);
 
-		final AuthnContext authnContext = (AuthnContext) SAMLEngineUtils
-		.createSamlObject(AuthnContext.DEFAULT_ELEMENT_NAME);
+		final AuthnContext authnContext = (AuthnContext) SAMLEngineUtils.createSamlObject(AuthnContext.DEFAULT_ELEMENT_NAME);
 
-		final AuthnContextDecl authnContextDecl = (AuthnContextDecl) SAMLEngineUtils
-		.createSamlObject(AuthnContextDecl.DEFAULT_ELEMENT_NAME);
+		final AuthnContextDecl authnContextDecl = (AuthnContextDecl) SAMLEngineUtils.createSamlObject(AuthnContextDecl.DEFAULT_ELEMENT_NAME);
 
 		authnContext.setAuthnContextDecl(authnContextDecl);
 
-		final AuthnStatement authnStatement = SAMLEngineUtils
-		.generateAthnStatement(new DateTime(), authnContext);
+		final AuthnStatement authnStatement = SAMLEngineUtils.generateAthnStatement(new DateTime(), authnContext);
 
 		// Optional STORK
 		authnStatement.setSessionIndex(null);
@@ -1862,101 +1660,84 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Generate stork extensions.
 	 * 
-	 * @param request the request
+	 * @param request
+	 *            the request
 	 * 
 	 * @return the extensions
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private Extensions generateSTORKExtensions(final STORKAuthnRequest request)
-	throws STORKSAMLEngineException {
+	private Extensions generateSTORKExtensions(final STORKAuthnRequest request) throws STORKSAMLEngineException {
 		LOG.debug("Generate STORKExtensions");
 
 		final Extensions extensions = SAMLEngineUtils.generateExtension();
 
 		LOG.debug("Generate QAAAttribute");
-		final QAAAttribute qaaAttribute = SAMLEngineUtils
-		.generateQAAAttribute(request.getQaa());
+		final QAAAttribute qaaAttribute = SAMLEngineUtils.generateQAAAttribute(request.getQaa());
 		extensions.getUnknownXMLObjects().add(qaaAttribute);
 
-
-		if (StringUtils.isNotEmpty(request
-				.getSpSector())) {
+		if (StringUtils.isNotEmpty(request.getSpSector())) {
 			// Add information about service provider.
 			LOG.debug("Generate SPSector");
-			final SPSector sector = SAMLEngineUtils.generateSPSector(request
-					.getSpSector());
+			final SPSector sector = SAMLEngineUtils.generateSPSector(request.getSpSector());
 			extensions.getUnknownXMLObjects().add(sector);
 		}
 
-		//Delete from specification. Kept for compatibility with Provider Name value
+		// Delete from specification. Kept for compatibility with Provider Name value
 		LOG.debug("Generate SPInstitution");
-		final SPInstitution institution = SAMLEngineUtils
-		.generateSPInstitution(request.getProviderName());
+		final SPInstitution institution = SAMLEngineUtils.generateSPInstitution(request.getProviderName());
 		extensions.getUnknownXMLObjects().add(institution);
 
-
 		if (StringUtils.isNotEmpty(request.getSpApplication())) {
 			LOG.debug("Generate SPApplication");
-			final SPApplication application = SAMLEngineUtils
-			.generateSPApplication(request.getSpApplication());
+			final SPApplication application = SAMLEngineUtils.generateSPApplication(request.getSpApplication());
 			extensions.getUnknownXMLObjects().add(application);
 		}
 
 		if (StringUtils.isNotEmpty(request.getSpCountry())) {
 			LOG.debug("Generate SPCountry");
-			final SPCountry country = SAMLEngineUtils.generateSPCountry(request
-					.getSpCountry());
+			final SPCountry country = SAMLEngineUtils.generateSPCountry(request.getSpCountry());
 			extensions.getUnknownXMLObjects().add(country);
 		}
 
-		//eIDSectorShare: optional; default value: false.
-		String valueSectorShare = super.getSamlCoreProperties()
-		.iseIDSectorShare();
+		// eIDSectorShare: optional; default value: false.
+		String valueSectorShare = super.getSamlCoreProperties().iseIDSectorShare();
 
 		if (StringUtils.isNotEmpty(valueSectorShare)) {
 			// Add information about the use of the SAML message.
 			LOG.debug("Generate EIDSectorShare");
-			final EIDSectorShare eIdSectorShare = (EIDSectorShare) SAMLEngineUtils
-			.createSamlObject(EIDSectorShare.DEF_ELEMENT_NAME);
+			final EIDSectorShare eIdSectorShare = (EIDSectorShare) SAMLEngineUtils.createSamlObject(EIDSectorShare.DEF_ELEMENT_NAME);
 
 			eIdSectorShare.setEIDSectorShare(String.valueOf(Boolean.valueOf(valueSectorShare)));
 
 			extensions.getUnknownXMLObjects().add(eIdSectorShare);
-		} 
+		}
 
-		String valueCrossSectorShare = super.getSamlCoreProperties()
-		.iseIDCrossSectorShare();
+		String valueCrossSectorShare = super.getSamlCoreProperties().iseIDCrossSectorShare();
 
 		if (StringUtils.isNotEmpty(valueCrossSectorShare)) {
 			LOG.debug("Generate EIDCrossSectorShare");
-			final EIDCrossSectorShare eIdCrossSecShare = (EIDCrossSectorShare) SAMLEngineUtils
-			.createSamlObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
+			final EIDCrossSectorShare eIdCrossSecShare = (EIDCrossSectorShare) SAMLEngineUtils.createSamlObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
 			eIdCrossSecShare.setEIDCrossSectorShare(String.valueOf(Boolean.valueOf(valueCrossSectorShare)));
 			extensions.getUnknownXMLObjects().add(eIdCrossSecShare);
 		}
 
-
-		String valueCrossBorderShare = super.getSamlCoreProperties()
-		.iseIDCrossBorderShare();
+		String valueCrossBorderShare = super.getSamlCoreProperties().iseIDCrossBorderShare();
 
 		if (StringUtils.isNotEmpty(valueCrossBorderShare)) {
 			LOG.debug("Generate EIDCrossBorderShare");
-			final EIDCrossBorderShare eIdCrossBordShare = (EIDCrossBorderShare) SAMLEngineUtils
-			.createSamlObject(EIDCrossBorderShare.DEF_ELEMENT_NAME);
+			final EIDCrossBorderShare eIdCrossBordShare = (EIDCrossBorderShare) SAMLEngineUtils.createSamlObject(EIDCrossBorderShare.DEF_ELEMENT_NAME);
 			eIdCrossBordShare.setEIDCrossBorderShare(String.valueOf(Boolean.valueOf(valueCrossBorderShare)));
 			extensions.getUnknownXMLObjects().add(eIdCrossBordShare);
 		}
 
-
 		// Add information about requested attributes.
 		LOG.debug("Generate RequestedAttributes.");
-		final RequestedAttributes reqAttributes = (RequestedAttributes) SAMLEngineUtils
-		.createSamlObject(RequestedAttributes.DEF_ELEMENT_NAME);
+		final RequestedAttributes reqAttributes = (RequestedAttributes) SAMLEngineUtils.createSamlObject(RequestedAttributes.DEF_ELEMENT_NAME);
 
 		LOG.debug("SAML Engine configuration properties load.");
-		final Iterator<PersonalAttribute> iterator = request
-		.getPersonalAttributeList().iterator();
+		final Iterator<PersonalAttribute> iterator = request.getPersonalAttributeList().iterator();
 
 		while (iterator.hasNext()) {
 
@@ -1968,14 +1749,11 @@ public final class STORKSAMLEngine extends SAMLEngine {
 			}
 
 			// Verified if exits the attribute name.
-			final String attributeName = super.getSamlCoreProperties()
-			.getProperty(attribute.getName());
+			final String attributeName = super.getSamlCoreProperties().getProperty(attribute.getName());
 
 			if (StringUtils.isBlank(attributeName)) {
-				LOG.debug("Attribute name: {} was not found.", attribute
-						.getName());
-				throw new STORKSAMLEngineException("Attribute name: "
-						+ attribute.getName() + " was not found.");
+				LOG.debug("Attribute name: {} was not found.", attribute.getName());
+				throw new STORKSAMLEngineException("Attribute name: " + attribute.getName() + " was not found.");
 			}
 
 			// Friendly name it's an optional attribute.
@@ -1985,18 +1763,13 @@ public final class STORKSAMLEngine extends SAMLEngine {
 				friendlyName = attribute.getName();
 			}
 
-
 			String isRequired = null;
 			if (super.getSamlCoreProperties().isRequired()) {
 				isRequired = String.valueOf(attribute.isRequired());
 			}
 
-
 			LOG.debug("Generate requested attribute: " + attributeName);
-			final RequestedAttribute requestedAttr = SAMLEngineUtils
-			.generateReqAuthnAttributeSimple(attributeName,
-					friendlyName, isRequired, attribute
-					.getValue());
+			final RequestedAttribute requestedAttr = SAMLEngineUtils.generateReqAuthnAttributeSimple(attributeName, friendlyName, isRequired, attribute.getValue());
 
 			// Add requested attribute.
 			reqAttributes.getAttributes().add(requestedAttr);
@@ -2006,123 +1779,103 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		extensions.getUnknownXMLObjects().add(reqAttributes);
 
 		CitizenCountryCode citizenCountryCode = null;
-		if (request.getCitizenCountryCode() != null && StringUtils.isNotBlank(request.getCitizenCountryCode())){
+		if (request.getCitizenCountryCode() != null && StringUtils.isNotBlank(request.getCitizenCountryCode())) {
 			LOG.debug("Generate CitizenCountryCode");
-			citizenCountryCode = (CitizenCountryCode) SAMLEngineUtils
-			.createSamlObject(CitizenCountryCode.DEF_ELEMENT_NAME);
+			citizenCountryCode = (CitizenCountryCode) SAMLEngineUtils.createSamlObject(CitizenCountryCode.DEF_ELEMENT_NAME);
 
-			citizenCountryCode.setCitizenCountryCode(request
-					.getCitizenCountryCode().toUpperCase());
-		}		
+			citizenCountryCode.setCitizenCountryCode(request.getCitizenCountryCode().toUpperCase());
+		}
 
 		SPID spid = null;
-		if(request.getSPID()!=null && StringUtils.isNotBlank(request.getSPID())) {
+		if (request.getSPID() != null && StringUtils.isNotBlank(request.getSPID())) {
 			LOG.debug("Generate SPID");
-			spid = (SPID) SAMLEngineUtils
-			.createSamlObject(SPID.DEF_ELEMENT_NAME);
+			spid = (SPID) SAMLEngineUtils.createSamlObject(SPID.DEF_ELEMENT_NAME);
 
 			spid.setSPID(request.getSPID().toUpperCase());
-		}	   
+		}
 
-		AuthenticationAttributes authenticationAttr = (AuthenticationAttributes) SAMLEngineUtils
-		.createSamlObject(AuthenticationAttributes.DEF_ELEMENT_NAME);
+		AuthenticationAttributes authenticationAttr = (AuthenticationAttributes) SAMLEngineUtils.createSamlObject(AuthenticationAttributes.DEF_ELEMENT_NAME);
 
-		final VIDPAuthenticationAttributes vIDPauthenticationAttr = (VIDPAuthenticationAttributes) SAMLEngineUtils
-		.createSamlObject(VIDPAuthenticationAttributes.DEF_ELEMENT_NAME);
+		final VIDPAuthenticationAttributes vIDPauthenticationAttr = (VIDPAuthenticationAttributes) SAMLEngineUtils.createSamlObject(VIDPAuthenticationAttributes.DEF_ELEMENT_NAME);
 
-		final SPInformation spInformation = (SPInformation) SAMLEngineUtils
-		.createSamlObject(SPInformation.DEF_ELEMENT_NAME);
+		final SPInformation spInformation = (SPInformation) SAMLEngineUtils.createSamlObject(SPInformation.DEF_ELEMENT_NAME);
 
-		if(citizenCountryCode!=null){
+		if (citizenCountryCode != null) {
 			vIDPauthenticationAttr.setCitizenCountryCode(citizenCountryCode);
 		}
 
-		if(spid!=null){
+		if (spid != null) {
 			spInformation.setSPID(spid);
 		}
 
 		vIDPauthenticationAttr.setSPInformation(spInformation);
 
-		authenticationAttr
-		.setVIDPAuthenticationAttributes(vIDPauthenticationAttr);
+		authenticationAttr.setVIDPAuthenticationAttributes(vIDPauthenticationAttr);
 		extensions.getUnknownXMLObjects().add(authenticationAttr);
 
-
 		return extensions;
 
 	}
-	
+
 	/**
 	 * Generate stork extensions.
 	 * 
-	 * @param request the attribute query request
+	 * @param request
+	 *            the attribute query request
 	 * 
 	 * @return the extensions
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private Extensions generateSTORKAttrExtensions(final STORKAttrQueryRequest request)
-	throws STORKSAMLEngineException {
+	private Extensions generateSTORKAttrExtensions(final STORKAttrQueryRequest request) throws STORKSAMLEngineException {
 		LOG.debug("Generate STORKExtensions");
 
 		final Extensions extensions = SAMLEngineUtils.generateExtension();
 
 		LOG.debug("Generate QAAAttribute");
-		final QAAAttribute qaaAttribute = SAMLEngineUtils
-		.generateQAAAttribute(request.getQaa());
+		final QAAAttribute qaaAttribute = SAMLEngineUtils.generateQAAAttribute(request.getQaa());
 		extensions.getUnknownXMLObjects().add(qaaAttribute);
 
-
-		if (StringUtils.isNotEmpty(request
-				.getSpSector())) {
+		if (StringUtils.isNotEmpty(request.getSpSector())) {
 			// Add information about service provider.
 			LOG.debug("Generate SPSector");
-			final SPSector sector = SAMLEngineUtils.generateSPSector(request
-					.getSpSector());
+			final SPSector sector = SAMLEngineUtils.generateSPSector(request.getSpSector());
 			extensions.getUnknownXMLObjects().add(sector);
 		}
 
-
 		if (StringUtils.isNotEmpty(request.getSpApplication())) {
 			LOG.debug("Generate SPApplication");
-			final SPApplication application = SAMLEngineUtils
-			.generateSPApplication(request.getSpApplication());
+			final SPApplication application = SAMLEngineUtils.generateSPApplication(request.getSpApplication());
 			extensions.getUnknownXMLObjects().add(application);
 		}
 
 		if (StringUtils.isNotEmpty(request.getSpCountry())) {
 			LOG.debug("Generate SPCountry");
-			final SPCountry country = SAMLEngineUtils.generateSPCountry(request
-					.getSpCountry());
+			final SPCountry country = SAMLEngineUtils.generateSPCountry(request.getSpCountry());
 			extensions.getUnknownXMLObjects().add(country);
 		}
 
-		final EIDSectorShare eIdSectorShare = (EIDSectorShare) SAMLEngineUtils
-		.createSamlObject(EIDSectorShare.DEF_ELEMENT_NAME);
+		final EIDSectorShare eIdSectorShare = (EIDSectorShare) SAMLEngineUtils.createSamlObject(EIDSectorShare.DEF_ELEMENT_NAME);
 
 		eIdSectorShare.setEIDSectorShare(String.valueOf(request.isEIDSectorShare()));
 
 		extensions.getUnknownXMLObjects().add(eIdSectorShare);
 
-		final EIDCrossSectorShare eIdCrossSecShare = (EIDCrossSectorShare) SAMLEngineUtils
-		.createSamlObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
+		final EIDCrossSectorShare eIdCrossSecShare = (EIDCrossSectorShare) SAMLEngineUtils.createSamlObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
 		eIdCrossSecShare.setEIDCrossSectorShare(String.valueOf(request.isEIDCrossSectorShare()));
 		extensions.getUnknownXMLObjects().add(eIdCrossSecShare);
 
-		final EIDCrossBorderShare eIdCrossBordShare = (EIDCrossBorderShare) SAMLEngineUtils
-		.createSamlObject(EIDCrossBorderShare.DEF_ELEMENT_NAME);
+		final EIDCrossBorderShare eIdCrossBordShare = (EIDCrossBorderShare) SAMLEngineUtils.createSamlObject(EIDCrossBorderShare.DEF_ELEMENT_NAME);
 		eIdCrossBordShare.setEIDCrossBorderShare(String.valueOf(request.isEIDCrossBorderShare()));
 		extensions.getUnknownXMLObjects().add(eIdCrossBordShare);
 
-
 		// Add information about requested attributes.
 		LOG.debug("Generate RequestedAttributes.");
-		final RequestedAttributes reqAttributes = (RequestedAttributes) SAMLEngineUtils
-		.createSamlObject(RequestedAttributes.DEF_ELEMENT_NAME);
+		final RequestedAttributes reqAttributes = (RequestedAttributes) SAMLEngineUtils.createSamlObject(RequestedAttributes.DEF_ELEMENT_NAME);
 
 		LOG.debug("SAML Engine configuration properties load.");
-		final Iterator<PersonalAttribute> iterator = request
-		.getPersonalAttributeList().iterator();
+		final Iterator<PersonalAttribute> iterator = request.getPersonalAttributeList().iterator();
 
 		while (iterator.hasNext()) {
 
@@ -2134,14 +1887,11 @@ public final class STORKSAMLEngine extends SAMLEngine {
 			}
 
 			// Verified if exits the attribute name.
-			final String attributeName = super.getSamlCoreProperties()
-			.getProperty(attribute.getName());
+			final String attributeName = super.getSamlCoreProperties().getProperty(attribute.getName());
 
 			if (StringUtils.isBlank(attributeName)) {
-				LOG.debug("Attribute name: {} was not found.", attribute
-						.getName());
-				throw new STORKSAMLEngineException("Attribute name: "
-						+ attribute.getName() + " was not found.");
+				LOG.debug("Attribute name: {} was not found.", attribute.getName());
+				throw new STORKSAMLEngineException("Attribute name: " + attribute.getName() + " was not found.");
 			}
 
 			// Friendly name it's an optional attribute.
@@ -2151,18 +1901,13 @@ public final class STORKSAMLEngine extends SAMLEngine {
 				friendlyName = attribute.getName();
 			}
 
-
 			String isRequired = null;
 			if (super.getSamlCoreProperties().isRequired()) {
 				isRequired = String.valueOf(attribute.isRequired());
 			}
 
-
 			LOG.debug("Generate requested attribute: " + attributeName);
-			final RequestedAttribute requestedAttr = SAMLEngineUtils
-			.generateReqAuthnAttributeSimple(attributeName,
-					friendlyName, isRequired, attribute
-					.getValue());
+			final RequestedAttribute requestedAttr = SAMLEngineUtils.generateReqAuthnAttributeSimple(attributeName, friendlyName, isRequired, attribute.getValue());
 
 			// Add requested attribute.
 			reqAttributes.getAttributes().add(requestedAttr);
@@ -2172,100 +1917,92 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		extensions.getUnknownXMLObjects().add(reqAttributes);
 
 		CitizenCountryCode citizenCountryCode = null;
-		if (request.getCitizenCountryCode() != null && StringUtils.isNotBlank(request.getCitizenCountryCode())){
+		if (request.getCitizenCountryCode() != null && StringUtils.isNotBlank(request.getCitizenCountryCode())) {
 			LOG.debug("Generate CitizenCountryCode");
-			citizenCountryCode = (CitizenCountryCode) SAMLEngineUtils
-			.createSamlObject(CitizenCountryCode.DEF_ELEMENT_NAME);
+			citizenCountryCode = (CitizenCountryCode) SAMLEngineUtils.createSamlObject(CitizenCountryCode.DEF_ELEMENT_NAME);
+
+			citizenCountryCode.setCitizenCountryCode(request.getCitizenCountryCode().toUpperCase());
 
-			citizenCountryCode.setCitizenCountryCode(request
-					.getCitizenCountryCode().toUpperCase());
-		}		
+			extensions.getUnknownXMLObjects().add(citizenCountryCode);
+		}
 
 		SPID spid = null;
-		if(request.getSPID()!=null && StringUtils.isNotBlank(request.getSPID())) {
+		if (request.getSPID() != null && StringUtils.isNotBlank(request.getSPID())) {
 			LOG.debug("Generate SPID");
-			spid = (SPID) SAMLEngineUtils
-			.createSamlObject(SPID.DEF_ELEMENT_NAME);
+			spid = (SPID) SAMLEngineUtils.createSamlObject(SPID.DEF_ELEMENT_NAME);
 
 			spid.setSPID(request.getSPID().toUpperCase());
-		}	   
 
+			extensions.getUnknownXMLObjects().add(spid);
+		}
 
 		return extensions;
 
 	}
-	
+
 	/**
 	 * Gets the alias from X.509 Certificate at keystore.
 	 * 
-	 * @param keyInfo the key info
-	 * @param storkOwnKeyStore 
-	 * @param storkOwnKeyStore 
+	 * @param keyInfo
+	 *            the key info
+	 * @param storkOwnKeyStore
+	 * @param storkOwnKeyStore
 	 * 
 	 * @return the alias
 	 */
-    private String getAlias(final KeyInfo keyInfo, KeyStore storkOwnKeyStore) {
-
-        LOG.debug("Recover alias information");
+	private String getAlias(final KeyInfo keyInfo, KeyStore storkOwnKeyStore) {
 
-        String alias = null;
-        try {
-            final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo
-                    .getX509Datas().get(0).getX509Certificates().get(0);
+		LOG.debug("Recover alias information");
 
-            // Transform the KeyInfo to X509Certificate.
-            CertificateFactory certFact;
-            certFact = CertificateFactory.getInstance("X.509");
+		String alias = null;
+		try {
+			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo.getX509Datas().get(0).getX509Certificates().get(0);
 
-            final ByteArrayInputStream bis = new ByteArrayInputStream(Base64
-                    .decode(xmlCert.getValue()));
+			// Transform the KeyInfo to X509Certificate.
+			CertificateFactory certFact;
+			certFact = CertificateFactory.getInstance("X.509");
 
-            final X509Certificate cert = (X509Certificate) certFact
-                    .generateCertificate(bis);
+			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64.decode(xmlCert.getValue()));
 
-            final String tokenSerialNumber = cert.getSerialNumber().toString(16);
-            final X509Principal tokenIssuerDN = new X509Principal(cert.getIssuerDN().getName());
+			final X509Certificate cert = (X509Certificate) certFact.generateCertificate(bis);
 
+			final String tokenSerialNumber = cert.getSerialNumber().toString(16);
+			final X509Principal tokenIssuerDN = new X509Principal(cert.getIssuerDN().getName());
 
-            String aliasCert;
-            X509Certificate certificate;
-            boolean find = false;
+			String aliasCert;
+			X509Certificate certificate;
+			boolean find = false;
 
-            for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e
-                    .hasMoreElements()
-                    && !find; ) {
-                aliasCert = e.nextElement();
-                certificate = (X509Certificate) storkOwnKeyStore
-                        .getCertificate(aliasCert);                
+			for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e.hasMoreElements() && !find;) {
+				aliasCert = e.nextElement();
+				certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);
 
-                final String serialNum = certificate.getSerialNumber()
-                        .toString(16);
+				final String serialNum = certificate.getSerialNumber().toString(16);
 
-                X509Principal issuerDN = new X509Principal(certificate
-                        .getIssuerDN().getName());
+				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
 
-                if(serialNum.equalsIgnoreCase(tokenSerialNumber)
-                        && X509PrincipalUtil.equals2(issuerDN, tokenIssuerDN)){
-                    alias = aliasCert;
-                    find = true;
-                }
+				if (serialNum.equalsIgnoreCase(tokenSerialNumber) && X509PrincipalUtil.equals2(issuerDN, tokenIssuerDN)) {
+					alias = aliasCert;
+					find = true;
+				}
 
-            }
+			}
 
-        } catch (KeyStoreException e) {
-            LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
-        } catch (CertificateException e) {
-            LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
-        } catch (RuntimeException e) {
-            LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
-        }
-        return alias;
-    }
+		} catch (KeyStoreException e) {
+			LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
+		} catch (CertificateException e) {
+			LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
+		} catch (RuntimeException e) {
+			LOG.error("Procces getAlias from certificate associated into the signing keystore..", e);
+		}
+		return alias;
+	}
 
 	/**
 	 * Gets the country from X.509 Certificate.
 	 * 
-	 * @param keyInfo the key info
+	 * @param keyInfo
+	 *            the key info
 	 * 
 	 * @return the country
 	 */
@@ -2274,23 +2011,19 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		String result = "";
 		try {
-			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo
-			.getX509Datas().get(0).getX509Certificates().get(0);
+			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo.getX509Datas().get(0).getX509Certificates().get(0);
 
 			// Transform the KeyInfo to X509Certificate.
 			CertificateFactory certFact;
 			certFact = CertificateFactory.getInstance("X.509");
 
-			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64
-					.decode(xmlCert.getValue()));
+			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64.decode(xmlCert.getValue()));
 
-			final X509Certificate cert = (X509Certificate) certFact
-			.generateCertificate(bis);
+			final X509Certificate cert = (X509Certificate) certFact.generateCertificate(bis);
 
 			String distName = cert.getSubjectDN().toString();
 
-			distName = StringUtils.deleteWhitespace(StringUtils
-					.upperCase(distName));
+			distName = StringUtils.deleteWhitespace(StringUtils.upperCase(distName));
 
 			final String countryCode = "C=";
 			final int init = distName.indexOf(countryCode);
@@ -2303,12 +2036,11 @@ public final class STORKSAMLEngine extends SAMLEngine {
 				}
 
 				if (init < end && end > StringUtils.INDEX_NOT_FOUND) {
-					result = distName.substring(init + countryCode.length(),
-							end);
-					//It must be a two characters value
-					if(result.length()>2){
+					result = distName.substring(init + countryCode.length(), end);
+					// It must be a two characters value
+					if (result.length() > 2) {
 						result = result.substring(0, 2);
-                    }
+					}
 				}
 			}
 
@@ -2321,112 +2053,97 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Process all elements XMLObjects from the extensions.
 	 * 
-	 * @param extensions the extensions from the authentication request.
+	 * @param extensions
+	 *            the extensions from the authentication request.
 	 * 
 	 * @return the STORK authentication request
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private STORKAuthnRequest processExtensions(final Extensions extensions)
-	throws STORKSAMLEngineException {
+	private STORKAuthnRequest processExtensions(final Extensions extensions) throws STORKSAMLEngineException {
 		LOG.debug("Procces the extensions.");
 
 		final STORKAuthnRequest request = new STORKAuthnRequest();
 
-		final QAAAttribute qaa = (QAAAttribute) extensions
-		.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME).get(0);
+		final QAAAttribute qaa = (QAAAttribute) extensions.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME).get(0);
 		request.setQaa(Integer.parseInt(qaa.getQaaLevel()));
 
-		List optionalElements = extensions.getUnknownXMLObjects(
-				SPSector.DEF_ELEMENT_NAME);
+		List optionalElements = extensions.getUnknownXMLObjects(SPSector.DEF_ELEMENT_NAME);
 
 		if (!optionalElements.isEmpty()) {
-			final SPSector sector = (SPSector) extensions.getUnknownXMLObjects(
-					SPSector.DEF_ELEMENT_NAME).get(0);
+			final SPSector sector = (SPSector) extensions.getUnknownXMLObjects(SPSector.DEF_ELEMENT_NAME).get(0);
 			request.setSpSector(sector.getSPSector());
 		}
 
 		optionalElements = extensions.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME);
 
 		if (!optionalElements.isEmpty()) {
-			final SPApplication application = (SPApplication) extensions
-			.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME).get(0);
+			final SPApplication application = (SPApplication) extensions.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME).get(0);
 			request.setSpApplication(application.getSPApplication());
 		}
 
 		optionalElements = extensions.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME);
 
 		if (!optionalElements.isEmpty()) {
-			final SPCountry application = (SPCountry) extensions
-			.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME).get(0);
+			final SPCountry application = (SPCountry) extensions.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME).get(0);
 			request.setSpCountry(application.getSPCountry());
-		}	
-
+		}
 
-		List listCrossBorderShare = extensions
-		.getUnknownXMLObjects(EIDCrossBorderShare.DEF_ELEMENT_NAME);
+		List listCrossBorderShare = extensions.getUnknownXMLObjects(EIDCrossBorderShare.DEF_ELEMENT_NAME);
 
-		if (!listCrossBorderShare .isEmpty()) {
+		if (!listCrossBorderShare.isEmpty()) {
 			final EIDCrossBorderShare crossBorderShare = (EIDCrossBorderShare) listCrossBorderShare.get(0);
-			request.setEIDCrossBorderShare(Boolean.parseBoolean(crossBorderShare
-					.getEIDCrossBorderShare()));		
+			request.setEIDCrossBorderShare(Boolean.parseBoolean(crossBorderShare.getEIDCrossBorderShare()));
 		}
 
-
-		List listCrosSectorShare = extensions
-		.getUnknownXMLObjects(EIDCrossSectorShare.DEF_ELEMENT_NAME);
+		List listCrosSectorShare = extensions.getUnknownXMLObjects(EIDCrossSectorShare.DEF_ELEMENT_NAME);
 
 		if (!listCrosSectorShare.isEmpty()) {
 			final EIDCrossSectorShare crossSectorShare = (EIDCrossSectorShare) listCrosSectorShare.get(0);
-			request.setEIDCrossSectorShare(Boolean.parseBoolean(crossSectorShare
-					.getEIDCrossSectorShare()));
+			request.setEIDCrossSectorShare(Boolean.parseBoolean(crossSectorShare.getEIDCrossSectorShare()));
 		}
 
-		List listSectorShareExtension = extensions
-		.getUnknownXMLObjects(EIDSectorShare.DEF_ELEMENT_NAME);
+		List listSectorShareExtension = extensions.getUnknownXMLObjects(EIDSectorShare.DEF_ELEMENT_NAME);
 		if (!listSectorShareExtension.isEmpty()) {
 			final EIDSectorShare sectorShare = (EIDSectorShare) listSectorShareExtension.get(0);
 			request.setEIDSectorShare(Boolean.parseBoolean(sectorShare.getEIDSectorShare()));
 		}
 
-
-
-		List<XMLObject> authAttrs = extensions
-		.getUnknownXMLObjects(AuthenticationAttributes.DEF_ELEMENT_NAME);
+		List<XMLObject> authAttrs = extensions.getUnknownXMLObjects(AuthenticationAttributes.DEF_ELEMENT_NAME);
 
 		if (authAttrs != null && !authAttrs.isEmpty()) {
 
-			final AuthenticationAttributes authnAttr = (AuthenticationAttributes) authAttrs
-			.get(0);	
+			final AuthenticationAttributes authnAttr = (AuthenticationAttributes) authAttrs.get(0);
 
 			VIDPAuthenticationAttributes vidpAuthnAttr = null;
-			if (authnAttr != null && !authAttrs.isEmpty()){
+			if (authnAttr != null && !authAttrs.isEmpty()) {
 				vidpAuthnAttr = authnAttr.getVIDPAuthenticationAttributes();
 			}
 
 			CitizenCountryCode citizenCountryCodeElement = null;
 			SPInformation spInformation = null;
-			if (vidpAuthnAttr != null){
+			if (vidpAuthnAttr != null) {
 				citizenCountryCodeElement = vidpAuthnAttr.getCitizenCountryCode();
 				spInformation = vidpAuthnAttr.getSPInformation();
 			}
 
 			String citizenCountryCode = null;
-			if(citizenCountryCodeElement!=null){
+			if (citizenCountryCodeElement != null) {
 				citizenCountryCode = citizenCountryCodeElement.getCitizenCountryCode();
 			}
 
-			if(citizenCountryCode!= null && StringUtils.isNotBlank(citizenCountryCode)){
+			if (citizenCountryCode != null && StringUtils.isNotBlank(citizenCountryCode)) {
 				request.setCitizenCountryCode(citizenCountryCode);
-			}	  	    
+			}
 
 			SPID spidElement = null;
-			if (spInformation != null){
+			if (spInformation != null) {
 				spidElement = spInformation.getSPID();
 			}
 
 			String spid = null;
-			if(spidElement!=null){
+			if (spidElement != null) {
 				spid = spidElement.getSPID();
 			}
 
@@ -2435,16 +2152,12 @@ public final class STORKSAMLEngine extends SAMLEngine {
 			}
 		}
 
-		if (extensions
-				.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME) == null) {
+		if (extensions.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME) == null) {
 			LOG.error("Extensions not contains any requested attribute.");
-			throw new STORKSAMLEngineException(
-			"Extensions not contains any requested attribute.");
+			throw new STORKSAMLEngineException("Extensions not contains any requested attribute.");
 		}
 
-		final RequestedAttributes requestedAttr = (RequestedAttributes) extensions
-		.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME)
-		.get(0);
+		final RequestedAttributes requestedAttr = (RequestedAttributes) extensions.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME).get(0);
 
 		final List<RequestedAttribute> reqAttrs = requestedAttr.getAttributes();
 
@@ -2459,8 +2172,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
 			attributeName = attribute.getName();
 
 			// recover the last name from the string.
-			personalAttribute.setName(attributeName.substring(attributeName
-					.lastIndexOf('/') + 1));
+			personalAttribute.setName(attributeName.substring(attributeName.lastIndexOf('/') + 1));
 
 			final ArrayList<String> valores = new ArrayList<String>();
 			final List<XMLObject> values = attribute.getOrderedChildren();
@@ -2469,52 +2181,46 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 				// Process attributes simples. An AuthenticationRequest only
 				// must contains simple values.
-				
+
 				final XMLObject xmlObject = values.get(nextSimpleValue);
-								
-				if(xmlObject instanceof XSStringImpl){
-					
-					final XSStringImpl xmlString = (XSStringImpl) values
-					.get(nextSimpleValue);
+
+				if (xmlObject instanceof XSStringImpl) {
+
+					final XSStringImpl xmlString = (XSStringImpl) values.get(nextSimpleValue);
 					valores.add(xmlString.getValue());
-				
-				}else{
-				
+
+				} else {
+
 					if (attributeName.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
-						
-						final XSAnyImpl xmlString = (XSAnyImpl) values
-						.get(nextSimpleValue);
-						
+
+						final XSAnyImpl xmlString = (XSAnyImpl) values.get(nextSimpleValue);
+
 						TransformerFactory transFactory = TransformerFactory.newInstance();
 						Transformer transformer = null;
 						try {
 							transformer = transFactory.newTransformer();
 							transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
 						} catch (TransformerConfigurationException e) {
-                            LOG.error("Error transformer configuration exception", e);
+							LOG.error("Error transformer configuration exception", e);
 						}
-						StringWriter buffer = new StringWriter();					
+						StringWriter buffer = new StringWriter();
 						try {
-                            if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0 ){
-                                transformer.transform(new DOMSource(xmlString.getUnknownXMLObjects().get(0).getDOM()),
-                                      new StreamResult(buffer));
-                            }
+							if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0) {
+								transformer.transform(new DOMSource(xmlString.getUnknownXMLObjects().get(0).getDOM()), new StreamResult(buffer));
+							}
 						} catch (TransformerException e) {
-                            LOG.error("Error transformer exception", e);
+							LOG.error("Error transformer exception", e);
 						}
 						String str = buffer.toString();
-						
-						valores.add(str);	
-										
-					}else{
-						
-						final XSAnyImpl xmlString = (XSAnyImpl) values
-						.get(nextSimpleValue);
+
+						valores.add(str);
+
+					} else {
+
+						final XSAnyImpl xmlString = (XSAnyImpl) values.get(nextSimpleValue);
 						valores.add(xmlString.getTextContent());
 					}
-								
-					
-										
+
 				}
 			}
 			personalAttribute.setValue(valores);
@@ -2526,116 +2232,100 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		return request;
 	}
 
-	
 	/**
 	 * Process all elements XMLObjects from the extensions.
 	 * 
-	 * @param extensions the extensions from the authentication request.
+	 * @param extensions
+	 *            the extensions from the authentication request.
 	 * 
 	 * @return the STORK authentication request
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private STORKAttrQueryRequest processAttrExtensions(final Extensions extensions)
-	throws STORKSAMLEngineException {
+	private STORKAttrQueryRequest processAttrExtensions(final Extensions extensions) throws STORKSAMLEngineException {
 		LOG.debug("Procces the atribute query extensions.");
 
 		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
 
-		final QAAAttribute qaa = (QAAAttribute) extensions
-		.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME).get(0);
+		final QAAAttribute qaa = (QAAAttribute) extensions.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME).get(0);
 		request.setQaa(Integer.parseInt(qaa.getQaaLevel()));
 
-		List optionalElements = extensions.getUnknownXMLObjects(
-				SPSector.DEF_ELEMENT_NAME);
+		List optionalElements = extensions.getUnknownXMLObjects(SPSector.DEF_ELEMENT_NAME);
 
 		if (!optionalElements.isEmpty()) {
-			final SPSector sector = (SPSector) extensions.getUnknownXMLObjects(
-					SPSector.DEF_ELEMENT_NAME).get(0);
+			final SPSector sector = (SPSector) extensions.getUnknownXMLObjects(SPSector.DEF_ELEMENT_NAME).get(0);
 			request.setSpSector(sector.getSPSector());
 		}
 
 		optionalElements = extensions.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME);
 
 		if (!optionalElements.isEmpty()) {
-			final SPApplication application = (SPApplication) extensions
-			.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME).get(0);
+			final SPApplication application = (SPApplication) extensions.getUnknownXMLObjects(SPApplication.DEF_ELEMENT_NAME).get(0);
 			request.setSpApplication(application.getSPApplication());
 		}
 
 		optionalElements = extensions.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME);
 
 		if (!optionalElements.isEmpty()) {
-			final SPCountry application = (SPCountry) extensions
-			.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME).get(0);
+			final SPCountry application = (SPCountry) extensions.getUnknownXMLObjects(SPCountry.DEF_ELEMENT_NAME).get(0);
 			request.setSpCountry(application.getSPCountry());
-		}	
-
+		}
 
-		List listCrossBorderShare = extensions
-		.getUnknownXMLObjects(EIDCrossBorderShare.DEF_ELEMENT_NAME);
+		List listCrossBorderShare = extensions.getUnknownXMLObjects(EIDCrossBorderShare.DEF_ELEMENT_NAME);
 
-		if (!listCrossBorderShare .isEmpty()) {
+		if (!listCrossBorderShare.isEmpty()) {
 			final EIDCrossBorderShare crossBorderShare = (EIDCrossBorderShare) listCrossBorderShare.get(0);
-			request.setEIDCrossBorderShare(Boolean.parseBoolean(crossBorderShare
-					.getEIDCrossBorderShare()));		
+			request.setEIDCrossBorderShare(Boolean.parseBoolean(crossBorderShare.getEIDCrossBorderShare()));
 		}
 
-
-		List listCrosSectorShare = extensions
-		.getUnknownXMLObjects(EIDCrossSectorShare.DEF_ELEMENT_NAME);
+		List listCrosSectorShare = extensions.getUnknownXMLObjects(EIDCrossSectorShare.DEF_ELEMENT_NAME);
 
 		if (!listCrosSectorShare.isEmpty()) {
 			final EIDCrossSectorShare crossSectorShare = (EIDCrossSectorShare) listCrosSectorShare.get(0);
-			request.setEIDCrossSectorShare(Boolean.parseBoolean(crossSectorShare
-					.getEIDCrossSectorShare()));
+			request.setEIDCrossSectorShare(Boolean.parseBoolean(crossSectorShare.getEIDCrossSectorShare()));
 		}
 
-		List listSectorShareExtension = extensions
-		.getUnknownXMLObjects(EIDSectorShare.DEF_ELEMENT_NAME);
+		List listSectorShareExtension = extensions.getUnknownXMLObjects(EIDSectorShare.DEF_ELEMENT_NAME);
 		if (!listSectorShareExtension.isEmpty()) {
 			final EIDSectorShare sectorShare = (EIDSectorShare) listSectorShareExtension.get(0);
 			request.setEIDSectorShare(Boolean.parseBoolean(sectorShare.getEIDSectorShare()));
 		}
 
-
-
-		List<XMLObject> authAttrs = extensions
-		.getUnknownXMLObjects(AuthenticationAttributes.DEF_ELEMENT_NAME);
+		List<XMLObject> authAttrs = extensions.getUnknownXMLObjects(AuthenticationAttributes.DEF_ELEMENT_NAME);
 
 		if (authAttrs != null && !authAttrs.isEmpty()) {
 
-			final AuthenticationAttributes authnAttr = (AuthenticationAttributes) authAttrs
-			.get(0);	
+			final AuthenticationAttributes authnAttr = (AuthenticationAttributes) authAttrs.get(0);
 
 			VIDPAuthenticationAttributes vidpAuthnAttr = null;
-			if (authnAttr != null && !authAttrs.isEmpty()){
+			if (authnAttr != null && !authAttrs.isEmpty()) {
 				vidpAuthnAttr = authnAttr.getVIDPAuthenticationAttributes();
 			}
 
 			CitizenCountryCode citizenCountryCodeElement = null;
 			SPInformation spInformation = null;
-			if (vidpAuthnAttr != null){
+			if (vidpAuthnAttr != null) {
 				citizenCountryCodeElement = vidpAuthnAttr.getCitizenCountryCode();
 				spInformation = vidpAuthnAttr.getSPInformation();
 			}
 
 			String citizenCountryCode = null;
-			if(citizenCountryCodeElement!=null){
+			if (citizenCountryCodeElement != null) {
 				citizenCountryCode = citizenCountryCodeElement.getCitizenCountryCode();
 			}
 
-			if(citizenCountryCode!= null && StringUtils.isNotBlank(citizenCountryCode)){
+			if (citizenCountryCode != null && StringUtils.isNotBlank(citizenCountryCode)) {
 				request.setCitizenCountryCode(citizenCountryCode);
-			}	  	    
+			}
 
 			SPID spidElement = null;
-			if (spInformation != null){
+			if (spInformation != null) {
 				spidElement = spInformation.getSPID();
 			}
 
 			String spid = null;
-			if(spidElement!=null){
+			if (spidElement != null) {
 				spid = spidElement.getSPID();
 			}
 
@@ -2644,16 +2334,12 @@ public final class STORKSAMLEngine extends SAMLEngine {
 			}
 		}
 
-		if (extensions
-				.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME) == null) {
+		if (extensions.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME) == null) {
 			LOG.error("Extensions not contains any requested attribute.");
-			throw new STORKSAMLEngineException(
-			"Extensions not contains any requested attribute.");
+			throw new STORKSAMLEngineException("Extensions not contains any requested attribute.");
 		}
 
-		final RequestedAttributes requestedAttr = (RequestedAttributes) extensions
-		.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME)
-		.get(0);
+		final RequestedAttributes requestedAttr = (RequestedAttributes) extensions.getUnknownXMLObjects(RequestedAttributes.DEF_ELEMENT_NAME).get(0);
 
 		final List<RequestedAttribute> reqAttrs = requestedAttr.getAttributes();
 
@@ -2668,8 +2354,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
 			attributeName = attribute.getName();
 
 			// recover the last name from the string.
-			personalAttribute.setName(attributeName.substring(attributeName
-					.lastIndexOf('/') + 1));
+			personalAttribute.setName(attributeName.substring(attributeName.lastIndexOf('/') + 1));
 
 			final ArrayList<String> valores = new ArrayList<String>();
 			final List<XMLObject> values = attribute.getOrderedChildren();
@@ -2678,52 +2363,46 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 				// Process attributes simples. An AuthenticationRequest only
 				// must contains simple values.
-				
+
 				final XMLObject xmlObject = values.get(nextSimpleValue);
-								
-				if(xmlObject instanceof XSStringImpl){
-					
-					final XSStringImpl xmlString = (XSStringImpl) values
-					.get(nextSimpleValue);
+
+				if (xmlObject instanceof XSStringImpl) {
+
+					final XSStringImpl xmlString = (XSStringImpl) values.get(nextSimpleValue);
 					valores.add(xmlString.getValue());
-				
-				}else{
-				
+
+				} else {
+
 					if (attributeName.equals("http://www.stork.gov.eu/1.0/signedDoc")) {
-						
-						final XSAnyImpl xmlString = (XSAnyImpl) values
-						.get(nextSimpleValue);
-						
+
+						final XSAnyImpl xmlString = (XSAnyImpl) values.get(nextSimpleValue);
+
 						TransformerFactory transFactory = TransformerFactory.newInstance();
 						Transformer transformer = null;
 						try {
 							transformer = transFactory.newTransformer();
 							transformer.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
 						} catch (TransformerConfigurationException e) {
-                            LOG.error("Error transformer configuration exception", e);
+							LOG.error("Error transformer configuration exception", e);
 						}
-						StringWriter buffer = new StringWriter();					
+						StringWriter buffer = new StringWriter();
 						try {
-                            if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0 ){
-                                transformer.transform(new DOMSource(xmlString.getUnknownXMLObjects().get(0).getDOM()),
-                                      new StreamResult(buffer));
-                            }
+							if (xmlString != null && xmlString.getUnknownXMLObjects() != null && xmlString.getUnknownXMLObjects().size() > 0) {
+								transformer.transform(new DOMSource(xmlString.getUnknownXMLObjects().get(0).getDOM()), new StreamResult(buffer));
+							}
 						} catch (TransformerException e) {
-                            LOG.error("Error transformer exception", e);
+							LOG.error("Error transformer exception", e);
 						}
 						String str = buffer.toString();
-						
-						valores.add(str);	
-										
-					}else{
-						
-						final XSAnyImpl xmlString = (XSAnyImpl) values
-						.get(nextSimpleValue);
+
+						valores.add(str);
+
+					} else {
+
+						final XSAnyImpl xmlString = (XSAnyImpl) values.get(nextSimpleValue);
 						valores.add(xmlString.getTextContent());
 					}
-								
-					
-										
+
 				}
 			}
 			personalAttribute.setValue(valores);
@@ -2738,25 +2417,22 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Sets the name spaces.
 	 * 
-	 * @param tokenSaml the new name spaces
+	 * @param tokenSaml
+	 *            the new name spaces
 	 */
 	private void setNameSpaces(final XMLObject tokenSaml) {
 		LOG.debug("Set namespaces.");
 
-		final Namespace saml2 = new Namespace(SAMLConstants.SAML20_NS,
-				SAMLConstants.SAML20_PREFIX);
+		final Namespace saml2 = new Namespace(SAMLConstants.SAML20_NS, SAMLConstants.SAML20_PREFIX);
 		tokenSaml.addNamespace(saml2);
 
-		final Namespace digSig = new Namespace(
-				"http://www.w3.org/2000/09/xmldsig#", "ds");
+		final Namespace digSig = new Namespace("http://www.w3.org/2000/09/xmldsig#", "ds");
 		tokenSaml.addNamespace(digSig);
 
-		final Namespace storkp = new Namespace(SAMLCore.STORK10P_NS.getValue(),
-				SAMLCore.STORK10P_PREFIX.getValue());
+		final Namespace storkp = new Namespace(SAMLCore.STORK10P_NS.getValue(), SAMLCore.STORK10P_PREFIX.getValue());
 		tokenSaml.addNamespace(storkp);
 
-		final Namespace stork = new Namespace(SAMLCore.STORK10_NS.getValue(),
-				SAMLCore.STORK10_PREFIX.getValue());
+		final Namespace stork = new Namespace(SAMLCore.STORK10_NS.getValue(), SAMLCore.STORK10_PREFIX.getValue());
 
 		tokenSaml.addNamespace(stork);
 	}
@@ -2764,248 +2440,209 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Validate parameters from authentication request.
 	 * 
-	 * @param request the request.
+	 * @param request
+	 *            the request.
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private void validateParamAuthnReq(final STORKAuthnRequest request)
-	throws STORKSAMLEngineException {
+	private void validateParamAuthnReq(final STORKAuthnRequest request) throws STORKSAMLEngineException {
 		LOG.info("Validate parameters from authentication request.");
 
 		// URL to which Authentication Response must be sent.
 		if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
-			throw new STORKSAMLEngineException(
-					"StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
+			throw new STORKSAMLEngineException("StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
 		}
 
 		// the name of the original service provider requesting the
 		// authentication.
 		if (StringUtils.isBlank(request.getProviderName())) {
-			throw new STORKSAMLEngineException(
-					"StorkSamlEngine: Service Provider it's mandatory.");
+			throw new STORKSAMLEngineException("StorkSamlEngine: Service Provider it's mandatory.");
 		}
 
 		// object that contain all attributes requesting.
-		if (request.getPersonalAttributeList() == null
-				|| request.getPersonalAttributeList().isEmpty()) {
-			throw new STORKSAMLEngineException(
-			"attributeQueries is null or empty.");
+		if (request.getPersonalAttributeList() == null || request.getPersonalAttributeList().isEmpty()) {
+			throw new STORKSAMLEngineException("attributeQueries is null or empty.");
 		}
 
 		// Quality authentication assurance level.
-		if ((request.getQaa() < QAAAttribute.MIN_VALUE)
-				|| (request.getQaa() > QAAAttribute.MAX_VALUE)) {
-			throw new STORKSAMLEngineException("Qaal: " + request.getQaa()
-					+ ", is invalid.");
+		if ((request.getQaa() < QAAAttribute.MIN_VALUE) || (request.getQaa() > QAAAttribute.MAX_VALUE)) {
+			throw new STORKSAMLEngineException("Qaal: " + request.getQaa() + ", is invalid.");
 		}
 
 	}
-	
+
 	/**
 	 * Validate parameters from attribute query request.
 	 * 
-	 * @param request the request.
+	 * @param request
+	 *            the request.
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private void validateParamAttrQueryReq(final STORKAttrQueryRequest request)
-	throws STORKSAMLEngineException {
+	private void validateParamAttrQueryReq(final STORKAttrQueryRequest request) throws STORKSAMLEngineException {
 		LOG.info("Validate parameters from attribute query request.");
 
 		// URL to which AP Response must be sent.
 		if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
-			throw new STORKSAMLEngineException(
-					"StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
+			throw new STORKSAMLEngineException("StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
 		}
 
-		// Destination of the request - not mandatory
-		/*if (StringUtils.isBlank(request.getDestination())) {
-			throw new STORKSAMLEngineException(
-					"StorkSamlEngine: Destination is mandatory.");
-		}*/
-		
 		// SP country is empty
 		if (StringUtils.isBlank(request.getSpCountry())) {
-			throw new STORKSAMLEngineException(
-					"StorkSamlEngine: SP country is mandatory.");
+			throw new STORKSAMLEngineException("StorkSamlEngine: SP country is mandatory.");
 		}
 
 		// object that contain all attributes requesting.
-		if (request.getPersonalAttributeList() == null
-				|| request.getPersonalAttributeList().isEmpty()) {
-			throw new STORKSAMLEngineException(
-			"attributeQueries is null or empty.");
+		if (request.getPersonalAttributeList() == null || request.getPersonalAttributeList().isEmpty()) {
+			throw new STORKSAMLEngineException("attributeQueries is null or empty.");
 		}
 
 		// Quality authentication assurance level.
-		if ((request.getQaa() < QAAAttribute.MIN_VALUE)
-				|| (request.getQaa() > QAAAttribute.MAX_VALUE)) {
-			throw new STORKSAMLEngineException("Qaal: " + request.getQaa()
-					+ ", is invalid.");
+		if ((request.getQaa() < QAAAttribute.MIN_VALUE) || (request.getQaa() > QAAAttribute.MAX_VALUE)) {
+			throw new STORKSAMLEngineException("Qaal: " + request.getQaa() + ", is invalid.");
 		}
 	}
-	
+
 	/**
 	 * Validate parameters from logout request.
 	 * 
-	 * @param request the request.
+	 * @param request
+	 *            the request.
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private void validateParamLogoutReq(final STORKLogoutRequest request)
-	throws STORKSAMLEngineException {
+	private void validateParamLogoutReq(final STORKLogoutRequest request) throws STORKSAMLEngineException {
 		LOG.info("Validate parameters from logout request.");
-
 		// URL to which AP Response must be sent.
-		/*if (StringUtils.isBlank(request.get())) {
-			throw new STORKSAMLEngineException(
-					"StorkSamlEngine: Assertion Consumer Service URL it's mandatory.");
-		}*/
-
 		// Destination of the request
 		if (StringUtils.isBlank(request.getDestination())) {
-			throw new STORKSAMLEngineException(
-					"StorkSamlEngine: Destination is mandatory.");
+			throw new STORKSAMLEngineException("StorkSamlEngine: Destination is mandatory.");
 		}
-		
+
 		// SP Provided Id
 		if (StringUtils.isBlank(request.getSpProvidedId())) {
-			throw new STORKSAMLEngineException(
-					"StorkSamlEngine: SP provided Id is mandatory.");
+			throw new STORKSAMLEngineException("StorkSamlEngine: SP provided Id is mandatory.");
 		}
 	}
-	
+
 	/**
 	 * Validate parameters from logout response.
 	 * 
-	 * @param response the response.
+	 * @param response
+	 *            the response.
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private void validateParamLogoutRes(final STORKLogoutRequest request, 
-			final STORKLogoutResponse response)	throws STORKSAMLEngineException {
+	private void validateParamLogoutRes(final STORKLogoutRequest request, final STORKLogoutResponse response) throws STORKSAMLEngineException {
 		LOG.info("Validate parameters from logout request.");
 
 		// Issuer is mandatory
 		if (StringUtils.isBlank(request.getIssuer())) {
-			throw new STORKSAMLEngineException(
-					"Issuer must be not empty or null.");
+			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
 		}
 
 		// Destination of the request
 		if (StringUtils.isBlank(response.getDestination())) {
-			throw new STORKSAMLEngineException(
-					"StorkSamlEngine: Destination is mandatory.");
+			throw new STORKSAMLEngineException("StorkSamlEngine: Destination is mandatory.");
 		}
-		
+
 		// SP Provided Id
 		if (StringUtils.isBlank(request.getSpProvidedId())) {
-			throw new STORKSAMLEngineException(
-					"StorkSamlEngine: SP provided Id is mandatory.");
+			throw new STORKSAMLEngineException("StorkSamlEngine: SP provided Id is mandatory.");
 		}
-		
+
 		if (StringUtils.isBlank(request.getSamlId())) {
 			throw new STORKSAMLEngineException("request ID is null or empty.");
 		}
 	}
 
-
 	/**
 	 * Validate parameters from response.
 	 * 
-	 * @param request the request
-	 * @param responseAuthReq the response authentication request
+	 * @param request
+	 *            the request
+	 * @param responseAuthReq
+	 *            the response authentication request
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private void validateParamResponse(final STORKAuthnRequest request,
-			final STORKAuthnResponse responseAuthReq)
-	throws STORKSAMLEngineException {
+	private void validateParamResponse(final STORKAuthnRequest request, final STORKAuthnResponse responseAuthReq) throws STORKSAMLEngineException {
 		LOG.info("Validate parameters response.");
 		if (StringUtils.isBlank(request.getIssuer())) {
-			throw new STORKSAMLEngineException(
-					"Issuer must be not empty or null.");
+			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
 		}
 
-		if (responseAuthReq.getPersonalAttributeList() == null
-				|| responseAuthReq.getPersonalAttributeList().isEmpty()) {
-			LOG.error("PersonalAttributeList is null or empty.");
-			throw new STORKSAMLEngineException(
-			"PersonalAttributeList is null or empty.");
+		if (responseAuthReq.getPersonalAttributeList() == null) {
+			LOG.error("PersonalAttributeList is null.");
+			throw new STORKSAMLEngineException("PersonalAttributeList is null.");
 		}
 
 		if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
-			throw new STORKSAMLEngineException(
-					"assertionConsumerServiceURL is null or empty.");
+			throw new STORKSAMLEngineException("assertionConsumerServiceURL is null or empty.");
 		}
 
 		if (StringUtils.isBlank(request.getSamlId())) {
 			throw new STORKSAMLEngineException("request ID is null or empty.");
 		}
 	}
-	
+
 	/**
 	 * Validate parameters from response.
 	 * 
-	 * @param request the request
-	 * @param responseAttrQueryReq the response authentication request
+	 * @param request
+	 *            the request
+	 * @param responseAttrQueryReq
+	 *            the response authentication request
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private void validateParamAttrQueryResponse(final STORKAttrQueryRequest request,
-			final STORKAttrQueryResponse responseAttrQueryReq)
-	throws STORKSAMLEngineException {
+	private void validateParamAttrQueryResponse(final STORKAttrQueryRequest request, final STORKAttrQueryResponse responseAttrQueryReq) throws STORKSAMLEngineException {
 		LOG.info("Validate attribute querey parameters response.");
 		if (StringUtils.isBlank(request.getIssuer())) {
-			throw new STORKSAMLEngineException(
-					"Issuer must be not empty or null.");
+			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
 		}
 
-		if (responseAttrQueryReq.getPersonalAttributeList() == null
-				|| responseAttrQueryReq.getPersonalAttributeList().isEmpty()) {
+		if (responseAttrQueryReq.getPersonalAttributeList() == null || responseAttrQueryReq.getPersonalAttributeList().isEmpty()) {
 			LOG.error("PersonalAttributeList is null or empty.");
-			throw new STORKSAMLEngineException(
-			"PersonalAttributeList is null or empty.");
+			throw new STORKSAMLEngineException("PersonalAttributeList is null or empty.");
 		}
 
-		/*if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
-			throw new STORKSAMLEngineException(
-					"assertionConsumerServiceURL is null or empty.");
-		}*/
-
 		if (StringUtils.isBlank(request.getSamlId())) {
 			throw new STORKSAMLEngineException("request ID is null or empty.");
 		}
 	}
-	
+
 	/**
 	 * Validate parameters from response.
 	 * 
-	 * @param request the request
-	 * @param responseAttrQueryReq the response authentication request
+	 * @param request
+	 *            the request
+	 * @param responseAttrQueryReq
+	 *            the response authentication request
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private void validateParamAttrQueryResponseFromAssertions(final STORKAttrQueryRequest request,
-			final STORKAttrQueryResponse responseAttrQueryReq)
-	throws STORKSAMLEngineException {
+	private void validateParamAttrQueryResponseFromAssertions(final STORKAttrQueryRequest request, final STORKAttrQueryResponse responseAttrQueryReq) throws STORKSAMLEngineException {
 		LOG.info("Validate attribute querey parameters response.");
 		if (StringUtils.isBlank(request.getIssuer())) {
-			throw new STORKSAMLEngineException(
-					"Issuer must be not empty or null.");
+			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
 		}
 
-		/*if (responseAttrQueryReq.getPersonalAttributeList() == null
-				|| responseAttrQueryReq.getPersonalAttributeList().isEmpty()) {
-			LOG.error("PersonalAttributeList is null or empty.");
-			throw new STORKSAMLEngineException(
-			"PersonalAttributeList is null or empty.");
-		}*/
+		/*
+		 * if (responseAttrQueryReq.getPersonalAttributeList() == null || responseAttrQueryReq.getPersonalAttributeList().isEmpty()) { LOG.error("PersonalAttributeList is null or empty."); throw new
+		 * STORKSAMLEngineException( "PersonalAttributeList is null or empty."); }
+		 */
 
-		/*if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
-			throw new STORKSAMLEngineException(
-					"assertionConsumerServiceURL is null or empty.");
-		}*/
+		/*
+		 * if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) { throw new STORKSAMLEngineException( "assertionConsumerServiceURL is null or empty."); }
+		 */
 
 		if (StringUtils.isBlank(request.getSamlId())) {
 			throw new STORKSAMLEngineException("request ID is null or empty.");
@@ -3015,38 +2652,41 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Validate parameter from response fail.
 	 * 
-	 * @param request the request
-	 * @param response the response
+	 * @param request
+	 *            the request
+	 * @param response
+	 *            the response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private void validateParamResponseFail(final STORKAuthnRequest request,
-			final STORKAuthnResponse response) throws STORKSAMLEngineException {
+	private void validateParamResponseFail(final STORKAuthnRequest request, final STORKAuthnResponse response) throws STORKSAMLEngineException {
 		LOG.info("Validate parameters response fail.");
 		if (StringUtils.isBlank(response.getStatusCode())) {
 			throw new STORKSAMLEngineException("Code error it's null or empty.");
 		}
 
 		if (StringUtils.isBlank(request.getAssertionConsumerServiceURL())) {
-			throw new STORKSAMLEngineException(
-					"assertionConsumerServiceURL is null or empty.");
+			throw new STORKSAMLEngineException("assertionConsumerServiceURL is null or empty.");
 		}
 
 		if (StringUtils.isBlank(request.getSamlId())) {
 			throw new STORKSAMLEngineException("request ID is null or empty.");
 		}
 	}
-	
+
 	/**
 	 * Validate parameter from response fail.
 	 * 
-	 * @param request the request
-	 * @param response the response
+	 * @param request
+	 *            the request
+	 * @param response
+	 *            the response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private void validateParamAttrQueryResponseFail(final STORKAttrQueryRequest request,
-			final STORKAttrQueryResponse response) throws STORKSAMLEngineException {
+	private void validateParamAttrQueryResponseFail(final STORKAttrQueryRequest request, final STORKAttrQueryResponse response) throws STORKSAMLEngineException {
 		LOG.info("Validate parameters response fail.");
 		if (StringUtils.isBlank(response.getStatusCode())) {
 			throw new STORKSAMLEngineException("Code error it's null or empty.");
@@ -3056,22 +2696,23 @@ public final class STORKSAMLEngine extends SAMLEngine {
 			throw new STORKSAMLEngineException("request ID is null or empty.");
 		}
 	}
-	
+
 	/**
 	 * Validate parameter from response fail.
 	 * 
-	 * @param request the request
-	 * @param response the response
+	 * @param request
+	 *            the request
+	 * @param response
+	 *            the response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private void validateParamLogoutResFail(final STORKLogoutRequest request,
-			final STORKLogoutResponse response) throws STORKSAMLEngineException {
+	private void validateParamLogoutResFail(final STORKLogoutRequest request, final STORKLogoutResponse response) throws STORKSAMLEngineException {
 		LOG.info("Validate parameters response fail.");
-		
+
 		if (StringUtils.isBlank(request.getIssuer())) {
-			throw new STORKSAMLEngineException(
-					"Issuer must be not empty or null.");
+			throw new STORKSAMLEngineException("Issuer must be not empty or null.");
 		}
 
 		if (StringUtils.isBlank(response.getStatusCode())) {
@@ -3086,14 +2727,15 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Validate stork authentication request.
 	 * 
-	 * @param tokenSaml the token SAML
+	 * @param tokenSaml
+	 *            the token SAML
 	 * 
 	 * @return the sTORK authentication request
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAuthnRequest validateSTORKAuthnRequest(final byte[] tokenSaml)
-	throws STORKSAMLEngineException {
+	public STORKAuthnRequest validateSTORKAuthnRequest(final byte[] tokenSaml) throws STORKSAMLEngineException {
 		LOG.info("validateSTORKAuthnRequest");
 
 		final AuthnRequest samlRequest = (AuthnRequest) validateStorkSaml(tokenSaml);
@@ -3108,60 +2750,56 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		}
 
 		LOG.debug("Generate STORKAuthnRequest.");
-		final STORKAuthnRequest authnRequest = processExtensions(samlRequest
-				.getExtensions());
-
-		authnRequest.setCountry(this.getCountry(samlRequest.getSignature()
-				.getKeyInfo()));
-		
-		authnRequest.setAlias(this.getAlias(samlRequest.getSignature()
-				.getKeyInfo(), super.getSigner().getTrustStore()));
-		
+		final STORKAuthnRequest authnRequest = processExtensions(samlRequest.getExtensions());
+
+		authnRequest.setCountry(this.getCountry(samlRequest.getSignature().getKeyInfo()));
+
+		authnRequest.setAlias(this.getAlias(samlRequest.getSignature().getKeyInfo(), super.getSigner().getTrustStore()));
+
 		authnRequest.setSamlId(samlRequest.getID());
 		authnRequest.setDestination(samlRequest.getDestination());
-		authnRequest.setAssertionConsumerServiceURL(samlRequest
-				.getAssertionConsumerServiceURL());
+		authnRequest.setAssertionConsumerServiceURL(samlRequest.getAssertionConsumerServiceURL());
 
 		authnRequest.setProviderName(samlRequest.getProviderName());
 		authnRequest.setIssuer(samlRequest.getIssuer().getValue());
 
-		//Delete unknown elements from requested ones
+		// Delete unknown elements from requested ones
 		final Iterator<PersonalAttribute> iterator = authnRequest.getPersonalAttributeList().iterator();
-        IPersonalAttributeList cleanPerAttrList = (PersonalAttributeList) authnRequest.getPersonalAttributeList();
+		IPersonalAttributeList cleanPerAttrList = (PersonalAttributeList) authnRequest.getPersonalAttributeList();
 		while (iterator.hasNext()) {
 
 			final PersonalAttribute attribute = iterator.next();
 
 			// Verify if the attribute name exits.
-			final String attributeName = super.getSamlCoreProperties()
-			.getProperty(attribute.getName());
+			final String attributeName = super.getSamlCoreProperties().getProperty(attribute.getName());
 
 			if (StringUtils.isBlank(attributeName)) {
 				LOG.info("Attribute name: {} was not found. It will be removed from the request object", attribute.getName());
 				cleanPerAttrList.remove(attribute.getName());
 			}
 
-		}	
+		}
 		authnRequest.setPersonalAttributeList(cleanPerAttrList);
 
 		return authnRequest;
 
 	}
-	
+
 	/**
 	 * Validate stork attribute query request.
 	 * 
-	 * @param tokenSaml the token SAML
+	 * @param tokenSaml
+	 *            the token SAML
 	 * 
 	 * @return the STORK attribute query request
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAttrQueryRequest validateSTORKAttrQueryRequest(final byte[] tokenSaml)
-	throws STORKSAMLEngineException {
+	public STORKAttrQueryRequest validateSTORKAttrQueryRequest(final byte[] tokenSaml) throws STORKSAMLEngineException {
 		LOG.info("validateSTORKAttrQueryRequest");
 
-		//final AttributeQuery samlRequest = (AttributeQuery) validateStorkSaml(tokenSaml);
+		// final AttributeQuery samlRequest = (AttributeQuery) validateStorkSaml(tokenSaml);
 		final CustomRequestAbstractType samlRequest = (CustomRequestAbstractType) validateStorkSaml(tokenSaml);
 
 		LOG.debug("Validate Extensions.");
@@ -3174,82 +2812,77 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		}
 
 		LOG.debug("Generate STORKAttrQueryRequest.");
-		final STORKAttrQueryRequest attrRequest = processAttrExtensions(samlRequest
-				.getExtensions());
-
-		attrRequest.setCountry(this.getCountry(samlRequest.getSignature()
-				.getKeyInfo()));
-		
-		attrRequest.setAlias(this.getAlias(samlRequest.getSignature()
-				.getKeyInfo(), super.getSigner().getTrustStore()));
-		
+		final STORKAttrQueryRequest attrRequest = processAttrExtensions(samlRequest.getExtensions());
+
+		attrRequest.setCountry(this.getCountry(samlRequest.getSignature().getKeyInfo()));
+
+		attrRequest.setAlias(this.getAlias(samlRequest.getSignature().getKeyInfo(), super.getSigner().getTrustStore()));
+
 		attrRequest.setSamlId(samlRequest.getID());
 		attrRequest.setDestination(samlRequest.getDestination());
-		attrRequest.setAssertionConsumerServiceURL(samlRequest
-				.getAssertionConsumerServiceURL());
+		attrRequest.setAssertionConsumerServiceURL(samlRequest.getAssertionConsumerServiceURL());
 
-		/*authnRequest.setProviderName(samlRequest.getProviderName());*/
 		attrRequest.setIssuer(samlRequest.getIssuer().getValue());
 
-		//Delete unknown elements from requested ones
+		// Delete unknown elements from requested ones
 		final Iterator<PersonalAttribute> iterator = attrRequest.getPersonalAttributeList().iterator();
-        IPersonalAttributeList cleanPerAttrList = (PersonalAttributeList) attrRequest.getPersonalAttributeList();
+		IPersonalAttributeList cleanPerAttrList = (PersonalAttributeList) attrRequest.getPersonalAttributeList();
 		while (iterator.hasNext()) {
 
 			final PersonalAttribute attribute = iterator.next();
 
 			// Verify if the attribute name exits.
-			final String attributeName = super.getSamlCoreProperties()
-			.getProperty(attribute.getName());
+			final String attributeName = super.getSamlCoreProperties().getProperty(attribute.getName());
 
 			if (StringUtils.isBlank(attributeName)) {
 				LOG.info("Attribute name: {} was not found. It will be removed from the request object", attribute.getName());
 				cleanPerAttrList.remove(attribute.getName());
 			}
 
-		}	
+		}
 		attrRequest.setPersonalAttributeList(cleanPerAttrList);
 
 		return attrRequest;
 
 	}
-	
+
 	/**
 	 * Validate stork logout request.
 	 * 
-	 * @param tokenSaml the token SAML
+	 * @param tokenSaml
+	 *            the token SAML
 	 * 
 	 * @return the STORK logout request
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKLogoutRequest validateSTORKLogoutRequest(final byte[] tokenSaml)
-	throws STORKSAMLEngineException {
+	public STORKLogoutRequest validateSTORKLogoutRequest(final byte[] tokenSaml) throws STORKSAMLEngineException {
 		LOG.info("validateSTORKLogoutRequest");
 
-		final LogoutRequest samlRequest = (LogoutRequest)validateStorkSaml(tokenSaml);
+		final LogoutRequest samlRequest = (LogoutRequest) validateStorkSaml(tokenSaml);
 
-		LOG.debug("Validate Extensions.");
-		final Validator<Extensions> validatorExt = new ExtensionsSchemaValidator();
-		try {
-			validatorExt.validate(samlRequest.getExtensions());
-		} catch (ValidationException e) {
-			LOG.error("ValidationException: validate Extensions.", e);
-			throw new STORKSAMLEngineException(e);
+		if (samlRequest.getExtensions() != null) {
+			LOG.debug("Validate Extensions.");
+			final Validator<Extensions> validatorExt = new ExtensionsSchemaValidator();
+			try {
+				validatorExt.validate(samlRequest.getExtensions());
+			} catch (ValidationException e) {
+				LOG.error("ValidationException: validate Extensions.", e);
+				throw new STORKSAMLEngineException(e);
+			}
 		}
 
 		LOG.debug("Generate STORKLogoutRequest.");
 		final STORKLogoutRequest logoutRequest = new STORKLogoutRequest();
 
-		logoutRequest.setCountry(this.getCountry(samlRequest.getSignature()
-				.getKeyInfo()));
-		
-		logoutRequest.setAlias(this.getAlias(samlRequest.getSignature()
-				.getKeyInfo(), super.getSigner().getTrustStore()));
-		
+		logoutRequest.setCountry(this.getCountry(samlRequest.getSignature().getKeyInfo()));
+
+		logoutRequest.setAlias(this.getAlias(samlRequest.getSignature().getKeyInfo(), super.getSigner().getTrustStore()));
+
 		logoutRequest.setSamlId(samlRequest.getID());
 		logoutRequest.setDestination(samlRequest.getDestination());
-		
+
 		logoutRequest.setIssuer(samlRequest.getIssuer().getValue());
 
 		logoutRequest.setSpProvidedId(samlRequest.getNameID().getValue());
@@ -3259,18 +2892,56 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	}
 
 	/**
+	 * Validate stork logout response.
+	 * 
+	 * @param tokenSaml
+	 *            The SAML token
+	 * 
+	 * @return the STORK logout response
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	public STORKLogoutResponse validateSTORKLogoutResponse(final byte[] tokenSaml) throws STORKSAMLEngineException {
+
+		LOG.info("validate STORK Logout Response");
+
+		final LogoutResponse samlRes = (LogoutResponse) validateStorkSaml(tokenSaml);
+
+		LOG.debug("Generate STORKLogoutResponse.");
+		final STORKLogoutResponse logoutRes = new STORKLogoutResponse();
+
+		try {
+			logoutRes.setTokenSaml(super.signAndMarshall(samlRes));
+		} catch (SAMLEngineException e) {
+			LOG.error("Sign and Marshall.", e);
+			throw new STORKSAMLEngineException(e);
+		}
+
+		logoutRes.setAlias(this.getAlias(samlRes.getSignature().getKeyInfo(), super.getSigner().getTrustStore()));
+		logoutRes.setSamlId(samlRes.getID());
+		logoutRes.setDestination(samlRes.getDestination());
+		logoutRes.setIssuer(samlRes.getIssuer().getValue());
+		logoutRes.setStatusCode(samlRes.getStatus().getStatusCode().getValue().toString());
+		logoutRes.setStatusMessage(samlRes.getStatus().getStatusMessage().getMessage().toString());
+		logoutRes.setInResponseTo(samlRes.getInResponseTo());
+		return logoutRes;
+	}
+
+	/**
 	 * Validate stork authentication response.
 	 * 
-	 * @param tokenSaml the token SAML
-	 * @param userIP the user IP
+	 * @param tokenSaml
+	 *            the token SAML
+	 * @param userIP
+	 *            the user IP
 	 * 
 	 * @return the Stork authentication response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAuthnResponse validateSTORKAuthnResponse(
-			final byte[] tokenSaml, final String userIP)
-	throws STORKSAMLEngineException {
+	public STORKAuthnResponse validateSTORKAuthnResponse(final byte[] tokenSaml, final String userIP) throws STORKSAMLEngineException {
 
 		LOG.info("validateSTORKAuthnResponse");
 		final Response samlResponse = (Response) validateStorkSaml(tokenSaml);
@@ -3278,90 +2949,76 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		LOG.debug("Create StorkAuthResponse.");
 		final STORKAuthnResponse authnResponse = new STORKAuthnResponse();
 
-		authnResponse.setCountry(this.getCountry(samlResponse.getSignature()
-				.getKeyInfo()));
+		authnResponse.setCountry(this.getCountry(samlResponse.getSignature().getKeyInfo()));
 
 		LOG.debug("Set ID.");
 		authnResponse.setSamlId(samlResponse.getID());
 		LOG.debug("Set InResponseTo.");
 		authnResponse.setInResponseTo(samlResponse.getInResponseTo());
 		LOG.debug("Set statusCode.");
-		authnResponse.setStatusCode(samlResponse.getStatus().getStatusCode()
-				.getValue());
+		authnResponse.setStatusCode(samlResponse.getStatus().getStatusCode().getValue());
 
 		// Subordinate code.
 		if (samlResponse.getStatus().getStatusCode().getStatusCode() != null) {
-			authnResponse.setSubStatusCode(samlResponse.getStatus()
-					.getStatusCode().getStatusCode().getValue());
+			authnResponse.setSubStatusCode(samlResponse.getStatus().getStatusCode().getStatusCode().getValue());
 		}
 
 		if (samlResponse.getStatus().getStatusMessage() != null) {
 			LOG.debug("Set statusMessage.");
-			authnResponse.setMessage(samlResponse.getStatus()
-					.getStatusMessage().getMessage());
+			authnResponse.setMessage(samlResponse.getStatus().getStatusMessage().getMessage());
 		}
 
 		LOG.debug("validateStorkResponse");
-		final Assertion assertion = (Assertion) validateStorkResponse(
-				samlResponse, userIP);	
-		
-		if(assertion!=null){
+		final Assertion assertion = (Assertion) validateStorkResponse(samlResponse, userIP);
+
+		if (assertion != null) {
 			final DateTime serverDate = new DateTime();
 
 			if (assertion.getConditions().getNotOnOrAfter().isBefore(serverDate)) {
-				LOG.error("Token date expired (getNotOnOrAfter =  "
-						+ assertion.getConditions().getNotOnOrAfter()
-						+ ", server_date: " + serverDate + ")");
-				throw new STORKSAMLEngineException(
-						"Token date expired (getNotOnOrAfter =  "
-						+ assertion.getConditions().getNotOnOrAfter()
-						+ " ), server_date: " + serverDate);
+				LOG.error("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + ", server_date: " + serverDate + ")");
+				throw new STORKSAMLEngineException("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + " ), server_date: " + serverDate);
 			}
 
 			LOG.debug("Set notOnOrAfter.");
-			authnResponse.setNotOnOrAfter(assertion.getConditions()
-					.getNotOnOrAfter());
+			authnResponse.setNotOnOrAfter(assertion.getConditions().getNotOnOrAfter());
 
 			LOG.debug("Set notBefore.");
 			authnResponse.setNotBefore(assertion.getConditions().getNotBefore());
 
 			authnResponse.setNotBefore(assertion.getConditions().getNotBefore());
 
-			authnResponse.setAudienceRestriction(((AudienceRestriction) assertion
-					.getConditions().getAudienceRestrictions().get(0))
-					.getAudiences().get(0).getAudienceURI());
+			authnResponse.setAudienceRestriction(((AudienceRestriction) assertion.getConditions().getAudienceRestrictions().get(0)).getAudiences().get(0).getAudienceURI());
 			authnResponse.setAssertions(samlResponse.getAssertions());
 		}
-		
+
 		// Case no error.
-		if (assertion!=null && StatusCode.SUCCESS_URI.equalsIgnoreCase(authnResponse
-				.getStatusCode())) {
+		if (assertion != null && StatusCode.SUCCESS_URI.equalsIgnoreCase(authnResponse.getStatusCode())) {
 			LOG.debug("Status Success. Set PersonalAttributeList.");
-			authnResponse
-			.setPersonalAttributeList(generatePersonalAttributeList(assertion));
+			authnResponse.setPersonalAttributeList(generatePersonalAttributeList(assertion));
 			authnResponse.setFail(false);
 		} else {
 			LOG.debug("Status Fail.");
 			authnResponse.setFail(true);
-		}		
+		}
 		LOG.debug("Return result.");
 		return authnResponse;
 
 	}
-	
+
 	/**
 	 * Validate stork authentication response.
 	 * 
-	 * @param tokenSaml the token SAML
-	 * @param userIP the user IP
+	 * @param tokenSaml
+	 *            the token SAML
+	 * @param userIP
+	 *            the user IP
 	 * 
 	 * @return the Stork authentication response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAuthnResponse validateSTORKAuthnResponseWithQuery(
-			final byte[] tokenSaml, final String userIP)
-	throws STORKSAMLEngineException {
+	public STORKAuthnResponse validateSTORKAuthnResponseWithQuery(final byte[] tokenSaml, final String userIP) throws STORKSAMLEngineException {
 
 		LOG.info("validateSTORKAuthnResponse");
 		final Response samlResponse = (Response) validateStorkSaml(tokenSaml);
@@ -3369,113 +3026,95 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		LOG.debug("Create StorkAuthResponse.");
 		final STORKAuthnResponse authnResponse = new STORKAuthnResponse();
 
-		authnResponse.setCountry(this.getCountry(samlResponse.getSignature()
-				.getKeyInfo()));
+		authnResponse.setCountry(this.getCountry(samlResponse.getSignature().getKeyInfo()));
 
 		LOG.debug("Set ID.");
 		authnResponse.setSamlId(samlResponse.getID());
 		LOG.debug("Set InResponseTo.");
 		authnResponse.setInResponseTo(samlResponse.getInResponseTo());
 		LOG.debug("Set statusCode.");
-		authnResponse.setStatusCode(samlResponse.getStatus().getStatusCode()
-				.getValue());
+		authnResponse.setStatusCode(samlResponse.getStatus().getStatusCode().getValue());
 
 		// Subordinate code.
 		if (samlResponse.getStatus().getStatusCode().getStatusCode() != null) {
-			authnResponse.setSubStatusCode(samlResponse.getStatus()
-					.getStatusCode().getStatusCode().getValue());
+			authnResponse.setSubStatusCode(samlResponse.getStatus().getStatusCode().getStatusCode().getValue());
 		}
 
 		if (samlResponse.getStatus().getStatusMessage() != null) {
 			LOG.debug("Set statusMessage.");
-			authnResponse.setMessage(samlResponse.getStatus()
-					.getStatusMessage().getMessage());
+			authnResponse.setMessage(samlResponse.getStatus().getStatusMessage().getMessage());
 		}
 
 		LOG.debug("validateStorkResponse");
-		final Assertion assertion = (Assertion) validateStorkResponse(
-				samlResponse, userIP);	
-		
-		if(assertion!=null){
+		final Assertion assertion = (Assertion) validateStorkResponse(samlResponse, userIP);
+
+		if (assertion != null) {
 			final DateTime serverDate = new DateTime();
 
 			if (assertion.getConditions().getNotOnOrAfter().isBefore(serverDate)) {
-				LOG.error("Token date expired (getNotOnOrAfter =  "
-						+ assertion.getConditions().getNotOnOrAfter()
-						+ ", server_date: " + serverDate + ")");
-				throw new STORKSAMLEngineException(
-						"Token date expired (getNotOnOrAfter =  "
-						+ assertion.getConditions().getNotOnOrAfter()
-						+ " ), server_date: " + serverDate);
+				LOG.error("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + ", server_date: " + serverDate + ")");
+				throw new STORKSAMLEngineException("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + " ), server_date: " + serverDate);
 			}
 
 			LOG.debug("Set notOnOrAfter.");
-			authnResponse.setNotOnOrAfter(assertion.getConditions()
-					.getNotOnOrAfter());
+			authnResponse.setNotOnOrAfter(assertion.getConditions().getNotOnOrAfter());
 
 			LOG.debug("Set notBefore.");
 			authnResponse.setNotBefore(assertion.getConditions().getNotBefore());
 
 			authnResponse.setNotBefore(assertion.getConditions().getNotBefore());
 
-			authnResponse.setAudienceRestriction(((AudienceRestriction) assertion
-					.getConditions().getAudienceRestrictions().get(0))
-					.getAudiences().get(0).getAudienceURI());
+			authnResponse.setAudienceRestriction(((AudienceRestriction) assertion.getConditions().getAudienceRestrictions().get(0)).getAudiences().get(0).getAudienceURI());
 		}
-		
+
 		// Case no error.
-		if (assertion!=null && StatusCode.SUCCESS_URI.equalsIgnoreCase(authnResponse
-				.getStatusCode())) {
+		if (assertion != null && StatusCode.SUCCESS_URI.equalsIgnoreCase(authnResponse.getStatusCode())) {
 			LOG.debug("Status Success. Set PersonalAttributeList.");
-			authnResponse
-			.setPersonalAttributeList(generatePersonalAttributeList(assertion));
+			authnResponse.setPersonalAttributeList(generatePersonalAttributeList(assertion));
 			authnResponse.setFail(false);
 		} else {
 			LOG.debug("Status Fail.");
 			authnResponse.setFail(true);
 		}
-		
+
 		authnResponse.setAssertions(samlResponse.getAssertions());
-		if (samlResponse.getAssertions().size() > 1)
-		{
+		if (samlResponse.getAssertions().size() > 1) {
 			PersonalAttributeList total = new PersonalAttributeList();
-			List<IPersonalAttributeList> attrList = new ArrayList();
-			for (int i = 0; i < samlResponse.getAssertions().size(); i++)
-			{
-				Assertion tempAssertion = (Assertion)samlResponse.getAssertions().get(i);
+			List<IPersonalAttributeList> attrList = new ArrayList<IPersonalAttributeList>();
+			for (int i = 0; i < samlResponse.getAssertions().size(); i++) {
+				Assertion tempAssertion = (Assertion) samlResponse.getAssertions().get(i);
 				IPersonalAttributeList temp = generatePersonalAttributeList(tempAssertion);
-				if (temp != null)
-				{ 
+				if (temp != null) {
 					attrList.add(temp);
-					for (PersonalAttribute attribute : temp) {
-						PersonalAttribute attr = (PersonalAttribute)attribute.clone();
-						attr.setName(attr.getName()+tempAssertion.getID());
-						total.add(attr);
+					for (PersonalAttribute attribute : (IPersonalAttributeList) temp.clone()) {
+						attribute.setName(attribute.getName() + tempAssertion.getID());
+						total.add(attribute);
 					}
 				}
 			}
 			authnResponse.setPersonalAttributeLists(attrList);
 			authnResponse.setTotalPersonalAttributeList(total);
 		}
-		
+
 		LOG.debug("Return result.");
 		return authnResponse;
 
 	}
-	
+
 	/**
 	 * Validate stork attribute query response.
 	 * 
-	 * @param tokenSaml the token SAML
-	 * @param userIP the user IP
+	 * @param tokenSaml
+	 *            the token SAML
+	 * @param userIP
+	 *            the user IP
 	 * 
 	 * @return the Stork attribute query response
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	public STORKAttrQueryResponse validateSTORKAttrQueryResponse(
-			final byte[] tokenSaml, final String userIP)
-	throws STORKSAMLEngineException {
+	public STORKAttrQueryResponse validateSTORKAttrQueryResponse(final byte[] tokenSaml, final String userIP) throws STORKSAMLEngineException {
 
 		LOG.info("validateSTORKAttrQueryResponse");
 		final Response samlResponse = (Response) validateStorkSaml(tokenSaml);
@@ -3483,90 +3122,71 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		LOG.debug("Create StorkAttrQueryResponse.");
 		final STORKAttrQueryResponse attrQueryResponse = new STORKAttrQueryResponse();
 
-		attrQueryResponse.setCountry(this.getCountry(samlResponse.getSignature()
-				.getKeyInfo()));
+		attrQueryResponse.setCountry(this.getCountry(samlResponse.getSignature().getKeyInfo()));
 
 		LOG.debug("Set ID.");
 		attrQueryResponse.setSamlId(samlResponse.getID());
 		LOG.debug("Set InResponseTo.");
 		attrQueryResponse.setInResponseTo(samlResponse.getInResponseTo());
 		LOG.debug("Set statusCode.");
-		attrQueryResponse.setStatusCode(samlResponse.getStatus().getStatusCode()
-				.getValue());
-		
+		attrQueryResponse.setStatusCode(samlResponse.getStatus().getStatusCode().getValue());
 
 		// Subordinate code.
 		if (samlResponse.getStatus().getStatusCode().getStatusCode() != null) {
-			attrQueryResponse.setSubStatusCode(samlResponse.getStatus()
-					.getStatusCode().getStatusCode().getValue());
+			attrQueryResponse.setSubStatusCode(samlResponse.getStatus().getStatusCode().getStatusCode().getValue());
 		}
 
 		if (samlResponse.getStatus().getStatusMessage() != null) {
 			LOG.debug("Set statusMessage.");
-			attrQueryResponse.setMessage(samlResponse.getStatus()
-					.getStatusMessage().getMessage());
+			attrQueryResponse.setMessage(samlResponse.getStatus().getStatusMessage().getMessage());
 		}
 
 		LOG.debug("validateStorkResponse");
-		final Assertion assertion = (Assertion) validateStorkResponse(
-				samlResponse, userIP);	
-		
-		if(assertion!=null){
+		final Assertion assertion = (Assertion) validateStorkResponse(samlResponse, userIP);
+
+		if (assertion != null) {
 			final DateTime serverDate = new DateTime();
 
 			attrQueryResponse.setAssertion(assertion);
 
 			if (assertion.getConditions().getNotOnOrAfter().isBefore(serverDate)) {
-				LOG.error("Token date expired (getNotOnOrAfter =  "
-						+ assertion.getConditions().getNotOnOrAfter()
-						+ ", server_date: " + serverDate + ")");
-				throw new STORKSAMLEngineException(
-						"Token date expired (getNotOnOrAfter =  "
-						+ assertion.getConditions().getNotOnOrAfter()
-						+ " ), server_date: " + serverDate);
+				LOG.error("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + ", server_date: " + serverDate + ")");
+				throw new STORKSAMLEngineException("Token date expired (getNotOnOrAfter =  " + assertion.getConditions().getNotOnOrAfter() + " ), server_date: " + serverDate);
 			}
 
 			LOG.debug("Set notOnOrAfter.");
-			attrQueryResponse.setNotOnOrAfter(assertion.getConditions()
-					.getNotOnOrAfter());
+			attrQueryResponse.setNotOnOrAfter(assertion.getConditions().getNotOnOrAfter());
 
 			LOG.debug("Set notBefore.");
 			attrQueryResponse.setNotBefore(assertion.getConditions().getNotBefore());
 
 			attrQueryResponse.setNotBefore(assertion.getConditions().getNotBefore());
 
-			attrQueryResponse.setAudienceRestriction(((AudienceRestriction) assertion
-					.getConditions().getAudienceRestrictions().get(0))
-					.getAudiences().get(0).getAudienceURI());
+			attrQueryResponse.setAudienceRestriction(((AudienceRestriction) assertion.getConditions().getAudienceRestrictions().get(0)).getAudiences().get(0).getAudienceURI());
 		}
-		
+
 		// Case no error.
-		if (assertion!=null && StatusCode.SUCCESS_URI.equalsIgnoreCase(attrQueryResponse
-				.getStatusCode())) {
+		if (assertion != null && StatusCode.SUCCESS_URI.equalsIgnoreCase(attrQueryResponse.getStatusCode())) {
 			LOG.debug("Status Success. Set PersonalAttributeList.");
-			attrQueryResponse
-			.setPersonalAttributeList(generatePersonalAttributeList(assertion));
+			attrQueryResponse.setPersonalAttributeList(generatePersonalAttributeList(assertion));
 			attrQueryResponse.setFail(false);
 		} else {
 			LOG.debug("Status Fail.");
 			attrQueryResponse.setFail(true);
 		}
-		
+
 		attrQueryResponse.setAssertions(samlResponse.getAssertions());
-		if (samlResponse.getAssertions().size() > 1)
-		{
+		if (samlResponse.getAssertions().size() > 1) {
 			PersonalAttributeList total = new PersonalAttributeList();
 			List<IPersonalAttributeList> attrList = new ArrayList();
-			for (int i = 0; i < samlResponse.getAssertions().size(); i++)
-			{
-				Assertion tempAssertion = (Assertion)samlResponse.getAssertions().get(i);
+			for (int i = 0; i < samlResponse.getAssertions().size(); i++) {
+				Assertion tempAssertion = (Assertion) samlResponse.getAssertions().get(i);
 				IPersonalAttributeList temp = generatePersonalAttributeList(tempAssertion);
-				if (temp != null)
-				{ 
+				if (temp != null) {
 					attrList.add(temp);
 					for (PersonalAttribute attribute : temp) {
-						PersonalAttribute attr = (PersonalAttribute)attribute.clone();
-						attr.setName(attr.getName()+tempAssertion.getID());
+						PersonalAttribute attr = (PersonalAttribute) attribute.clone();
+						attr.setName(attr.getName() + tempAssertion.getID());
 						total.add(attr);
 					}
 				}
@@ -3574,7 +3194,7 @@ public final class STORKSAMLEngine extends SAMLEngine {
 			attrQueryResponse.setPersonalAttributeLists(attrList);
 			attrQueryResponse.setTotalPersonalAttributeList(total);
 		}
-		
+
 		LOG.debug("Return result.");
 		return attrQueryResponse;
 
@@ -3583,61 +3203,50 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Validate stork response.
 	 * 
-	 * @param samlResponse the SAML response
-	 * @param userIP the user IP
+	 * @param samlResponse
+	 *            the SAML response
+	 * @param userIP
+	 *            the user IP
 	 * 
 	 * @return the assertion
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private Assertion validateStorkResponse(final Response samlResponse,
-			final String userIP) throws STORKSAMLEngineException {
+	private Assertion validateStorkResponse(final Response samlResponse, final String userIP) throws STORKSAMLEngineException {
 		// Exist only one Assertion
 
-		if (samlResponse.getAssertions() == null
-				|| samlResponse.getAssertions().isEmpty()) {
-			LOG.info("Assertion is null or empty."); //in replace of throw new STORKSAMLEngineException("Assertion is null or empty.")
+		if (samlResponse.getAssertions() == null || samlResponse.getAssertions().isEmpty()) {
+			LOG.info("Assertion is null or empty."); // in replace of throw new STORKSAMLEngineException("Assertion is null or empty.")
 			return null;
 		}
 
-		final Assertion assertion = (Assertion) samlResponse.getAssertions()
-		.get(0);
+		final Assertion assertion = (Assertion) samlResponse.getAssertions().get(0);
 
 		LOG.debug("Verified method Bearer");
-		for (final Iterator<SubjectConfirmation> iter = assertion.getSubject()
-				.getSubjectConfirmations().iterator(); iter.hasNext();) {
+		for (final Iterator<SubjectConfirmation> iter = assertion.getSubject().getSubjectConfirmations().iterator(); iter.hasNext();) {
 			final SubjectConfirmation element = iter.next();
-			final boolean isBearer = SubjectConfirmation.METHOD_BEARER
-			.equals(element.getMethod());
+			final boolean isBearer = SubjectConfirmation.METHOD_BEARER.equals(element.getMethod());
 
-			final boolean ipValidate = super.getSamlCoreProperties()
-			.isIpValidation();
+			final boolean ipValidate = super.getSamlCoreProperties().isIpValidation();
 
 			if (ipValidate) {
 				if (isBearer) {
 					if (StringUtils.isBlank(userIP)) {
 						LOG.error("browser_ip is null or empty.");
-						throw new STORKSAMLEngineException(
-						"browser_ip is null or empty.");
-					} else if (StringUtils.isBlank(element
-							.getSubjectConfirmationData().getAddress())) {
+						throw new STORKSAMLEngineException("browser_ip is null or empty.");
+					} else if (StringUtils.isBlank(element.getSubjectConfirmationData().getAddress())) {
 						LOG.error("token_ip attribute is null or empty.");
-						throw new STORKSAMLEngineException(
-						"token_ip attribute is null or empty.");
+						throw new STORKSAMLEngineException("token_ip attribute is null or empty.");
 					}
 				}
 
-				final boolean ipEqual = element.getSubjectConfirmationData()
-				.getAddress().equals(userIP);
+				final boolean ipEqual = element.getSubjectConfirmationData().getAddress().equals(userIP);
 
 				// Validation ipUser
 				if (!ipEqual && ipValidate) {
 					LOG.error("SubjectConfirmation BEARER: ");
-					throw new STORKSAMLEngineException(
-							"IPs doesn't match : token_ip ("
-							+ element.getSubjectConfirmationData()
-							.getAddress() + ") browser_ip ("
-							+ userIP + ")");
+					throw new STORKSAMLEngineException("IPs doesn't match : token_ip (" + element.getSubjectConfirmationData().getAddress() + ") browser_ip (" + userIP + ")");
 				}
 			}
 
@@ -3648,27 +3257,27 @@ public final class STORKSAMLEngine extends SAMLEngine {
 	/**
 	 * Validate stork SAML.
 	 * 
-	 * @param tokenSaml the token SAML
+	 * @param tokenSaml
+	 *            the token SAML
 	 * 
 	 * @return the signable SAML object
 	 * 
-	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
 	 */
-	private SignableSAMLObject validateStorkSaml(final byte[] tokenSaml)
-	throws STORKSAMLEngineException {
+	private SignableSAMLObject validateStorkSaml(final byte[] tokenSaml) throws STORKSAMLEngineException {
 
 		LOG.info("Validate StorkSaml message.");
 
 		if (tokenSaml == null) {
 			LOG.error("Saml authentication request is null.");
-			throw new STORKSAMLEngineException(
-			"Saml authentication request is null.");
+			throw new STORKSAMLEngineException("Saml authentication request is null.");
 		}
 
 		LOG.debug("Generate AuthnRequest from request.");
 		SignableSAMLObject samlObject;
 
-		try {			
+		try {
 			samlObject = (SignableSAMLObject) super.unmarshall(tokenSaml);
 		} catch (SAMLEngineException e) {
 			LOG.error("SAMLEngineException unmarshall.", e);
@@ -3677,10 +3286,8 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		boolean validateSign = true;
 
-		if (StringUtils.isNotBlank(super.getSamlCoreProperties().getProperty(
-		"validateSignature"))) {
-			validateSign = Boolean.valueOf(super.getSamlCoreProperties()
-					.getProperty("validateSignature"));
+		if (StringUtils.isNotBlank(super.getSamlCoreProperties().getProperty("validateSignature"))) {
+			validateSign = Boolean.valueOf(super.getSamlCoreProperties().getProperty("validateSignature"));
 		}
 
 		if (validateSign) {
@@ -3694,22 +3301,15 @@ public final class STORKSAMLEngine extends SAMLEngine {
 		}
 
 		LOG.debug("Validate Schema.");
-		final ValidatorSuite validatorSuite = Configuration
-		.getValidatorSuite("saml2-core-schema-validator");
-		try {			
-			if (samlObject.getElementQName().toString().endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
-			{
-				CustomAttributeQueryValidator val = 
-					new CustomAttributeQueryValidator();
-				val.validate((CustomAttributeQuery)samlObject);
-			}
-			else if (samlObject instanceof Response 
-					&& ((Response) samlObject).getAssertions().size() > 1) {
-							 MultipleAssertionResponseValidator val = 
-									 new MultipleAssertionResponseValidator();
-							 val.validate((Response)samlObject);
-			}
-			else
+		final ValidatorSuite validatorSuite = Configuration.getValidatorSuite("saml2-core-schema-validator");
+		try {
+			if (samlObject.getElementQName().toString().endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
+				CustomAttributeQueryValidator val = new CustomAttributeQueryValidator();
+				val.validate((CustomAttributeQuery) samlObject);
+			} else if (samlObject instanceof Response && ((Response) samlObject).getAssertions().size() > 1) {
+				MultipleAssertionResponseValidator val = new MultipleAssertionResponseValidator();
+				val.validate((Response) samlObject);
+			} else
 				validatorSuite.validate(samlObject);
 		} catch (ValidationException e) {
 			LOG.error("ValidationException.", e);
@@ -3718,27 +3318,22 @@ public final class STORKSAMLEngine extends SAMLEngine {
 
 		return samlObject;
 	}
-	
-	private boolean isComplex(XMLObject xmlObject)
-	{
+
+	private boolean isComplex(XMLObject xmlObject) {
 		boolean isComplex = false;
-		
+
 		final XSAnyImpl complexValue = (XSAnyImpl) xmlObject;
 
-		for (int nextComplexValue = 0; nextComplexValue < complexValue
-				.getUnknownXMLObjects().size(); nextComplexValue++) {
+		for (int nextComplexValue = 0; nextComplexValue < complexValue.getUnknownXMLObjects().size(); nextComplexValue++) {
 
-			final XSAnyImpl simple = (XSAnyImpl) complexValue
-					.getUnknownXMLObjects().get(
-							nextComplexValue);
-			
-			if (simple.getElementQName().getLocalPart() != null)
-			{
+			final XSAnyImpl simple = (XSAnyImpl) complexValue.getUnknownXMLObjects().get(nextComplexValue);
+
+			if (simple.getElementQName().getLocalPart() != null) {
 				isComplex = true;
 				break;
 			}
 		}
-		
+
 		return isComplex;
-	}	
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
index 724a522d1..73d7e4f62 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/X509PrincipalUtil.java
@@ -11,59 +11,53 @@ import org.slf4j.LoggerFactory;
  * @author vanegdi
  * @version $Revision: 1.00 $, $Date: 2013-05-24 20:53:51 $
  */
-public final class X509PrincipalUtil{
+public final class X509PrincipalUtil {
 
-    private static final DERObjectIdentifier[] DER_OBJECT_IDENTIFIERS_ARRAY= {
-            X509Principal.CN,
-            X509Principal.OU,
-            X509Principal.O,
-            X509Principal.L,
-            X509Principal.ST,
-            X509Principal.C,
-            X509Principal.E
-    };
-    
-    private static final Logger LOG = LoggerFactory.getLogger(eu.stork.peps.auth.engine.X509PrincipalUtil.class);
+	private static final DERObjectIdentifier[] DER_OBJECT_IDENTIFIERS_ARRAY = { X509Principal.CN, X509Principal.OU, X509Principal.O, X509Principal.L, X509Principal.ST, X509Principal.C,
+			X509Principal.E };
 
-    /**
-     * Compares 2 X509Principals to detect if they equals
-     * @param principal1
-     * @param principal2
-     * @return true if arguments are not null and equals
-     */
-    public static boolean equals(X509Principal principal1, X509Principal principal2) {
-        boolean continueProcess = true;
-        if (principal1 == null || principal2 == null){
-            return false;
-        }
-        
-        int cpt = 0;
-        while(continueProcess && cpt < DER_OBJECT_IDENTIFIERS_ARRAY.length){
-            continueProcess = continueProcess && x509ValuesByIdentifierEquals(principal1, principal2, DER_OBJECT_IDENTIFIERS_ARRAY[cpt]);
-            cpt++;
-        }
-        return continueProcess;
-    }
-    
-    public static boolean equals2(X509Principal principal1, X509Principal principal2) {
-        
-        if (principal1 == null || principal2 == null){
-            return false;
-        }
-        
-        if (principal1.getName().equals(principal2.getName()))
-        	return true;
-        else
-        	return false;
-        
-    }
+	private static final Logger LOG = LoggerFactory.getLogger(eu.stork.peps.auth.engine.X509PrincipalUtil.class);
 
-    private static boolean x509ValuesByIdentifierEquals(X509Principal principal1, X509Principal principal2, DERObjectIdentifier identifier){
-        return principal1.getValues(identifier).equals(principal2.getValues(identifier));
-    }
+	/**
+	 * Compares 2 X509Principals to detect if they equals
+	 * 
+	 * @param principal1
+	 * @param principal2
+	 * @return true if arguments are not null and equals
+	 */
+	public static boolean X509equals(X509Principal principal1, X509Principal principal2) {
+		boolean continueProcess = true;
+		if (principal1 == null || principal2 == null) {
+			return false;
+		}
 
-    private X509PrincipalUtil(){
-        // default contructor
-        LOG.error("Fake X509PrincipalUtil : never be called");
-    }
+		int cpt = 0;
+		while (continueProcess && cpt < DER_OBJECT_IDENTIFIERS_ARRAY.length) {
+			continueProcess = continueProcess && x509ValuesByIdentifierEquals(principal1, principal2, DER_OBJECT_IDENTIFIERS_ARRAY[cpt]);
+			cpt++;
+		}
+		return continueProcess;
+	}
+
+	public static boolean equals2(X509Principal principal1, X509Principal principal2) {
+
+		if (principal1 == null || principal2 == null) {
+			return false;
+		}
+
+		if (principal1.getName().equals(principal2.getName()))
+			return true;
+		else
+			return false;
+
+	}
+
+	private static boolean x509ValuesByIdentifierEquals(X509Principal principal1, X509Principal principal2, DERObjectIdentifier identifier) {
+		return principal1.getValues(identifier).equals(principal2.getValues(identifier));
+	}
+
+	private X509PrincipalUtil() {
+		// default contructor
+		LOG.error("Fake X509PrincipalUtil : never be called");
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/AuthenticationAttributes.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/AuthenticationAttributes.java
index a9efe6362..3821f3c06 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/AuthenticationAttributes.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/AuthenticationAttributes.java
@@ -21,37 +21,35 @@ import org.opensaml.common.SAMLObject;
 
 /**
  * The Interface AuthenticationAttributes.
+ * 
  * @author fjquevedo
  */
 public interface AuthenticationAttributes extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "AuthenticationAttributes";
-
-    /** Default element name. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "AuthenticationAttributes";
 
-    /** Local name of the XSI type. */
-    String TYPE_LOCAL_NAME = "AuthenticationAttributesType";
+	/** Default element name. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
-    /** QName of the XSI type. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** Local name of the XSI type. */
+	String TYPE_LOCAL_NAME = "AuthenticationAttributesType";
 
+	/** QName of the XSI type. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
-    /**
-     * Gets the citizen country code.
-     * 
-     * @return the citizen country code
-     */
-    VIDPAuthenticationAttributes getVIDPAuthenticationAttributes();
-    
+	/**
+	 * Gets the citizen country code.
+	 * 
+	 * @return the citizen country code
+	 */
+	VIDPAuthenticationAttributes getVIDPAuthenticationAttributes();
 
-    /**
-     * Sets the vIDP authentication attributes.
-     * 
-     * @param newVIDPAuthenticationAttr the new vIDP authentication attributes
-     */
-    void setVIDPAuthenticationAttributes(VIDPAuthenticationAttributes newVIDPAuthenticationAttr);
+	/**
+	 * Sets the vIDP authentication attributes.
+	 * 
+	 * @param newVIDPAuthenticationAttr
+	 *            the new vIDP authentication attributes
+	 */
+	void setVIDPAuthenticationAttributes(VIDPAuthenticationAttributes newVIDPAuthenticationAttr);
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CitizenCountryCode.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CitizenCountryCode.java
index 4af7524ea..95994695d 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CitizenCountryCode.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CitizenCountryCode.java
@@ -21,36 +21,35 @@ import org.opensaml.common.SAMLObject;
 
 /**
  * The Interface EIDCrossBorderShare.
+ * 
  * @author fjquevedo
  */
 public interface CitizenCountryCode extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "CitizenCountryCode";
-
-    /** The Constant DEFAULT_ELEMENT_NAME. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "CitizenCountryCode";
 
-    /** The Constant TYPE_LOCAL_NAME. */
-    String TYPE_LOCAL_NAME = "CitizenCountryCodeType";
+	/** The Constant DEFAULT_ELEMENT_NAME. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
-    /** The Constant TYPE_NAME. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** The Constant TYPE_LOCAL_NAME. */
+	String TYPE_LOCAL_NAME = "CitizenCountryCodeType";
 
-    /**
-     * Gets the SP country.
-     * 
-     * @return the sP country
-     */
-    String getCitizenCountryCode();
+	/** The Constant TYPE_NAME. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
+	/**
+	 * Gets the SP country.
+	 * 
+	 * @return the sP country
+	 */
+	String getCitizenCountryCode();
 
-    /**
-     * Sets the citizen country code.
-     * 
-     * @param citizenCountryCode the new citizen country code
-     */
-    void setCitizenCountryCode(String citizenCountryCode);
+	/**
+	 * Sets the citizen country code.
+	 * 
+	 * @param citizenCountryCode
+	 *            the new citizen country code
+	 */
+	void setCitizenCountryCode(String citizenCountryCode);
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java
index b558fc19d..d603c2293 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomAttributeQuery.java
@@ -10,42 +10,40 @@ import org.opensaml.saml2.core.SubjectQuery;
 
 public interface CustomAttributeQuery extends CustomRequestAbstractType {
 	/** Element local name. */
-    public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AttributeQuery";
-
-    /** Default element name. */
-    public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME,
-            SAMLConstants.SAML20P_PREFIX);
-
-    /** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "CustomAttributeQueryType";
-
-    /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20P_NS, TYPE_LOCAL_NAME,
-            SAMLConstants.SAML20P_PREFIX);
-    
-    /** AssertionConsumerServiceURL attribute name. */
-    public static final String ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME 
-    	= "AssertionConsumerServiceURL";
-
-    /**
-     * Gets the Attributes of this query.
-     * 
-     * @return the list of Attributes of this query
-     */
-    public List<Attribute> getAttributes();       
-    
-    /**
-     * Gets the Subject of this request.
-     * 
-     * @return the Subject of this request
-     */
-    public Subject getSubject();
-
-    /**
-     * Sets the Subject of this request.
-     * 
-     * @param newSubject the Subject of this request
-     */
-    public void setSubject(Subject newSubject);
+	public static final String DEFAULT_ELEMENT_LOCAL_NAME = "AttributeQuery";
+
+	/** Default element name. */
+	public static final QName DEFAULT_ELEMENT_NAME = new QName(SAMLConstants.SAML20P_NS, DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+
+	/** Local name of the XSI type. */
+	public static final String TYPE_LOCAL_NAME = "CustomAttributeQueryType";
+
+	/** QName of the XSI type. */
+	public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20P_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+
+	/** AssertionConsumerServiceURL attribute name. */
+	public static final String ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME = "AssertionConsumerServiceURL";
+
+	/**
+	 * Gets the Attributes of this query.
+	 * 
+	 * @return the list of Attributes of this query
+	 */
+	public List<Attribute> getAttributes();
+
+	/**
+	 * Gets the Subject of this request.
+	 * 
+	 * @return the Subject of this request
+	 */
+	public Subject getSubject();
+
+	/**
+	 * Sets the Subject of this request.
+	 * 
+	 * @param newSubject
+	 *            the Subject of this request
+	 */
+	public void setSubject(Subject newSubject);
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomRequestAbstractType.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomRequestAbstractType.java
index 77dd8c4a5..2dd36a4d9 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomRequestAbstractType.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/CustomRequestAbstractType.java
@@ -10,167 +10,172 @@ import org.opensaml.saml2.common.Extensions;
 import org.opensaml.saml2.core.Issuer;
 
 public interface CustomRequestAbstractType extends SignableSAMLObject {
-	
+
 	/** Local name of the XSI type. */
-    public static final String TYPE_LOCAL_NAME = "RequestAbstractType";
-
-    /** QName of the XSI type. */
-    public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20P_NS, TYPE_LOCAL_NAME,
-            SAMLConstants.SAML20P_PREFIX);
-
-    /** ID attribute name. */
-    public static final String ID_ATTRIB_NAME = "ID";
-
-    /** Version attribute name. */
-    public static final String VERSION_ATTRIB_NAME = "Version";
-
-    /** IssueInstant attribute name. */
-    public static final String ISSUE_INSTANT_ATTRIB_NAME = "IssueInstant";
-
-    /** Destination attribute name. */
-    public static final String DESTINATION_ATTRIB_NAME = "Destination";
-    
-    /** Destination attribute name. */
-    public static final String ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME = "AssertionConsumerServiceURL";
-
-    /** Consent attribute name. */
-    public static final String CONSENT_ATTRIB_NAME = "Consent";
-
-    /** Unspecified consent URI. */
-    public static final String UNSPECIFIED_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:unspecified";
-
-    /** Obtained consent URI. */
-    public static final String OBTAINED_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:obtained";
-
-    /** Prior consent URI. */
-    public static final String PRIOR_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:prior";
-
-    /** Implicit consent URI. */
-    public static final String IMPLICIT_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:current-implicit";
-
-    /** Explicit consent URI. */
-    public static final String EXPLICIT_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:current-explicit";
-
-    /** Unavailable consent URI. */
-    public static final String UNAVAILABLE_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:unavailable";
-
-    /** Inapplicable consent URI. */
-    public static final String INAPPLICABLE_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:inapplicable";
-
-    /**
-     * Gets the SAML Version of this request.
-     * 
-     * @return the SAML Version of this request.
-     */
-    public SAMLVersion getVersion();
-
-    /**
-     * Sets the SAML Version of this request.
-     * 
-     * @param newVersion the SAML Version of this request
-     */
-    public void setVersion(SAMLVersion newVersion);
-
-    /**
-     * Gets the unique identifier of the request.
-     * 
-     * @return the unique identifier of the request
-     */
-    public String getID();
-
-    /**
-     * Sets the unique identifier of the request.
-     * 
-     * @param newID the unique identifier of the request
-     */
-
-    public void setID(String newID);
-
-    /**
-     * Gets the date/time the request was issued.
-     * 
-     * @return the date/time the request was issued
-     */
-
-    public DateTime getIssueInstant();
-
-    /**
-     * Sets the date/time the request was issued.
-     * 
-     * @param newIssueInstant the date/time the request was issued
-     */
-    public void setIssueInstant(DateTime newIssueInstant);
-
-    /**
-     * Gets the URI of the destination of the request.
-     * 
-     * @return the URI of the destination of the request
-     */
-    public String getDestination();
-
-    /**
-     * Sets the URI of the destination of the request.
-     * 
-     * @param newDestination the URI of the destination of the request
-     */
-    public void setDestination(String newDestination);
-    
-    /**
-     * Sets the index of the particular Assertion Consumer Service to which the response to this request should be
-     * delivered.
-     * 
-     * @param newAssertionConsumerServiceIndex the new value of the AssertionConsumerServiceIndex attribute
-     */
-    public void setAssertionConsumerServiceURL(String newServiceUrl);
-
-    /**
-     * Gets the URL of the particular Assertion Consumer Service to which the response to this request should be
-     * delivered.
-     * 
-     * @return the value of the AssertionConsumerServiceURL attribute
-     */
-    public String getAssertionConsumerServiceURL();
-
-    /**
-     * Gets the consent obtained from the principal for sending this request.
-     * 
-     * @return the consent obtained from the principal for sending this request
-     */
-    public String getConsent();
-
-    /**
-     * Sets the consent obtained from the principal for sending this request.
-     * 
-     * @param newConsent the new consent obtained from the principal for sending this request
-     */
-    public void setConsent(String newConsent);
-
-    /**
-     * Gets the issuer of this request.
-     * 
-     * @return the issuer of this request
-     */
-    public Issuer getIssuer();
-
-    /**
-     * Sets the issuer of this request.
-     * 
-     * @param newIssuer the issuer of this request
-     */
-    public void setIssuer(Issuer newIssuer);
-
-    /**
-     * Gets the Extensions of this request.
-     * 
-     * @return the Status of this request
-     */
-    public Extensions getExtensions();
-
-    /**
-     * Sets the Extensions of this request.
-     * 
-     * @param newExtensions the Extensions of this request
-     */
-    public void setExtensions(Extensions newExtensions);
+	public static final String TYPE_LOCAL_NAME = "RequestAbstractType";
+
+	/** QName of the XSI type. */
+	public static final QName TYPE_NAME = new QName(SAMLConstants.SAML20P_NS, TYPE_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+
+	/** ID attribute name. */
+	public static final String ID_ATTRIB_NAME = "ID";
+
+	/** Version attribute name. */
+	public static final String VERSION_ATTRIB_NAME = "Version";
+
+	/** IssueInstant attribute name. */
+	public static final String ISSUE_INSTANT_ATTRIB_NAME = "IssueInstant";
+
+	/** Destination attribute name. */
+	public static final String DESTINATION_ATTRIB_NAME = "Destination";
+
+	/** Destination attribute name. */
+	public static final String ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME = "AssertionConsumerServiceURL";
+
+	/** Consent attribute name. */
+	public static final String CONSENT_ATTRIB_NAME = "Consent";
+
+	/** Unspecified consent URI. */
+	public static final String UNSPECIFIED_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:unspecified";
+
+	/** Obtained consent URI. */
+	public static final String OBTAINED_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:obtained";
+
+	/** Prior consent URI. */
+	public static final String PRIOR_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:prior";
+
+	/** Implicit consent URI. */
+	public static final String IMPLICIT_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:current-implicit";
+
+	/** Explicit consent URI. */
+	public static final String EXPLICIT_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:current-explicit";
+
+	/** Unavailable consent URI. */
+	public static final String UNAVAILABLE_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:unavailable";
+
+	/** Inapplicable consent URI. */
+	public static final String INAPPLICABLE_CONSENT = "urn:oasis:names:tc:SAML:2.0:consent:inapplicable";
+
+	/**
+	 * Gets the SAML Version of this request.
+	 * 
+	 * @return the SAML Version of this request.
+	 */
+	public SAMLVersion getVersion();
+
+	/**
+	 * Sets the SAML Version of this request.
+	 * 
+	 * @param newVersion
+	 *            the SAML Version of this request
+	 */
+	public void setVersion(SAMLVersion newVersion);
+
+	/**
+	 * Gets the unique identifier of the request.
+	 * 
+	 * @return the unique identifier of the request
+	 */
+	public String getID();
+
+	/**
+	 * Sets the unique identifier of the request.
+	 * 
+	 * @param newID
+	 *            the unique identifier of the request
+	 */
+
+	public void setID(String newID);
+
+	/**
+	 * Gets the date/time the request was issued.
+	 * 
+	 * @return the date/time the request was issued
+	 */
+
+	public DateTime getIssueInstant();
+
+	/**
+	 * Sets the date/time the request was issued.
+	 * 
+	 * @param newIssueInstant
+	 *            the date/time the request was issued
+	 */
+	public void setIssueInstant(DateTime newIssueInstant);
+
+	/**
+	 * Gets the URI of the destination of the request.
+	 * 
+	 * @return the URI of the destination of the request
+	 */
+	public String getDestination();
+
+	/**
+	 * Sets the URI of the destination of the request.
+	 * 
+	 * @param newDestination
+	 *            the URI of the destination of the request
+	 */
+	public void setDestination(String newDestination);
+
+	/**
+	 * Sets the index of the particular Assertion Consumer Service to which the response to this request should be delivered.
+	 * 
+	 * @param newAssertionConsumerServiceIndex
+	 *            the new value of the AssertionConsumerServiceIndex attribute
+	 */
+	public void setAssertionConsumerServiceURL(String newServiceUrl);
+
+	/**
+	 * Gets the URL of the particular Assertion Consumer Service to which the response to this request should be delivered.
+	 * 
+	 * @return the value of the AssertionConsumerServiceURL attribute
+	 */
+	public String getAssertionConsumerServiceURL();
+
+	/**
+	 * Gets the consent obtained from the principal for sending this request.
+	 * 
+	 * @return the consent obtained from the principal for sending this request
+	 */
+	public String getConsent();
+
+	/**
+	 * Sets the consent obtained from the principal for sending this request.
+	 * 
+	 * @param newConsent
+	 *            the new consent obtained from the principal for sending this request
+	 */
+	public void setConsent(String newConsent);
+
+	/**
+	 * Gets the issuer of this request.
+	 * 
+	 * @return the issuer of this request
+	 */
+	public Issuer getIssuer();
+
+	/**
+	 * Sets the issuer of this request.
+	 * 
+	 * @param newIssuer
+	 *            the issuer of this request
+	 */
+	public void setIssuer(Issuer newIssuer);
+
+	/**
+	 * Gets the Extensions of this request.
+	 * 
+	 * @return the Status of this request
+	 */
+	public Extensions getExtensions();
+
+	/**
+	 * Sets the Extensions of this request.
+	 * 
+	 * @param newExtensions
+	 *            the Extensions of this request
+	 */
+	public void setExtensions(Extensions newExtensions);
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossBorderShare.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossBorderShare.java
index 03541ece1..423f0f342 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossBorderShare.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossBorderShare.java
@@ -21,38 +21,36 @@ import org.opensaml.common.SAMLObject;
 
 /**
  * The Interface EIDCrossBorderShare.
+ * 
  * @author fjquevedo
  */
 public interface EIDCrossBorderShare extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "eIDCrossBorderShare";
-
-    /** The Constant DEFAULT_ELEMENT_NAME. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
-
-    /** The Constant TYPE_LOCAL_NAME. */
-    String TYPE_LOCAL_NAME = "eIDCrossBorderShareType";
-
-    /** The Constant TYPE_NAME. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
-    
-   
-    /**
-     * Gets the eID cross border share.
-     *
-     * @return the eID cross border share
-     */
-    String getEIDCrossBorderShare();
-
-
-    /**
-     * Sets the eID cross border share.
-     *
-     * @param eIDCrossBorderShare the new eID cross border share
-     */
-    void setEIDCrossBorderShare(String eIDCrossBorderShare);
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "eIDCrossBorderShare";
+
+	/** The Constant DEFAULT_ELEMENT_NAME. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
+
+	/** The Constant TYPE_LOCAL_NAME. */
+	String TYPE_LOCAL_NAME = "eIDCrossBorderShareType";
+
+	/** The Constant TYPE_NAME. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
+
+	/**
+	 * Gets the eID cross border share.
+	 *
+	 * @return the eID cross border share
+	 */
+	String getEIDCrossBorderShare();
+
+	/**
+	 * Sets the eID cross border share.
+	 *
+	 * @param eIDCrossBorderShare
+	 *            the new eID cross border share
+	 */
+	void setEIDCrossBorderShare(String eIDCrossBorderShare);
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossSectorShare.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossSectorShare.java
index 14c504510..260f91046 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossSectorShare.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDCrossSectorShare.java
@@ -21,36 +21,36 @@ import org.opensaml.common.SAMLObject;
 
 /**
  * The Interface EIDCrossSectorShare.
+ * 
  * @author fjquevedo
  */
 public interface EIDCrossSectorShare extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String ELEM_LOCAL_NAME = "eIDCrossSectorShare";
-
-    /** The Constant DEFAULT_ELEMENT_NAME. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), ELEM_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
-
-    /** The Constant TYPE_LOCAL_NAME. */
-    String TYPE_LOCAL_NAME = "eIDCrossSectorShareType";
-
-    /** The Constant TYPE_NAME. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
-    
-    /**
-     * Gets the eID cross sector share.
-     *
-     * @return the eID cross sector share
-     */
-    String getEIDCrossSectorShare();
-
-    /**
-     * Sets the eID cross sector share.
-     *
-     * @param eIDCrossSectorShare the new eID cross sector share
-     */
-    void setEIDCrossSectorShare(String eIDCrossSectorShare);
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String ELEM_LOCAL_NAME = "eIDCrossSectorShare";
+
+	/** The Constant DEFAULT_ELEMENT_NAME. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), ELEM_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
+
+	/** The Constant TYPE_LOCAL_NAME. */
+	String TYPE_LOCAL_NAME = "eIDCrossSectorShareType";
+
+	/** The Constant TYPE_NAME. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
+
+	/**
+	 * Gets the eID cross sector share.
+	 *
+	 * @return the eID cross sector share
+	 */
+	String getEIDCrossSectorShare();
+
+	/**
+	 * Sets the eID cross sector share.
+	 *
+	 * @param eIDCrossSectorShare
+	 *            the new eID cross sector share
+	 */
+	void setEIDCrossSectorShare(String eIDCrossSectorShare);
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDSectorShare.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDSectorShare.java
index 0202f000c..a5748d5f1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDSectorShare.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/EIDSectorShare.java
@@ -21,37 +21,36 @@ import org.opensaml.common.SAMLObject;
 
 /**
  * The Interface EIDSectorShare.
+ * 
  * @author fjquevedo
  */
 public interface EIDSectorShare extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "eIDSectorShare";
-
-    /** The Constant DEFAULT_ELEMENT_NAME. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
-
-    /** The Constant TYPE_LOCAL_NAME. */
-    String TYPE_LOCAL_NAME = "eIDSectorShare";
-
-    /** The Constant TYPE_NAME. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
-    
-
-    /**
-     * Gets the eID sector share.
-     *
-     * @return the eID sector share
-     */
-    String getEIDSectorShare();
-
-    /**
-     * Sets the eID sector share.
-     *
-     * @param eIDSectorShare the new eID sector share
-     */
-    void setEIDSectorShare(String eIDSectorShare);
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "eIDSectorShare";
+
+	/** The Constant DEFAULT_ELEMENT_NAME. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
+
+	/** The Constant TYPE_LOCAL_NAME. */
+	String TYPE_LOCAL_NAME = "eIDSectorShare";
+
+	/** The Constant TYPE_NAME. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
+
+	/**
+	 * Gets the eID sector share.
+	 *
+	 * @return the eID sector share
+	 */
+	String getEIDSectorShare();
+
+	/**
+	 * Sets the eID sector share.
+	 *
+	 * @param eIDSectorShare
+	 *            the new eID sector share
+	 */
+	void setEIDSectorShare(String eIDSectorShare);
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java
index d99d23896..22d472be9 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/QAAAttribute.java
@@ -26,38 +26,37 @@ import org.opensaml.common.SAMLObject;
  */
 public interface QAAAttribute extends SAMLObject {
 
-    /** Element local name. */
-    String DEF_LOCAL_NAME = "QualityAuthenticationAssuranceLevel";
-
-    /** Default element name. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /** Local name of the XSI type. */
-    String TYPE_LOCAL_NAME = "QualityAuthenticationAssuranceLevelAbstractType";
-
-    /** QName of the XSI type. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /** The minimum value allowed. */
-    int MIN_VALUE = 1;
-
-    /** The Max value allowed. */
-    int MAX_VALUE = 4;
-
-    /**
-     * Gets the qAA level.
-     * 
-     * @return the qAA level
-     */
-    String getQaaLevel();
-
-    /**
-     * Sets the qAA level.
-     * 
-     * @param qaaLevel the new qAA level
-     * 
-     */
-    void setQaaLevel(String qaaLevel);
+	/** Element local name. */
+	String DEF_LOCAL_NAME = "QualityAuthenticationAssuranceLevel";
+
+	/** Default element name. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/** Local name of the XSI type. */
+	String TYPE_LOCAL_NAME = "QualityAuthenticationAssuranceLevelAbstractType";
+
+	/** QName of the XSI type. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/** The minimum value allowed. */
+	int MIN_VALUE = 1;
+
+	/** The Max value allowed. */
+	int MAX_VALUE = 4;
+
+	/**
+	 * Gets the qAA level.
+	 * 
+	 * @return the qAA level
+	 */
+	String getQaaLevel();
+
+	/**
+	 * Sets the qAA level.
+	 * 
+	 * @param qaaLevel
+	 *            the new qAA level
+	 * 
+	 */
+	void setQaaLevel(String qaaLevel);
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttribute.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttribute.java
index ffd32b3cf..955f6bef9 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttribute.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttribute.java
@@ -29,112 +29,113 @@ import org.opensaml.xml.XMLObject;
  * 
  * @author fjquevedo
  */
-public interface RequestedAttribute extends SAMLObject,
-	AttributeExtensibleXMLObject {
-
-    /** Element local name. */
-    String DEF_LOCAL_NAME = "RequestedAttribute";
-
-    /** Default element name. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /** Local name of the XSI type. */
-    String TYPE_LOCAL_NAME = "RequestedAttributeAbstractType";
-
-    /** QName of the XSI type. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /** NAME_ATTRIB_NAME attribute name. */
-    String NAME_ATTRIB_NAME = "Name";
-
-    /** NAME_FORMAT_ATTRIB_NAME attribute name. */
-    String NAME_FORMAT_ATTR = "NameFormat";
-
-    /** IS_REQUIRED_ATTRIB_NAME attribute name. */
-    String IS_REQUIRED_ATTR = "isRequired";
-
-    /** FRIENDLY_NAME_ATTRIB_NAME attribute name. */
-    String FRIENDLY_NAME_ATT = "FriendlyName";
-
-    /** Unspecified attribute format ID. */
-    String UNSPECIFIED = "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified";
-
-    /** URI reference attribute format ID. */
-    String URI_REFERENCE = "urn:oasis:names:tc:SAML:2.0:attrname-format:uri";
-
-    /** Basic attribute format ID. */
-    String BASIC = "urn:oasis:names:tc:SAML:2.0:attrname-format:basic";
-
-    /**
-     * Gets the name.
-     * 
-     * @return the name
-     */
-    String getName();
-
-    /**
-     * Sets the name.
-     * 
-     * @param name the new name
-     */
-    void setName(String name);
-
-    /**
-     * Gets the name format.
-     * 
-     * @return the name format
-     */
-    String getNameFormat();
-
-    /**
-     * Sets the name format.
-     * 
-     * @param nameFormat the new name format
-     */
-    void setNameFormat(String nameFormat);
-
-    /**
-     * Gets the friendly name.
-     * 
-     * @return the friendly name
-     */
-    String getFriendlyName();
-
-    /**
-     * Sets the friendly name.
-     * 
-     * @param friendlyName the new friendly name
-     */
-    void setFriendlyName(String friendlyName);
-
-    /**
-     * Gets the checks if is required.
-     * 
-     * @return the checks if is required
-     */
-    String isRequired();
-
-    /**
-     * Gets the checks if is required xs boolean.
-     * 
-     * @return the checks if is required xs boolean
-     */
-    String getIsRequiredXSBoolean();
-
-    /**
-     * Sets the checks if is required.
-     * 
-     * @param newIsRequired the new checks if is required
-     */
-    void setIsRequired(String newIsRequired);
-
-    /**
-     * Gets the attribute values.
-     * 
-     * @return the attribute values
-     */
-    List<XMLObject> getAttributeValues();
+public interface RequestedAttribute extends SAMLObject, AttributeExtensibleXMLObject {
+
+	/** Element local name. */
+	String DEF_LOCAL_NAME = "RequestedAttribute";
+
+	/** Default element name. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/** Local name of the XSI type. */
+	String TYPE_LOCAL_NAME = "RequestedAttributeAbstractType";
+
+	/** QName of the XSI type. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/** NAME_ATTRIB_NAME attribute name. */
+	String NAME_ATTRIB_NAME = "Name";
+
+	/** NAME_FORMAT_ATTRIB_NAME attribute name. */
+	String NAME_FORMAT_ATTR = "NameFormat";
+
+	/** IS_REQUIRED_ATTRIB_NAME attribute name. */
+	String IS_REQUIRED_ATTR = "isRequired";
+
+	/** FRIENDLY_NAME_ATTRIB_NAME attribute name. */
+	String FRIENDLY_NAME_ATT = "FriendlyName";
+
+	/** Unspecified attribute format ID. */
+	String UNSPECIFIED = "urn:oasis:names:tc:SAML:2.0:attrname-format:unspecified";
+
+	/** URI reference attribute format ID. */
+	String URI_REFERENCE = "urn:oasis:names:tc:SAML:2.0:attrname-format:uri";
+
+	/** Basic attribute format ID. */
+	String BASIC = "urn:oasis:names:tc:SAML:2.0:attrname-format:basic";
+
+	/**
+	 * Gets the name.
+	 * 
+	 * @return the name
+	 */
+	String getName();
+
+	/**
+	 * Sets the name.
+	 * 
+	 * @param name
+	 *            the new name
+	 */
+	void setName(String name);
+
+	/**
+	 * Gets the name format.
+	 * 
+	 * @return the name format
+	 */
+	String getNameFormat();
+
+	/**
+	 * Sets the name format.
+	 * 
+	 * @param nameFormat
+	 *            the new name format
+	 */
+	void setNameFormat(String nameFormat);
+
+	/**
+	 * Gets the friendly name.
+	 * 
+	 * @return the friendly name
+	 */
+	String getFriendlyName();
+
+	/**
+	 * Sets the friendly name.
+	 * 
+	 * @param friendlyName
+	 *            the new friendly name
+	 */
+	void setFriendlyName(String friendlyName);
+
+	/**
+	 * Gets the checks if is required.
+	 * 
+	 * @return the checks if is required
+	 */
+	String isRequired();
+
+	/**
+	 * Gets the checks if is required xs boolean.
+	 * 
+	 * @return the checks if is required xs boolean
+	 */
+	String getIsRequiredXSBoolean();
+
+	/**
+	 * Sets the checks if is required.
+	 * 
+	 * @param newIsRequired
+	 *            the new checks if is required
+	 */
+	void setIsRequired(String newIsRequired);
+
+	/**
+	 * Gets the attribute values.
+	 * 
+	 * @return the attribute values
+	 */
+	List<XMLObject> getAttributeValues();
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttributes.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttributes.java
index 6e3da28c3..4527bfdb6 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttributes.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/RequestedAttributes.java
@@ -28,24 +28,22 @@ import org.opensaml.common.SAMLObject;
  */
 public interface RequestedAttributes extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "RequestedAttributes";
-
-    /** Default element name. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
-
-    /** Local name of the XSI type. */
-    String TYPE_LOCAL_NAME = "RequestedAttributesType";
-
-    /** QName of the XSI type. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
-
-    /**
-     * Gets the attributes.
-     * 
-     * @return the attributes
-     */
-    List<RequestedAttribute> getAttributes();
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "RequestedAttributes";
+
+	/** Default element name. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
+
+	/** Local name of the XSI type. */
+	String TYPE_LOCAL_NAME = "RequestedAttributesType";
+
+	/** QName of the XSI type. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
+
+	/**
+	 * Gets the attributes.
+	 * 
+	 * @return the attributes
+	 */
+	List<RequestedAttribute> getAttributes();
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java
index cbedcf7d9..16b9afd18 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLCore.java
@@ -22,77 +22,81 @@ package eu.stork.peps.auth.engine.core;
  */
 
 public enum SAMLCore {
-    
-    /** The consent authentication request. */
-    CONSENT_AUTHN_REQ("consentAuthnRequest"),
-    
-    /** The consent authentication response. */
-    CONSENT_AUTHN_RES("consentAuthnResponse"),
-    
-    /** The FORC e_ auth n_ tag. */
-    FORCE_AUTHN_TAG("forceAuthN"),
-    
-    /** The I s_ passiv e_ tag. */
-    IS_PASSIVE_TAG("isPassive"),
-    
-    /** The FORMA t_ entity. */
-    FORMAT_ENTITY("formatEntity"),
-    
-    /** The FRIENDLY name. */
-    FRIENDLY_NAME("friendlyName"),
-    
-    /** The IS_REQUIRED AN ATTRIBUTE */
-    IS_REQUIRED("isRequired"),
-    
-    /** The PRO t_ bindin g_ tag. */
-    PROT_BINDING_TAG("protocolBinding"),
-    
-    /** The ASSER t_ con s_ tag. */
-    ASSERT_CONS_TAG("assertionConsumerServiceURL"),
-    
-    /** The REQUESTE r_ tag. */
-    REQUESTER_TAG("requester"),
-    
-    /** The RESPONDE r_ tag. */
-    RESPONDER_TAG("responder"),
-    
-    /** The STOR k10_ ns. */
-    STORK10_NS("urn:eu:stork:names:tc:STORK:1.0:assertion"),
-    
-    /** The STOR k10 p_ ns. */
-    STORK10P_NS("urn:eu:stork:names:tc:STORK:1.0:protocol"),
-    
-    /** The STOR k10_ prefix. */
-    STORK10_PREFIX("stork"),
-    
-    /** The STOR k10 p_ prefix. */
-    STORK10P_PREFIX("storkp"),
-    
-    /** The STOR k10_ bas e_ uri. */
-    STORK10_BASE_URI("http://www.stork.gov.eu/1.0/"),
-    
-    /** The ON e_ tim e_ use. */
-    ONE_TIME_USE("oneTimeUse");
-
-    /** The value. */
-    private String value;
-
-    /**
-     * Instantiates a new sAML core.
-     * 
-     * @param fullName the full name
-     */
-    private SAMLCore(final String fullName) {
-	this.value = fullName;
-    }	
-    
-    /**
-     * Gets the value.
-     * 
-     * @return the value
-     */
-    public String getValue() {
-	return value;
-    }
+
+	/** The consent authentication request. */
+	CONSENT_AUTHN_REQ("consentAuthnRequest"),
+
+	/** The consent authentication response. */
+	CONSENT_AUTHN_RES("consentAuthnResponse"),
+
+	/** The FORC e_ auth n_ tag. */
+	FORCE_AUTHN_TAG("forceAuthN"),
+
+	/** The I s_ passiv e_ tag. */
+	IS_PASSIVE_TAG("isPassive"),
+
+	/** The FORMA t_ entity. */
+	FORMAT_ENTITY("formatEntity"),
+
+	/** The FRIENDLY name. */
+	FRIENDLY_NAME("friendlyName"),
+
+	/** The IS_REQUIRED AN ATTRIBUTE */
+	IS_REQUIRED("isRequired"),
+
+	/** The PRO t_ bindin g_ tag. */
+	PROT_BINDING_TAG("protocolBinding"),
+
+	/** The ASSER t_ con s_ tag. */
+	ASSERT_CONS_TAG("assertionConsumerServiceURL"),
+
+	/** The REQUESTE r_ tag. */
+	REQUESTER_TAG("requester"),
+
+	/** The RESPONDE r_ tag. */
+	RESPONDER_TAG("responder"),
+	
+	/** The format r_tag. */
+	FORMAT_TAG("format"),
+
+	/** The STOR k10_ ns. */
+	STORK10_NS("urn:eu:stork:names:tc:STORK:1.0:assertion"),
+
+	/** The STOR k10 p_ ns. */
+	STORK10P_NS("urn:eu:stork:names:tc:STORK:1.0:protocol"),
+
+	/** The STOR k10_ prefix. */
+	STORK10_PREFIX("stork"),
+
+	/** The STOR k10 p_ prefix. */
+	STORK10P_PREFIX("storkp"),
+
+	/** The STOR k10_ bas e_ uri. */
+	STORK10_BASE_URI("http://www.stork.gov.eu/1.0/"),
+
+	/** The ON e_ tim e_ use. */
+	ONE_TIME_USE("oneTimeUse");
+
+	/** The value. */
+	private String value;
+
+	/**
+	 * Instantiates a new sAML core.
+	 * 
+	 * @param fullName
+	 *            the full name
+	 */
+	private SAMLCore(final String fullName) {
+		this.value = fullName;
+	}
+
+	/**
+	 * Gets the value.
+	 * 
+	 * @return the value
+	 */
+	public String getValue() {
+		return value;
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java
index e846983d8..8474eeedc 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SAMLEngineSignI.java
@@ -30,59 +30,64 @@ import eu.stork.peps.exceptions.SAMLEngineException;
  */
 public interface SAMLEngineSignI {
 
-    /**
-     * Sign.
-     * 
-     * @param tokenSaml the token SAML
-     * 
-     * @return the sAML object
-     * 
-     * @throws SAMLEngineException the SAML engine exception
-     */
-    SAMLObject sign(SignableSAMLObject tokenSaml) throws SAMLEngineException;
+	/**
+	 * Sign.
+	 * 
+	 * @param tokenSaml
+	 *            the token SAML
+	 * 
+	 * @return the sAML object
+	 * 
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
+	 */
+	SAMLObject sign(SignableSAMLObject tokenSaml) throws SAMLEngineException;
 
-    /**
-     * Gets the certificate.
-     * 
-     * @return the certificate
-     */
-    X509Certificate getCertificate();
+	/**
+	 * Gets the certificate.
+	 * 
+	 * @return the certificate
+	 */
+	X509Certificate getCertificate();
 
-    /**
-     * Gets the trustStore used when validating SAMLTokens
-     * 
-     * @return the trustStore
-     *   
-     */
+	/**
+	 * Gets the trustStore used when validating SAMLTokens
+	 * 
+	 * @return the trustStore
+	 * 
+	 */
 	KeyStore getTrustStore();
-	
-    /**
-     * Validate signature.
-     * 
-     * @param tokenSaml the token SAML
-     * 
-     * @return the sAML object
-     * 
-     * @throws SAMLEngineException the SAML engine exception
-     */
-    SAMLObject validateSignature(SignableSAMLObject tokenSaml)
-	    throws SAMLEngineException;
 
-    /**
-     * Initialize the signature module.
-     * 
-     * @param fileConf the configuration file.
-     * 
-     * @throws SAMLEngineException the STORKSAML engine runtime
-     *             exception
-     */
-    void init(String fileConf) throws SAMLEngineException;
+	/**
+	 * Validate signature.
+	 * 
+	 * @param tokenSaml
+	 *            the token SAML
+	 * 
+	 * @return the sAML object
+	 * 
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
+	 */
+	SAMLObject validateSignature(SignableSAMLObject tokenSaml) throws SAMLEngineException;
+
+	/**
+	 * Initialize the signature module.
+	 * 
+	 * @param fileConf
+	 *            the configuration file.
+	 * 
+	 * @throws SAMLEngineException
+	 *             the STORKSAML engine runtime exception
+	 */
+	void init(String fileConf) throws SAMLEngineException;
+
+	/**
+	 * Load cryptographic service provider.
+	 * 
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
+	 */
+	void loadCryptServiceProvider() throws SAMLEngineException;
 
-    /**
-     * Load cryptographic service provider.
-     * 
-     * @throws SAMLEngineException the SAML engine exception
-     */
-    void loadCryptServiceProvider() throws SAMLEngineException;
-    
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPApplication.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPApplication.java
index 9510bf790..82753b61f 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPApplication.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPApplication.java
@@ -26,31 +26,30 @@ import org.opensaml.common.SAMLObject;
  */
 public interface SPApplication extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "spApplication";
-
-    /** The Constant DEFAULT_ELEMENT_NAME. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /** The Constant TYPE_LOCAL_NAME. */
-    String TYPE_LOCAL_NAME = "spApplicationType";
-
-    /** The Constant TYPE_NAME. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /**
-     * Gets the service provider application.
-     * 
-     * @return the service provider application
-     */
-    String getSPApplication();
-
-    /**
-     * Sets the service provider application.
-     * 
-     * @param spApplication the new service provider application
-     */
-    void setSPApplication(String spApplication);
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "spApplication";
+
+	/** The Constant DEFAULT_ELEMENT_NAME. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/** The Constant TYPE_LOCAL_NAME. */
+	String TYPE_LOCAL_NAME = "spApplicationType";
+
+	/** The Constant TYPE_NAME. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/**
+	 * Gets the service provider application.
+	 * 
+	 * @return the service provider application
+	 */
+	String getSPApplication();
+
+	/**
+	 * Sets the service provider application.
+	 * 
+	 * @param spApplication
+	 *            the new service provider application
+	 */
+	void setSPApplication(String spApplication);
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPCountry.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPCountry.java
index 829ace878..e04d817ca 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPCountry.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPCountry.java
@@ -26,31 +26,30 @@ import org.opensaml.common.SAMLObject;
  */
 public interface SPCountry extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "spCountry";
-
-    /** The Constant DEFAULT_ELEMENT_NAME. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /** The Constant TYPE_LOCAL_NAME. */
-    String TYPE_LOCAL_NAME = "spCountryType";
-
-    /** The Constant TYPE_NAME. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /**
-     * Gets the service provider country.
-     * 
-     * @return the service provider country
-     */
-    String getSPCountry();
-
-    /**
-     * Sets the service provider country.
-     * 
-     * @param spCountry the new service provider country
-     */
-    void setSPCountry(String spCountry);
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "spCountry";
+
+	/** The Constant DEFAULT_ELEMENT_NAME. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/** The Constant TYPE_LOCAL_NAME. */
+	String TYPE_LOCAL_NAME = "spCountryType";
+
+	/** The Constant TYPE_NAME. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/**
+	 * Gets the service provider country.
+	 * 
+	 * @return the service provider country
+	 */
+	String getSPCountry();
+
+	/**
+	 * Sets the service provider country.
+	 * 
+	 * @param spCountry
+	 *            the new service provider country
+	 */
+	void setSPCountry(String spCountry);
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPID.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPID.java
index bd13f6dbf..8dad4d968 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPID.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPID.java
@@ -21,36 +21,35 @@ import org.opensaml.common.SAMLObject;
 
 /**
  * The Interface EIDCrossBorderShare.
+ * 
  * @author iinigo
  */
 public interface SPID extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "SPID";
-
-    /** The Constant DEFAULT_ELEMENT_NAME. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "SPID";
 
-    /** The Constant TYPE_LOCAL_NAME. */
-    String TYPE_LOCAL_NAME = "SPIDType";
+	/** The Constant DEFAULT_ELEMENT_NAME. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
-    /** The Constant TYPE_NAME. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** The Constant TYPE_LOCAL_NAME. */
+	String TYPE_LOCAL_NAME = "SPIDType";
 
-    /**
-     * Gets the SP ID.
-     * 
-     * @return the SP ID
-     */
-    String getSPID();
+	/** The Constant TYPE_NAME. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
+	/**
+	 * Gets the SP ID.
+	 * 
+	 * @return the SP ID
+	 */
+	String getSPID();
 
-    /**
-     * Sets the SP ID.
-     * 
-     * @param SPID the new SP ID
-     */
-    void setSPID(String newSPID);
+	/**
+	 * Sets the SP ID.
+	 * 
+	 * @param SPID
+	 *            the new SP ID
+	 */
+	void setSPID(String newSPID);
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInformation.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInformation.java
index bc870c2cc..8ad5b6eef 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInformation.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInformation.java
@@ -21,36 +21,35 @@ import org.opensaml.common.SAMLObject;
 
 /**
  * The Interface EIDCrossBorderShare.
+ * 
  * @author iinigo
  */
 public interface SPInformation extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "SPInformation";
-
-    /** The Constant DEFAULT_ELEMENT_NAME. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "SPInformation";
 
-    /** The Constant TYPE_LOCAL_NAME. */
-    String TYPE_LOCAL_NAME = "SPInformationType";
+	/** The Constant DEFAULT_ELEMENT_NAME. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
-    /** The Constant TYPE_NAME. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** The Constant TYPE_LOCAL_NAME. */
+	String TYPE_LOCAL_NAME = "SPInformationType";
 
-    /**
-     * Gets the SP Id.
-     * 
-     * @return the SP Id
-     */
-    SPID getSPID();
+	/** The Constant TYPE_NAME. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
+	/**
+	 * Gets the SP Id.
+	 * 
+	 * @return the SP Id
+	 */
+	SPID getSPID();
 
-    /**
-     * Sets the SP Id.
-     * 
-     * @param newSPId the new SP Id
-     */
-    void setSPID(SPID newSPID);
+	/**
+	 * Sets the SP Id.
+	 * 
+	 * @param newSPId
+	 *            the new SP Id
+	 */
+	void setSPID(SPID newSPID);
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInstitution.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInstitution.java
index add45023c..8a34a94ff 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInstitution.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPInstitution.java
@@ -26,31 +26,30 @@ import org.opensaml.common.SAMLObject;
  */
 public interface SPInstitution extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "spInstitution";
-
-    /** The Constant DEFAULT_ELEMENT_NAME. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /** The Constant TYPE_LOCAL_NAME. */
-    String TYPE_LOCAL_NAME = "spInstitutionType";
-
-    /** The Constant TYPE_NAME. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /**
-     * Gets the service provider institution.
-     * 
-     * @return the service provider institution
-     */
-    String getSPInstitution();
-
-    /**
-     * Sets the service provider institution.
-     * 
-     * @param spInstitution the new service provider institution
-     */
-    void setSPInstitution(String spInstitution);
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "spInstitution";
+
+	/** The Constant DEFAULT_ELEMENT_NAME. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/** The Constant TYPE_LOCAL_NAME. */
+	String TYPE_LOCAL_NAME = "spInstitutionType";
+
+	/** The Constant TYPE_NAME. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/**
+	 * Gets the service provider institution.
+	 * 
+	 * @return the service provider institution
+	 */
+	String getSPInstitution();
+
+	/**
+	 * Sets the service provider institution.
+	 * 
+	 * @param spInstitution
+	 *            the new service provider institution
+	 */
+	void setSPInstitution(String spInstitution);
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPSector.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPSector.java
index 8322a0d47..4b8af10cf 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPSector.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/SPSector.java
@@ -26,31 +26,30 @@ import org.opensaml.common.SAMLObject;
  */
 public interface SPSector extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "spSector";
-
-    /** The Constant DEFAULT_ELEMENT_NAME. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /** The Constant TYPE_LOCAL_NAME. */
-    String TYPE_LOCAL_NAME = "spSectorType";
-
-    /** The Constant TYPE_NAME. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10_PREFIX.getValue());
-
-    /**
-     * Gets the service provider sector.
-     * 
-     * @return the service provider sector
-     */
-    String getSPSector();
-
-    /**
-     * Sets the service provider sector.
-     * 
-     * @param spSector the new service provider sector
-     */
-    void setSPSector(String spSector);
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "spSector";
+
+	/** The Constant DEFAULT_ELEMENT_NAME. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/** The Constant TYPE_LOCAL_NAME. */
+	String TYPE_LOCAL_NAME = "spSectorType";
+
+	/** The Constant TYPE_NAME. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10_PREFIX.getValue());
+
+	/**
+	 * Gets the service provider sector.
+	 * 
+	 * @return the service provider sector
+	 */
+	String getSPSector();
+
+	/**
+	 * Sets the service provider sector.
+	 * 
+	 * @param spSector
+	 *            the new service provider sector
+	 */
+	void setSPSector(String spSector);
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java
index 4c314ae68..2a548ca6f 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/STORKSAMLCore.java
@@ -34,475 +34,495 @@ import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
  */
 public final class STORKSAMLCore {
 
-    /** The Constant LOGGER. */
-    private static final Logger LOGGER = LoggerFactory
-    .getLogger(STORKSAMLCore.class.getName());
+	/** The Constant LOGGER. */
+	private static final Logger LOGGER = LoggerFactory.getLogger(STORKSAMLCore.class.getName());
 
-    /** The consent authentication request. */
-    private String consentAuthnReq = null;
+	/** The consent authentication request. */
+	private String consentAuthnReq = null;
 
-    /** The consent authentication response. */
-    private String consentAuthnResp = null;
+	/** The consent authentication response. */
+	private String consentAuthnResp = null;
 
-    /** The id cross border share. */
-    private String eIDCrossBordShare = null;
+	/** The id cross border share. */
+	private String eIDCrossBordShare = null;
 
-    /** The e id cross sect share. */
-    private String eIDCrossSectShare = null;
+	/** The e id cross sect share. */
+	private String eIDCrossSectShare = null;
 
-    /** The e id sector share. */
-    private String eIDSectorShare = null;
+	/** The e id sector share. */
+	private String eIDSectorShare = null;
 
-    /** The format entity. */
-    private String formatEntity = null;
+	/** The format entity. */
+	private String formatEntity = null;
 
-    /** The friendly name. */
-    private boolean friendlyName = false;
+	/** The friendly name. */
+	private boolean friendlyName = false;
 
-    /** The IP validation. */
-    private boolean ipValidation = false;
+	/** The IP validation. */
+	private boolean ipValidation = false;
 
-    /** The one time use. */
-    private boolean oneTimeUse = true;
+	/** The one time use. */
+	private boolean oneTimeUse = true;
 
-    /** The protocol binding. */
-    private String protocolBinding = null;
+	/** The protocol binding. */
+	private String protocolBinding = null;
 
-    /** The requester. */
-    private String requester = null;
+	/** The requester. */
+	private String requester = null;
 
+	/** The responder. */
+	private String responder = null;
 
-    /** The responder. */
-    private String responder = null;
+	private String format = null;
 
-    /** The SAML core properties. */
-    private Properties samlCoreProp = null;
+	/**
+	 * The SAML core properties.
+	 */
+	private Properties samlCoreProp = null;
 
-    /** The time not on or after. */
-    private Integer timeNotOnOrAfter = null;
+	/** The time not on or after. */
+	private Integer timeNotOnOrAfter = null;
 
-    /** The is required parameter. */
-    private boolean isRequired = true;
+	/** The is required parameter. */
+	private boolean isRequired = true;
 
-    private static final String SAML_ENGINE_LITERAL = "SamlEngine.xml: ";
+	private static final String SAML_ENGINE_LITERAL = "SamlEngine.xml: ";
 
-    /**
-    * Gets the isRequired.
-    *
-    * @return the isRequired
-    */
-    public boolean isRequired() {
-    	return isRequired;
+	/**
+	 * Gets the isRequired.
+	 *
+	 * @return the isRequired
+	 */
+	public boolean isRequired() {
+		return isRequired;
 	}
 
-    /**
-     * Sets the isRequired.
-     *
-     * @param isRequired the required.
-     */
+	/**
+	 * Sets the isRequired.
+	 *
+	 * @param isRequired
+	 *            the required.
+	 */
 	public void setRequired(boolean isRequired) {
 		this.isRequired = isRequired;
 	}
 
 	/**
-     * Instantiates a new sAML core.
-     *
-     * @param instance the instance
-     */
-    public STORKSAMLCore(final Properties instance) {
-	loadConfiguration(instance);
-    }
-
-    /**
-     * Gets the consent.
-     * 
-     * @return the consent
-     */
-    public String getConsentAuthnRequest() {
-	return consentAuthnReq;
-    }
-
-    /**
-     * Gets the consent authentication response.
-     * 
-     * @return the consent authentication response.
-     */
-    public String getConsentAuthnResp() {
-	return consentAuthnResp;
-    }
-
-    /**
-     * Gets the consent authentication response.
-     * 
-     * @return the consent authentication response
-     */
-    public String getConsentAuthnResponse() {
-	return consentAuthnResp;
-    }
-
-    /**
-     * Gets the format entity.
-     * 
-     * @return the format entity
-     */
-    public String getFormatEntity() {
-	return formatEntity;
-    }
-
-    /**
-     * Gets the property.
-     * 
-     * @param key the key
-     * 
-     * @return the property
-     */
-    public String getProperty(final String key) {
-	return samlCoreProp.getProperty(key);
-    }
-
-    /**
-     * Gets the protocol binding.
-     * 
-     * @return the protocol binding
-     */
-    public String getProtocolBinding() {
-	return protocolBinding;
-    }
-
-    /**
-     * Gets the requester.
-     * 
-     * @return the requester
-     */
-    public String getRequester() {
-	return requester;
-    }
-
-    /**
-     * Gets the responder.
-     * 
-     * @return the responder
-     */
-    public String getResponder() {
-	return responder;
-    }
-
-    /**
-     * Gets the time not on or after.
-     * 
-     * @return the time not on or after
-     */
-    public Integer getTimeNotOnOrAfter() {
-	return timeNotOnOrAfter;
-    }
-
-    /**
-     * Checks if is e id cross border share.
-     * 
-     * @return true, if is e id cross border share
-     */
-    public String iseIDCrossBorderShare() {
-	return eIDCrossBordShare;
-    }
-
-    /**
-     * Checks if is e id cross border share.
-     * 
-     * @return true, if is e id cross border share
-     */
-    public String iseIDCrossBordShare() {
-	return eIDCrossBordShare;
-    }
-
-    /**
-     * Checks if is e id cross sector share.
-     * 
-     * @return true, if is e id cross sector share
-     */
-    public String iseIDCrossSectorShare() {
-	return eIDCrossSectShare;
-    }
-
-    /**
-     * Checks if is e id cross sect share.
-     * 
-     * @return true, if is e id cross sect share
-     */
-    public String iseIDCrossSectShare() {
-	return eIDCrossSectShare;
-    }
-
-    /**
-     * Checks if is e id sector share.
-     * 
-     * @return true, if is e id sector share
-     */
-    public String iseIDSectorShare() {
-	return eIDSectorShare;
-    }
-
-    /**
-     * Checks if is friendly name.
-     * 
-     * @return true, if checks if is friendly name
-     */
-    public boolean isFriendlyName() {
-	return friendlyName;
-    }
-
-    /**
-     * Checks if is IP validation.
-     * 
-     * @return true, if is IP validation
-     */
-    public boolean isIpValidation() {
-	return ipValidation;
-    }
-
-    /**
-     * Checks if is one time use.
-     * 
-     * @return true, if is one time use
-     */
-    public boolean isOneTimeUse() {
-	return oneTimeUse;
-    }
-
-    /**
-     * Method that loads the configuration file for the SAML Engine.
-     * 
-     * @param instance the instance of the Engine properties.
-     */
-    private void loadConfiguration(final Properties instance) {
-
-        try {
-            LOGGER.info("SAMLCore: Loading SAMLEngine properties.");
-
-            samlCoreProp = instance;
-
-            final String parameter = samlCoreProp
-                    .getProperty(SAMLCore.FORMAT_ENTITY.getValue());
-
-            if ("entity".equalsIgnoreCase(parameter)) {
-                formatEntity = NameIDType.ENTITY;
-            }
-
-            friendlyName = Boolean.valueOf(samlCoreProp
-                    .getProperty(SAMLCore.FRIENDLY_NAME.getValue()));
-
-            String isRequiredValue = samlCoreProp.
-                    getProperty(SAMLCore.IS_REQUIRED.getValue());
-            if (isRequiredValue != null) {
-                isRequired = Boolean.valueOf(isRequiredValue);
-            }
-
-            eIDSectorShare = samlCoreProp
-                    .getProperty("eIDSectorShare");
-            eIDCrossSectShare = samlCoreProp
-                    .getProperty("eIDCrossSectorShare");
-            eIDCrossBordShare = samlCoreProp
-                    .getProperty("eIDCrossBorderShare");
-
-            ipValidation = Boolean.valueOf(samlCoreProp
-                    .getProperty("ipAddrValidation"));
-
-            final String oneTimeUseProp = samlCoreProp
-                    .getProperty(SAMLCore.ONE_TIME_USE.getValue());
-
-            if (StringUtils.isNotBlank(oneTimeUseProp)) {
-                oneTimeUse = Boolean.valueOf(oneTimeUseProp);
-            }
-
-            // Protocol Binding
-            loadProtocolBiding();
-
-            // Consent Authentication Request
-            consentAuthnReq = samlCoreProp
-                    .getProperty(SAMLCore.CONSENT_AUTHN_REQ.getValue());
-
-            if ("unspecified".equalsIgnoreCase(consentAuthnReq)) {
-                consentAuthnReq = RequestAbstractType.UNSPECIFIED_CONSENT;
-            }
-
-            loadConsentAuthResp();
-
-            timeNotOnOrAfter = Integer.valueOf(samlCoreProp
-                    .getProperty("timeNotOnOrAfter"));
-
-            if (timeNotOnOrAfter.intValue() < 0) {
-                LOGGER.error(SAML_ENGINE_LITERAL + "timeNotOnOrAfter"
-                        + " is negative number.");
-
-                throw new SAMLEngineException(SAML_ENGINE_LITERAL
-                        + "timeNotOnOrAfter" + " is negative number.");
-            }
-
-            requester = samlCoreProp.getProperty(SAMLCore.REQUESTER_TAG.getValue());
-            responder = samlCoreProp.getProperty(SAMLCore.RESPONDER_TAG.getValue());
-
-        } catch (SAMLEngineException e) {
-            LOGGER.error("SAMLCore: error loadConfiguration. ", e);
-            throw new STORKSAMLEngineRuntimeException(e);
-        } catch (RuntimeException e) {
-            LOGGER.error("SAMLCore: error loadConfiguration. ", e);
-            throw new STORKSAMLEngineRuntimeException(e);
-        }
-    }
-
-    /**
-     * Load consent authentication response.
-     */
-    private void loadConsentAuthResp() {
-	// Consent Authentication Response
-	consentAuthnResp = samlCoreProp
-		.getProperty(SAMLCore.CONSENT_AUTHN_RES.getValue());
-
-	if ("obtained".equalsIgnoreCase(consentAuthnResp)) {
-	    consentAuthnResp = RequestAbstractType.OBTAINED_CONSENT;
-	} else if ("prior".equalsIgnoreCase(consentAuthnResp)) {
-	    consentAuthnResp = RequestAbstractType.PRIOR_CONSENT;
-	} else if ("curent-implicit".equalsIgnoreCase(consentAuthnResp)) {
-	    consentAuthnResp = 
-		"urn:oasis:names:tc:SAML:2.0:consent:current-implicit";
-	} else if ("curent-explicit".equalsIgnoreCase(consentAuthnResp)) {
-	    consentAuthnResp = 
-		"urn:oasis:names:tc:SAML:2.0:consent:current-explicit";
-	} else if ("unspecified".equalsIgnoreCase(consentAuthnResp)) {
-	    consentAuthnResp = RequestAbstractType.UNSPECIFIED_CONSENT;
-	}
-    }
-
-    /**
-     * Load protocol biding.
-     * 
-     * @throws SAMLEngineException the SAML engine exception
-     */
-    private void loadProtocolBiding() throws SAMLEngineException {
-	// Protocol Binding
-	protocolBinding = samlCoreProp.getProperty(SAMLCore.PROT_BINDING_TAG.getValue());
-
-	if (StringUtils.isBlank(protocolBinding)) {
-	    LOGGER.error(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG
-		    + " it's mandatory.");
-	    throw new SAMLEngineException(SAML_ENGINE_LITERAL
-		    + SAMLCore.PROT_BINDING_TAG + " it's mandatory.");
-	} else if (protocolBinding.equalsIgnoreCase("HTTP-POST")) {
-	    protocolBinding = SAMLConstants.SAML2_POST_BINDING_URI;
-	} else {
-	    LOGGER.error(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG
-		    + " it's not supporting.");
-
-	    throw new SAMLEngineException(SAML_ENGINE_LITERAL
-		    + SAMLCore.PROT_BINDING_TAG + " it's not supporting.");
-	}
-    }
-
-    /**
-     * Sets the consent authentication response.
-     * 
-     * @param newConsAuthnResp the new consent authentication response
-     */
-    public void setConsentAuthnResp(final String newConsAuthnResp) {
-	this.consentAuthnResp = newConsAuthnResp;
-    }
-
-    /**
-     * Sets an eID that can be shared outside of the  Service Provider’s member state.
-     * 
-     * @param newEIDCrossBord the new eid cross border share
-     */
-    public void setEIDCrossBordShare(final String newEIDCrossBord) {
-	this.eIDCrossBordShare = newEIDCrossBord;
-    }
-
-    /**
-     * Sets an eID that can be shared outside of the  Service Provider’s sector.
-     * 
-     * @param newEIDCrossSect the new eid cross sect share
-     */
-    public void setEIDCrossSectShare(final String newEIDCrossSect) {
-	this.eIDCrossSectShare = newEIDCrossSect;
-    }
-
-    /**
-     * Sets an eID that can be shared within the Service Provider’s sector.
-     * 
-     * @param newEIDSectorShare the new eid sector share
-     */
-    public void seteIDSectorShare(final String newEIDSectorShare) {
-	this.eIDSectorShare = newEIDSectorShare;
-    }
-
-    /**
-     * Sets the format entity.
-     * 
-     * @param newFormatEntity the new format entity
-     */
-    public void setFormatEntity(final String newFormatEntity) {
-	this.formatEntity = newFormatEntity;
-    }
-
-    /**
-     * Sets the friendly name.
-     * 
-     * @param newFriendlyName the new friendly name
-     */
-    public void setFriendlyName(final boolean newFriendlyName) {
-	this.friendlyName = newFriendlyName;
-    }
-
-    /**
-     * Sets the IP validation.
-     * 
-     * @param newIpValidation the new IP validation
-     */
-    public void setIpValidation(final boolean newIpValidation) {
-	this.ipValidation = newIpValidation;
-    }
-
-    /**
-     * Sets the one time use.
-     * 
-     * @param newOneTimeUse the new one time use
-     */
-    public void setOneTimeUse(final boolean newOneTimeUse) {
-	this.oneTimeUse = newOneTimeUse;
-    }
-
-    /**
-     * Sets the protocol binding.
-     * 
-     * @param newProtBinding the new protocol binding
-     */
-    public void setProtocolBinding(final String newProtBinding) {
-	this.protocolBinding = newProtBinding;
-    }
-
-    /**
-     * Sets the requester.
-     * 
-     * @param newRequester the new requester
-     */
-    public void setRequester(final String newRequester) {
-	this.requester = newRequester;
-    }
-
-    /**
-     * Sets the responder.
-     * 
-     * @param newResponder the new responder
-     */
-    public void setResponder(final String newResponder) {
-	this.responder = newResponder;
-    }
-
-    /**
-     * Sets the time not on or after.
-     * 
-     * @param newTimeNotOnOrAft the new time not on or after
-     */
-    public void setTimeNotOnOrAfter(final Integer newTimeNotOnOrAft) {
-	this.timeNotOnOrAfter = newTimeNotOnOrAft;
-    }
+	 * Instantiates a new sAML core.
+	 *
+	 * @param instance
+	 *            the instance
+	 */
+	public STORKSAMLCore(final Properties instance) {
+		loadConfiguration(instance);
+	}
+
+	/**
+	 * Gets the consent.
+	 * 
+	 * @return the consent
+	 */
+	public String getConsentAuthnRequest() {
+		return consentAuthnReq;
+	}
+
+	/**
+	 * Gets the consent authentication response.
+	 * 
+	 * @return the consent authentication response.
+	 */
+	public String getConsentAuthnResp() {
+		return consentAuthnResp;
+	}
+
+	/**
+	 * Gets the consent authentication response.
+	 * 
+	 * @return the consent authentication response
+	 */
+	public String getConsentAuthnResponse() {
+		return consentAuthnResp;
+	}
+
+	/**
+	 * Gets the format entity.
+	 * 
+	 * @return the format entity
+	 */
+	public String getFormatEntity() {
+		return formatEntity;
+	}
+
+	/**
+	 * Gets the property.
+	 * 
+	 * @param key
+	 *            the key
+	 * 
+	 * @return the property
+	 */
+	public String getProperty(final String key) {
+		return samlCoreProp.getProperty(key);
+	}
+
+	/**
+	 * Gets the protocol binding.
+	 * 
+	 * @return the protocol binding
+	 */
+	public String getProtocolBinding() {
+		return protocolBinding;
+	}
+
+	/**
+	 * Gets the requester.
+	 * 
+	 * @return the requester
+	 */
+	public String getRequester() {
+		return requester;
+	}
+
+	/**
+	 * Gets the responder.
+	 * 
+	 * @return the responder
+	 */
+	public String getResponder() {
+		return responder;
+	}
+
+	/**
+	 * return the format string.
+	 * 
+	 * @return
+	 */
+	public String getFormat() {
+		return this.format;
+	}
+
+	/**
+	 * Gets the time not on or after.
+	 * 
+	 * @return the time not on or after
+	 */
+	public Integer getTimeNotOnOrAfter() {
+		return timeNotOnOrAfter;
+	}
+
+	/**
+	 * Checks if is e id cross border share.
+	 * 
+	 * @return true, if is e id cross border share
+	 */
+	public String iseIDCrossBorderShare() {
+		return eIDCrossBordShare;
+	}
+
+	/**
+	 * Checks if is e id cross border share.
+	 * 
+	 * @return true, if is e id cross border share
+	 */
+	public String iseIDCrossBordShare() {
+		return eIDCrossBordShare;
+	}
+
+	/**
+	 * Checks if is e id cross sector share.
+	 * 
+	 * @return true, if is e id cross sector share
+	 */
+	public String iseIDCrossSectorShare() {
+		return eIDCrossSectShare;
+	}
+
+	/**
+	 * Checks if is e id cross sect share.
+	 * 
+	 * @return true, if is e id cross sect share
+	 */
+	public String iseIDCrossSectShare() {
+		return eIDCrossSectShare;
+	}
+
+	/**
+	 * Checks if is e id sector share.
+	 * 
+	 * @return true, if is e id sector share
+	 */
+	public String iseIDSectorShare() {
+		return eIDSectorShare;
+	}
+
+	/**
+	 * Checks if is friendly name.
+	 * 
+	 * @return true, if checks if is friendly name
+	 */
+	public boolean isFriendlyName() {
+		return friendlyName;
+	}
+
+	/**
+	 * Checks if is IP validation.
+	 * 
+	 * @return true, if is IP validation
+	 */
+	public boolean isIpValidation() {
+		return ipValidation;
+	}
+
+	/**
+	 * Checks if is one time use.
+	 * 
+	 * @return true, if is one time use
+	 */
+	public boolean isOneTimeUse() {
+		return oneTimeUse;
+	}
+
+	/**
+	 * Method that loads the configuration file for the SAML Engine.
+	 * 
+	 * @param instance
+	 *            the instance of the Engine properties.
+	 */
+	private void loadConfiguration(final Properties instance) {
+
+		try {
+			LOGGER.info("SAMLCore: Loading SAMLEngine properties.");
+
+			samlCoreProp = instance;
+
+			final String parameter = samlCoreProp.getProperty(SAMLCore.FORMAT_ENTITY.getValue());
+
+			if ("entity".equalsIgnoreCase(parameter)) {
+				formatEntity = NameIDType.ENTITY;
+			}
+
+			friendlyName = Boolean.valueOf(samlCoreProp.getProperty(SAMLCore.FRIENDLY_NAME.getValue()));
+
+			String isRequiredValue = samlCoreProp.getProperty(SAMLCore.IS_REQUIRED.getValue());
+			if (isRequiredValue != null) {
+				isRequired = Boolean.valueOf(isRequiredValue);
+			}
+
+			eIDSectorShare = samlCoreProp.getProperty("eIDSectorShare");
+			eIDCrossSectShare = samlCoreProp.getProperty("eIDCrossSectorShare");
+			eIDCrossBordShare = samlCoreProp.getProperty("eIDCrossBorderShare");
+
+			ipValidation = Boolean.valueOf(samlCoreProp.getProperty("ipAddrValidation"));
+
+			final String oneTimeUseProp = samlCoreProp.getProperty(SAMLCore.ONE_TIME_USE.getValue());
+
+			if (StringUtils.isNotBlank(oneTimeUseProp)) {
+				oneTimeUse = Boolean.valueOf(oneTimeUseProp);
+			}
+
+			// Protocol Binding
+			loadProtocolBiding();
+
+			// Consent Authentication Request
+			consentAuthnReq = samlCoreProp.getProperty(SAMLCore.CONSENT_AUTHN_REQ.getValue());
+
+			if ("unspecified".equalsIgnoreCase(consentAuthnReq)) {
+				consentAuthnReq = RequestAbstractType.UNSPECIFIED_CONSENT;
+			}
+
+			loadConsentAuthResp();
+
+			timeNotOnOrAfter = Integer.valueOf(samlCoreProp.getProperty("timeNotOnOrAfter"));
+
+			if (timeNotOnOrAfter.intValue() < 0) {
+				LOGGER.error(SAML_ENGINE_LITERAL + "timeNotOnOrAfter" + " is negative number.");
+
+				throw new SAMLEngineException(SAML_ENGINE_LITERAL + "timeNotOnOrAfter" + " is negative number.");
+			}
+
+			requester = samlCoreProp.getProperty(SAMLCore.REQUESTER_TAG.getValue());
+			responder = samlCoreProp.getProperty(SAMLCore.RESPONDER_TAG.getValue());
+
+			format = samlCoreProp.getProperty(SAMLCore.FORMAT_TAG.getValue(), "urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified");
+
+		} catch (SAMLEngineException e) {
+			LOGGER.error("SAMLCore: error loadConfiguration. ", e);
+			throw new STORKSAMLEngineRuntimeException(e);
+		} catch (RuntimeException e) {
+			LOGGER.error("SAMLCore: error loadConfiguration. ", e);
+			throw new STORKSAMLEngineRuntimeException(e);
+		}
+	}
+
+	/**
+	 * Load consent authentication response.
+	 */
+	private void loadConsentAuthResp() {
+		// Consent Authentication Response
+		consentAuthnResp = samlCoreProp.getProperty(SAMLCore.CONSENT_AUTHN_RES.getValue());
+
+		if ("obtained".equalsIgnoreCase(consentAuthnResp)) {
+			consentAuthnResp = RequestAbstractType.OBTAINED_CONSENT;
+		} else if ("prior".equalsIgnoreCase(consentAuthnResp)) {
+			consentAuthnResp = RequestAbstractType.PRIOR_CONSENT;
+		} else if ("curent-implicit".equalsIgnoreCase(consentAuthnResp)) {
+			consentAuthnResp = "urn:oasis:names:tc:SAML:2.0:consent:current-implicit";
+		} else if ("curent-explicit".equalsIgnoreCase(consentAuthnResp)) {
+			consentAuthnResp = "urn:oasis:names:tc:SAML:2.0:consent:current-explicit";
+		} else if ("unspecified".equalsIgnoreCase(consentAuthnResp)) {
+			consentAuthnResp = RequestAbstractType.UNSPECIFIED_CONSENT;
+		}
+	}
+
+	/**
+	 * Load protocol biding.
+	 * 
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
+	 */
+	private void loadProtocolBiding() throws SAMLEngineException {
+		// Protocol Binding
+		protocolBinding = samlCoreProp.getProperty(SAMLCore.PROT_BINDING_TAG.getValue());
+
+		if (StringUtils.isBlank(protocolBinding)) {
+			LOGGER.error(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG + " it's mandatory.");
+			throw new SAMLEngineException(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG + " it's mandatory.");
+		} else if (protocolBinding.equalsIgnoreCase("HTTP-POST")) {
+			protocolBinding = SAMLConstants.SAML2_POST_BINDING_URI;
+		} else {
+			LOGGER.error(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG + " it's not supporting.");
+
+			throw new SAMLEngineException(SAML_ENGINE_LITERAL + SAMLCore.PROT_BINDING_TAG + " it's not supporting.");
+		}
+	}
+
+	/**
+	 * Sets the consent authentication response.
+	 * 
+	 * @param newConsAuthnResp
+	 *            the new consent authentication response
+	 */
+	public void setConsentAuthnResp(final String newConsAuthnResp) {
+		this.consentAuthnResp = newConsAuthnResp;
+	}
+
+	/**
+	 * Sets an eID that can be shared outside of the Service Provider’s member state.
+	 * 
+	 * @param newEIDCrossBord
+	 *            the new eid cross border share
+	 */
+	public void setEIDCrossBordShare(final String newEIDCrossBord) {
+		this.eIDCrossBordShare = newEIDCrossBord;
+	}
+
+	/**
+	 * Sets an eID that can be shared outside of the Service Provider’s sector.
+	 * 
+	 * @param newEIDCrossSect
+	 *            the new eid cross sect share
+	 */
+	public void setEIDCrossSectShare(final String newEIDCrossSect) {
+		this.eIDCrossSectShare = newEIDCrossSect;
+	}
+
+	/**
+	 * Sets an eID that can be shared within the Service Provider’s sector.
+	 * 
+	 * @param newEIDSectorShare
+	 *            the new eid sector share
+	 */
+	public void seteIDSectorShare(final String newEIDSectorShare) {
+		this.eIDSectorShare = newEIDSectorShare;
+	}
+
+	/**
+	 * Sets the format entity.
+	 * 
+	 * @param newFormatEntity
+	 *            the new format entity
+	 */
+	public void setFormatEntity(final String newFormatEntity) {
+		this.formatEntity = newFormatEntity;
+	}
+
+	/**
+	 * Sets the friendly name.
+	 * 
+	 * @param newFriendlyName
+	 *            the new friendly name
+	 */
+	public void setFriendlyName(final boolean newFriendlyName) {
+		this.friendlyName = newFriendlyName;
+	}
+
+	/**
+	 * Sets the IP validation.
+	 * 
+	 * @param newIpValidation
+	 *            the new IP validation
+	 */
+	public void setIpValidation(final boolean newIpValidation) {
+		this.ipValidation = newIpValidation;
+	}
+
+	/**
+	 * Sets the one time use.
+	 * 
+	 * @param newOneTimeUse
+	 *            the new one time use
+	 */
+	public void setOneTimeUse(final boolean newOneTimeUse) {
+		this.oneTimeUse = newOneTimeUse;
+	}
+
+	/**
+	 * Sets the protocol binding.
+	 * 
+	 * @param newProtBinding
+	 *            the new protocol binding
+	 */
+	public void setProtocolBinding(final String newProtBinding) {
+		this.protocolBinding = newProtBinding;
+	}
+
+	/**
+	 * Sets the requester.
+	 * 
+	 * @param newRequester
+	 *            the new requester
+	 */
+	public void setRequester(final String newRequester) {
+		this.requester = newRequester;
+	}
+
+	/**
+	 * Sets the responder.
+	 * 
+	 * @param newResponder
+	 *            the new responder
+	 */
+	public void setResponder(final String newResponder) {
+		this.responder = newResponder;
+	}
+
+	/**
+	 * Sets the format string
+	 * 
+	 * @param newFormat
+	 */
+	public void setFormat(final String newFormat) {
+		this.format = newFormat;
+	}
+
+	/**
+	 * Sets the time not on or after.
+	 * 
+	 * @param newTimeNotOnOrAft
+	 *            the new time not on or after
+	 */
+	public void setTimeNotOnOrAfter(final Integer newTimeNotOnOrAft) {
+		this.timeNotOnOrAfter = newTimeNotOnOrAft;
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java
index 6ee9e0e1b..c4c1ec845 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/VIDPAuthenticationAttributes.java
@@ -26,47 +26,46 @@ import org.opensaml.common.SAMLObject;
  */
 public interface VIDPAuthenticationAttributes extends SAMLObject {
 
-    /** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
-    String DEF_LOCAL_NAME = "VIDPAuthenticationAttributes";
+	/** The Constant DEFAULT_ELEMENT_LOCAL_NAME. */
+	String DEF_LOCAL_NAME = "VIDPAuthenticationAttributes";
 
-    /** Default element name. */
-    QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** Default element name. */
+	QName DEF_ELEMENT_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
-    /** Local name of the XSI type. */
-    String TYPE_LOCAL_NAME = "VIDPAuthenticationAttributesType";
+	/** Local name of the XSI type. */
+	String TYPE_LOCAL_NAME = "VIDPAuthenticationAttributesType";
 
-    /** QName of the XSI type. */
-    QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME,
-	    SAMLCore.STORK10P_PREFIX.getValue());
+	/** QName of the XSI type. */
+	QName TYPE_NAME = new QName(SAMLCore.STORK10P_NS.getValue(), TYPE_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
 
+	/**
+	 * Gets the citizen country code.
+	 * 
+	 * @return the citizen country code
+	 */
+	CitizenCountryCode getCitizenCountryCode();
+
+	/**
+	 * Sets the citizen country code.
+	 * 
+	 * @param newCitizenCountryCode
+	 *            the new citizen country code
+	 */
+	void setCitizenCountryCode(CitizenCountryCode newCitizenCountryCode);
+
+	/**
+	 * Gets the SP information
+	 * 
+	 * @return the SP information
+	 */
+	SPInformation getSPInformation();
+
+	/**
+	 * Sets the SP information
+	 * 
+	 * @param newSPInformation
+	 *            the new SPInformation
+	 */
+	void setSPInformation(SPInformation newSPInformation);
 
-    /**
-     * Gets the citizen country code.
-     * 
-     * @return the citizen country code
-     */
-    CitizenCountryCode getCitizenCountryCode();
-    
-    /**
-     * Sets the citizen country code.
-     * 
-     * @param newCitizenCountryCode the new citizen country code
-     */
-    void setCitizenCountryCode(CitizenCountryCode newCitizenCountryCode);
-    
-    /**
-     * Gets the SP information
-     * 
-     * @return the SP information
-     */
-    SPInformation getSPInformation();
-    
-    /**
-     * Sets the SP information
-     * 
-     * @param newSPInformation the new SPInformation
-     */
-    void setSPInformation(SPInformation newSPInformation);
-     
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java
index 2d9039d4c..f34adfcb4 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesBuilder.java
@@ -24,33 +24,31 @@ import eu.stork.peps.auth.engine.core.AuthenticationAttributes;
  * 
  * @author fjquevedo
  */
-public class AuthenticationAttributesBuilder extends
-	AbstractSAMLObjectBuilder<AuthenticationAttributes> {
-
-
-
-    /**
-     * Builds the object.
-     *
-     * @return the authentication attributes
-     */
-    public final AuthenticationAttributes buildObject() {
-	return buildObject(AuthenticationAttributes.DEF_ELEMENT_NAME);
-    }
-
-    /**
-     * Builds the object.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * 
-     * @return the authentication attributes 
-     */
-    public final AuthenticationAttributes buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new AuthenticationAttributesImpl(namespaceURI, localName,
-		namespacePrefix);
-    }
+public class AuthenticationAttributesBuilder extends AbstractSAMLObjectBuilder<AuthenticationAttributes> {
+
+	/**
+	 * Builds the object.
+	 *
+	 * @return the authentication attributes
+	 */
+	public final AuthenticationAttributes buildObject() {
+		return buildObject(AuthenticationAttributes.DEF_ELEMENT_NAME);
+	}
+
+	/**
+	 * Builds the object.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace URI
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * 
+	 * @return the authentication attributes
+	 */
+	public final AuthenticationAttributes buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new AuthenticationAttributesImpl(namespaceURI, localName, namespacePrefix);
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
index e0de20f7d..9f602aba1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesImpl.java
@@ -32,78 +32,74 @@ import org.slf4j.LoggerFactory;
  * 
  * @author fjquevedo
  */
-public final class AuthenticationAttributesImpl extends AbstractSignableSAMLObject implements
-AuthenticationAttributes {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticationAttributesImpl.class.getName());
-
-    /** The indexed children. */
-    private VIDPAuthenticationAttributes vIDPAuthenAttr;
-
-    /**
-     * Instantiates a new authentication attributes implementation.
-     * 
-     * @param namespaceURI the namespace uri
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected AuthenticationAttributesImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {	
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
-
-    /**
-     * Gets the ordered children.
-     * 
-     * @return the ordered children
-     * 
-     */
-    public List<XMLObject> getOrderedChildren() {
-	final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
-
-	children.add(vIDPAuthenAttr);
-
-	if (getSignature() != null) {
-	    children.add(getSignature());
+public final class AuthenticationAttributesImpl extends AbstractSignableSAMLObject implements AuthenticationAttributes {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(AuthenticationAttributesImpl.class.getName());
+
+	/** The indexed children. */
+	private VIDPAuthenticationAttributes vIDPAuthenAttr;
+
+	/**
+	 * Instantiates a new authentication attributes implementation.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected AuthenticationAttributesImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
+
+	/**
+	 * Gets the ordered children.
+	 * 
+	 * @return the ordered children
+	 * 
+	 */
+	public List<XMLObject> getOrderedChildren() {
+		final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
+
+		children.add(vIDPAuthenAttr);
+
+		if (getSignature() != null) {
+			children.add(getSignature());
+		}
+
+		return Collections.unmodifiableList(children);
+	}
+
+	/**
+	 * Gets the signature reference id.
+	 * 
+	 * @return the signature reference id
+	 * 
+	 */
+	public String getSignatureReferenceID() {
+		return null;
+	}
+
+	/**
+	 * Gets the vidp authentication attributes.
+	 * 
+	 * @return the VIDP authentication attributes
+	 *
+	 */
+	public VIDPAuthenticationAttributes getVIDPAuthenticationAttributes() {
+		return vIDPAuthenAttr;
+	}
+
+	/**
+	 * Sets the vidp authentication attributes.
+	 * 
+	 * @param newVIDPAuthenAttr
+	 *            the new vidp authen attr
+	 *
+	 */
+	public void setVIDPAuthenticationAttributes(final VIDPAuthenticationAttributes newVIDPAuthenAttr) {
+		vIDPAuthenAttr = prepareForAssignment(this.vIDPAuthenAttr, newVIDPAuthenAttr);
 	}
 
-	return Collections.unmodifiableList(children);
-    }
-
-    /**
-     * Gets the signature reference id.
-     * 
-     * @return the signature reference id
-     * 
-     */
-    public String getSignatureReferenceID() {	
-	return null;
-    }
-
-    /**
-     * Gets the vidp authentication attributes.
-     * 
-     * @return the VIDP authentication attributes
-     *
-     */
-    public VIDPAuthenticationAttributes getVIDPAuthenticationAttributes() {	
-	return vIDPAuthenAttr;
-    }
-
-    /**
-     * Sets the vidp authentication attributes.
-     * 
-     * @param newVIDPAuthenAttr the new vidp authen attr
-     *
-     */
-    public void setVIDPAuthenticationAttributes(
-	    final VIDPAuthenticationAttributes newVIDPAuthenAttr) {	
-	vIDPAuthenAttr = prepareForAssignment(this.vIDPAuthenAttr, newVIDPAuthenAttr);
-    }
-
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java
index 113214712..7e1b6bbe2 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/AuthenticationAttributesUnmarshaller.java
@@ -28,20 +28,21 @@ import eu.stork.peps.auth.engine.core.AuthenticationAttributes;
  * 
  * @author fjquevedo
  */
-public class AuthenticationAttributesUnmarshaller extends
-AbstractSAMLObjectUnmarshaller {
+public class AuthenticationAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
 	/**
 	 * Process child element.
 	 * 
-	 * @param parentObject the parent object
-	 * @param childObject the child object
+	 * @param parentObject
+	 *            the parent object
+	 * @param childObject
+	 *            the child object
 	 * 
-	 * @throws UnmarshallingException the unmarshalling exception
+	 * @throws UnmarshallingException
+	 *             the unmarshalling exception
 	 *
 	 */
-	protected final void processChildElement(final XMLObject parentObject,
-			final XMLObject childObject) throws UnmarshallingException {
+	protected final void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
 		final AuthenticationAttributes attrStatement = (AuthenticationAttributes) parentObject;
 
 		if (childObject instanceof VIDPAuthenticationAttributes) {
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeBuilder.java
index 64651691f..49ed66d88 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeBuilder.java
@@ -26,25 +26,27 @@ import eu.stork.peps.auth.engine.core.CitizenCountryCode;
  */
 public class CitizenCountryCodeBuilder extends AbstractSAMLObjectBuilder<CitizenCountryCode> {
 
-    /**
-     * Builds the object.
-     *
-     * @return the citizen country code
-     */
-    public final CitizenCountryCode buildObject() {
-	return buildObject(CitizenCountryCode.DEF_ELEMENT_NAME);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @return the citizen country code
+	 */
+	public final CitizenCountryCode buildObject() {
+		return buildObject(CitizenCountryCode.DEF_ELEMENT_NAME);
+	}
 
-    /**
-     * Builds the object.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the citizen country code
-     */
-    public final CitizenCountryCode buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new CitizenCountryCodeImpl(namespaceURI, localName, namespacePrefix);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the citizen country code
+	 */
+	public final CitizenCountryCode buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new CitizenCountryCodeImpl(namespaceURI, localName, namespacePrefix);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java
index 374398cf1..aa4c725f1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeImpl.java
@@ -31,52 +31,50 @@ import org.slf4j.LoggerFactory;
  */
 public class CitizenCountryCodeImpl extends AbstractSAMLObject implements CitizenCountryCode {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(CitizenCountryCodeImpl.class.getName());
-    /** The citizen country code. */
-    private String citizenCountryCode;
-    
-    /**
-     * Instantiates a new sP country impl.
-     * 
-     * @param namespaceURI the namespace uri
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */   
-    protected CitizenCountryCodeImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);	
-    }
+	private static final Logger LOGGER = LoggerFactory.getLogger(CitizenCountryCodeImpl.class.getName());
+	/** The citizen country code. */
+	private String citizenCountryCode;
 
-    /**
-     * Gets the citizen country code.
-     *
-     * @return the citizen country code
-     */
-    public final String getCitizenCountryCode() {
-	return citizenCountryCode;
-    }
+	/**
+	 * Instantiates a new sP country impl.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected CitizenCountryCodeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    /**
-     * Sets the citizen country code.
-     *
-     * @param newCitizenCountryCode the new citizen country code
-     */
-    public final void setCitizenCountryCode(final String newCitizenCountryCode) {
-	this.citizenCountryCode = prepareForAssignment(this.citizenCountryCode, newCitizenCountryCode);
-    }
+	/**
+	 * Gets the citizen country code.
+	 *
+	 * @return the citizen country code
+	 */
+	public final String getCitizenCountryCode() {
+		return citizenCountryCode;
+	}
 
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	return null;
-    }
+	/**
+	 * Sets the citizen country code.
+	 *
+	 * @param newCitizenCountryCode
+	 *            the new citizen country code
+	 */
+	public final void setCitizenCountryCode(final String newCitizenCountryCode) {
+		this.citizenCountryCode = prepareForAssignment(this.citizenCountryCode, newCitizenCountryCode);
+	}
+
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeMarshaller.java
index decae04c5..e04323f06 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeMarshaller.java
@@ -30,16 +30,18 @@ import eu.stork.peps.auth.engine.core.CitizenCountryCode;
  */
 public class CitizenCountryCodeMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Marshall element content.
-     *
-     * @param samlObject the SAML object
-     * @param domElement the DOM element
-     * @throws MarshallingException the marshalling exception
-     */
-    protected final void marshallElementContent(final XMLObject samlObject,
-	    final Element domElement) throws MarshallingException {
-	final CitizenCountryCode citizenCountryCode = (CitizenCountryCode) samlObject;
-	XMLHelper.appendTextContent(domElement, citizenCountryCode.getCitizenCountryCode());
-    }
+	/**
+	 * Marshall element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
+	 */
+	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
+		final CitizenCountryCode citizenCountryCode = (CitizenCountryCode) samlObject;
+		XMLHelper.appendTextContent(domElement, citizenCountryCode.getCitizenCountryCode());
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeUnmarshaller.java
index 93132b508..eca6d69b9 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CitizenCountryCodeUnmarshaller.java
@@ -27,15 +27,16 @@ import eu.stork.peps.auth.engine.core.CitizenCountryCode;
  */
 public class CitizenCountryCodeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process element content.
-     *
-     * @param samlObject the SAML object
-     * @param elementContent the element content
-     */
-    protected final void processElementContent(final XMLObject samlObject,
-	    final String elementContent) {
-	final CitizenCountryCode citizenCountryCode = (CitizenCountryCode) samlObject;
-	citizenCountryCode.setCitizenCountryCode(elementContent);
-    }
+	/**
+	 * Process element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param elementContent
+	 *            the element content
+	 */
+	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
+		final CitizenCountryCode citizenCountryCode = (CitizenCountryCode) samlObject;
+		citizenCountryCode.setCitizenCountryCode(elementContent);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryBuilder.java
index 48da2a24b..f2d2fe7fb 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryBuilder.java
@@ -6,21 +6,20 @@ import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
 
 public class CustomAttributeQueryBuilder extends AbstractSAMLObjectBuilder<CustomAttributeQuery> {
 	/**
-     * Constructor.
-     */
-    public CustomAttributeQueryBuilder() {
+	 * Constructor.
+	 */
+	public CustomAttributeQueryBuilder() {
 
-    }
+	}
 
-    /** {@inheritDoc} */
-    public CustomAttributeQuery buildObject() {
-        return buildObject(SAMLConstants.SAML20P_NS, CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME,
-                SAMLConstants.SAML20P_PREFIX);
-    }
+	/** {@inheritDoc} */
+	public CustomAttributeQuery buildObject() {
+		return buildObject(SAMLConstants.SAML20P_NS, CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+	}
 
-    /** {@inheritDoc} */
-    public CustomAttributeQuery buildObject(String namespaceURI, String localName, String namespacePrefix) {
-        return new CustomAttributeQueryImpl(namespaceURI, localName, namespacePrefix);
-    }
+	/** {@inheritDoc} */
+	public CustomAttributeQuery buildObject(String namespaceURI, String localName, String namespacePrefix) {
+		return new CustomAttributeQueryImpl(namespaceURI, localName, namespacePrefix);
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
index cbf9221eb..d88ede1a3 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryImpl.java
@@ -11,44 +11,46 @@ import org.opensaml.xml.util.XMLObjectChildrenList;
 
 import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
 
-
 public class CustomAttributeQueryImpl extends SubjectQueryImpl implements CustomAttributeQuery {
 	/** Attribute child elements. */
-    private final XMLObjectChildrenList<Attribute> attributes;
-    private String serviceURL;
+	private final XMLObjectChildrenList<Attribute> attributes;
+	private String serviceURL;
 
-    /**
-     * Constructor.
-     * 
-     * @param namespaceURI the namespace the element is in
-     * @param elementLocalName the local name of the XML element this Object represents
-     * @param namespacePrefix the prefix for the given namespace
-     */
-    protected CustomAttributeQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
-        super(namespaceURI, elementLocalName, namespacePrefix);
-        attributes = new XMLObjectChildrenList<Attribute>(this);
-    }
+	/**
+	 * Constructor.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace the element is in
+	 * @param elementLocalName
+	 *            the local name of the XML element this Object represents
+	 * @param namespacePrefix
+	 *            the prefix for the given namespace
+	 */
+	protected CustomAttributeQueryImpl(String namespaceURI, String elementLocalName, String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+		attributes = new XMLObjectChildrenList<Attribute>(this);
+	}
 
-    /** {@inheritDoc} */
-    public List<Attribute> getAttributes() {
-        return attributes;
-    }
+	/** {@inheritDoc} */
+	public List<Attribute> getAttributes() {
+		return attributes;
+	}
 
-    /** {@inheritDoc} */
-    public List<XMLObject> getOrderedChildren() {
-        ArrayList<XMLObject> children = new ArrayList<XMLObject>();
+	/** {@inheritDoc} */
+	public List<XMLObject> getOrderedChildren() {
+		ArrayList<XMLObject> children = new ArrayList<XMLObject>();
 
-        if (super.getOrderedChildren() != null) {
-            children.addAll(super.getOrderedChildren());
-        }
-        children.addAll(attributes);
+		if (super.getOrderedChildren() != null) {
+			children.addAll(super.getOrderedChildren());
+		}
+		children.addAll(attributes);
 
-        if (children.size() == 0) {
-            return null;
-        }
+		if (children.size() == 0) {
+			return null;
+		}
 
-        return Collections.unmodifiableList(children);
-    }
+		return Collections.unmodifiableList(children);
+	}
 
 	@Override
 	public String getAssertionConsumerServiceURL() {
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryMarshaller.java
index 7f2013ca8..5e0cf55b3 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryMarshaller.java
@@ -10,41 +10,40 @@ import org.w3c.dom.Element;
 import eu.stork.peps.auth.engine.core.CustomRequestAbstractType;
 
 public class CustomAttributeQueryMarshaller extends SubjectQueryMarshaller {
-	
-	/** {@inheritDoc} */
-    protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
-        CustomRequestAbstractType req = (CustomRequestAbstractType) samlObject;
-
-        if (req.getVersion() != null) {
-            domElement.setAttributeNS(null, RequestAbstractType.VERSION_ATTRIB_NAME, req.getVersion().toString());
-        }
-
-        if (req.getID() != null) {
-            domElement.setAttributeNS(null, RequestAbstractType.ID_ATTRIB_NAME, req.getID());
-            domElement.setIdAttributeNS(null, RequestAbstractType.ID_ATTRIB_NAME, true);
-        }
-
-        if (req.getVersion() != null) {
-            domElement.setAttributeNS(null, RequestAbstractType.VERSION_ATTRIB_NAME, req.getVersion().toString());
-        }
-
-        if (req.getIssueInstant() != null) {
-            String iiStr = Configuration.getSAMLDateFormatter().print(req.getIssueInstant());
-            domElement.setAttributeNS(null, RequestAbstractType.ISSUE_INSTANT_ATTRIB_NAME, iiStr);
-        }
-
-        if (req.getDestination() != null) {
-            domElement.setAttributeNS(null, RequestAbstractType.DESTINATION_ATTRIB_NAME, req.getDestination());
-        }
-        
-        if (req.getAssertionConsumerServiceURL() != null) {
-            domElement.setAttributeNS(null, CustomRequestAbstractType.ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME, req.getAssertionConsumerServiceURL());
-        }
-
-        if (req.getConsent() != null) {
-            domElement.setAttributeNS(null, RequestAbstractType.CONSENT_ATTRIB_NAME, req.getConsent());
-        }
-    }
 
+	/** {@inheritDoc} */
+	protected void marshallAttributes(XMLObject samlObject, Element domElement) throws MarshallingException {
+		CustomRequestAbstractType req = (CustomRequestAbstractType) samlObject;
+
+		if (req.getVersion() != null) {
+			domElement.setAttributeNS(null, RequestAbstractType.VERSION_ATTRIB_NAME, req.getVersion().toString());
+		}
+
+		if (req.getID() != null) {
+			domElement.setAttributeNS(null, RequestAbstractType.ID_ATTRIB_NAME, req.getID());
+			domElement.setIdAttributeNS(null, RequestAbstractType.ID_ATTRIB_NAME, true);
+		}
+
+		if (req.getVersion() != null) {
+			domElement.setAttributeNS(null, RequestAbstractType.VERSION_ATTRIB_NAME, req.getVersion().toString());
+		}
+
+		if (req.getIssueInstant() != null) {
+			String iiStr = Configuration.getSAMLDateFormatter().print(req.getIssueInstant());
+			domElement.setAttributeNS(null, RequestAbstractType.ISSUE_INSTANT_ATTRIB_NAME, iiStr);
+		}
+
+		if (req.getDestination() != null) {
+			domElement.setAttributeNS(null, RequestAbstractType.DESTINATION_ATTRIB_NAME, req.getDestination());
+		}
+
+		if (req.getAssertionConsumerServiceURL() != null) {
+			domElement.setAttributeNS(null, CustomRequestAbstractType.ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME, req.getAssertionConsumerServiceURL());
+		}
+
+		if (req.getConsent() != null) {
+			domElement.setAttributeNS(null, RequestAbstractType.CONSENT_ATTRIB_NAME, req.getConsent());
+		}
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryUnmarshaller.java
index e351b65b0..485d6656b 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/CustomAttributeQueryUnmarshaller.java
@@ -24,91 +24,88 @@ import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
 import eu.stork.peps.auth.engine.core.CustomRequestAbstractType;
 
 public class CustomAttributeQueryUnmarshaller extends SubjectQueryUnmarshaller {
-	
+
 	private final Logger log = LoggerFactory.getLogger(AbstractXMLObjectUnmarshaller.class);
+
+	/** {@inheritDoc} */
+	protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject) throws UnmarshallingException {
+		CustomAttributeQuery query = (CustomAttributeQuery) parentSAMLObject;
+
+		if (childSAMLObject instanceof Attribute) {
+			query.getAttributes().add((Attribute) childSAMLObject);
+		} else {
+			super.processChildElement(parentSAMLObject, childSAMLObject);
+		}
+	}
+
+	/** {@inheritDoc} */
+	public XMLObject unmarshall(Element domElement) throws UnmarshallingException {
+		if (log.isTraceEnabled()) {
+			log.trace("Starting to unmarshall DOM element {}", XMLHelper.getNodeQName(domElement));
+		}
+
+		checkElementIsTarget(domElement);
+
+		// String namespaceURI, String elementLocalName, String namespacePrefix
+		XMLObject xmlObject = new CustomAttributeQueryImpl(SAMLConstants.SAML20P_NS, CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME, SAMLConstants.SAML20P_PREFIX);
+
+		if (log.isTraceEnabled()) {
+			log.trace("Unmarshalling attributes of DOM Element {}", XMLHelper.getNodeQName(domElement));
+		}
+
+		NamedNodeMap attributes = domElement.getAttributes();
+		Node attribute;
+		for (int i = 0; i < attributes.getLength(); i++) {
+			attribute = attributes.item(i);
+
+			// These should allows be attribute nodes, but just in case...
+			if (attribute.getNodeType() == Node.ATTRIBUTE_NODE) {
+				unmarshallAttribute(xmlObject, (Attr) attribute);
+			}
+		}
+
+		if (log.isTraceEnabled()) {
+			log.trace("Unmarshalling other child nodes of DOM Element {}", XMLHelper.getNodeQName(domElement));
+		}
+
+		Node childNode = domElement.getFirstChild();
+		while (childNode != null) {
+
+			if (childNode.getNodeType() == Node.ATTRIBUTE_NODE) {
+				unmarshallAttribute(xmlObject, (Attr) childNode);
+			} else if (childNode.getNodeType() == Node.ELEMENT_NODE) {
+				unmarshallChildElement(xmlObject, (Element) childNode);
+			} else if (childNode.getNodeType() == Node.TEXT_NODE || childNode.getNodeType() == Node.CDATA_SECTION_NODE) {
+				unmarshallTextContent(xmlObject, (Text) childNode);
+			}
+
+			childNode = childNode.getNextSibling();
+		}
+
+		xmlObject.setDOM(domElement);
+		return xmlObject;
+	}
+
 	/** {@inheritDoc} */
-    protected void processChildElement(XMLObject parentSAMLObject, XMLObject childSAMLObject)
-            throws UnmarshallingException {
-        CustomAttributeQuery query = (CustomAttributeQuery) parentSAMLObject;
-
-        if (childSAMLObject instanceof Attribute) {
-            query.getAttributes().add((Attribute) childSAMLObject);
-        } else {
-            super.processChildElement(parentSAMLObject, childSAMLObject);
-        }
-    }
-    
-    /** {@inheritDoc} */
-    public XMLObject unmarshall(Element domElement) throws UnmarshallingException {
-        if (log.isTraceEnabled()) {
-            log.trace("Starting to unmarshall DOM element {}", XMLHelper.getNodeQName(domElement));
-        }
-        
-        checkElementIsTarget(domElement);
-
-        //String namespaceURI, String elementLocalName, String namespacePrefix
-        XMLObject xmlObject = new CustomAttributeQueryImpl(SAMLConstants.SAML20P_NS, CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME,
-                SAMLConstants.SAML20P_PREFIX);
-
-        if (log.isTraceEnabled()) {
-            log.trace("Unmarshalling attributes of DOM Element {}", XMLHelper.getNodeQName(domElement));
-        }
-        
-        NamedNodeMap attributes = domElement.getAttributes();
-        Node attribute;
-        for (int i = 0; i < attributes.getLength(); i++) {
-            attribute = attributes.item(i);
-
-            // These should allows be attribute nodes, but just in case...
-            if (attribute.getNodeType() == Node.ATTRIBUTE_NODE) {
-                unmarshallAttribute(xmlObject, (Attr) attribute);
-            }
-        }
-
-        if (log.isTraceEnabled()) {
-            log.trace("Unmarshalling other child nodes of DOM Element {}", XMLHelper.getNodeQName(domElement));
-        }
-        
-        Node childNode = domElement.getFirstChild();
-        while (childNode != null) {
-
-            if (childNode.getNodeType() == Node.ATTRIBUTE_NODE) {
-                unmarshallAttribute(xmlObject, (Attr) childNode);
-            } else if (childNode.getNodeType() == Node.ELEMENT_NODE) {
-                unmarshallChildElement(xmlObject, (Element) childNode);
-            } else if (childNode.getNodeType() == Node.TEXT_NODE
-                    || childNode.getNodeType() == Node.CDATA_SECTION_NODE) {
-                unmarshallTextContent(xmlObject, (Text) childNode);
-            }
-            
-            childNode = childNode.getNextSibling();
-        }
-
-        xmlObject.setDOM(domElement);
-        return xmlObject;
-    }
-    
-    /** {@inheritDoc} */
-    protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
-        CustomRequestAbstractType req = (CustomRequestAbstractType) samlObject;
-
-        if (attribute.getLocalName().equals(RequestAbstractType.VERSION_ATTRIB_NAME)) {
-            req.setVersion(SAMLVersion.valueOf(attribute.getValue()));
-        } else if (attribute.getLocalName().equals(RequestAbstractType.ID_ATTRIB_NAME)) {
-            req.setID(attribute.getValue());
-            attribute.getOwnerElement().setIdAttributeNode(attribute, true);
-        } else if (attribute.getLocalName().equals(RequestAbstractType.ISSUE_INSTANT_ATTRIB_NAME)
-                && !DatatypeHelper.isEmpty(attribute.getValue())) {
-            req.setIssueInstant(new DateTime(attribute.getValue(), ISOChronology.getInstanceUTC()));
-        } else if (attribute.getLocalName().equals(RequestAbstractType.DESTINATION_ATTRIB_NAME)) {
-            req.setDestination(attribute.getValue());
-        } else if (attribute.getLocalName().equals(RequestAbstractType.CONSENT_ATTRIB_NAME)) {
-            req.setConsent(attribute.getValue());
-        } else if (attribute.getLocalName().equals(CustomRequestAbstractType.ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME)) {
-        	req.setAssertionConsumerServiceURL(attribute.getValue());
-        }else {
-            super.processAttribute(samlObject, attribute);
-        }
-    }
+	protected void processAttribute(XMLObject samlObject, Attr attribute) throws UnmarshallingException {
+		CustomRequestAbstractType req = (CustomRequestAbstractType) samlObject;
+
+		if (attribute.getLocalName().equals(RequestAbstractType.VERSION_ATTRIB_NAME)) {
+			req.setVersion(SAMLVersion.valueOf(attribute.getValue()));
+		} else if (attribute.getLocalName().equals(RequestAbstractType.ID_ATTRIB_NAME)) {
+			req.setID(attribute.getValue());
+			attribute.getOwnerElement().setIdAttributeNode(attribute, true);
+		} else if (attribute.getLocalName().equals(RequestAbstractType.ISSUE_INSTANT_ATTRIB_NAME) && !DatatypeHelper.isEmpty(attribute.getValue())) {
+			req.setIssueInstant(new DateTime(attribute.getValue(), ISOChronology.getInstanceUTC()));
+		} else if (attribute.getLocalName().equals(RequestAbstractType.DESTINATION_ATTRIB_NAME)) {
+			req.setDestination(attribute.getValue());
+		} else if (attribute.getLocalName().equals(RequestAbstractType.CONSENT_ATTRIB_NAME)) {
+			req.setConsent(attribute.getValue());
+		} else if (attribute.getLocalName().equals(CustomRequestAbstractType.ASSERTION_CONSUMER_SERVICE_URL_ATTRIB_NAME)) {
+			req.setAssertionConsumerServiceURL(attribute.getValue());
+		} else {
+			super.processAttribute(samlObject, attribute);
+		}
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java
index 3f4fc633d..7c7a88b89 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareBuilder.java
@@ -24,8 +24,7 @@ import eu.stork.peps.auth.engine.core.EIDCrossBorderShare;
  * 
  * @author fjquevedo
  */
-public class EIDCrossBorderShareBuilder extends	AbstractSAMLObjectBuilder<EIDCrossBorderShare> {
-
+public class EIDCrossBorderShareBuilder extends AbstractSAMLObjectBuilder<EIDCrossBorderShare> {
 
 	/**
 	 * Builds the object.
@@ -36,17 +35,18 @@ public class EIDCrossBorderShareBuilder extends	AbstractSAMLObjectBuilder<EIDCro
 		return buildObject(EIDCrossBorderShare.DEF_ELEMENT_NAME);
 	}
 
-
 	/**
 	 * Builds the object.
 	 *
-	 * @param namespaceURI the namespace uri
-	 * @param localName the local name
-	 * @param namespacePrefix the namespace prefix
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
 	 * @return the eID cross border share
 	 */
-	public final EIDCrossBorderShare buildObject(final String namespaceURI,
-			final String localName, final String namespacePrefix) {
+	public final EIDCrossBorderShare buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
 		return new EIDCrossBorderShareImpl(namespaceURI, localName, namespacePrefix);
 	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareImpl.java
index 3827f5085..13cc3d287 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareImpl.java
@@ -29,59 +29,52 @@ import org.slf4j.LoggerFactory;
  * 
  * @author fjquevedo
  */
-public class EIDCrossBorderShareImpl extends AbstractSAMLObject implements
-	EIDCrossBorderShare {
+public class EIDCrossBorderShareImpl extends AbstractSAMLObject implements EIDCrossBorderShare {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EIDCrossBorderShareImpl.class.getName());
+	private static final Logger LOGGER = LoggerFactory.getLogger(EIDCrossBorderShareImpl.class.getName());
 	/** The citizen country code. */
-    private String eIDCrossBorderShare;
+	private String eIDCrossBorderShare;
 
-    /**
-     * Instantiates a new eID cross border share implementation.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected EIDCrossBorderShareImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
-    
-    
-    
-    /**
-     * Gets the eID cross border share.
-     *
-     * @return the eID cross border share
-     */
-    public final String getEIDCrossBorderShare() {
-    	return eIDCrossBorderShare;
-    }
+	/**
+	 * Instantiates a new eID cross border share implementation.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace URI
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected EIDCrossBorderShareImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
+	/**
+	 * Gets the eID cross border share.
+	 *
+	 * @return the eID cross border share
+	 */
+	public final String getEIDCrossBorderShare() {
+		return eIDCrossBorderShare;
+	}
 
-    /**
-     * Sets the eID cross border share.
-     *
-     * @param newEIDCrossBorderShare the new eID cross border share
-     */
-    public final void setEIDCrossBorderShare(String newEIDCrossBorderShare) {
-    	this.eIDCrossBorderShare = prepareForAssignment(this.eIDCrossBorderShare, newEIDCrossBorderShare);
-    }
-    
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     * {@inheritDoc}
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	return null;
-    }
+	/**
+	 * Sets the eID cross border share.
+	 *
+	 * @param newEIDCrossBorderShare
+	 *            the new eID cross border share
+	 */
+	public final void setEIDCrossBorderShare(String newEIDCrossBorderShare) {
+		this.eIDCrossBorderShare = prepareForAssignment(this.eIDCrossBorderShare, newEIDCrossBorderShare);
+	}
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
-}
\ No newline at end of file
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children {@inheritDoc}
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
+
+}
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareMarshaller.java
index c5e113013..2e8868ac1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareMarshaller.java
@@ -23,7 +23,6 @@ import org.w3c.dom.Element;
 
 import eu.stork.peps.auth.engine.core.EIDCrossBorderShare;
 
-
 /**
  * The Class EIDCrossBorderShareMarshaller.
  * 
@@ -31,16 +30,17 @@ import eu.stork.peps.auth.engine.core.EIDCrossBorderShare;
  */
 public class EIDCrossBorderShareMarshaller extends AbstractSAMLObjectMarshaller {
 
-
 	/**
 	 * Marshall element content.
 	 *
-	 * @param samlObject the SAML object
-	 * @param domElement the DOM element
-	 * @throws MarshallingException the marshalling exception
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
 	 */
-	protected final void marshallElementContent(final XMLObject samlObject,
-			final Element domElement) throws MarshallingException {
+	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
 		final EIDCrossBorderShare crossBorderShare = (EIDCrossBorderShare) samlObject;
 		XMLHelper.appendTextContent(domElement, crossBorderShare.getEIDCrossBorderShare());
 	}
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareUnmarshaller.java
index e74bee6ca..013b5b78b 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossBorderShareUnmarshaller.java
@@ -25,18 +25,17 @@ import eu.stork.peps.auth.engine.core.EIDCrossBorderShare;
  * 
  * @author fjquevedo
  */
-public class EIDCrossBorderShareUnmarshaller extends
-		AbstractSAMLObjectUnmarshaller {
-
+public class EIDCrossBorderShareUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
 	/**
 	 * Process element content.
 	 *
-	 * @param samlObject the SAML object
-	 * @param elementContent the element content
+	 * @param samlObject
+	 *            the SAML object
+	 * @param elementContent
+	 *            the element content
 	 */
-	protected final void processElementContent(final XMLObject samlObject,
-			final String elementContent) {
+	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
 		final EIDCrossBorderShare crossBorderShare = (EIDCrossBorderShare) samlObject;
 		crossBorderShare.setEIDCrossBorderShare(elementContent);
 	}
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareBuilder.java
index 5e91e18fd..398815719 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareBuilder.java
@@ -24,29 +24,29 @@ import eu.stork.peps.auth.engine.core.EIDCrossSectorShare;
  * 
  * @author fjquevedo
  */
-public class EIDCrossSectorShareBuilder extends
-	AbstractSAMLObjectBuilder<EIDCrossSectorShare> {
+public class EIDCrossSectorShareBuilder extends AbstractSAMLObjectBuilder<EIDCrossSectorShare> {
 
-    /**
-     * Builds the object.
-     *
-     * @return the eID cross sector share
-     */
-    public final EIDCrossSectorShare buildObject() {
-	return buildObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @return the eID cross sector share
+	 */
+	public final EIDCrossSectorShare buildObject() {
+		return buildObject(EIDCrossSectorShare.DEF_ELEMENT_NAME);
+	}
 
-    /**
-     * Builds the object.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the eID cross sector share implementation
-     */
-    public final EIDCrossSectorShareImpl buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new EIDCrossSectorShareImpl(namespaceURI, localName,
-		namespacePrefix);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the eID cross sector share implementation
+	 */
+	public final EIDCrossSectorShareImpl buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new EIDCrossSectorShareImpl(namespaceURI, localName, namespacePrefix);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
index 7b2ad3dbd..2e3f6ab7e 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareImpl.java
@@ -25,65 +25,57 @@ import eu.stork.peps.auth.engine.core.EIDCrossSectorShare;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * The Class EIDCrossSectorShareImpl.
  * 
  * @author fjquevedo
  */
-public class EIDCrossSectorShareImpl extends AbstractSAMLObject implements
-	EIDCrossSectorShare {
+public class EIDCrossSectorShareImpl extends AbstractSAMLObject implements EIDCrossSectorShare {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EIDCrossSectorShareImpl.class.getName());
+	private static final Logger LOGGER = LoggerFactory.getLogger(EIDCrossSectorShareImpl.class.getName());
 	/** The citizen country code. */
-    private String eIDCrossSectorShare;
+	private String eIDCrossSectorShare;
 
+	/**
+	 * Instantiates a new eID cross sector share implementation.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace URI
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected EIDCrossSectorShareImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    /**
-     * Instantiates a new eID cross sector share implementation.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected EIDCrossSectorShareImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
-    
-    
-  
-    /**
-     * Gets the eID cross sector share.
-     *
-     * @return the eID cross sector share
-     */
-    public final String getEIDCrossSectorShare() {
-    	return eIDCrossSectorShare;
-    }
+	/**
+	 * Gets the eID cross sector share.
+	 *
+	 * @return the eID cross sector share
+	 */
+	public final String getEIDCrossSectorShare() {
+		return eIDCrossSectorShare;
+	}
 
+	/**
+	 * Sets the eID cross sector share.
+	 *
+	 * @param newEIDCrossSectorShare
+	 *            the new eID cross sector share
+	 */
+	public final void setEIDCrossSectorShare(String newEIDCrossSectorShare) {
+		this.eIDCrossSectorShare = prepareForAssignment(this.eIDCrossSectorShare, newEIDCrossSectorShare);
+	}
 
-    /**
-     * Sets the eID cross sector share.
-     *
-     * @param newEIDCrossSectorShare the new eID cross sector share
-     */
-    public final void setEIDCrossSectorShare(String newEIDCrossSectorShare) {
-    	this.eIDCrossSectorShare = prepareForAssignment(this.eIDCrossSectorShare, newEIDCrossSectorShare);
-    }
-    
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	return null;
-    }
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
-}
\ No newline at end of file
+}
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareMarshaller.java
index 3ee9df698..caa2df56a 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareMarshaller.java
@@ -23,7 +23,6 @@ import org.w3c.dom.Element;
 
 import eu.stork.peps.auth.engine.core.EIDCrossSectorShare;
 
-
 /**
  * The Class EIDCrossSectorShareMarshaller.
  * 
@@ -34,12 +33,14 @@ public class EIDCrossSectorShareMarshaller extends AbstractSAMLObjectMarshaller
 	/**
 	 * Marshall element content.
 	 *
-	 * @param samlObject the SAML object
-	 * @param domElement the DOM element
-	 * @throws MarshallingException the marshalling exception
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
 	 */
-	protected final void marshallElementContent(final XMLObject samlObject,
-			final Element domElement) throws MarshallingException {
+	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
 		final EIDCrossSectorShare crossSectorShare = (EIDCrossSectorShare) samlObject;
 		XMLHelper.appendTextContent(domElement, crossSectorShare.getEIDCrossSectorShare());
 	}
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareUnmarshaller.java
index 94c7689be..ebf80e700 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDCrossSectorShareUnmarshaller.java
@@ -28,18 +28,19 @@ import eu.stork.peps.auth.engine.core.EIDCrossSectorShare;
  * 
  * @author fjquevedo
  */
-public class EIDCrossSectorShareUnmarshaller extends
-	AbstractSAMLObjectUnmarshaller {
+public class EIDCrossSectorShareUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
 	/**
 	 * Process element content.
 	 *
-	 * @param samlObject the SAML object
-	 * @param domElement the DOM element
-	 * @throws MarshallingException the marshalling exception
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
 	 */
-	protected final void processElementContent(final XMLObject samlObject,
-			final String domElement)  {
+	protected final void processElementContent(final XMLObject samlObject, final String domElement) {
 
 		final EIDCrossSectorShare crossSectorShare = (EIDCrossSectorShare) samlObject;
 		crossSectorShare.setEIDCrossSectorShare(domElement);
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareBuilder.java
index 230ff3ca4..670b6f33a 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareBuilder.java
@@ -24,28 +24,29 @@ import eu.stork.peps.auth.engine.core.EIDSectorShare;
  * 
  * @author fjquevedo
  */
-public class EIDSectorShareBuilder extends
-	AbstractSAMLObjectBuilder<EIDSectorShare> {
+public class EIDSectorShareBuilder extends AbstractSAMLObjectBuilder<EIDSectorShare> {
 
-    /**
-     * Builds the object.
-     *
-     * @return the eID sector share
-     */
-    public final EIDSectorShare buildObject() {
-	return buildObject(EIDSectorShare.DEF_ELEMENT_NAME);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @return the eID sector share
+	 */
+	public final EIDSectorShare buildObject() {
+		return buildObject(EIDSectorShare.DEF_ELEMENT_NAME);
+	}
 
-    /**
-     * Builds the object.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the eID sector share
-     */
-    public final EIDSectorShare buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new EIDSectorShareImpl(namespaceURI, localName, namespacePrefix);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the eID sector share
+	 */
+	public final EIDSectorShare buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new EIDSectorShareImpl(namespaceURI, localName, namespacePrefix);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
index 9ed726a32..f7c514722 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareImpl.java
@@ -30,56 +30,58 @@ import org.slf4j.LoggerFactory;
  * 
  * @author fjquevedo
  */
-public class EIDSectorShareImpl extends AbstractSAMLObject implements
-	EIDSectorShare {
+public class EIDSectorShareImpl extends AbstractSAMLObject implements EIDSectorShare {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(EIDSectorShareImpl.class.getName());
-	
-    /** The e id sector share. */
-    private String eIDSectorShare;
-    /**
-     * Instantiates a new eID sector share implementation.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected EIDSectorShareImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
-    
-    
-    /**
-     * Gets the eID sector share.
-     *
-     * @return the eID sector share
-     */
-    public final String getEIDSectorShare() {
-    	return eIDSectorShare;	
-    }
+	private static final Logger LOGGER = LoggerFactory.getLogger(EIDSectorShareImpl.class.getName());
 
-    /**
-     * Sets the eID sector share.
-     *
-     * @param newEIDSectorShare the new eID sector share
-     */
-    public final void setEIDSectorShare(String newEIDSectorShare) {
-    	this.eIDSectorShare = prepareForAssignment(this.eIDSectorShare, newEIDSectorShare);
-    }
-    
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	return null;
-    }
+	/** The e id sector share. */
+	private String eIDSectorShare;
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
+	/**
+	 * Instantiates a new eID sector share implementation.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace URI
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected EIDSectorShareImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
+
+	/**
+	 * Gets the eID sector share.
+	 *
+	 * @return the eID sector share
+	 */
+	public final String getEIDSectorShare() {
+		return eIDSectorShare;
+	}
+
+	/**
+	 * Sets the eID sector share.
+	 *
+	 * @param newEIDSectorShare
+	 *            the new eID sector share
+	 */
+	public final void setEIDSectorShare(String newEIDSectorShare) {
+		this.eIDSectorShare = prepareForAssignment(this.eIDSectorShare, newEIDSectorShare);
+	}
+
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
+
+	@Override
+	public int hashCode() {
+		LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
+		return super.hashCode();
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java
index 0ce449cd1..509503af0 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareMarshaller.java
@@ -34,12 +34,14 @@ public class EIDSectorShareMarshaller extends AbstractSAMLObjectMarshaller {
 	/**
 	 * Marshall element content.
 	 *
-	 * @param samlObject the SAML object
-	 * @param domElement the DOM element
-	 * @throws MarshallingException the marshalling exception
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
 	 */
-	protected final void marshallElementContent(final XMLObject samlObject,
-			final Element domElement) throws MarshallingException {
+	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
 		final EIDSectorShare sectorShare = (EIDSectorShare) samlObject;
 		XMLHelper.appendTextContent(domElement, sectorShare.getEIDSectorShare());
 	}
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java
index f7f00adb9..8e2f327c6 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/EIDSectorShareUnmarshaller.java
@@ -23,7 +23,6 @@ import org.w3c.dom.Element;
 
 import eu.stork.peps.auth.engine.core.EIDSectorShare;
 
-
 /**
  * The Class EIDSectorShareUnmarshaller.
  * 
@@ -31,16 +30,17 @@ import eu.stork.peps.auth.engine.core.EIDSectorShare;
  */
 public class EIDSectorShareUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-
 	/**
 	 * Process element content.
 	 *
-	 * @param samlObject the SAML object
-	 * @param domElement the DOM element
-	 * @throws MarshallingException the marshalling exception
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
 	 */
-	protected final void processElementContent(final XMLObject samlObject,
-			final String domElement)  {
+	protected final void processElementContent(final XMLObject samlObject, final String domElement) {
 		final EIDSectorShare sectorShare = (EIDSectorShare) samlObject;
 		sectorShare.setEIDSectorShare(domElement);
 	}
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeBuilder.java
index 41676931b..deeb2ae56 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeBuilder.java
@@ -24,29 +24,29 @@ import eu.stork.peps.auth.engine.core.QAAAttribute;
  * 
  * @author fjquevedo
  */
-public class QAAAttributeBuilder extends
-	AbstractSAMLObjectBuilder<QAAAttribute> {
+public class QAAAttributeBuilder extends AbstractSAMLObjectBuilder<QAAAttribute> {
 
-    /**
-     * Builds the object.
-     *
-     * @return the quality authentication assurance object
-     */
-    public final QAAAttribute buildObject() {
-	return buildObject(QAAAttribute.DEF_ELEMENT_NAME);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @return the quality authentication assurance object
+	 */
+	public final QAAAttribute buildObject() {
+		return buildObject(QAAAttribute.DEF_ELEMENT_NAME);
+	}
 
-    /**
-     * Builds the object.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the quality authentication assurance object
-
-     */
-    public final QAAAttribute buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new QAAAttributeImpl(namespaceURI, localName, namespacePrefix);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the quality authentication assurance object
+	 */
+	public final QAAAttribute buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new QAAAttributeImpl(namespaceURI, localName, namespacePrefix);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
index 46f3bb402..e74ce1fec 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeImpl.java
@@ -29,56 +29,52 @@ import org.slf4j.LoggerFactory;
  * 
  * @author fjquevedo
  */
-public class QAAAttributeImpl extends AbstractSAMLObject implements
-	QAAAttribute {
+public class QAAAttributeImpl extends AbstractSAMLObject implements QAAAttribute {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(QAAAttributeImpl.class.getName());
-    /** The quality authentication assurance level. */
-    private String qaaLevel;
+	private static final Logger LOGGER = LoggerFactory.getLogger(QAAAttributeImpl.class.getName());
+	/** The quality authentication assurance level. */
+	private String qaaLevel;
 
-    /**
-     * Constructor.
-     * 
-     * @param namespaceURI the namespace the element is in
-     * @param elementLocalName the local name of the XML element this Object
-     * represents
-     * @param namespacePrefix the prefix for the given namespace
-     */
-    protected QAAAttributeImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
+	/**
+	 * Constructor.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace the element is in
+	 * @param elementLocalName
+	 *            the local name of the XML element this Object represents
+	 * @param namespacePrefix
+	 *            the prefix for the given namespace
+	 */
+	protected QAAAttributeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    /**
-     * Gets the quality authentication assurance level.
-     *
-     * @return the quality authentication assurance level
-     */
-    public final String getQaaLevel() {
-	return qaaLevel;
-    }
+	/**
+	 * Gets the quality authentication assurance level.
+	 *
+	 * @return the quality authentication assurance level
+	 */
+	public final String getQaaLevel() {
+		return qaaLevel;
+	}
 
-    /**
-     * Sets the quality authentication assurance level.
-     *
-     * @param newQaaLevel the new quality authentication assurance level
-     */
-    public final void setQaaLevel(final String newQaaLevel) {
-	this.qaaLevel = prepareForAssignment(this.qaaLevel, newQaaLevel);
-    }
+	/**
+	 * Sets the quality authentication assurance level.
+	 *
+	 * @param newQaaLevel
+	 *            the new quality authentication assurance level
+	 */
+	public final void setQaaLevel(final String newQaaLevel) {
+		this.qaaLevel = prepareForAssignment(this.qaaLevel, newQaaLevel);
+	}
 
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	return null;
-    }
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeMarshaller.java
index 000879368..03a7a758a 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeMarshaller.java
@@ -30,16 +30,18 @@ import eu.stork.peps.auth.engine.core.QAAAttribute;
  */
 public class QAAAttributeMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Marshall element content.
-     *
-     * @param samlObject the SAML object
-     * @param domElement the DOM element
-     * @throws MarshallingException the marshalling exception
-     */
-    protected final void marshallElementContent(final XMLObject samlObject,
-	    final Element domElement) throws MarshallingException {
-	final QAAAttribute qaaAttribute = (QAAAttribute) samlObject;
-	XMLHelper.appendTextContent(domElement, qaaAttribute.getQaaLevel());
-    }
+	/**
+	 * Marshall element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
+	 */
+	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
+		final QAAAttribute qaaAttribute = (QAAAttribute) samlObject;
+		XMLHelper.appendTextContent(domElement, qaaAttribute.getQaaLevel());
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeUnmarshaller.java
index 8445e4eeb..1b9e813f0 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/QAAAttributeUnmarshaller.java
@@ -27,15 +27,16 @@ import eu.stork.peps.auth.engine.core.QAAAttribute;
  */
 public class QAAAttributeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process element content.
-     *
-     * @param samlObject the SAML object
-     * @param elementContent the element content
-     */
-    protected final void processElementContent(final XMLObject samlObject,
-	    final String elementContent) {
-	final QAAAttribute qaaLevel = (QAAAttribute) samlObject;
-	qaaLevel.setQaaLevel(elementContent);
-    }
+	/**
+	 * Process element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param elementContent
+	 *            the element content
+	 */
+	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
+		final QAAAttribute qaaLevel = (QAAAttribute) samlObject;
+		qaaLevel.setQaaLevel(elementContent);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeBuilder.java
index c9881c439..4367c4ecf 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeBuilder.java
@@ -24,31 +24,30 @@ import eu.stork.peps.auth.engine.core.RequestedAttribute;
  * 
  * @author fjquevedo
  */
-public class RequestedAttributeBuilder extends
-	AbstractSAMLObjectBuilder<RequestedAttribute> {
-
-
-    /**
-     * Builds the object.
-     *
-     * @return the requested attribute
-     */
-    public final RequestedAttribute buildObject() {
-	return buildObject(RequestedAttribute.DEF_ELEMENT_NAME);
-    }
-
-    /**
-     * Builds the object.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the requested attribute
-     */
-    public final RequestedAttribute buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new RequestedAttributeImpl(namespaceURI, localName,
-		namespacePrefix);
-    }
+public class RequestedAttributeBuilder extends AbstractSAMLObjectBuilder<RequestedAttribute> {
+
+	/**
+	 * Builds the object.
+	 *
+	 * @return the requested attribute
+	 */
+	public final RequestedAttribute buildObject() {
+		return buildObject(RequestedAttribute.DEF_ELEMENT_NAME);
+	}
+
+	/**
+	 * Builds the object.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the requested attribute
+	 */
+	public final RequestedAttribute buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new RequestedAttributeImpl(namespaceURI, localName, namespacePrefix);
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java
index ac2e8a3ee..2537d3794 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeImpl.java
@@ -35,186 +35,182 @@ import org.slf4j.LoggerFactory;
  * 
  * @author fjquevedo
  */
-public class RequestedAttributeImpl extends AbstractSAMLObject implements
-	RequestedAttribute {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(RequestedAttributeImpl.class.getName());
-    /**
-     * The attribute values.
-     */
-    private final XMLObjectChildrenList<XMLObject> attributeValues;
-
-    /**
-     * The friendly name.
-     * 
-     */
-    private String friendlyName;
-
-    /**
-     * The is required.
-    */
-    private String isRequired;
-
-    /**
-     * The name.
-     * 
-     */
-    private String name;
-
-    /**
-     * The name format.
-     * 
-     */
-    private String nameFormat;
-
-    /**
-     * The unknown attributes.
-     * 
-     */
-    private AttributeMap unknownAttributes;
-
-    /**
-     * Instantiates a new requested attribute impl.
-     * 
-     * @param namespaceURI the namespace uri
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected RequestedAttributeImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-	unknownAttributes = new AttributeMap(this);
-	attributeValues = new XMLObjectChildrenList<XMLObject>(this);
-    }
-
-
-    /**
-     * Gets the attribute values.
-     *
-     * @return the attribute values
-     */
-    public final List<XMLObject> getAttributeValues() {
-	return attributeValues;
-    }
-
-    /**
-     * Gets the friendly name.
-     *
-     * @return the friendly name.
-     */
-    public final String getFriendlyName() {
-	return friendlyName;
-    }
-
-  
-    /**
-     * Gets the checks if is required.
-     *
-     * @return the boolean if it's required.
-     */
-    public final String isRequired() {
-	return isRequired;
-    }
-
-
-    /**
-     * Gets the is required xs boolean.
-     * 
-     * @return the XSBoolean if it's required.
-     */
-    public final String getIsRequiredXSBoolean() {
-	return isRequired;
-    }
-
-
-    /**
-     * Gets the name.
-     *
-     * @return the name
-     */
-    public final String getName() {
-	return name;
-    }
-
-
-    /**
-     * Gets the name format.
-     *
-     * @return the name format.
-     */
-    public final String getNameFormat() {
-	return nameFormat;
-    }
-
-    /**
-     * Gets the ordered children.
-     * 
-     * @return the list of XMLObject.
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
-	children.addAll(attributeValues);
-	return Collections.unmodifiableList(children);
-    }
-
-    /**
-     * Gets the unknown attributes.
-     *
-     * @return the attribute map
-     */
-    public final AttributeMap getUnknownAttributes() {
-	return unknownAttributes;
-    }
-
-    /**
-     * Sets the friendly name.
-     * 
-     * @param newFriendlyName the new friendly name format
-     */
-    public final void setFriendlyName(final String newFriendlyName) {
-	this.friendlyName = prepareForAssignment(this.friendlyName,
-		newFriendlyName);
-    }
-
-    /**
-     * Set new boolean value isRequired.
-     * @param newIsRequired then new value
-     */
-    public final void setIsRequired(final String newIsRequired) {
-	isRequired = prepareForAssignment(this.isRequired, newIsRequired);
-
-    }
-
-    /**
-     * Sets the name.
-     * 
-     * @param newName the new name
-     */
-    public final void setName(final String newName) {
-	this.name = prepareForAssignment(this.name, newName);
-    }
-
-    /**
-     * Sets the name format.
-     * 
-     * @param newNameFormat the new name format
-     */
-    public final void setNameFormat(final String newNameFormat) {
-	this.nameFormat = prepareForAssignment(this.nameFormat, newNameFormat);
-    }
-
-    /**
-     * Sets the unknown attributes.
-     * 
-     * @param newUnknownAttr the new unknown attributes
-     */
-    public final void setUnknownAttributes(final AttributeMap newUnknownAttr) {
-	this.unknownAttributes = newUnknownAttr;
-    }
-
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
+public class RequestedAttributeImpl extends AbstractSAMLObject implements RequestedAttribute {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(RequestedAttributeImpl.class.getName());
+	/**
+	 * The attribute values.
+	 */
+	private final XMLObjectChildrenList<XMLObject> attributeValues;
+
+	/**
+	 * The friendly name.
+	 * 
+	 */
+	private String friendlyName;
+
+	/**
+	 * The is required.
+	 */
+	private String isRequired;
+
+	/**
+	 * The name.
+	 * 
+	 */
+	private String name;
+
+	/**
+	 * The name format.
+	 * 
+	 */
+	private String nameFormat;
+
+	/**
+	 * The unknown attributes.
+	 * 
+	 */
+	private AttributeMap unknownAttributes;
+
+	/**
+	 * Instantiates a new requested attribute impl.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected RequestedAttributeImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+		unknownAttributes = new AttributeMap(this);
+		attributeValues = new XMLObjectChildrenList<XMLObject>(this);
+	}
+
+	/**
+	 * Gets the attribute values.
+	 *
+	 * @return the attribute values
+	 */
+	public final List<XMLObject> getAttributeValues() {
+		return attributeValues;
+	}
+
+	/**
+	 * Gets the friendly name.
+	 *
+	 * @return the friendly name.
+	 */
+	public final String getFriendlyName() {
+		return friendlyName;
+	}
+
+	/**
+	 * Gets the checks if is required.
+	 *
+	 * @return the boolean if it's required.
+	 */
+	public final String isRequired() {
+		return isRequired;
+	}
+
+	/**
+	 * Gets the is required xs boolean.
+	 * 
+	 * @return the XSBoolean if it's required.
+	 */
+	public final String getIsRequiredXSBoolean() {
+		return isRequired;
+	}
+
+	/**
+	 * Gets the name.
+	 *
+	 * @return the name
+	 */
+	public final String getName() {
+		return name;
+	}
+
+	/**
+	 * Gets the name format.
+	 *
+	 * @return the name format.
+	 */
+	public final String getNameFormat() {
+		return nameFormat;
+	}
+
+	/**
+	 * Gets the ordered children.
+	 * 
+	 * @return the list of XMLObject.
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
+		children.addAll(attributeValues);
+		return Collections.unmodifiableList(children);
+	}
+
+	/**
+	 * Gets the unknown attributes.
+	 *
+	 * @return the attribute map
+	 */
+	public final AttributeMap getUnknownAttributes() {
+		return unknownAttributes;
+	}
+
+	/**
+	 * Sets the friendly name.
+	 * 
+	 * @param newFriendlyName
+	 *            the new friendly name format
+	 */
+	public final void setFriendlyName(final String newFriendlyName) {
+		this.friendlyName = prepareForAssignment(this.friendlyName, newFriendlyName);
+	}
+
+	/**
+	 * Set new boolean value isRequired.
+	 * 
+	 * @param newIsRequired
+	 *            then new value
+	 */
+	public final void setIsRequired(final String newIsRequired) {
+		isRequired = prepareForAssignment(this.isRequired, newIsRequired);
+
+	}
+
+	/**
+	 * Sets the name.
+	 * 
+	 * @param newName
+	 *            the new name
+	 */
+	public final void setName(final String newName) {
+		this.name = prepareForAssignment(this.name, newName);
+	}
+
+	/**
+	 * Sets the name format.
+	 * 
+	 * @param newNameFormat
+	 *            the new name format
+	 */
+	public final void setNameFormat(final String newNameFormat) {
+		this.nameFormat = prepareForAssignment(this.nameFormat, newNameFormat);
+	}
+
+	/**
+	 * Sets the unknown attributes.
+	 * 
+	 * @param newUnknownAttr
+	 *            the new unknown attributes
+	 */
+	public final void setUnknownAttributes(final AttributeMap newUnknownAttr) {
+		this.unknownAttributes = newUnknownAttr;
+	}
+
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeMarshaller.java
index 1a14a118a..4a9ec94b1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeMarshaller.java
@@ -36,54 +36,44 @@ import eu.stork.peps.auth.engine.core.RequestedAttribute;
  */
 public class RequestedAttributeMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Marshall attributes.
-     *
-     * @param samlElement the SAML element
-     * @param domElement the DOM element
-     * @throws MarshallingException the marshalling exception
-     */
-    protected final void marshallAttributes(final XMLObject samlElement,
-	    final Element domElement) throws MarshallingException {
-	final RequestedAttribute requestedAttr = (RequestedAttribute) samlElement;
+	/**
+	 * Marshall attributes.
+	 *
+	 * @param samlElement
+	 *            the SAML element
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
+	 */
+	protected final void marshallAttributes(final XMLObject samlElement, final Element domElement) throws MarshallingException {
+		final RequestedAttribute requestedAttr = (RequestedAttribute) samlElement;
 
-	if (requestedAttr.getName() != null) {
-	    domElement.setAttributeNS(null,
-		    RequestedAttribute.NAME_ATTRIB_NAME, requestedAttr
-			    .getName());
-	}
+		if (requestedAttr.getName() != null) {
+			domElement.setAttributeNS(null, RequestedAttribute.NAME_ATTRIB_NAME, requestedAttr.getName());
+		}
 
-	if (requestedAttr.getNameFormat() != null) {
-	    domElement.setAttributeNS(null,
-		    RequestedAttribute.NAME_FORMAT_ATTR, requestedAttr
-			    .getNameFormat());
-	}
+		if (requestedAttr.getNameFormat() != null) {
+			domElement.setAttributeNS(null, RequestedAttribute.NAME_FORMAT_ATTR, requestedAttr.getNameFormat());
+		}
 
-	if (requestedAttr.getFriendlyName() != null) {
-	    domElement.setAttributeNS(null,
-		    RequestedAttribute.FRIENDLY_NAME_ATT, requestedAttr
-			    .getFriendlyName());
-	}
+		if (requestedAttr.getFriendlyName() != null) {
+			domElement.setAttributeNS(null, RequestedAttribute.FRIENDLY_NAME_ATT, requestedAttr.getFriendlyName());
+		}
 
-	if (requestedAttr.getIsRequiredXSBoolean() != null) {
-	    domElement.setAttributeNS(null,
-		    RequestedAttribute.IS_REQUIRED_ATTR, requestedAttr
-			    .getIsRequiredXSBoolean().toString());
-	}
+		if (requestedAttr.getIsRequiredXSBoolean() != null) {
+			domElement.setAttributeNS(null, RequestedAttribute.IS_REQUIRED_ATTR, requestedAttr.getIsRequiredXSBoolean().toString());
+		}
 
-	Attr attr;
-	for (Entry<QName, String> entry : requestedAttr.getUnknownAttributes()
-		.entrySet()) {
-	    attr = XMLHelper.constructAttribute(domElement.getOwnerDocument(),
-		    entry.getKey());
-	    attr.setValue(entry.getValue());
-	    domElement.setAttributeNodeNS(attr);
-	    if (Configuration.isIDAttribute(entry.getKey())
-		    || requestedAttr.getUnknownAttributes().isIDAttribute(
-			    entry.getKey())) {
-		attr.getOwnerElement().setIdAttributeNode(attr, true);
-	    }
+		Attr attr;
+		for (Entry<QName, String> entry : requestedAttr.getUnknownAttributes().entrySet()) {
+			attr = XMLHelper.constructAttribute(domElement.getOwnerDocument(), entry.getKey());
+			attr.setValue(entry.getValue());
+			domElement.setAttributeNodeNS(attr);
+			if (Configuration.isIDAttribute(entry.getKey()) || requestedAttr.getUnknownAttributes().isIDAttribute(entry.getKey())) {
+				attr.getOwnerElement().setIdAttributeNode(attr, true);
+			}
+		}
 	}
-    }
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeUnmarshaller.java
index c07f852d9..098ece427 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributeUnmarshaller.java
@@ -33,64 +33,60 @@ import eu.stork.peps.auth.engine.core.SAMLCore;
  * 
  * @author fjquevedo
  */
-public class RequestedAttributeUnmarshaller extends
-	AbstractSAMLObjectUnmarshaller {
+public class RequestedAttributeUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process child element.
-     * 
-     * @param parentSAMLObject parent SAMLObject
-     * @param childSAMLObject child SAMLObject
-     * 
-     * @throws UnmarshallingException error at unmarshall XML object
-     */
-    protected final void processChildElement(final XMLObject parentSAMLObject,
-	    final XMLObject childSAMLObject) throws UnmarshallingException {
+	/**
+	 * Process child element.
+	 * 
+	 * @param parentSAMLObject
+	 *            parent SAMLObject
+	 * @param childSAMLObject
+	 *            child SAMLObject
+	 * 
+	 * @throws UnmarshallingException
+	 *             error at unmarshall XML object
+	 */
+	protected final void processChildElement(final XMLObject parentSAMLObject, final XMLObject childSAMLObject) throws UnmarshallingException {
 
-	final RequestedAttribute requestedAttr = (RequestedAttribute) parentSAMLObject;
+		final RequestedAttribute requestedAttr = (RequestedAttribute) parentSAMLObject;
 
-	final QName childQName = childSAMLObject.getElementQName();
-	if (childQName.getLocalPart().equals("AttributeValue")
-		&& childQName.getNamespaceURI().equals(SAMLCore.STORK10_NS.getValue())) {
-	    requestedAttr.getAttributeValues().add(childSAMLObject);
-	} else {
-	    super.processChildElement(parentSAMLObject, childSAMLObject);
+		final QName childQName = childSAMLObject.getElementQName();
+		if (childQName.getLocalPart().equals("AttributeValue") && childQName.getNamespaceURI().equals(SAMLCore.STORK10_NS.getValue())) {
+			requestedAttr.getAttributeValues().add(childSAMLObject);
+		} else {
+			super.processChildElement(parentSAMLObject, childSAMLObject);
+		}
 	}
-    }
 
-    /**
-     * Process attribute.
-     *
-     * @param samlObject the SAML object
-     * @param attribute the attribute
-     * @throws UnmarshallingException the unmarshalling exception
-     */
-    protected final void processAttribute(final XMLObject samlObject,
-	    final Attr attribute) throws UnmarshallingException {
+	/**
+	 * Process attribute.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param attribute
+	 *            the attribute
+	 * @throws UnmarshallingException
+	 *             the unmarshalling exception
+	 */
+	protected final void processAttribute(final XMLObject samlObject, final Attr attribute) throws UnmarshallingException {
 
-	final RequestedAttribute requestedAttr = (RequestedAttribute) samlObject;
+		final RequestedAttribute requestedAttr = (RequestedAttribute) samlObject;
 
-	if (attribute.getLocalName()
-		.equals(RequestedAttribute.NAME_ATTRIB_NAME)) {
-	    requestedAttr.setName(attribute.getValue());
-	} else if (attribute.getLocalName().equals(
-		RequestedAttribute.NAME_FORMAT_ATTR)) {
-	    requestedAttr.setNameFormat(attribute.getValue());
-	} else if (attribute.getLocalName().equals(
-		RequestedAttribute.FRIENDLY_NAME_ATT)) {
-	    requestedAttr.setFriendlyName(attribute.getValue());
-	} else if (attribute.getLocalName().equals(
-		RequestedAttribute.IS_REQUIRED_ATTR)) {
-	    requestedAttr.setIsRequired(attribute
-		    .getValue());
+		if (attribute.getLocalName().equals(RequestedAttribute.NAME_ATTRIB_NAME)) {
+			requestedAttr.setName(attribute.getValue());
+		} else if (attribute.getLocalName().equals(RequestedAttribute.NAME_FORMAT_ATTR)) {
+			requestedAttr.setNameFormat(attribute.getValue());
+		} else if (attribute.getLocalName().equals(RequestedAttribute.FRIENDLY_NAME_ATT)) {
+			requestedAttr.setFriendlyName(attribute.getValue());
+		} else if (attribute.getLocalName().equals(RequestedAttribute.IS_REQUIRED_ATTR)) {
+			requestedAttr.setIsRequired(attribute.getValue());
 
-	} else {
-	    final QName attribQName = XMLHelper.getNodeQName(attribute);
-	    if (attribute.isId()) {
-		requestedAttr.getUnknownAttributes().registerID(attribQName);
-	    }
-	    requestedAttr.getUnknownAttributes().put(attribQName,
-		    attribute.getValue());
+		} else {
+			final QName attribQName = XMLHelper.getNodeQName(attribute);
+			if (attribute.isId()) {
+				requestedAttr.getUnknownAttributes().registerID(attribQName);
+			}
+			requestedAttr.getUnknownAttributes().put(attribQName, attribute.getValue());
+		}
 	}
-    }
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesBuilder.java
index d421c53d2..c9643d7ae 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesBuilder.java
@@ -24,31 +24,30 @@ import eu.stork.peps.auth.engine.core.RequestedAttributes;
  * 
  * @author fjquevedo
  */
-public class RequestedAttributesBuilder extends
-	AbstractSAMLObjectBuilder<RequestedAttributes> {
-
-
-    /**
-     * Builds the object.
-     *
-     * @return the requested attributes
-     */
-    public final RequestedAttributes buildObject() {
-	return buildObject(RequestedAttributes.DEF_ELEMENT_NAME);
-    }
-
-    /**
-     * Builds the object.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the requested attributes
-     */
-    public final RequestedAttributes buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new RequestedAttributesImpl(namespaceURI, localName,
-		namespacePrefix);
-    }
+public class RequestedAttributesBuilder extends AbstractSAMLObjectBuilder<RequestedAttributes> {
+
+	/**
+	 * Builds the object.
+	 *
+	 * @return the requested attributes
+	 */
+	public final RequestedAttributes buildObject() {
+		return buildObject(RequestedAttributes.DEF_ELEMENT_NAME);
+	}
+
+	/**
+	 * Builds the object.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the requested attributes
+	 */
+	public final RequestedAttributes buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new RequestedAttributesImpl(namespaceURI, localName, namespacePrefix);
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java
index 0a5b37add..ad81e4846 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesImpl.java
@@ -31,65 +31,64 @@ import eu.stork.peps.auth.engine.core.RequestedAttributes;
  * 
  * @author fjquevedo
  */
-public class RequestedAttributesImpl extends AbstractSAMLObject implements
-	RequestedAttributes {
-
-    /**
-     * Instantiates a new requested attributes implement.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected RequestedAttributesImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-	indexedChildren = new IndexedXMLObjectChildrenList<XMLObject>(this);
-    }
-
-    /** The indexed children. */
-    private final IndexedXMLObjectChildrenList<XMLObject> indexedChildren;
-
-    /**
-     * Gets the indexed children.
-     * 
-     * @return the indexed children
-     */
-    public final IndexedXMLObjectChildrenList<XMLObject> getIndexedChildren() {
-	return indexedChildren;
-    }
-
-
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-
-	final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
-
-	children.addAll(indexedChildren);
-
-	return Collections.unmodifiableList(children);
-
-    }
-
-    /**
-     * Gets the attributes.
-     * 
-     * @return the attributes
-     * 
-     * @see eu.stork.peps.auth.engine.core.RequestedAttributes#getAttributes()
-     */
-    @SuppressWarnings("unchecked")
-    public final List<RequestedAttribute> getAttributes() {
-	return (List<RequestedAttribute>) indexedChildren
-		.subList(RequestedAttribute.DEF_ELEMENT_NAME);
-    }
-
-    @Override
-    public int hashCode() {
-        throw new UnsupportedOperationException("hashCode method not implemented");
-    }
+public class RequestedAttributesImpl extends AbstractSAMLObject implements RequestedAttributes {
+
+	/**
+	 * Instantiates a new requested attributes implement.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace URI
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected RequestedAttributesImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+		indexedChildren = new IndexedXMLObjectChildrenList<XMLObject>(this);
+	}
+
+	/** The indexed children. */
+	private final IndexedXMLObjectChildrenList<XMLObject> indexedChildren;
+
+	/**
+	 * Gets the indexed children.
+	 * 
+	 * @return the indexed children
+	 */
+	public final IndexedXMLObjectChildrenList<XMLObject> getIndexedChildren() {
+		return indexedChildren;
+	}
+
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+
+		final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
+
+		children.addAll(indexedChildren);
+
+		return Collections.unmodifiableList(children);
+
+	}
+
+	/**
+	 * Gets the attributes.
+	 * 
+	 * @return the attributes
+	 * 
+	 * @see eu.stork.peps.auth.engine.core.RequestedAttributes#getAttributes()
+	 */
+	@SuppressWarnings("unchecked")
+	public final List<RequestedAttribute> getAttributes() {
+		return (List<RequestedAttribute>) indexedChildren.subList(RequestedAttribute.DEF_ELEMENT_NAME);
+	}
+
+	@Override
+	public int hashCode() {
+		throw new UnsupportedOperationException("hashCode method not implemented");
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesMarshaller.java
index dfc42adf3..e1b15015e 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesMarshaller.java
@@ -24,10 +24,10 @@ import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
  */
 public class RequestedAttributesMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Instantiates a new requested attributes marshaller.
-     */
-    public RequestedAttributesMarshaller() {
-	super();
-    }
+	/**
+	 * Instantiates a new requested attributes marshaller.
+	 */
+	public RequestedAttributesMarshaller() {
+		super();
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesUnmarshaller.java
index 41b3afa40..69990ebe5 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/RequestedAttributesUnmarshaller.java
@@ -27,26 +27,27 @@ import eu.stork.peps.auth.engine.core.RequestedAttributes;
  * 
  * @author fjquevedo
  */
-public class RequestedAttributesUnmarshaller extends
-	AbstractSAMLObjectUnmarshaller {
+public class RequestedAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process child element.
-     * 
-     * @param parentObject the parent object
-     * @param childObject the child object
-     * 
-     * @throws UnmarshallingException error in unmarshall
-     */
-    protected final void processChildElement(final XMLObject parentObject,
-	    final XMLObject childObject) throws UnmarshallingException {
-	final RequestedAttributes attrStatement = (RequestedAttributes) parentObject;
+	/**
+	 * Process child element.
+	 * 
+	 * @param parentObject
+	 *            the parent object
+	 * @param childObject
+	 *            the child object
+	 * 
+	 * @throws UnmarshallingException
+	 *             error in unmarshall
+	 */
+	protected final void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
+		final RequestedAttributes attrStatement = (RequestedAttributes) parentObject;
 
-	if (childObject instanceof RequestedAttribute) {
-	    attrStatement.getAttributes().add((RequestedAttribute) childObject);
-	} else {
-	    super.processChildElement(parentObject, childObject);
+		if (childObject instanceof RequestedAttribute) {
+			attrStatement.getAttributes().add((RequestedAttribute) childObject);
+		} else {
+			super.processChildElement(parentObject, childObject);
+		}
 	}
-    }
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java
index a35c77936..6d9f9bf1e 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationBuilder.java
@@ -24,28 +24,29 @@ import eu.stork.peps.auth.engine.core.SPApplication;
  * 
  * @author fjquevedo
  */
-public class SPApplicationBuilder extends
-	AbstractSAMLObjectBuilder<SPApplication> {
+public class SPApplicationBuilder extends AbstractSAMLObjectBuilder<SPApplication> {
 
-    /**
-     * Builds the object.
-     *
-     * @return the service provider application
-     */
-    public final SPApplication buildObject() {
-	return buildObject(SPApplication.DEF_ELEMENT_NAME);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @return the service provider application
+	 */
+	public final SPApplication buildObject() {
+		return buildObject(SPApplication.DEF_ELEMENT_NAME);
+	}
 
-    /**
-     * Builds the object.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the service provider application
-     */
-    public final SPApplication buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new SPApplicationImpl(namespaceURI, localName, namespacePrefix);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the service provider application
+	 */
+	public final SPApplication buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new SPApplicationImpl(namespaceURI, localName, namespacePrefix);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java
index 0a428a521..7f09d611f 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationImpl.java
@@ -29,56 +29,52 @@ import org.slf4j.LoggerFactory;
  * 
  * @author fjquevedo
  */
-public class SPApplicationImpl extends AbstractSAMLObject implements
-	SPApplication {
+public class SPApplicationImpl extends AbstractSAMLObject implements SPApplication {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SPApplicationImpl.class.getName());
-    /** The service provider application. */
-    private String spApplication;
+	private static final Logger LOGGER = LoggerFactory.getLogger(SPApplicationImpl.class.getName());
+	/** The service provider application. */
+	private String spApplication;
 
-    /**
-     * Instantiates a new service provider application.
-     * 
-     * @param namespaceURI the namespace uri
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected SPApplicationImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
+	/**
+	 * Instantiates a new service provider application.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected SPApplicationImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    /**
-     * Gets the service provider application.
-     *
-     * @return the service provider application
-     */
-    public final String getSPApplication() {
-	return spApplication;
-    }
+	/**
+	 * Gets the service provider application.
+	 *
+	 * @return the service provider application
+	 */
+	public final String getSPApplication() {
+		return spApplication;
+	}
 
-    /**
-     * Sets the service provider application.
-     *
-     * @param newSpApplication the new service provider application
-     */
-    public final void setSPApplication(final String newSpApplication) {
-	this.spApplication = prepareForAssignment(this.spApplication,
-		newSpApplication);
-    }
+	/**
+	 * Sets the service provider application.
+	 *
+	 * @param newSpApplication
+	 *            the new service provider application
+	 */
+	public final void setSPApplication(final String newSpApplication) {
+		this.spApplication = prepareForAssignment(this.spApplication, newSpApplication);
+	}
 
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	return null;
-    }
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationMarshaller.java
index 4866c3535..d9268c550 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationMarshaller.java
@@ -30,17 +30,18 @@ import eu.stork.peps.auth.engine.core.SPApplication;
  */
 public class SPApplicationMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Marshall element content.
-     *
-     * @param samlObject the SAML object
-     * @param domElement the DOM element
-     * @throws MarshallingException the marshalling exception
-     */
-    protected final void marshallElementContent(final XMLObject samlObject,
-	    final Element domElement) throws MarshallingException {
-	final SPApplication spApplication = (SPApplication) samlObject;
-	XMLHelper.appendTextContent(domElement, spApplication
-		.getSPApplication());
-    }
+	/**
+	 * Marshall element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
+	 */
+	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
+		final SPApplication spApplication = (SPApplication) samlObject;
+		XMLHelper.appendTextContent(domElement, spApplication.getSPApplication());
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationUnmarshaller.java
index a28432a13..9fb514cf0 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPApplicationUnmarshaller.java
@@ -20,7 +20,6 @@ import org.opensaml.xml.XMLObject;
 
 import eu.stork.peps.auth.engine.core.SPApplication;
 
-
 /**
  * The Class SPApplicationUnmarshaller.
  * 
@@ -28,15 +27,16 @@ import eu.stork.peps.auth.engine.core.SPApplication;
  */
 public class SPApplicationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process element content.
-     *
-     * @param samlObject the SAML object
-     * @param elementContent the element content
-     */
-    protected final void processElementContent(final XMLObject samlObject,
-	    final String elementContent) {
-	final SPApplication spApplication = (SPApplication) samlObject;
-	spApplication.setSPApplication(elementContent);
-    }
+	/**
+	 * Process element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param elementContent
+	 *            the element content
+	 */
+	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
+		final SPApplication spApplication = (SPApplication) samlObject;
+		spApplication.setSPApplication(elementContent);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryBuilder.java
index 48ec92f49..2c6c124e3 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryBuilder.java
@@ -26,27 +26,27 @@ import eu.stork.peps.auth.engine.core.SPCountry;
  */
 public class SPCountryBuilder extends AbstractSAMLObjectBuilder<SPCountry> {
 
-    
-    /**
-     * Builds the object SPCountry.
-     *
-     * @return the service provider country
-     */
-    public final SPCountry buildObject() {
-	return buildObject(SPCountry.DEF_ELEMENT_NAME);
-    }
+	/**
+	 * Builds the object SPCountry.
+	 *
+	 * @return the service provider country
+	 */
+	public final SPCountry buildObject() {
+		return buildObject(SPCountry.DEF_ELEMENT_NAME);
+	}
 
-    
-    /**
-     * Builds the object SPCountry.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the service provider country
-     */
-    public final SPCountry buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new SPCountryImpl(namespaceURI, localName, namespacePrefix);
-    }
+	/**
+	 * Builds the object SPCountry.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the service provider country
+	 */
+	public final SPCountry buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new SPCountryImpl(namespaceURI, localName, namespacePrefix);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
index 40a1ac86a..ea9085867 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryImpl.java
@@ -31,52 +31,50 @@ import org.slf4j.LoggerFactory;
  */
 public class SPCountryImpl extends AbstractSAMLObject implements SPCountry {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SPCountryImpl.class.getName());
-    /** The service provider country. */
-    private String spCountry;
+	private static final Logger LOGGER = LoggerFactory.getLogger(SPCountryImpl.class.getName());
+	/** The service provider country. */
+	private String spCountry;
 
-    /**
-     * Instantiates a new service provider country.
-     * 
-     * @param namespaceURI the namespace uri
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected SPCountryImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
+	/**
+	 * Instantiates a new service provider country.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected SPCountryImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    /**
-     * Gets the service provider country.
-     *
-     * @return the service provider country
-     */
-    public final String getSPCountry() {
-	return spCountry;
-    }
+	/**
+	 * Gets the service provider country.
+	 *
+	 * @return the service provider country
+	 */
+	public final String getSPCountry() {
+		return spCountry;
+	}
 
-    /**
-     * Sets the service provider country.
-     *
-     * @param newSpCountry the new service provider country
-     */
-    public final void setSPCountry(final String newSpCountry) {
-	this.spCountry = prepareForAssignment(this.spCountry, newSpCountry);
-    }
+	/**
+	 * Sets the service provider country.
+	 *
+	 * @param newSpCountry
+	 *            the new service provider country
+	 */
+	public final void setSPCountry(final String newSpCountry) {
+		this.spCountry = prepareForAssignment(this.spCountry, newSpCountry);
+	}
 
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	return null;
-    }
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryMarshaller.java
index e82634749..1bd7121f0 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryMarshaller.java
@@ -30,16 +30,18 @@ import eu.stork.peps.auth.engine.core.SPCountry;
  */
 public class SPCountryMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Marshall element content.
-     *
-     * @param samlObject the SAML object
-     * @param domElement the DOM element
-     * @throws MarshallingException the marshalling exception
-     */
-    protected final void marshallElementContent(final XMLObject samlObject,
-	    final Element domElement) throws MarshallingException {
-	final SPCountry spCountry = (SPCountry) samlObject;
-	XMLHelper.appendTextContent(domElement, spCountry.getSPCountry());
-    }
+	/**
+	 * Marshall element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
+	 */
+	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
+		final SPCountry spCountry = (SPCountry) samlObject;
+		XMLHelper.appendTextContent(domElement, spCountry.getSPCountry());
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java
index deb695ac6..c9ac243f1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPCountryUnmarshaller.java
@@ -20,7 +20,6 @@ import org.opensaml.xml.XMLObject;
 
 import eu.stork.peps.auth.engine.core.SPCountry;
 
-
 /**
  * The Class SPCountryUnmarshaller.
  * 
@@ -28,15 +27,16 @@ import eu.stork.peps.auth.engine.core.SPCountry;
  */
 public class SPCountryUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process element content.
-     *
-     * @param samlObject the SAML object
-     * @param elementContent the element content
-     */
-    protected final void processElementContent(final XMLObject samlObject,
-	    final String elementContent) {
-	final SPCountry spCountry = (SPCountry) samlObject;
-	spCountry.setSPCountry(elementContent);
-    }
+	/**
+	 * Process element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param elementContent
+	 *            the element content
+	 */
+	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
+		final SPCountry spCountry = (SPCountry) samlObject;
+		spCountry.setSPCountry(elementContent);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDBuilder.java
index b3640947b..2cee08268 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDBuilder.java
@@ -26,25 +26,27 @@ import eu.stork.peps.auth.engine.core.SPID;
  */
 public class SPIDBuilder extends AbstractSAMLObjectBuilder<SPID> {
 
-    /**
-     * Builds the object.
-     *
-     * @return the SP ID
-     */
-    public final SPID buildObject() {
-	return buildObject(SPID.DEF_ELEMENT_NAME);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @return the SP ID
+	 */
+	public final SPID buildObject() {
+		return buildObject(SPID.DEF_ELEMENT_NAME);
+	}
 
-    /**
-     * Builds the object.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the citizen country code
-     */
-    public final SPID buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new SPIDImpl(namespaceURI, localName, namespacePrefix);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the citizen country code
+	 */
+	public final SPID buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new SPIDImpl(namespaceURI, localName, namespacePrefix);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java
index 68611997b..03dea20ed 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDImpl.java
@@ -31,52 +31,50 @@ import org.slf4j.LoggerFactory;
  */
 public class SPIDImpl extends AbstractSAMLObject implements SPID {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SPIDImpl.class.getName());
-    /** The citizen country code. */
-    private String spId;
-    
-    /**
-     * Instantiates a new sP country impl.
-     * 
-     * @param namespaceURI the namespace uri
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */   
-    protected SPIDImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);	
-    }
+	private static final Logger LOGGER = LoggerFactory.getLogger(SPIDImpl.class.getName());
+	/** The citizen country code. */
+	private String spId;
 
-    /**
-     * Gets the SP ID.
-     *
-     * @return the SP ID
-     */
-    public final String getSPID() {
-    	return spId;
-    }
+	/**
+	 * Instantiates a new sP country impl.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected SPIDImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    /**
-     * Sets the SP ID.
-     *
-     * @param newSPID the new SP ID
-     */
-    public final void setSPID(final String newSPID) {
-    	this.spId = prepareForAssignment(this.spId, newSPID);
-    }
+	/**
+	 * Gets the SP ID.
+	 *
+	 * @return the SP ID
+	 */
+	public final String getSPID() {
+		return spId;
+	}
 
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-    	return null;
-    }
+	/**
+	 * Sets the SP ID.
+	 *
+	 * @param newSPID
+	 *            the new SP ID
+	 */
+	public final void setSPID(final String newSPID) {
+		this.spId = prepareForAssignment(this.spId, newSPID);
+	}
+
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDMarshaller.java
index 24389522e..d8cac34fc 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDMarshaller.java
@@ -30,16 +30,18 @@ import eu.stork.peps.auth.engine.core.SPID;
  */
 public class SPIDMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Marshall element content.
-     *
-     * @param samlObject the SAML object
-     * @param domElement the DOM element
-     * @throws MarshallingException the marshalling exception
-     */
-    protected final void marshallElementContent(final XMLObject samlObject,
-	    final Element domElement) throws MarshallingException {
-	final SPID spid = (SPID) samlObject;
-	XMLHelper.appendTextContent(domElement, spid.getSPID());
-    }
+	/**
+	 * Marshall element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
+	 */
+	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
+		final SPID spid = (SPID) samlObject;
+		XMLHelper.appendTextContent(domElement, spid.getSPID());
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDUnmarshaller.java
index e4d230b94..ab3aef878 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPIDUnmarshaller.java
@@ -27,15 +27,16 @@ import eu.stork.peps.auth.engine.core.SPID;
  */
 public class SPIDUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process element content.
-     *
-     * @param samlObject the SAML object
-     * @param elementContent the element content
-     */
-    protected final void processElementContent(final XMLObject samlObject,
-	    final String elementContent) {
-	final SPID spid = (SPID) samlObject;
-	spid.setSPID(elementContent);
-    }
+	/**
+	 * Process element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param elementContent
+	 *            the element content
+	 */
+	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
+		final SPID spid = (SPID) samlObject;
+		spid.setSPID(elementContent);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationBuilder.java
index a6e1fe686..af7c97d19 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationBuilder.java
@@ -26,16 +26,15 @@ import eu.stork.peps.auth.engine.core.SPInformation;
  * @author iinigo
  */
 public final class SPInformationBuilder extends AbstractSAMLObjectBuilder<SPInformation> {
-    
 
-    /** {@inheritDoc} */
-    public SPInformation buildObject() {
-        return buildObject(SAMLCore.STORK10P_NS.getValue(), SPInformation.DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
-    }
+	/** {@inheritDoc} */
+	public SPInformation buildObject() {
+		return buildObject(SAMLCore.STORK10P_NS.getValue(), SPInformation.DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
+	}
+
+	/** {@inheritDoc} */
+	public SPInformation buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new SPInformationImpl(namespaceURI, localName, namespacePrefix);
+	}
 
-    /** {@inheritDoc} */
-    public SPInformation buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
-        return new SPInformationImpl(namespaceURI, localName, namespacePrefix);
-    }
-    
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java
index ff6e90999..41b3d8998 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationImpl.java
@@ -27,84 +27,78 @@ import eu.stork.peps.auth.engine.core.SPInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
 /**
  * The Class SPInformationImpl.
  * 
  * @author iinigo
  */
-public final class SPInformationImpl extends AbstractSignableSAMLObject implements
-SPInformation {
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(SPInformationImpl.class.getName());
-    /** The citizen country code. */
-    private SPID spId;
-    
-    
+public final class SPInformationImpl extends AbstractSignableSAMLObject implements SPInformation {
+
+	private static final Logger LOGGER = LoggerFactory.getLogger(SPInformationImpl.class.getName());
+	/** The citizen country code. */
+	private SPID spId;
+
+	/**
+	 * Instantiates a new requested attributes implement.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace URI
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected SPInformationImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
+
+	/**
+	 * getSPId.
+	 * 
+	 * @return the SP ID
+	 */
+	public SPID getSPID() {
+		return spId;
+	}
+
+	/**
+	 * Gets the ordered children.
+	 * 
+	 * @return the ordered children
+	 *
+	 */
+	public List<XMLObject> getOrderedChildren() {
+		final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
+
+		children.add(spId);
+
+		if (getSignature() != null) {
+			children.add(getSignature());
+		}
+
+		return Collections.unmodifiableList(children);
+
+	}
+
 	/**
-     * Instantiates a new requested attributes implement.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected SPInformationImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {	
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
-    
-   
-    /**
-     * getSPId.
-     * 
-     * @return the SP ID
-     */    
-    public SPID getSPID() {
-    	return spId;
-    }        
-
-    /**
-     * Gets the ordered children.
-     * 
-     * @return the ordered children
-     *
-     */
-    public List<XMLObject> getOrderedChildren() {
-	final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
-
-	children.add(spId);
-		
-	if (getSignature() != null) {
-	    children.add(getSignature());
+	 * Gets the signature reference id.
+	 * 
+	 * @return the signature reference id
+	 *
+	 */
+	public String getSignatureReferenceID() {
+		return null;
 	}
-	
-	return Collections.unmodifiableList(children);
-
-    }
-
-    /**
-     * Gets the signature reference id.
-     * 
-     * @return the signature reference id
-     *
-     */
-    public String getSignatureReferenceID() {
-	return null;
-    }
-    
-    /**
-     * Sets the SP Id.
-     * 
-     * @param newSPId the new SP Id
-     *
-     */
-    public void setSPID(SPID newSPId) {
-    	this.spId = prepareForAssignment(this.spId, newSPId);	
-    }
-
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
+
+	/**
+	 * Sets the SP Id.
+	 * 
+	 * @param newSPId
+	 *            the new SP Id
+	 *
+	 */
+	public void setSPID(SPID newSPId) {
+		this.spId = prepareForAssignment(this.spId, newSPId);
+	}
+
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationMarshaller.java
index 44845948c..027e49e9d 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationMarshaller.java
@@ -24,10 +24,10 @@ import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
  */
 public class SPInformationMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Instantiates a new SP Information marshaller.
-     */
-    public SPInformationMarshaller() {
-	super();
-    }
+	/**
+	 * Instantiates a new SP Information marshaller.
+	 */
+	public SPInformationMarshaller() {
+		super();
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationUnmarshaller.java
index 414b93386..ecf69e2c7 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInformationUnmarshaller.java
@@ -27,26 +27,27 @@ import eu.stork.peps.auth.engine.core.SPInformation;
  * 
  * @author iinigo
  */
-public class SPInformationUnmarshaller extends
-	AbstractSAMLObjectUnmarshaller {
+public class SPInformationUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process child element.
-     * 
-     * @param parentObject the parent object
-     * @param childObject the child object
-     * 
-     * @throws UnmarshallingException the unmarshalling exception
-     *
-     */
-    protected final void processChildElement(final XMLObject parentObject,
-	    final XMLObject childObject) throws UnmarshallingException {
-	final SPInformation spInformation = (SPInformation) parentObject;
+	/**
+	 * Process child element.
+	 * 
+	 * @param parentObject
+	 *            the parent object
+	 * @param childObject
+	 *            the child object
+	 * 
+	 * @throws UnmarshallingException
+	 *             the unmarshalling exception
+	 *
+	 */
+	protected final void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
+		final SPInformation spInformation = (SPInformation) parentObject;
 
-	if (childObject instanceof SPID) {
-        spInformation.setSPID((SPID) childObject);
-	} else {
-	    super.processChildElement(parentObject, childObject);
-	}	
-    }
+		if (childObject instanceof SPID) {
+			spInformation.setSPID((SPID) childObject);
+		} else {
+			super.processChildElement(parentObject, childObject);
+		}
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionBuilder.java
index fe47cf99c..d26b15a1e 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionBuilder.java
@@ -24,28 +24,29 @@ import eu.stork.peps.auth.engine.core.SPInstitution;
  * 
  * @author fjquevedo
  */
-public class SPInstitutionBuilder extends
-	AbstractSAMLObjectBuilder<SPInstitution> {
+public class SPInstitutionBuilder extends AbstractSAMLObjectBuilder<SPInstitution> {
 
-    /**
-     * Builds the object.
-     *
-     * @return the service provider institution
-     */
-    public final SPInstitution buildObject() {
-	return buildObject(SPInstitution.DEF_ELEMENT_NAME);
-    }
+	/**
+	 * Builds the object.
+	 *
+	 * @return the service provider institution
+	 */
+	public final SPInstitution buildObject() {
+		return buildObject(SPInstitution.DEF_ELEMENT_NAME);
+	}
 
-    /**
-     * Builds the object SPInstitution.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the service provider institution
-     */
-    public final SPInstitution buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new SPInstitutionImpl(namespaceURI, localName, namespacePrefix);
-    }
+	/**
+	 * Builds the object SPInstitution.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the service provider institution
+	 */
+	public final SPInstitution buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new SPInstitutionImpl(namespaceURI, localName, namespacePrefix);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java
index 38438613a..ed0a75f35 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionImpl.java
@@ -29,56 +29,52 @@ import org.slf4j.LoggerFactory;
  * 
  * @author fjquevedo
  */
-public class SPInstitutionImpl extends AbstractSAMLObject implements
-	SPInstitution {
+public class SPInstitutionImpl extends AbstractSAMLObject implements SPInstitution {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(SPInstitutionImpl.class.getName());
-    /** The service provider institution. */
-    private String spInstitution;
+	private static final Logger LOGGER = LoggerFactory.getLogger(SPInstitutionImpl.class.getName());
+	/** The service provider institution. */
+	private String spInstitution;
 
-    /**
-     * Instantiates a new service provider institution.
-     * 
-     * @param namespaceURI the namespace uri
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected SPInstitutionImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
+	/**
+	 * Instantiates a new service provider institution.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected SPInstitutionImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    /**
-     * Gets the service provider institution.
-     *
-     * @return the service provider institution
-     */
-    public final String getSPInstitution() {
-	return spInstitution;
-    }
+	/**
+	 * Gets the service provider institution.
+	 *
+	 * @return the service provider institution
+	 */
+	public final String getSPInstitution() {
+		return spInstitution;
+	}
 
-    /**
-     * Sets the service provider institution.
-     *
-     * @param newSpInstitution the new service provider institution
-     */
-    public final void setSPInstitution(final String newSpInstitution) {
-	this.spInstitution = prepareForAssignment(this.spInstitution,
-		newSpInstitution);
-    }
+	/**
+	 * Sets the service provider institution.
+	 *
+	 * @param newSpInstitution
+	 *            the new service provider institution
+	 */
+	public final void setSPInstitution(final String newSpInstitution) {
+		this.spInstitution = prepareForAssignment(this.spInstitution, newSpInstitution);
+	}
 
-    /**
-     * Gets the ordered children.
-     *
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	return null;
-    }
+	/**
+	 * Gets the ordered children.
+	 *
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
- }
+}
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionMarshaller.java
index 504a1f035..48bb3fec5 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionMarshaller.java
@@ -30,17 +30,18 @@ import eu.stork.peps.auth.engine.core.SPInstitution;
  */
 public class SPInstitutionMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Marshall element content.
-     *
-     * @param samlObject the SAML object
-     * @param domElement the DOM element
-     * @throws MarshallingException the marshalling exception
-     */
-    protected final void marshallElementContent(final XMLObject samlObject,
-	    final Element domElement) throws MarshallingException {
-	final SPInstitution spInstitution = (SPInstitution) samlObject;
-	XMLHelper.appendTextContent(domElement, spInstitution
-		.getSPInstitution());
-    }
+	/**
+	 * Marshall element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
+	 */
+	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
+		final SPInstitution spInstitution = (SPInstitution) samlObject;
+		XMLHelper.appendTextContent(domElement, spInstitution.getSPInstitution());
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionUnmarshaller.java
index 103d5f2b2..f7b1f440e 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPInstitutionUnmarshaller.java
@@ -27,15 +27,16 @@ import eu.stork.peps.auth.engine.core.SPInstitution;
  */
 public class SPInstitutionUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process element content.
-     *
-     * @param samlObject the SAML object
-     * @param elementContent the element content
-     */
-    protected final void processElementContent(final XMLObject samlObject,
-	    final String elementContent) {
-	final SPInstitution spInstitution = (SPInstitution) samlObject;
-	spInstitution.setSPInstitution(elementContent);
-    }
+	/**
+	 * Process element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param elementContent
+	 *            the element content
+	 */
+	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
+		final SPInstitution spInstitution = (SPInstitution) samlObject;
+		spInstitution.setSPInstitution(elementContent);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorBuilder.java
index a691b9008..b97e91b36 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorBuilder.java
@@ -26,25 +26,27 @@ import eu.stork.peps.auth.engine.core.SPSector;
  */
 public class SPSectorBuilder extends AbstractSAMLObjectBuilder<SPSector> {
 
-    /**
-     * Builds the object SPSector.
-     *
-     * @return the service provider sector.
-     */
-    public final SPSector buildObject() {
-	return buildObject(SPSector.DEF_ELEMENT_NAME);
-    }
+	/**
+	 * Builds the object SPSector.
+	 *
+	 * @return the service provider sector.
+	 */
+	public final SPSector buildObject() {
+		return buildObject(SPSector.DEF_ELEMENT_NAME);
+	}
 
-    /**
-     * Builds the object SPSector.
-     *
-     * @param namespaceURI the namespace uri
-     * @param localName the local name
-     * @param namespacePrefix the namespace prefix
-     * @return the service provider sector
-     */
-    public final SPSector buildObject(final String namespaceURI,
-	    final String localName, final String namespacePrefix) {
-	return new SPSectorImpl(namespaceURI, localName, namespacePrefix);
-    }
+	/**
+	 * Builds the object SPSector.
+	 *
+	 * @param namespaceURI
+	 *            the namespace uri
+	 * @param localName
+	 *            the local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 * @return the service provider sector
+	 */
+	public final SPSector buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new SPSectorImpl(namespaceURI, localName, namespacePrefix);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorImpl.java
index 4ac822876..670198e67 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorImpl.java
@@ -22,7 +22,6 @@ import org.opensaml.xml.XMLObject;
 
 import eu.stork.peps.auth.engine.core.SPSector;
 
-
 /**
  * The Class SPSectorImpl.
  * 
@@ -30,55 +29,55 @@ import eu.stork.peps.auth.engine.core.SPSector;
  */
 public class SPSectorImpl extends AbstractSAMLObject implements SPSector {
 
-    /** The service provider sector. */
-    private String spSector;
+	/** The service provider sector. */
+	private String spSector;
 
-    /**
-     * Instantiates a new Service provider sector implementation.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected SPSectorImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
+	/**
+	 * Instantiates a new Service provider sector implementation.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace URI
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected SPSectorImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
-    
-    /**
-     * Gets the service provider sector.
-     * 
-     * @return the SP sector
-     * 
-     * @see eu.stork.peps.auth.engine.core.SPSector#getSPSector()
-     */
-    public final String getSPSector() {
-	return spSector;
-    }
+	/**
+	 * Gets the service provider sector.
+	 * 
+	 * @return the SP sector
+	 * 
+	 * @see eu.stork.peps.auth.engine.core.SPSector#getSPSector()
+	 */
+	public final String getSPSector() {
+		return spSector;
+	}
 
-    
-    /**
-     * Sets the service provider sector.
-     * 
-     * @param newSpSector the new service provider sector
-     */
-    public final void setSPSector(final String newSpSector) {
-	this.spSector = prepareForAssignment(this.spSector, newSpSector);
-    }
+	/**
+	 * Sets the service provider sector.
+	 * 
+	 * @param newSpSector
+	 *            the new service provider sector
+	 */
+	public final void setSPSector(final String newSpSector) {
+		this.spSector = prepareForAssignment(this.spSector, newSpSector);
+	}
 
-   
-    /**
-     * Gets the ordered children.
-     * 
-     * @return the ordered children
-     */
-    public final List<XMLObject> getOrderedChildren() {
-	return null;
-    }
+	/**
+	 * Gets the ordered children.
+	 * 
+	 * @return the ordered children
+	 */
+	public final List<XMLObject> getOrderedChildren() {
+		return null;
+	}
 
-    @Override
-    public int hashCode() {
-        throw new UnsupportedOperationException("hashCode method not implemented");
-    }
+	@Override
+	public int hashCode() {
+		throw new UnsupportedOperationException("hashCode method not implemented");
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorMarshaller.java
index c5331e8f4..59e349f9f 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorMarshaller.java
@@ -30,16 +30,18 @@ import eu.stork.peps.auth.engine.core.SPSector;
  */
 public class SPSectorMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Marshall element content.
-     *
-     * @param samlObject the SAML object
-     * @param domElement the DOM element
-     * @throws MarshallingException the marshalling exception
-     */
-    protected final void marshallElementContent(final XMLObject samlObject,
-	    final Element domElement) throws MarshallingException {
-	final SPSector spSector = (SPSector) samlObject;
-	XMLHelper.appendTextContent(domElement, spSector.getSPSector());
-    }
+	/**
+	 * Marshall element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param domElement
+	 *            the DOM element
+	 * @throws MarshallingException
+	 *             the marshalling exception
+	 */
+	protected final void marshallElementContent(final XMLObject samlObject, final Element domElement) throws MarshallingException {
+		final SPSector spSector = (SPSector) samlObject;
+		XMLHelper.appendTextContent(domElement, spSector.getSPSector());
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorUnmarshaller.java
index cbb05c6e5..e671cee03 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SPSectorUnmarshaller.java
@@ -27,16 +27,16 @@ import eu.stork.peps.auth.engine.core.SPSector;
  */
 public class SPSectorUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    
-    /**
-     * Process element content.
-     *
-     * @param samlObject the SAML object
-     * @param elementContent the element content
-     */
-    protected final void processElementContent(final XMLObject samlObject,
-	    final String elementContent) {
-	final SPSector spSector = (SPSector) samlObject;
-	spSector.setSPSector(elementContent);
-    }
+	/**
+	 * Process element content.
+	 *
+	 * @param samlObject
+	 *            the SAML object
+	 * @param elementContent
+	 *            the element content
+	 */
+	protected final void processElementContent(final XMLObject samlObject, final String elementContent) {
+		final SPSector spSector = (SPSector) samlObject;
+		spSector.setSPSector(elementContent);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java
index 80796ea86..1cd5fb761 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignHW.java
@@ -64,8 +64,6 @@ import org.opensaml.xml.validation.ValidationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
 import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
 import eu.stork.peps.auth.engine.core.SAMLEngineSignI;
 import eu.stork.peps.exceptions.SAMLEngineException;
@@ -74,395 +72,324 @@ import eu.stork.peps.exceptions.SAMLEngineException;
  * The Class HWSign. Module of sign.
  * 
  * @author fjquevedo
+ * @author advania
  */
 public final class SignHW implements SAMLEngineSignI {
 
-    /** The Constant CONFIGURATION_FILE. */
-    private static final String CONF_FILE = "configurationFile";
-
-    /** The Constant KEYSTORE_TYPE.
-    private static final String KEYSTORE_TYPE = "keystoreType" */
-
-    /** The logger. */
-    private static final Logger LOG = LoggerFactory.getLogger(SignHW.class
-	    .getName());
-
-    /** The stork own key store. */
-    private KeyStore storkOwnKeyStore = null;
-
-    /**
-     * Gets the stork own key store.
-     * 
-     * @return the stork own key store
-     */
-    public KeyStore getStorkOwnKeyStore() {
-	return storkOwnKeyStore;
-    }
-    
-    /**
-     * Gets the stork trustStore.
-     * 
-     * @return the stork own key store
-     */
-    public KeyStore getTrustStore() {
-	return storkOwnKeyStore;
-    }
-
-    /**
-     * Sets the stork own key store.
-     * 
-     * @param newkOwnKeyStore the new stork own key store
-     */
-    public void setStorkOwnKeyStore(final KeyStore newkOwnKeyStore) {
-	this.storkOwnKeyStore = newkOwnKeyStore;
-    }
-
-    /**
-     * Gets the properties.
-     * 
-     * @return the properties
-     */
-    public Properties getProperties() {
-	return properties;
-    }
-
-    /**
-     * Sets the properties.
-     * 
-     * @param newProperties the new properties
-     */
-    public void setProperties(final Properties newProperties) {
-	this.properties = newProperties;
-    }
-
-    /** The HW sign prop. */
-    private Properties properties = null;
-
-    /**
-     * @see
-     * eu.stork.peps.auth.engine.core.SAMLEngineSignI#init(java.lang.String)
-     * @param fileConf file of configuration
-     * @throws SAMLEngineException error in read file
-     */
-    public void init(final String fileConf)
-	    throws SAMLEngineException {
-	InputStream inputStr = null;
-	try {
-	inputStr = SignHW.class.getResourceAsStream("/"
-		+ fileConf);
-	properties = new Properties();
-	
-	    properties.loadFromXML(inputStr);
-	} catch (final InvalidPropertiesFormatException e) {
-	    LOG.info("Exception: invalid properties format.");
-	    throw new SAMLEngineException(e);
-	} catch (IOException e) {
-	    LOG.info("Exception: invalid file: " + fileConf);
-	    throw new SAMLEngineException(e);
-	} finally {
-	    IOUtils.closeQuietly(inputStr);
+	/** The Constant CONFIGURATION_FILE. */
+	private static final String CONF_FILE = "configurationFile";
+
+	/**
+	 * The Constant KEYSTORE_TYPE.
+	 */
+	private static final String KEYSTORE_TYPE = "keystoreType";
+
+	/** The logger. */
+	private static final Logger LOG = LoggerFactory.getLogger(SignHW.class.getName());
+
+	/** The stork own key store. */
+	private KeyStore storkOwnKeyStore = null;
+	/**
+	 * The soft trust key store.
+	 */
+	private SignSW swTrustStore = null;
+
+	/**
+	 * Gets the stork own key store.
+	 * 
+	 * @return the stork own key store
+	 */
+	public KeyStore getStorkOwnKeyStore() {
+		return storkOwnKeyStore;
+	}
+
+	/**
+	 * Gets the stork trustStore.
+	 * 
+	 * @return the stork own key store
+	 */
+	public KeyStore getTrustStore() {
+		return storkOwnKeyStore;
+	}
+
+	/**
+	 * Sets the stork own key store.
+	 * 
+	 * @param newkOwnKeyStore
+	 *            the new stork own key store
+	 */
+	public void setStorkOwnKeyStore(final KeyStore newkOwnKeyStore) {
+		this.storkOwnKeyStore = newkOwnKeyStore;
+	}
+
+	/**
+	 * Gets the properties.
+	 * 
+	 * @return the properties
+	 */
+	public Properties getProperties() {
+		return properties;
+	}
+
+	/**
+	 * Sets the properties.
+	 * 
+	 * @param newProperties
+	 *            the new properties
+	 */
+	public void setProperties(final Properties newProperties) {
+		this.properties = newProperties;
 	}
-    }
-
-
-    /**
-     * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#getCertificate()
-     * @return the X509Certificate.
-     */
-    public X509Certificate getCertificate() {
-	throw new NotImplementedException();
-    }
-
-    /**
-     * @see
-     * eu.stork.peps.auth.engine.core.SAMLEngineSignI#sign(SignableSAMLObject tokenSaml)
-     * @param tokenSaml signable SAML Object
-     * @return the SAMLObject signed.
-     * @throws SAMLEngineException error in sign token saml
-     */
-    public SAMLObject sign(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
-
-	try {
-	    LOG.info("Star procces of sign");
-	    final char[] pin = properties.getProperty("keyPassword")
-		    .toCharArray();
-
-	    storkOwnKeyStore.load(null, pin);
-
-	    final String serialNumber = properties.getProperty("serialNumber");
-	    final String issuer = properties.getProperty("issuer");
-
-	    String alias = null;
-	    String aliasCert;
-	    X509Certificate certificate;
-
-	    boolean find = false;
-	    for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e
-		    .hasMoreElements() && !find;) {
-		aliasCert = e.nextElement();
-		certificate = (X509Certificate) storkOwnKeyStore
-			.getCertificate(aliasCert);
-		// Verified serial number, issuer
-
-		final String serialNum = certificate.getSerialNumber()
-			.toString(16);
-		X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
-		X509Principal issuerDNConf = new X509Principal(issuer);
-
-            if(serialNum.equalsIgnoreCase(serialNumber)
-                    && X509PrincipalUtil.equals(issuerDN, issuerDNConf)){
-		              alias = aliasCert;
-		              find = true;
+
+	/** The HW sign prop. */
+	private Properties properties = null;
+
+	/**
+	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#init(java.lang.String)
+	 * @param fileConf
+	 *            file of configuration
+	 * @throws SAMLEngineException
+	 *             error in read file
+	 */
+	public void init(final String fileConf) throws SAMLEngineException {
+		InputStream inputStr = null;
+		try {
+			inputStr = SignHW.class.getResourceAsStream("/" + fileConf);
+			properties = new Properties();
+
+			properties.loadFromXML(inputStr);
+		} catch (final InvalidPropertiesFormatException e) {
+			LOG.info("Exception: invalid properties format.");
+			throw new SAMLEngineException(e);
+		} catch (IOException e) {
+			LOG.info("Exception: invalid file: " + fileConf);
+			throw new SAMLEngineException(e);
+		} finally {
+			IOUtils.closeQuietly(inputStr);
+			/**
+			 * Init the soft keystore to validate with. trustStoreConfig is read from the SignModule config file and should refer to the keystore containing trusted certificates.
+			 */
+			swTrustStore = new SignSW();
+			swTrustStore.init(properties.getProperty("trustStoreConfig"));
+			swTrustStore.loadCryptServiceProvider();
+		}
+	}
+
+	/**
+	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#getCertificate()
+	 * @return the X509Certificate.
+	 */
+	public X509Certificate getCertificate() {
+		throw new NotImplementedException();
+	}
+
+	/**
+	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#sign(SignableSAMLObject tokenSaml)
+	 * @param tokenSaml
+	 *            signable SAML Object
+	 * @return the SAMLObject signed.
+	 * @throws SAMLEngineException
+	 *             error in sign token saml
+	 */
+	public SAMLObject sign(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
+
+		try {
+			LOG.info("Star procces of sign");
+			final char[] pin = properties.getProperty("keyPassword").toCharArray();
+
+			storkOwnKeyStore.load(null, pin);
+
+			final String serialNumber = properties.getProperty("serialNumber");
+			final String issuer = properties.getProperty("issuer");
+
+			String alias = null;
+			String aliasCert;
+			X509Certificate certificate;
+
+			boolean find = false;
+			for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e.hasMoreElements() && !find;) {
+				aliasCert = e.nextElement();
+				certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);
+				// Verified serial number, issuer
+
+				final String serialNum = certificate.getSerialNumber().toString(16);
+				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
+				X509Principal issuerDNConf = new X509Principal(issuer);
+
+				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.X509equals(issuerDN, issuerDNConf)) {
+					alias = aliasCert;
+					find = true;
+				}
+
+			}
+
+			if (!find) {
+				throw new SAMLEngineException("Certificate cannot be found in keystore ");
+			}
+			certificate = (X509Certificate) storkOwnKeyStore.getCertificate(alias);
+			final PrivateKey privateKey = (PrivateKey) storkOwnKeyStore.getKey(alias, pin);
+
+			LOG.info("Recover BasicX509Credential.");
+			final BasicX509Credential credential = new BasicX509Credential();
+
+			LOG.debug("Load certificate");
+			credential.setEntityCertificate(certificate);
+
+			LOG.debug("Load privateKey");
+			credential.setPrivateKey(privateKey);
+
+			LOG.info("Star procces of sign");
+			final Signature signature = (Signature) org.opensaml.xml.Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
+
+			LOG.debug("Begin signature with openSaml");
+			signature.setSigningCredential(credential);
+
+			/*
+			 * signature.setSignatureAlgorithm( SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
+			 */
+			signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
+
+			final SecurityConfiguration securityConf = org.opensaml.xml.Configuration.getGlobalSecurityConfiguration();
+			final NamedKeyInfoGeneratorManager keyInfoManager = securityConf.getKeyInfoGeneratorManager();
+			final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager.getDefaultManager();
+			final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager.getFactory(credential);
+			final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac.newInstance();
+
+			final KeyInfo keyInfo = keyInfoGenerator.generate(credential);
+
+			signature.setKeyInfo(keyInfo);
+
+			LOG.debug("Set Canonicalization Algorithm");
+			signature.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
+
+			// Create a second signature which will be used when signing assertion and response
+			final Signature signature2 = (Signature) Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
+			final SecurityConfiguration secConfiguration2 = Configuration.getGlobalSecurityConfiguration();
+			final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2.getKeyInfoGeneratorManager();
+			final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2.getDefaultManager();
+			final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2.getFactory(credential);
+			final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2.newInstance();
+
+			KeyInfo keyInfo2 = keyInfoGenerator2.generate(credential);
+			signature2.setSigningCredential(credential);
+			signature2.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
+			signature2.setKeyInfo(keyInfo2);
+			signature2.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
+
+			LOG.info("Marshall samlToken.");
+			String qn = tokenSaml.getElementQName().toString();
+
+			if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
+				tokenSaml.setSignature(signature);
+				CustomAttributeQueryMarshaller mars = new CustomAttributeQueryMarshaller();
+				mars.marshall(tokenSaml);
+				Signer.signObject(signature);
+			} else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME)) {
+				Response res = (Response) tokenSaml;
+				List<Assertion> asserts = res.getAssertions();
+				// If multiple assertions we just sign the response and not the assertion
+				if (asserts.size() > 1) {
+					tokenSaml.setSignature(signature);
+					Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
+					LOG.info("Sign samlToken.");
+					Signer.signObject(signature);
+				}
+				// If single assertion we sign the assertion and response
+				else {
+					Assertion assertion = (Assertion) asserts.get(0);
+					assertion.setSignature(signature);
+					tokenSaml.setSignature(signature2);
+					Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
+					LOG.info("Sign samlToken.");
+					Signer.signObject(signature);
+					Signer.signObject(signature2);
+				}
+			}
+			// Normally we just sign the total saml response
+			else {
+				tokenSaml.setSignature(signature);
+				Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
+				LOG.info("Sign samlToken.");
+				Signer.signObject(signature);
+			}
+
+		} catch (final MarshallingException e) {
+			LOG.error("MarshallingException");
+			throw new SAMLEngineException(e);
+		} catch (final NoSuchAlgorithmException e) {
+			LOG.error("A 'xmldsig#rsa-sha1' cryptographic algorithm is requested but is not available in the environment.");
+			throw new SAMLEngineException(e);
+		} catch (final KeyStoreException e) {
+			LOG.error("Generic KeyStore exception.");
+			throw new SAMLEngineException(e);
+		} catch (final SignatureException e) {
+			LOG.error("Signature exception.");
+			throw new SAMLEngineException(e);
+		} catch (final SecurityException e) {
+			LOG.error("Security exception.");
+			throw new SAMLEngineException(e);
+		} catch (final CertificateException e) {
+			LOG.error("Certificate exception.");
+			throw new SAMLEngineException(e);
+		} catch (final IOException e) {
+			LOG.error("IO exception.");
+			throw new SAMLEngineException(e);
+		} catch (final UnrecoverableKeyException e) {
+			LOG.error("UnrecoverableKeyException exception.");
+			throw new SAMLEngineException(e);
 		}
-		
-	    }
-
-        if (!find) {
-            throw new SAMLEngineException("Certificate cannot be found in keystore ");
-        }
-	    certificate = (X509Certificate) storkOwnKeyStore.getCertificate(alias);
-	    final PrivateKey privateKey = (PrivateKey) storkOwnKeyStore.getKey(
-		    alias, pin);
-
-	    LOG.info("Recover BasicX509Credential.");
-	    final BasicX509Credential credential = new BasicX509Credential();
-
-	    LOG.debug("Load certificate");
-	    credential.setEntityCertificate(certificate);
-
-	    LOG.debug("Load privateKey");
-	    credential.setPrivateKey(privateKey);
-
-	    LOG.info("Star procces of sign");
-	    final Signature signature = (Signature) org.opensaml.xml.Configuration
-		    .getBuilderFactory().getBuilder(
-			    Signature.DEFAULT_ELEMENT_NAME).buildObject(
-			    Signature.DEFAULT_ELEMENT_NAME);
-
-	    LOG.debug("Begin signature with openSaml");
-	    signature.setSigningCredential(credential);
-
-	    /*signature.setSignatureAlgorithm(
-	    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);*/
-	    signature.setSignatureAlgorithm(
-		    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
-
-	 
-
-	    final SecurityConfiguration securityConf =
-		org.opensaml.xml.Configuration.getGlobalSecurityConfiguration();
-	    final NamedKeyInfoGeneratorManager keyInfoManager = securityConf
-		    .getKeyInfoGeneratorManager();
-	    final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager
-		    .getDefaultManager();
-	    final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager
-		    .getFactory(credential);
-	    final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac
-		    .newInstance();
-	    
-	    final KeyInfo keyInfo = keyInfoGenerator.generate(credential);
-
-	    signature.setKeyInfo(keyInfo);
-
-	    LOG.debug("Set Canonicalization Algorithm");
-	    signature.setCanonicalizationAlgorithm(
-		    SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
-
-	  //Create a second signature which will be used when signing assertion and response
-	    final Signature signature2 = (Signature) Configuration
-	    .getBuilderFactory().getBuilder(
-		    Signature.DEFAULT_ELEMENT_NAME).buildObject(
-		    Signature.DEFAULT_ELEMENT_NAME);
-	    final SecurityConfiguration secConfiguration2 = Configuration
-	    .getGlobalSecurityConfiguration();
-	    final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2
-		    .getKeyInfoGeneratorManager();
-	    final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2
-		    .getDefaultManager();
-	    final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2
-		    .getFactory(credential);
-	    final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2
-		    .newInstance();
-	    
-	    KeyInfo keyInfo2 = keyInfoGenerator2.generate(credential);
-	    signature2.setSigningCredential(credential);
-	    signature2.setSignatureAlgorithm(
-			    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
-	    signature2.setKeyInfo(keyInfo2);
-	    signature2.setCanonicalizationAlgorithm(
-		    SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
-	    	 	    
-
-	    LOG.info("Marshall samlToken.");
-	    String qn = tokenSaml.getElementQName().toString();
-	    
-	    if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
-	    {	    
-	  		tokenSaml.setSignature(signature);
-	    	CustomAttributeQueryMarshaller mars = new CustomAttributeQueryMarshaller();
-	    	mars.marshall(tokenSaml);
-	    	Signer.signObject(signature);
-	    }
-	    else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME))
-	    {
-	    	Response res = (Response)tokenSaml;
-	    	List<Assertion> asserts = res.getAssertions();
-	    	//If multiple assertions we just sign the response and not the assertion
-	    	if (asserts.size() > 1)
-	    	{	    		
-	    		tokenSaml.setSignature(signature);
-	    		Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
-			    .marshall(tokenSaml);
-	    		LOG.info("Sign samlToken.");
-	    	    Signer.signObject(signature);
-	    	}
-	    	//If single assertion we sign the assertion and response
-	    	else
-	    	{
-			    Assertion assertion = (Assertion)asserts.get(0);
-			    assertion.setSignature(signature);			    
-			    tokenSaml.setSignature(signature2);
-			    Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
-			    .marshall(tokenSaml);
-			    LOG.info("Sign samlToken.");
-			    Signer.signObject(signature);
-			    Signer.signObject(signature2);
-	    	}
-	    }
-	    //Normally we just sign the total saml response
-	    else
-	    {
-	    	tokenSaml.setSignature(signature);
-	    	Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
-		    .marshall(tokenSaml);
-	    	LOG.info("Sign samlToken.");
-		    Signer.signObject(signature);
-	    }
-
-	} catch (final MarshallingException e) {
-	    LOG.error("MarshallingException");
-	    throw new SAMLEngineException(e);
-	} catch (final NoSuchAlgorithmException e) {
-	    LOG.error("A 'xmldsig#rsa-sha1' cryptographic algorithm is requested but is not available in the environment.");
-	    throw new SAMLEngineException(e);
-	} catch (final KeyStoreException e) {
-	    LOG.error("Generic KeyStore exception.");
-	    throw new SAMLEngineException(e);
-	} catch (final SignatureException e) {
-	    LOG.error("Signature exception.");
-	    throw new SAMLEngineException(e);
-	} catch (final SecurityException e) {
-	    LOG.error("Security exception.");
-	    throw new SAMLEngineException(e);
-	} catch (final CertificateException e) {
-	    LOG.error("Certificate exception.");
-	    throw new SAMLEngineException(e);
-	} catch (final IOException e) {
-	    LOG.error("IO exception.");
-	    throw new SAMLEngineException(e);
-	} catch (final UnrecoverableKeyException e) {
-	    LOG.error("UnrecoverableKeyException exception.");
-	    throw new SAMLEngineException(e);
+
+		return tokenSaml;
 	}
 
-	return tokenSaml;
-    }
-
-    /**
-     * @see
-     * eu.stork.peps.auth.engine.core.SAMLEngineSignI#validateSignature(SignableSAMLObject)
-     * @param tokenSaml the token saml
-     * @return the SAMLObject validated.
-     * @throws SAMLEngineException exception in validate signature
-     */
-    public SAMLObject validateSignature(final SignableSAMLObject tokenSaml)
-	    throws SAMLEngineException {
-	LOG.info("Start signature validation.");
-	try {
-
-	    // Validate structure signature
-	    final SAMLSignatureProfileValidator signProfValidator = 
-		new SAMLSignatureProfileValidator();
-
-	    // Indicates signature id conform to SAML Signature profile
-	    signProfValidator.validate(tokenSaml.getSignature());
-
-	    String aliasCert;
-	    X509Certificate certificate;
-
-	    final List<Credential> trustedCred = new ArrayList<Credential>();
-
-	    for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e
-		    .hasMoreElements();) {
-		aliasCert = e.nextElement();
-		final BasicX509Credential credential = new BasicX509Credential();
-		certificate = (X509Certificate) storkOwnKeyStore
-			.getCertificate(aliasCert);
-		credential.setEntityCertificate(certificate);
-		trustedCred.add(credential);
-	    }
-
-	    final KeyInfo keyInfo = tokenSaml.getSignature().getKeyInfo();
-	    final List<X509Certificate> listCertificates = KeyInfoHelper
-		    .getCertificates(keyInfo);
-
-	    if (listCertificates.size() != 1) {
-		throw new SAMLEngineException("Only must be one certificate");
-	    }
-
-	    // Exist only one certificate
-	    final BasicX509Credential entityX509Cred = new BasicX509Credential();
-	    entityX509Cred.setEntityCertificate(listCertificates.get(0));
-
-	    final ExplicitKeyTrustEvaluator keyTrustEvaluator = 
-		new ExplicitKeyTrustEvaluator();
-	    if (!keyTrustEvaluator.validate(entityX509Cred, trustedCred)) {
-		throw new SAMLEngineException("Certificate it is not trusted.");
-	    }
-
-	    final SignatureValidator sigValidator = new SignatureValidator(
-		    entityX509Cred);
-
-	    sigValidator.validate(tokenSaml.getSignature());
-
-	} catch (final ValidationException e) {
-	    LOG.error("ValidationException.", e);
-	    throw new SAMLEngineException(e);
-	} catch (final KeyStoreException e) {
-	    LOG.error("ValidationException.", e);
-	    throw new SAMLEngineException(e);
-	} catch (final CertificateException e) {
-	    LOG.error("CertificateException.", e);
-	    throw new SAMLEngineException(e);
+	/**
+	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#validateSignature(SignableSAMLObject)
+	 * @param tokenSaml
+	 *            the token saml
+	 * @return the SAMLObject validated.
+	 * @throws SAMLEngineException
+	 *             exception in validate signature
+	 */
+	public SAMLObject validateSignature(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
+		LOG.info("Start signature validation HW.");
+		/*
+		 * we are using the soft signature class to validate the signatures. This way we use the same key store code and validation that is used there.
+		 */
+		try {
+			swTrustStore.validateSignature(tokenSaml);
+		} catch (Exception e) {
+			LOG.error("SW ValidationException.", e);
+			throw new SAMLEngineException(e);
+		}
+		return tokenSaml;
 	}
-	return tokenSaml;
-    }
-
-    /**
-     * load cryptographic service provider.
-     * 
-     * @throws SAMLEngineException the SAML engine exception
-     * Note this class was using pkcs11Provider
-     * final Provider pkcs11Provider = new sun.security.pkcs11.SunPKCS11(inputStream)
-     * if (Security.getProperty(pkcs11Provider.getName()) == null) {
-     * Security.insertProviderAt(pkcs11Provider, Security .getProviders().length)
-     * }
-     * storkOwnKeyStore = KeyStore.getInstance(properties.getProperty(KEYSTORE_TYPE))
-     */
-    public void loadCryptServiceProvider() throws SAMLEngineException {
-	LOG.info("Load Cryptographic Service Provider");
-	InputStream inputStream = null; 
-	 
-	try {
-	    inputStream = SignHW.class.getResourceAsStream("/"
-		    + properties.getProperty(CONF_FILE));
-
-	} catch (final Exception e) {	       
-	    throw new SAMLEngineException(
-		    "Error loading CryptographicServiceProvider", e);
-	} finally {
-	    IOUtils.closeQuietly(inputStream);
+
+	/**
+	 * load cryptographic service provider.
+	 * 
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception Note this class was using pkcs11Provider final Provider pkcs11Provider = new sun.security.pkcs11.SunPKCS11(inputStream) if
+	 *             (Security.getProperty(pkcs11Provider.getName()) == null) { Security.insertProviderAt(pkcs11Provider, Security .getProviders().length) } storkOwnKeyStore =
+	 *             KeyStore.getInstance(properties.getProperty(KEYSTORE_TYPE))
+	 */
+	public void loadCryptServiceProvider() throws SAMLEngineException {
+		LOG.info("Load Cryptographic Service Provider");
+		InputStream inputStream = null;
+
+		try {
+			inputStream = SignHW.class.getResourceAsStream("/" + properties.getProperty(CONF_FILE));
+			final Provider pkcs11Provider = new sun.security.pkcs11.SunPKCS11(inputStream);
+			if (Security.getProperty(pkcs11Provider.getName()) == null) {
+				Security.insertProviderAt(pkcs11Provider, Security.getProviders().length);
+			}
+
+			storkOwnKeyStore = KeyStore.getInstance(properties.getProperty(KEYSTORE_TYPE), pkcs11Provider);
+
+		} catch (final Exception e) {
+			throw new SAMLEngineException("Error loading CryptographicServiceProvider", e);
+		} finally {
+			IOUtils.closeQuietly(inputStream);
+		}
 	}
-    }
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java
index c37074eab..66d0201d5 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignModuleFactory.java
@@ -30,35 +30,35 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
 
 public final class SignModuleFactory {
 
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory
-	    .getLogger(SignModuleFactory.class.getName());
+	/** The Constant LOG. */
+	private static final Logger LOG = LoggerFactory.getLogger(SignModuleFactory.class.getName());
 
-    /**
-     * Instantiates a new module sign factory.
-     */
-    private SignModuleFactory() {
+	/**
+	 * Instantiates a new module sign factory.
+	 */
+	private SignModuleFactory() {
 
-    }
-
-    /**
-     * Gets the single instance of SignModuleFactory.
-     * 
-     * @param className the class name
-     * 
-     * @return single instance of SignModuleFactory
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    public static SAMLEngineSignI getInstance(final String className)
-	    throws STORKSAMLEngineException {
-	LOG.info("[START]SignModuleFactory static");
-	try {
-	    final Class cls = Class.forName(className);
-	    return (SAMLEngineSignI) cls.newInstance();
-	} catch (Exception e) {
-	    throw new STORKSAMLEngineException(e);
 	}
 
-    }
+	/**
+	 * Gets the single instance of SignModuleFactory.
+	 * 
+	 * @param className
+	 *            the class name
+	 * 
+	 * @return single instance of SignModuleFactory
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	public static SAMLEngineSignI getInstance(final String className) throws STORKSAMLEngineException {
+		LOG.info("[START]SignModuleFactory static");
+		try {
+			final Class cls = Class.forName(className);
+			return (SAMLEngineSignI) cls.newInstance();
+		} catch (Exception e) {
+			throw new STORKSAMLEngineException(e);
+		}
+
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
index 06e80dc14..d5f01a4cc 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignP12.java
@@ -41,6 +41,7 @@ import eu.stork.peps.auth.engine.X509PrincipalUtil;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.NotImplementedException;
 import org.bouncycastle.jce.X509Principal;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.opensaml.Configuration;
 import org.opensaml.common.SAMLObject;
 import org.opensaml.common.SignableSAMLObject;
@@ -74,26 +75,21 @@ import eu.stork.peps.auth.engine.core.SAMLEngineSignI;
 import eu.stork.peps.exceptions.SAMLEngineException;
 
 /**
- * The Class SWSign. Class responsible for signing and validating of messages
- * SAML with a certificate store software.
+ * The Class SWSign. Class responsible for signing and validating of messages SAML with a certificate store software.
  * 
  * @author fjquevedo
  */
 public final class SignP12 implements SAMLEngineSignI {
 
 	/** The logger. */
-	private static final Logger LOG = LoggerFactory.getLogger(SignP12.class
-			.getName());
-
+	private static final Logger LOG = LoggerFactory.getLogger(SignP12.class.getName());
 
 	/** The p12 store. */
 	private KeyStore p12Store = null;
 
-
 	/** The trust store. */
 	private KeyStore trustStore = null;
 
-
 	/**
 	 * Gets the trust store.
 	 * 
@@ -107,7 +103,8 @@ public final class SignP12 implements SAMLEngineSignI {
 	/**
 	 * Sets the trust store.
 	 * 
-	 * @param newTrustStore the new trust store
+	 * @param newTrustStore
+	 *            the new trust store
 	 */
 	public void setTrustStore(final KeyStore newTrustStore) {
 		this.trustStore = newTrustStore;
@@ -123,8 +120,6 @@ public final class SignP12 implements SAMLEngineSignI {
 		return properties;
 	}
 
-
-
 	/**
 	 * Gets the p12 store.
 	 * 
@@ -134,23 +129,21 @@ public final class SignP12 implements SAMLEngineSignI {
 		return p12Store;
 	}
 
-
-
 	/**
 	 * Sets the p12 store.
 	 * 
-	 * @param newP12Store the new p12 store
+	 * @param newP12Store
+	 *            the new p12 store
 	 */
 	public void setP12Store(final KeyStore newP12Store) {
 		this.p12Store = newP12Store;
 	}
 
-
-
 	/**
 	 * Sets the properties.
 	 * 
-	 * @param newProperties the new properties
+	 * @param newProperties
+	 *            the new properties
 	 */
 	public void setProperties(final Properties newProperties) {
 		this.properties = newProperties;
@@ -159,13 +152,14 @@ public final class SignP12 implements SAMLEngineSignI {
 	/** The SW sign prop. */
 	private Properties properties = null;
 
-
 	/**
 	 * Initialize the file configuration.
 	 * 
-	 * @param fileConf name of the file configuration
+	 * @param fileConf
+	 *            name of the file configuration
 	 * 
-	 * @throws SAMLEngineException error at the load from  file configuration
+	 * @throws SAMLEngineException
+	 *             error at the load from file configuration
 	 */
 	@Override
 	public void init(final String fileConf) throws SAMLEngineException {
@@ -173,25 +167,25 @@ public final class SignP12 implements SAMLEngineSignI {
 		properties = new Properties();
 		try {
 			try {
-				LOG.debug("Fichero a cargar " + fileConf);
+				LOG.debug("Loading " + fileConf);
 				fileProperties = new FileInputStream(fileConf);
 				properties.loadFromXML(fileProperties);
 			} catch (Exception e) {
-				LOG.error("Fallo al cargar el recurso externo. Se reintenta como fichero interno.");
+				LOG.error("Failed to load external resource. Retrieving internal file.");
 				fileProperties = SignP12.class.getResourceAsStream("/" + fileConf);
 				if (fileProperties == null) {
 					fileProperties = Thread.currentThread().getContextClassLoader().getResourceAsStream(fileConf);
 					if (fileProperties == null) {
 						Enumeration<URL> files = ClassLoader.getSystemClassLoader().getResources(fileConf);
 						if (files != null && files.hasMoreElements()) {
-							LOG.info("Se han encontrado recurso/s. Se toma el primero.");
+							LOG.info("Found /s.");
 							fileProperties = ClassLoader.getSystemClassLoader().getResourceAsStream(files.nextElement().getFile());
 						} else {
-							throw new IOException("No se pudo recuperar el fichero: " + fileConf, e);
+							throw new IOException("Could not load file: " + fileConf, e);
 						}
 					}
 				}
-				LOG.debug("Recuperados " + fileProperties.available() + " bytes");
+				LOG.debug("Recovered " + fileProperties.available() + " bytes");
 				properties.loadFromXML(fileProperties);
 			}
 		} catch (InvalidPropertiesFormatException e) {
@@ -209,7 +203,7 @@ public final class SignP12 implements SAMLEngineSignI {
 	 * Gets the certificate.
 	 * 
 	 * @return the X509Certificate
-	 *     
+	 * 
 	 */
 	@Override
 	public X509Certificate getCertificate() {
@@ -219,16 +213,17 @@ public final class SignP12 implements SAMLEngineSignI {
 	/**
 	 * Sign the token SAML.
 	 * 
-	 * @param tokenSaml token SAML
+	 * @param tokenSaml
+	 *            token SAML
 	 * 
 	 * @return the X509Certificate signed.
 	 * 
-	 * @throws SAMLEngineException error at sign SAML token
+	 * @throws SAMLEngineException
+	 *             error at sign SAML token
 	 *
 	 */
 	@Override
-	public SAMLObject sign(final SignableSAMLObject tokenSaml)
-			throws SAMLEngineException {
+	public SAMLObject sign(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
 		LOG.info("Start Sign process");
 		try {
 
@@ -240,30 +235,24 @@ public final class SignP12 implements SAMLEngineSignI {
 			X509Certificate certificate;
 
 			boolean find = false;
-			for (final Enumeration<String> e = p12Store.aliases(); e
-					.hasMoreElements() && !find;) {
+			for (final Enumeration<String> e = p12Store.aliases(); e.hasMoreElements() && !find;) {
 				aliasCert = e.nextElement();
-				certificate = (X509Certificate) p12Store
-						.getCertificate(aliasCert);
+				certificate = (X509Certificate) p12Store.getCertificate(aliasCert);
 
-				final String serialNum = certificate.getSerialNumber()
-						.toString(16);
+				final String serialNum = certificate.getSerialNumber().toString(16);
 
 				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
 				X509Principal issuerDNConf = new X509Principal(issuer);
 
-				if(serialNum.equalsIgnoreCase(serialNumber)
-						&& X509PrincipalUtil.equals(issuerDN, issuerDNConf)){
+				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.X509equals(issuerDN, issuerDNConf)) {
 					alias = aliasCert;
 					find = true;
 				}
 
 			}
 
-			certificate = (X509Certificate) p12Store
-					.getCertificate(alias);
-			final PrivateKey privateKey = (PrivateKey) p12Store.getKey(
-					alias, properties.getProperty("keyPassword").toCharArray());
+			certificate = (X509Certificate) p12Store.getCertificate(alias);
+			final PrivateKey privateKey = (PrivateKey) p12Store.getKey(alias, properties.getProperty("keyPassword").toCharArray());
 
 			LOG.info("Recover BasicX509Credential.");
 			final BasicX509Credential credential = new BasicX509Credential();
@@ -275,102 +264,73 @@ public final class SignP12 implements SAMLEngineSignI {
 			credential.setPrivateKey(privateKey);
 
 			LOG.debug("Begin signature with openSaml");
-			final Signature signature = (Signature) org.opensaml.xml.Configuration
-					.getBuilderFactory().getBuilder(
-							Signature.DEFAULT_ELEMENT_NAME).buildObject(
-									Signature.DEFAULT_ELEMENT_NAME);
+			final Signature signature = (Signature) org.opensaml.xml.Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
 
 			signature.setSigningCredential(credential);
 
-			/*signature.setSignatureAlgorithm(
-	    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);*/
-			signature.setSignatureAlgorithm(
-					SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
-
-			final SecurityConfiguration secConfiguration = org.opensaml.xml.Configuration
-					.getGlobalSecurityConfiguration();
-			final NamedKeyInfoGeneratorManager keyInfoManager = secConfiguration
-					.getKeyInfoGeneratorManager();
-			final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager
-					.getDefaultManager();
-			final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager
-					.getFactory(credential);
-			final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac
-					.newInstance();
+			/*
+			 * signature.setSignatureAlgorithm( SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
+			 */
+			signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
+
+			final SecurityConfiguration secConfiguration = org.opensaml.xml.Configuration.getGlobalSecurityConfiguration();
+			final NamedKeyInfoGeneratorManager keyInfoManager = secConfiguration.getKeyInfoGeneratorManager();
+			final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager.getDefaultManager();
+			final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager.getFactory(credential);
+			final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac.newInstance();
 
 			final KeyInfo keyInfo = keyInfoGenerator.generate(credential);
 
 			signature.setKeyInfo(keyInfo);
-			signature.setCanonicalizationAlgorithm(
-					SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
-
-			//Create a second signature which will be used when signing assertion and response
-			final Signature signature2 = (Signature) org.opensaml.xml.Configuration
-					.getBuilderFactory().getBuilder(
-							Signature.DEFAULT_ELEMENT_NAME).buildObject(
-									Signature.DEFAULT_ELEMENT_NAME);
-			final SecurityConfiguration secConfiguration2 = org.opensaml.xml.Configuration
-					.getGlobalSecurityConfiguration();
-			final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2
-					.getKeyInfoGeneratorManager();
-			final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2
-					.getDefaultManager();
-			final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2
-					.getFactory(credential);
-			final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2
-					.newInstance();
+			signature.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
+
+			// Create a second signature which will be used when signing assertion and response
+			final Signature signature2 = (Signature) org.opensaml.xml.Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
+			final SecurityConfiguration secConfiguration2 = org.opensaml.xml.Configuration.getGlobalSecurityConfiguration();
+			final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2.getKeyInfoGeneratorManager();
+			final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2.getDefaultManager();
+			final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2.getFactory(credential);
+			final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2.newInstance();
 
 			KeyInfo keyInfo2 = keyInfoGenerator2.generate(credential);
 			signature2.setSigningCredential(credential);
-			signature2.setSignatureAlgorithm(
-					SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
+			signature2.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
 			signature2.setKeyInfo(keyInfo2);
-			signature2.setCanonicalizationAlgorithm(
-					SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
-
+			signature2.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
 
 			LOG.info("Marshall samlToken.");
 			String qn = tokenSaml.getElementQName().toString();
 
-			if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME))
-			{	    
+			if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
 				tokenSaml.setSignature(signature);
 				CustomAttributeQueryMarshaller mars = new CustomAttributeQueryMarshaller();
 				mars.marshall(tokenSaml);
 				Signer.signObject(signature);
-			}
-			else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME))
-			{
-				Response res = (Response)tokenSaml;
+			} else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME)) {
+				Response res = (Response) tokenSaml;
 				List<Assertion> asserts = res.getAssertions();
-				//If multiple assertions we just sign the response and not the assertion
-				if (asserts.size() > 1)
-				{	    		
+				// If multiple assertions we just sign the response and not the assertion
+				if (asserts.size() > 1) {
 					tokenSaml.setSignature(signature);
-					org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
-					.marshall(tokenSaml);
+					org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
 					LOG.info("Sign samlToken.");
 					Signer.signObject(signature);
 				}
-				//If single assertion we sign the assertion and response
-				else
-				{
+				// If single assertion we sign the assertion and response
+				else {
 					Assertion assertion = asserts.get(0);
-					assertion.setSignature(signature);			    
+					assertion.setSignature(signature);
 					tokenSaml.setSignature(signature2);
-					org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
-					.marshall(tokenSaml);
+					org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
 					LOG.info("Sign samlToken.");
 					Signer.signObject(signature);
 					Signer.signObject(signature2);
 				}
 			}
-			//Normally we just sign the total saml response
-			else
-			{
+			// Normally we just sign the total saml response
+			else {
 				tokenSaml.setSignature(signature);
-				org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
-				.marshall(tokenSaml);
+				org.opensaml.xml.Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
 				LOG.info("Sign samlToken.");
 				Signer.signObject(signature);
 			}
@@ -401,22 +361,22 @@ public final class SignP12 implements SAMLEngineSignI {
 	/**
 	 * Validate signature.
 	 * 
-	 * @param tokenSaml token SAML
+	 * @param tokenSaml
+	 *            token SAML
 	 * 
 	 * @return the SAMLObject validated.
 	 * 
-	 * @throws SAMLEngineException error validate signature
+	 * @throws SAMLEngineException
+	 *             error validate signature
 	 * 
 	 */
 	@Override
-	public SAMLObject validateSignature(final SignableSAMLObject tokenSaml)
-			throws SAMLEngineException {
+	public SAMLObject validateSignature(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
 		LOG.info("Start signature validation.");
 		try {
 
 			// Validate structure signature
-			final SAMLSignatureProfileValidator sigProfValidator = 
-					new SAMLSignatureProfileValidator();
+			final SAMLSignatureProfileValidator sigProfValidator = new SAMLSignatureProfileValidator();
 			try {
 				// Indicates signature id conform to SAML Signature profile
 				sigProfValidator.validate(tokenSaml.getSignature());
@@ -430,64 +390,43 @@ public final class SignP12 implements SAMLEngineSignI {
 
 			final List<Credential> trustCred = new ArrayList<Credential>();
 
-			for (final Enumeration<String> e = trustStore.aliases(); e
-					.hasMoreElements();) 
-			{
+			for (final Enumeration<String> e = trustStore.aliases(); e.hasMoreElements();) {
 				aliasCert = e.nextElement();
 				final BasicX509Credential credential = new BasicX509Credential();
-				certificate = (X509Certificate) trustStore
-						.getCertificate(aliasCert);
+				certificate = (X509Certificate) trustStore.getCertificate(aliasCert);
 				credential.setEntityCertificate(certificate);
 				trustCred.add(credential);
 			}
 
 			final KeyInfo keyInfo = tokenSaml.getSignature().getKeyInfo();
 
-			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo
-					.getX509Datas().get(0).getX509Certificates().get(0);
+			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo.getX509Datas().get(0).getX509Certificates().get(0);
 
-			final CertificateFactory certFact = CertificateFactory
-					.getInstance("X.509");
-			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64
-					.decode(xmlCert.getValue()));
-			final X509Certificate cert = (X509Certificate) certFact
-					.generateCertificate(bis);
+			final CertificateFactory certFact = CertificateFactory.getInstance("X.509");
+			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64.decode(xmlCert.getValue()));
+			final X509Certificate cert = (X509Certificate) certFact.generateCertificate(bis);
 
 			// Exist only one certificate
 			final BasicX509Credential entityX509Cred = new BasicX509Credential();
 			entityX509Cred.setEntityCertificate(cert);
 
-			/* A better use of PKI based validation but not wanted for STORK...
-			boolean trusted = false;
-
-			for (final Enumeration<String> e = trustStore.aliases(); e.hasMoreElements();) 
-			{
-				aliasCert = e.nextElement();		
-				certificate = (X509Certificate) trustStore.getCertificate(aliasCert);					
-				try {
-					cert.verify(certificate.getPublicKey());
-					trusted = true;
-					break;
-				}
-				catch (Exception ex) {
-					//Do nothing - cert not trusted yet
-				}
-			}
-
-			if (!trusted)
-				throw new SAMLEngineException("Certificate is not trusted.");*/
+			/*
+			 * A better use of PKI based validation but not wanted for STORK... boolean trusted = false;
+			 * 
+			 * for (final Enumeration<String> e = trustStore.aliases(); e.hasMoreElements();) { aliasCert = e.nextElement(); certificate = (X509Certificate) trustStore.getCertificate(aliasCert); try {
+			 * cert.verify(certificate.getPublicKey()); trusted = true; break; } catch (Exception ex) { //Do nothing - cert not trusted yet } }
+			 * 
+			 * if (!trusted) throw new SAMLEngineException("Certificate is not trusted.");
+			 */
 
 			// Validate trust certificates
-			final ExplicitKeyTrustEvaluator keyTrustEvaluator = 
-					new ExplicitKeyTrustEvaluator();
-			if (!keyTrustEvaluator.validate(entityX509Cred, trustCred)) 
-			{
+			final ExplicitKeyTrustEvaluator keyTrustEvaluator = new ExplicitKeyTrustEvaluator();
+			if (!keyTrustEvaluator.validate(entityX509Cred, trustCred)) {
 				throw new SAMLEngineException("Certificate it is not trusted.");
 			}
 
 			// Validate signature
-			final SignatureValidator sigValidator = new SignatureValidator(
-					entityX509Cred);
+			final SignatureValidator sigValidator = new SignatureValidator(entityX509Cred);
 			sigValidator.validate(tokenSaml.getSignature());
 
 		} catch (ValidationException e) {
@@ -503,11 +442,11 @@ public final class SignP12 implements SAMLEngineSignI {
 		return tokenSaml;
 	}
 
-
 	/**
 	 * Load cryptographic service provider.
 	 * 
-	 * @throws SAMLEngineException the SAML engine exception
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
 	 */
 	@Override
 	public void loadCryptServiceProvider() throws SAMLEngineException {
@@ -517,48 +456,38 @@ public final class SignP12 implements SAMLEngineSignI {
 		FileInputStream fisTrustStore = null;
 
 		try {
-//			// Dynamically register Bouncy Castle provider.
-//			boolean found = false;
-//			// Check if BouncyCastle is already registered as a provider
-//			final Provider[] providers = Security.getProviders();
-//			for (int i = 0; i < providers.length; i++) {
-//				if (providers[i].getName().equals(
-//						BouncyCastleProvider.PROVIDER_NAME)) {
-//					found = true;
-//				}
-//			}
-//
-//			// Register only if the provider has not been previously registered
-//			if (!found) {
-//				LOG.debug("SAMLCore: Register Bouncy Castle provider.");
-//				Security.insertProviderAt(new BouncyCastleProvider(), Security
-//						.getProviders().length);
-//			}
-
-			p12Store = KeyStore.getInstance(properties
-					.getProperty("keystoreType"));
-
-			fis = new FileInputStream(properties
-					.getProperty("keystorePath"));
-
-			p12Store.load(fis, properties.getProperty(
-					"keyStorePassword").toCharArray());
-
-
-			trustStore = KeyStore.getInstance(properties
-					.getProperty("trustStoreType"));
-
-			fisTrustStore = new FileInputStream(properties
-					.getProperty("trustStorePath"));
-			trustStore.load(fisTrustStore, properties.getProperty(
-					"trustStorePassword").toCharArray());
+			// Dynamically register Bouncy Castle provider.
+			boolean found = false;
+			// Check if BouncyCastle is already registered as a provider
+			final Provider[] providers = Security.getProviders();
+			for (int i = 0; i < providers.length; i++) {
+				if (providers[i].getName().equals(BouncyCastleProvider.PROVIDER_NAME)) {
+					found = true;
+				}
+			}
+
+			// Register only if the provider has not been previously registered
+			if (!found) {
+				LOG.debug("SAMLCore: Register Bouncy Castle provider.");
+				Security.insertProviderAt(new BouncyCastleProvider(), Security.getProviders().length);
+			}
+
+			p12Store = KeyStore.getInstance(properties.getProperty("keystoreType"));
+
+			fis = new FileInputStream(properties.getProperty("keystorePath"));
+
+			p12Store.load(fis, properties.getProperty("keyStorePassword").toCharArray());
+
+			trustStore = KeyStore.getInstance(properties.getProperty("trustStoreType"));
+
+			fisTrustStore = new FileInputStream(properties.getProperty("trustStorePath"));
+			trustStore.load(fisTrustStore, properties.getProperty("trustStorePassword").toCharArray());
 
 		} catch (Exception e) {
-			throw new SAMLEngineException(
-					"Error loading CryptographicServiceProvider", e);
-		}  finally {
+			throw new SAMLEngineException("Error loading CryptographicServiceProvider", e);
+		} finally {
 			IOUtils.closeQuietly(fis);
 			IOUtils.closeQuietly(fisTrustStore);
-		}	
+		}
 	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
index 0984bb9ca..1ca857e9e 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/SignSW.java
@@ -12,17 +12,34 @@
  * Licence for the specific language governing permissions and limitations under
  * the Licence.
  */
-
 package eu.stork.peps.auth.engine.core.impl;
 
-import eu.stork.peps.auth.engine.X509PrincipalUtil;
-import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
-import eu.stork.peps.auth.engine.core.SAMLEngineSignI;
-import eu.stork.peps.exceptions.SAMLEngineException;
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.security.GeneralSecurityException;
+import java.security.KeyStore;
+import java.security.KeyStoreException;
+import java.security.NoSuchAlgorithmException;
+import java.security.PrivateKey;
+import java.security.Provider;
+import java.security.Security;
+import java.security.UnrecoverableKeyException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.util.ArrayList;
+import java.util.Enumeration;
+import java.util.InvalidPropertiesFormatException;
+import java.util.List;
+import java.util.Properties;
+
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.NotImplementedException;
 import org.bouncycastle.jce.X509Principal;
-//import org.bouncycastle.jce.provider.BouncyCastleProvider;
+import org.bouncycastle.jce.provider.BouncyCastleProvider;
 import org.opensaml.Configuration;
 import org.opensaml.common.SAMLObject;
 import org.opensaml.common.SignableSAMLObject;
@@ -41,491 +58,426 @@ import org.opensaml.xml.security.keyinfo.NamedKeyInfoGeneratorManager;
 import org.opensaml.xml.security.trust.ExplicitKeyTrustEvaluator;
 import org.opensaml.xml.security.trust.ExplicitX509CertificateTrustEvaluator;
 import org.opensaml.xml.security.x509.BasicX509Credential;
-import org.opensaml.xml.signature.*;
+import org.opensaml.xml.signature.KeyInfo;
 import org.opensaml.xml.signature.Signature;
+import org.opensaml.xml.signature.SignatureConstants;
 import org.opensaml.xml.signature.SignatureException;
+import org.opensaml.xml.signature.SignatureValidator;
 import org.opensaml.xml.signature.Signer;
 import org.opensaml.xml.util.Base64;
 import org.opensaml.xml.validation.ValidationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.security.*;
-import java.security.cert.CertificateExpiredException;
-import java.security.cert.CertificateFactory;
-import java.security.cert.CertificateNotYetValidException;
-import java.security.cert.X509Certificate;
-import java.util.*;
+import eu.stork.peps.auth.engine.X509PrincipalUtil;
+import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
+import eu.stork.peps.auth.engine.core.SAMLEngineSignI;
+import eu.stork.peps.exceptions.SAMLEngineException;
 
 
 /**
- * The Class SWSign. Class responsible for signing and validating of messages
- * SAML with a certificate store software.
+ * The Class SWSign. Class responsible for signing and validating of messages SAML with a certificate store software.
  *
  * @author fjquevedo
  */
 public class SignSW implements SAMLEngineSignI {
 
-    /**
-     * The Constant KEYSTORE_TYPE.
-     */
-    private static final String KEYSTORE_TYPE = "keystoreType";
-
-    /**
-     * The Constant KEY_STORE_PASSWORD.
-     */
-    private static final String KEY_STORE_PASS = "keyStorePassword";
-
-    /**
-     * The logger.
-     */
-    private static final Logger LOG = LoggerFactory.getLogger(SignSW.class
-            .getName());
-
-    /**
-     * The stork own key store.
-     */
-    private KeyStore storkOwnKeyStore = null;
-
-    /**
-     * The instance.
-     *
-     * @return the properties
-     */
-
-    public final Properties getProperties() {
-        return properties;
-    }
-
-    /**
-     * Gets the stork own key store.
-     *
-     * @return the stork own key store
-     */
-    public final KeyStore getStorkOwnKeyStore() {
-        return storkOwnKeyStore;
-    }
-
-    /**
-     * Gets the stork trustStore.
-     *
-     * @return the stork own key store
-     */
-    public KeyStore getTrustStore() {
-        return storkOwnKeyStore;
-    }
-
-    /**
-     * Sets the stork own key store.
-     *
-     * @param newkOwnKeyStore the new stork own key store
-     */
-    public final void setStorkOwnKeyStore(final KeyStore newkOwnKeyStore) {
-        this.storkOwnKeyStore = newkOwnKeyStore;
-    }
-
-    /**
-     * Sets the properties.
-     *
-     * @param newProperties the new properties
-     */
-    public final void setProperties(final Properties newProperties) {
-        this.properties = newProperties;
-    }
-
-    /**
-     * The SW sign prop.
-     */
-    private Properties properties = null;
-
-
-    /**
-     * Inits the file configuration.
-     *
-     * @param fileConf name of the file configuration
-     * @throws SAMLEngineException error at the load from  file configuration
-     */
-    public final void init(final String fileConf)
-            throws SAMLEngineException {
-        InputStream fileProperties = null;
-        // fetch base from system properties, give a default if there is nothing configured
-        String base = System.getProperty("eu.stork.samlengine.config.location");
-        if (null != base) {
-            if (!base.endsWith("/")) {
-                base += "/";
-            }
-        } else {
-            base = "/";
-        }
-
-        try {
-            if (null != base)
-                fileProperties = new FileInputStream(base + fileConf);
-            else
-                fileProperties = SignSW.class.getResourceAsStream("/"
-                        + fileConf);
-            properties = new Properties();
-
-            properties.loadFromXML(fileProperties);
-            fileProperties.close();
-        } catch (InvalidPropertiesFormatException e) {
-            LOG.info("Exception: invalid properties format.");
-            throw new SAMLEngineException(e);
-        } catch (IOException e) {
-            LOG.info("Exception: invalid file: " + fileConf);
-            throw new SAMLEngineException(e);
-        } finally {
-            IOUtils.closeQuietly(fileProperties);
-        }
-    }
-
-    /**
-     * @return the X509Certificate
-     * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#getCertificate()
-     */
-    public final X509Certificate getCertificate() {
-        throw new NotImplementedException();
-    }
-
-
-    /**
-     * Sign the token SAML.
-     *
-     * @param tokenSaml the token SAML.
-     * @return the SAML object
-     * @throws SAMLEngineException the SAML engine exception
-     */
-    public final SAMLObject sign(final SignableSAMLObject tokenSaml)
-            throws SAMLEngineException {
-        LOG.info("Start Sign process.");
-        try {
-            final String serialNumber = properties.getProperty("serialNumber");
-            final String issuer = properties.getProperty("issuer");
-
-            String alias = null;
-            String aliasCert;
-            X509Certificate certificate;
-            boolean find = false;
-
-            for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e
-                    .hasMoreElements() && !find; ) {
-                aliasCert = e.nextElement();
-                certificate = (X509Certificate) storkOwnKeyStore
-                        .getCertificate(aliasCert);
-
-                final String serialNum = certificate.getSerialNumber()
-                        .toString(16);
-
-                try {
-                    X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
-                    X509Principal issuerDNConf = new X509Principal(issuer);
-
-                    if (serialNum.equalsIgnoreCase(serialNumber)
-                            && X509PrincipalUtil.equals(issuerDN, issuerDNConf)) {
-                        alias = aliasCert;
-                        find = true;
-                    }
-                } catch (Exception ex) {
-                    LOG.error("Exception during signing: " + ex.getMessage());     // Added as a workaround for Bouncycastle email error
-                }
-            }
-            if (!find) {
-                throw new SAMLEngineException("Certificate cannot be found in keystore ");
-            }
-            certificate = (X509Certificate) storkOwnKeyStore.getCertificate(alias);
-            final PrivateKey privateKey = (PrivateKey) storkOwnKeyStore.getKey(
-                    alias, properties.getProperty("keyPassword").toCharArray());
-
-            LOG.info("Recover BasicX509Credential.");
-            final BasicX509Credential credential = new BasicX509Credential();
-
-            LOG.debug("Load certificate");
-            credential.setEntityCertificate(certificate);
-
-            LOG.debug("Load privateKey");
-            credential.setPrivateKey(privateKey);
-
-            LOG.debug("Begin signature with openSaml");
-            final Signature signature = (Signature) Configuration
-                    .getBuilderFactory().getBuilder(
-                            Signature.DEFAULT_ELEMENT_NAME).buildObject(
-                            Signature.DEFAULT_ELEMENT_NAME);
-
-            signature.setSigningCredential(credential);
-            signature.setSignatureAlgorithm(
-                    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
-            //signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
-
-
-            final SecurityConfiguration secConfiguration = Configuration
-                    .getGlobalSecurityConfiguration();
-            final NamedKeyInfoGeneratorManager keyInfoManager = secConfiguration
-                    .getKeyInfoGeneratorManager();
-            final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager
-                    .getDefaultManager();
-            final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager
-                    .getFactory(credential);
-            final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac
-                    .newInstance();
-
-            KeyInfo keyInfo = keyInfoGenerator.generate(credential);
-
-            signature.setKeyInfo(keyInfo);
-            signature.setCanonicalizationAlgorithm(
-                    SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
-
-            //Create a second signature which will be used when signing assertion and response
-            final Signature signature2 = (Signature) Configuration
-                    .getBuilderFactory().getBuilder(
-                            Signature.DEFAULT_ELEMENT_NAME).buildObject(
-                            Signature.DEFAULT_ELEMENT_NAME);
-            final SecurityConfiguration secConfiguration2 = Configuration
-                    .getGlobalSecurityConfiguration();
-            final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2
-                    .getKeyInfoGeneratorManager();
-            final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2
-                    .getDefaultManager();
-            final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2
-                    .getFactory(credential);
-            final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2
-                    .newInstance();
-
-            KeyInfo keyInfo2 = keyInfoGenerator2.generate(credential);
-            signature2.setSigningCredential(credential);
-            signature2.setSignatureAlgorithm(
-                    SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
-            //signature2.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
-            signature2.setKeyInfo(keyInfo2);
-            signature2.setCanonicalizationAlgorithm(
-                    SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
-
-
-            LOG.info("Marshall samlToken.");
-            String qn = tokenSaml.getElementQName().toString();
-
-            if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
-                tokenSaml.setSignature(signature);
-                CustomAttributeQueryMarshaller mars = new CustomAttributeQueryMarshaller();
-                mars.marshall(tokenSaml);
-                Signer.signObject(signature);
-            } else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME)) {
-                Response res = (Response) tokenSaml;
-                List<Assertion> asserts = res.getAssertions();
-                //If multiple assertions we just sign the response and not the assertion
-                if (asserts.size() > 1) {
-                    tokenSaml.setSignature(signature);
-                    Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
-                            .marshall(tokenSaml);
-                    LOG.info("Sign samlToken.");
-                    Signer.signObject(signature);
-                }
-                //If single assertion we sign the assertion and response
-                else {
-                    Assertion assertion = (Assertion) asserts.get(0);
-                    assertion.setSignature(signature);
-                    tokenSaml.setSignature(signature2);
-                    Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
-                            .marshall(tokenSaml);
-                    LOG.info("Sign samlToken.");
-                    Signer.signObject(signature);
-                    Signer.signObject(signature2);
-                }
-            }
-            //Normally we just sign the total saml response
-            else {
-                tokenSaml.setSignature(signature);
-                Configuration.getMarshallerFactory().getMarshaller(tokenSaml)
-                        .marshall(tokenSaml);
-                LOG.info("Sign samlToken.");
-                Signer.signObject(signature);
-            }
-
-
-        } catch (MarshallingException e) {
-            LOG.error("MarshallingException");
-            throw new SAMLEngineException(e);
-        } catch (NoSuchAlgorithmException e) {
-            LOG.error("A 'xmldsig#rsa-sha1' cryptographic algorithm is requested but is not available in the environment.");
-            throw new SAMLEngineException(e);
-        } catch (KeyStoreException e) {
-            LOG.error("Generic KeyStore exception.");
-            throw new SAMLEngineException(e);
-        } catch (SignatureException e) {
-            LOG.error("Signature exception.");
-            throw new SAMLEngineException(e);
-        } catch (SecurityException e) {
-            LOG.error("Security exception.");
-            throw new SAMLEngineException(e);
-        } catch (UnrecoverableKeyException e) {
-            LOG.error("UnrecoverableKey exception.");
-            throw new SAMLEngineException(e);
-        }
-
-        return tokenSaml;
-    }
-
-    /**
-     * @param tokenSaml token SAML
-     * @return the SAMLObject validated.
-     * @throws SAMLEngineException error validate signature
-     * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#validateSignature(org.opensaml.common.SignableSAMLObject)
-     */
-    public final SAMLObject validateSignature(final SignableSAMLObject tokenSaml)
-            throws SAMLEngineException {
-        LOG.info("Start signature validation.");
-        try {
-
-            // Validate structure signature
-            final SAMLSignatureProfileValidator sigProfValidator =
-                    new SAMLSignatureProfileValidator();
-            try {
-                // Indicates signature id conform to SAML Signature profile
-                sigProfValidator.validate(tokenSaml.getSignature());
-            } catch (ValidationException e) {
-                LOG.error("ValidationException: signature isn't conform to SAML Signature profile.");
-                throw new SAMLEngineException(e);
-            }
-
-            String aliasCert = null;
-            X509Certificate certificate;
-
-            final List<Credential> trustCred = new ArrayList<Credential>();
-
-            for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e
-                    .hasMoreElements(); ) {
-                aliasCert = e.nextElement();
-                final BasicX509Credential credential = new BasicX509Credential();
-                certificate = (X509Certificate) storkOwnKeyStore
-                        .getCertificate(aliasCert);
-                credential.setEntityCertificate(certificate);
-                trustCred.add(credential);
-            }
-
-            final KeyInfo keyInfo = tokenSaml.getSignature().getKeyInfo();
-
-            final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo
-                    .getX509Datas().get(0).getX509Certificates().get(0);
-
-            final CertificateFactory certFact = CertificateFactory
-                    .getInstance("X.509");
-            final ByteArrayInputStream bis = new ByteArrayInputStream(Base64
-                    .decode(xmlCert.getValue()));
-            final X509Certificate cert = (X509Certificate) certFact
-                    .generateCertificate(bis);
-
-            // Exist only one certificate
-            final BasicX509Credential entityX509Cred = new BasicX509Credential();
-            entityX509Cred.setEntityCertificate(cert);
-
-            try {
-                cert.checkValidity();
-            } catch (CertificateExpiredException exp) {
-                throw new SAMLEngineException("Certificate expired.");
-            } catch (CertificateNotYetValidException exp) {
-                throw new SAMLEngineException("Certificate not yet valid.");
-            }
-
-		/* A better use of PKI based validation but not wanted for STORK... 
-        boolean trusted = false;
-		
-		for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e.hasMoreElements();) 
-	    {
-	    	aliasCert = e.nextElement();		
-	    	certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);					
-	    	try {
-	    		cert.verify(certificate.getPublicKey());
-	    		trusted = true;
-	    		break;
-	    	}
-	    	catch (Exception ex) {
-	    		//Do nothing - cert not trusted yet
-	    	}
-	    }
-		
-		if (!trusted)
-		    throw new SAMLEngineException("Certificate is not trusted.");*/
-
-            // Validate trust certificates
-            final ExplicitX509CertificateTrustEvaluator chainTrustEvaluator = new ExplicitX509CertificateTrustEvaluator();
-
-            if (!chainTrustEvaluator.validate(entityX509Cred, trustCred)) {
-                throw new SAMLEngineException("Certificate is not trusted.");
-            }
-            final ExplicitKeyTrustEvaluator keyTrustEvaluator =
-                    new ExplicitKeyTrustEvaluator();
-
-            if (!keyTrustEvaluator.validate(entityX509Cred, trustCred)) {
-            	throw new SAMLEngineException("Certificate is not trusted.");
-            }
-
-            // Validate signature
-            final SignatureValidator sigValidator = new SignatureValidator(
-                    entityX509Cred);
-            sigValidator.validate(tokenSaml.getSignature());
-
-        } catch (ValidationException e) {
-            LOG.error("ValidationException.");
-            throw new SAMLEngineException(e);
-        } catch (KeyStoreException e) {
-            LOG.error("KeyStoreException.", e);
-            throw new SAMLEngineException(e);
-        } catch (GeneralSecurityException e) {
-            LOG.error("GeneralSecurityException.", e);
-            throw new SAMLEngineException(e);
-        }
-        LOG.info(tokenSaml.getSignatureReferenceID());
-        LOG.info("Start signature validation - END.");
-        return tokenSaml;
-    }
-
-
-    /**
-     * Load cryptographic service provider.
-     *
-     * @throws SAMLEngineException the SAML engine exception
-     */
-    public final void loadCryptServiceProvider() throws SAMLEngineException {
-        LOG.info("Load Cryptographic Service Provider");
-        FileInputStream fis = null;
-        try {
-//            // Dynamically register Bouncy Castle provider.
-//            boolean found = false;
-//            // Check if BouncyCastle is already registered as a provider
-//            final Provider[] providers = Security.getProviders();
-//            for (int i = 0; i < providers.length; i++) {
-//                if (providers[i].getName().equals(
-//                        BouncyCastleProvider.PROVIDER_NAME)) {
-//                    found = true;
-//                }
-//            }
-//
-//            // Register only if the provider has not been previously registered
-//            if (!found) {
-//                LOG.info("SAMLCore: Register Bouncy Castle provider.");
-//                Security.insertProviderAt(new BouncyCastleProvider(), Security
-//                        .getProviders().length);
-//            }
-
-            storkOwnKeyStore = KeyStore.getInstance(properties
-                    .getProperty(KEYSTORE_TYPE));
-
-            LOG.info("Loading KeyInfo from keystore file " + properties.getProperty("keystorePath"));
-            fis = new FileInputStream(properties
-                    .getProperty("keystorePath"));
-
-            storkOwnKeyStore.load(fis, properties.getProperty(
-                    KEY_STORE_PASS).toCharArray());
-
-        } catch (Exception e) {
-            LOG.error("Error loading CryptographicServiceProvider", e);
-            throw new SAMLEngineException(
-                    "Error loading CryptographicServiceProvider", e);
-        } finally {
-            IOUtils.closeQuietly(fis);
-        }
-    }
+	/**
+	 * The Constant KEYSTORE_TYPE.
+	 */
+	private static final String KEYSTORE_TYPE = "keystoreType";
+
+	/**
+	 * The Constant KEY_STORE_PASSWORD.
+	 */
+	private static final String KEY_STORE_PASS = "keyStorePassword";
+
+	/**
+	 * The logger.
+	 */
+	private static final Logger LOG = LoggerFactory.getLogger(SignSW.class.getName());
+
+	/**
+	 * The stork own key store.
+	 */
+	private KeyStore storkOwnKeyStore = null;
+
+	/**
+	 * The instance.
+	 *
+	 * @return the properties
+	 */
+
+	public final Properties getProperties() {
+		return properties;
+	}
+
+	/**
+	 * Gets the stork own key store.
+	 *
+	 * @return the stork own key store
+	 */
+	public final KeyStore getStorkOwnKeyStore() {
+		return storkOwnKeyStore;
+	}
+
+	/**
+	 * Gets the stork trustStore.
+	 *
+	 * @return the stork own key store
+	 */
+	public KeyStore getTrustStore() {
+		return storkOwnKeyStore;
+	}
+
+	/**
+	 * Sets the stork own key store.
+	 *
+	 * @param newkOwnKeyStore
+	 *            the new stork own key store
+	 */
+	public final void setStorkOwnKeyStore(final KeyStore newkOwnKeyStore) {
+		this.storkOwnKeyStore = newkOwnKeyStore;
+	}
+
+	/**
+	 * Sets the properties.
+	 *
+	 * @param newProperties
+	 *            the new properties
+	 */
+	public final void setProperties(final Properties newProperties) {
+		this.properties = newProperties;
+	}
+
+	/**
+	 * The SW sign prop.
+	 */
+	private Properties properties = null;
+
+	/**
+	 * Inits the file configuration.
+	 *
+	 * @param fileConf
+	 *            name of the file configuration
+	 * @throws SAMLEngineException
+	 *             error at the load from file configuration
+	 */
+	public final void init(final String fileConf) throws SAMLEngineException {
+		InputStream fileProperties = null;
+		// fetch base from system properties, give a default if there is nothing configured
+		String base = System.getProperty("eu.stork.samlengine.config.location");
+		if (null != base) {
+			if (!base.endsWith("/")) {
+				base += "/";
+			}
+		} else {
+			base = "/";
+		}
+
+		try {
+			if (null != base)
+				fileProperties = new FileInputStream(base + fileConf);
+			else
+				fileProperties = SignSW.class.getResourceAsStream("/" + fileConf);
+			properties = new Properties();
+
+			properties.loadFromXML(fileProperties);
+			fileProperties.close();
+		} catch (InvalidPropertiesFormatException e) {
+			LOG.info("Exception: invalid properties format.");
+			throw new SAMLEngineException(e);
+		} catch (IOException e) {
+			LOG.info("Exception: invalid file: " + fileConf);
+			throw new SAMLEngineException(e);
+		} finally {
+			IOUtils.closeQuietly(fileProperties);
+		}
+	}
+
+	/**
+	 * @return the X509Certificate
+	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#getCertificate()
+	 */
+	public final X509Certificate getCertificate() {
+		throw new NotImplementedException();
+	}
+
+	/**
+	 * Sign the token SAML.
+	 *
+	 * @param tokenSaml
+	 *            the token SAML.
+	 * @return the SAML object
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
+	 */
+	public final SAMLObject sign(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
+		LOG.info("Start Sign process.");
+		try {
+			final String serialNumber = properties.getProperty("serialNumber");
+			final String issuer = properties.getProperty("issuer");
+
+			String alias = null;
+			String aliasCert;
+			X509Certificate certificate;
+			boolean find = false;
+
+			for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e.hasMoreElements() && !find;) {
+				aliasCert = e.nextElement();
+				certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);
+
+				final String serialNum = certificate.getSerialNumber().toString(16);
+
+				X509Principal issuerDN = new X509Principal(certificate.getIssuerDN().getName());
+				X509Principal issuerDNConf = new X509Principal(issuer);
+
+				if (serialNum.equalsIgnoreCase(serialNumber) && X509PrincipalUtil.X509equals(issuerDN, issuerDNConf)) {
+					alias = aliasCert;
+					find = true;
+				}
+			}
+			if (!find) {
+				throw new SAMLEngineException("Certificate cannot be found in keystore ");
+			}
+			certificate = (X509Certificate) storkOwnKeyStore.getCertificate(alias);
+			final PrivateKey privateKey = (PrivateKey) storkOwnKeyStore.getKey(alias, properties.getProperty("keyPassword").toCharArray());
+
+			LOG.info("Recover BasicX509Credential.");
+			final BasicX509Credential credential = new BasicX509Credential();
+
+			LOG.debug("Load certificate");
+			credential.setEntityCertificate(certificate);
+
+			LOG.debug("Load privateKey");
+			credential.setPrivateKey(privateKey);
+
+			LOG.debug("Begin signature with openSaml");
+			final Signature signature = (Signature) Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
+
+			signature.setSigningCredential(credential);
+			signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
+			// signature.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
+
+			final SecurityConfiguration secConfiguration = Configuration.getGlobalSecurityConfiguration();
+			final NamedKeyInfoGeneratorManager keyInfoManager = secConfiguration.getKeyInfoGeneratorManager();
+			final KeyInfoGeneratorManager keyInfoGenManager = keyInfoManager.getDefaultManager();
+			final KeyInfoGeneratorFactory keyInfoGenFac = keyInfoGenManager.getFactory(credential);
+			final KeyInfoGenerator keyInfoGenerator = keyInfoGenFac.newInstance();
+
+			KeyInfo keyInfo = keyInfoGenerator.generate(credential);
+
+			signature.setKeyInfo(keyInfo);
+			signature.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
+
+			// Create a second signature which will be used when signing assertion and response
+			final Signature signature2 = (Signature) Configuration.getBuilderFactory().getBuilder(Signature.DEFAULT_ELEMENT_NAME).buildObject(Signature.DEFAULT_ELEMENT_NAME);
+			final SecurityConfiguration secConfiguration2 = Configuration.getGlobalSecurityConfiguration();
+			final NamedKeyInfoGeneratorManager keyInfoManager2 = secConfiguration2.getKeyInfoGeneratorManager();
+			final KeyInfoGeneratorManager keyInfoGenManager2 = keyInfoManager2.getDefaultManager();
+			final KeyInfoGeneratorFactory keyInfoGenFac2 = keyInfoGenManager2.getFactory(credential);
+			final KeyInfoGenerator keyInfoGenerator2 = keyInfoGenFac2.newInstance();
+
+			KeyInfo keyInfo2 = keyInfoGenerator2.generate(credential);
+			signature2.setSigningCredential(credential);
+			signature2.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA256);
+			// signature2.setSignatureAlgorithm(SignatureConstants.ALGO_ID_SIGNATURE_RSA_SHA1);
+			signature2.setKeyInfo(keyInfo2);
+			signature2.setCanonicalizationAlgorithm(SignatureConstants.ALGO_ID_C14N_EXCL_OMIT_COMMENTS);
+
+			LOG.info("Marshall samlToken.");
+			String qn = tokenSaml.getElementQName().toString();
+
+			if (qn.endsWith(CustomAttributeQuery.DEFAULT_ELEMENT_LOCAL_NAME)) {
+				tokenSaml.setSignature(signature);
+				CustomAttributeQueryMarshaller mars = new CustomAttributeQueryMarshaller();
+				mars.marshall(tokenSaml);
+				Signer.signObject(signature);
+			} else if (qn.endsWith(Response.DEFAULT_ELEMENT_LOCAL_NAME) && !qn.contains(LogoutResponse.DEFAULT_ELEMENT_LOCAL_NAME)) {
+				Response res = (Response) tokenSaml;
+				List<Assertion> asserts = res.getAssertions();
+				// If multiple assertions we just sign the response and not the assertion
+				if (asserts.size() > 1) {
+					tokenSaml.setSignature(signature);
+					Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
+					LOG.info("Sign samlToken.");
+					Signer.signObject(signature);
+				}
+				// If single assertion we sign the assertion and response
+				else {
+					Assertion assertion = (Assertion) asserts.get(0);
+					assertion.setSignature(signature);
+					tokenSaml.setSignature(signature2);
+					Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
+					LOG.info("Sign samlToken.");
+					Signer.signObject(signature);
+					Signer.signObject(signature2);
+				}
+			}
+			// Normally we just sign the total saml response
+			else {
+				tokenSaml.setSignature(signature);
+				Configuration.getMarshallerFactory().getMarshaller(tokenSaml).marshall(tokenSaml);
+				LOG.info("Sign samlToken.");
+				Signer.signObject(signature);
+			}
+
+		} catch (MarshallingException e) {
+			LOG.error("MarshallingException");
+			throw new SAMLEngineException(e);
+		} catch (NoSuchAlgorithmException e) {
+			LOG.error("A 'xmldsig#rsa-sha1' cryptographic algorithm is requested but is not available in the environment.");
+			throw new SAMLEngineException(e);
+		} catch (KeyStoreException e) {
+			LOG.error("Generic KeyStore exception.");
+			throw new SAMLEngineException(e);
+		} catch (SignatureException e) {
+			LOG.error("Signature exception.");
+			throw new SAMLEngineException(e);
+		} catch (SecurityException e) {
+			LOG.error("Security exception.");
+			throw new SAMLEngineException(e);
+		} catch (UnrecoverableKeyException e) {
+			LOG.error("UnrecoverableKey exception.");
+			throw new SAMLEngineException(e);
+		}
+
+		return tokenSaml;
+	}
+
+	/**
+	 * @param tokenSaml
+	 *            token SAML
+	 * @return the SAMLObject validated.
+	 * @throws SAMLEngineException
+	 *             error validate signature
+	 * @see eu.stork.peps.auth.engine.core.SAMLEngineSignI#validateSignature(org.opensaml.common.SignableSAMLObject)
+	 */
+	public final SAMLObject validateSignature(final SignableSAMLObject tokenSaml) throws SAMLEngineException {
+		LOG.info("Start signature validation SW.");
+		try {
+
+			// Validate structure signature
+			final SAMLSignatureProfileValidator sigProfValidator = new SAMLSignatureProfileValidator();
+			try {
+				// Indicates signature id conform to SAML Signature profile
+				sigProfValidator.validate(tokenSaml.getSignature());
+			} catch (ValidationException e) {
+				LOG.error("ValidationException: signature isn't conform to SAML Signature profile.");
+				throw new SAMLEngineException(e);
+			}
+
+			String aliasCert = null;
+			X509Certificate certificate;
+
+			final List<Credential> trustCred = new ArrayList<Credential>();
+
+			for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e.hasMoreElements();) {
+				aliasCert = e.nextElement();
+				final BasicX509Credential credential = new BasicX509Credential();
+				certificate = (X509Certificate) storkOwnKeyStore.getCertificate(aliasCert);
+				credential.setEntityCertificate(certificate);
+				trustCred.add(credential);
+			}
+
+			final KeyInfo keyInfo = tokenSaml.getSignature().getKeyInfo();
+
+			final org.opensaml.xml.signature.X509Certificate xmlCert = keyInfo.getX509Datas().get(0).getX509Certificates().get(0);
+
+			final CertificateFactory certFact = CertificateFactory.getInstance("X.509");
+			final ByteArrayInputStream bis = new ByteArrayInputStream(Base64.decode(xmlCert.getValue()));
+			final X509Certificate cert = (X509Certificate) certFact.generateCertificate(bis);
+
+			// Exist only one certificate
+			final BasicX509Credential entityX509Cred = new BasicX509Credential();
+			entityX509Cred.setEntityCertificate(cert);
+
+			try {
+				cert.checkValidity();
+			} catch (CertificateExpiredException exp) {
+				throw new SAMLEngineException("Certificate expired.");
+			} catch (CertificateNotYetValidException exp) {
+				throw new SAMLEngineException("Certificate not yet valid.");
+			}
+
+			/*
+			 * A better use of PKI based validation but not wanted for STORK... boolean trusted = false;
+			 * 
+			 * for (final Enumeration<String> e = storkOwnKeyStore.aliases(); e.hasMoreElements();) { aliasCert = e.nextElement(); certificate = (X509Certificate)
+			 * storkOwnKeyStore.getCertificate(aliasCert); try { cert.verify(certificate.getPublicKey()); trusted = true; break; } catch (Exception ex) { //Do nothing - cert not trusted yet } }
+			 * 
+			 * if (!trusted) throw new SAMLEngineException("Certificate is not trusted.");
+			 */
+
+			// Validate trust certificates
+			final ExplicitX509CertificateTrustEvaluator chainTrustEvaluator = new ExplicitX509CertificateTrustEvaluator();
+
+			if (!chainTrustEvaluator.validate(entityX509Cred, trustCred)) {
+				throw new SAMLEngineException("Certificate is not trusted.");
+			}
+			final ExplicitKeyTrustEvaluator keyTrustEvaluator = new ExplicitKeyTrustEvaluator();
+
+			if (!keyTrustEvaluator.validate(entityX509Cred, trustCred)) {
+				throw new SAMLEngineException("Certificate is not trusted.");
+			}
+
+			// Validate signature
+			final SignatureValidator sigValidator = new SignatureValidator(entityX509Cred);
+			sigValidator.validate(tokenSaml.getSignature());
+
+		} catch (ValidationException e) {
+			LOG.error("ValidationException.");
+			throw new SAMLEngineException(e);
+		} catch (KeyStoreException e) {
+			LOG.error("KeyStoreException.", e);
+			throw new SAMLEngineException(e);
+		} catch (GeneralSecurityException e) {
+			LOG.error("GeneralSecurityException.", e);
+			throw new SAMLEngineException(e);
+		}
+		LOG.info(tokenSaml.getSignatureReferenceID());
+		LOG.info("Start signature validation - END.");
+		return tokenSaml;
+	}
+
+	/**
+	 * Load cryptographic service provider.
+	 *
+	 * @throws SAMLEngineException
+	 *             the SAML engine exception
+	 */
+	public final void loadCryptServiceProvider() throws SAMLEngineException {
+		LOG.info("Load Cryptographic Service Provider");
+		FileInputStream fis = null;
+		try {
+			// Dynamically register Bouncy Castle provider.
+			boolean found = false;
+			// Check if BouncyCastle is already registered as a provider
+			final Provider[] providers = Security.getProviders();
+			for (int i = 0; i < providers.length; i++) {
+				if (providers[i].getName().equals(BouncyCastleProvider.PROVIDER_NAME)) {
+					found = true;
+				}
+			}
+
+			// Register only if the provider has not been previously registered
+			if (!found) {
+				LOG.info("SAMLCore: Register Bouncy Castle provider.");
+				Security.insertProviderAt(new BouncyCastleProvider(), Security.getProviders().length);
+			}
+
+			storkOwnKeyStore = KeyStore.getInstance(properties.getProperty(KEYSTORE_TYPE));
+
+			LOG.info("Loading KeyInfo from keystore file " + properties.getProperty("keystorePath"));
+			fis = new FileInputStream(properties.getProperty("keystorePath"));
+
+			storkOwnKeyStore.load(fis, properties.getProperty(KEY_STORE_PASS).toCharArray());
+
+		} catch (Exception e) {
+			LOG.error("Error loading CryptographicServiceProvider", e);
+			throw new SAMLEngineException("Error loading CryptographicServiceProvider", e);
+		} finally {
+			IOUtils.closeQuietly(fis);
+		}
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesBuilder.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesBuilder.java
index a60515593..332882a03 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesBuilder.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesBuilder.java
@@ -26,16 +26,15 @@ import eu.stork.peps.auth.engine.core.VIDPAuthenticationAttributes;
  * @author fjquevedo
  */
 public final class VIDPAuthenticationAttributesBuilder extends AbstractSAMLObjectBuilder<VIDPAuthenticationAttributes> {
-    
 
-    /** {@inheritDoc} */
-    public VIDPAuthenticationAttributes buildObject() {
-        return buildObject(SAMLCore.STORK10P_NS.getValue(), VIDPAuthenticationAttributes.DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
-    }
+	/** {@inheritDoc} */
+	public VIDPAuthenticationAttributes buildObject() {
+		return buildObject(SAMLCore.STORK10P_NS.getValue(), VIDPAuthenticationAttributes.DEF_LOCAL_NAME, SAMLCore.STORK10P_PREFIX.getValue());
+	}
+
+	/** {@inheritDoc} */
+	public VIDPAuthenticationAttributes buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
+		return new VIDPAuthenticationAttributesImpl(namespaceURI, localName, namespacePrefix);
+	}
 
-    /** {@inheritDoc} */
-    public VIDPAuthenticationAttributes buildObject(final String namespaceURI, final String localName, final String namespacePrefix) {
-        return new VIDPAuthenticationAttributesImpl(namespaceURI, localName, namespacePrefix);
-    }
-    
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java
index 25737e307..bfb85e357 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesImpl.java
@@ -33,100 +33,96 @@ import org.slf4j.LoggerFactory;
  * 
  * @author fjquevedo
  */
-public final class VIDPAuthenticationAttributesImpl extends AbstractSignableSAMLObject implements
-VIDPAuthenticationAttributes {
+public final class VIDPAuthenticationAttributesImpl extends AbstractSignableSAMLObject implements VIDPAuthenticationAttributes {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(VIDPAuthenticationAttributesImpl.class.getName());
-    /** The citizen country code. */
-    private CitizenCountryCode citizenCountryCode;
-    
-    /** The SP information. */
-    private SPInformation spInformation;
+	private static final Logger LOGGER = LoggerFactory.getLogger(VIDPAuthenticationAttributesImpl.class.getName());
+	/** The citizen country code. */
+	private CitizenCountryCode citizenCountryCode;
+
+	/** The SP information. */
+	private SPInformation spInformation;
+
+	/**
+	 * Instantiates a new requested attributes implement.
+	 * 
+	 * @param namespaceURI
+	 *            the namespace URI
+	 * @param elementLocalName
+	 *            the element local name
+	 * @param namespacePrefix
+	 *            the namespace prefix
+	 */
+	protected VIDPAuthenticationAttributesImpl(final String namespaceURI, final String elementLocalName, final String namespacePrefix) {
+		super(namespaceURI, elementLocalName, namespacePrefix);
+	}
 
 	/**
-     * Instantiates a new requested attributes implement.
-     * 
-     * @param namespaceURI the namespace URI
-     * @param elementLocalName the element local name
-     * @param namespacePrefix the namespace prefix
-     */
-    protected VIDPAuthenticationAttributesImpl(final String namespaceURI,
-	    final String elementLocalName, final String namespacePrefix) {	
-	super(namespaceURI, elementLocalName, namespacePrefix);
-    }
-    
-   
-    /**
-     * getCitizenCountryCode.
-     * 
-     * @return the citizen country code
-     */    
-    public CitizenCountryCode getCitizenCountryCode() {
-    	return citizenCountryCode;
-    }
-    
-    /**
-     * getSPInformation
-     * 
-     * @return the SP information
-     */
-    public SPInformation getSPInformation() {
+	 * getCitizenCountryCode.
+	 * 
+	 * @return the citizen country code
+	 */
+	public CitizenCountryCode getCitizenCountryCode() {
+		return citizenCountryCode;
+	}
+
+	/**
+	 * getSPInformation
+	 * 
+	 * @return the SP information
+	 */
+	public SPInformation getSPInformation() {
 		return spInformation;
 	}
 
-    /**
-     * Gets the ordered children.
-     * 
-     * @return the ordered children
-     *
-     */
-    public List<XMLObject> getOrderedChildren() {
-	final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
-
-	children.add(citizenCountryCode);
-	children.add(spInformation);
-		
-	if (getSignature() != null) {
-	    children.add(getSignature());
+	/**
+	 * Gets the ordered children.
+	 * 
+	 * @return the ordered children
+	 *
+	 */
+	public List<XMLObject> getOrderedChildren() {
+		final ArrayList<XMLObject> children = new ArrayList<XMLObject>();
+
+		children.add(citizenCountryCode);
+		children.add(spInformation);
+
+		if (getSignature() != null) {
+			children.add(getSignature());
+		}
+
+		return Collections.unmodifiableList(children);
+
 	}
-	
-	return Collections.unmodifiableList(children);
-
-    }
-
-    /**
-     * Gets the signature reference id.
-     * 
-     * @return the signature reference id
-     *
-     */
-    public String getSignatureReferenceID() {
-	return null;
-    }
-    
-    /**
-     * Sets the citizen country code.
-     * 
-     * @param newCitizenCountryCode the new citizen country code
-     *
-     */
-    public void setCitizenCountryCode(CitizenCountryCode newCitizenCountryCode) {
-	this.citizenCountryCode = prepareForAssignment(this.citizenCountryCode, newCitizenCountryCode);	
-    }    
-    
-    /**
-     * Sets the SP information.
-     * 
-     * @param newSPInformation the new SP information
-     *
-     */
-    public void setSPInformation(SPInformation newSPInformation) {
-		this.spInformation = prepareForAssignment(this.spInformation, newSPInformation);
+
+	/**
+	 * Gets the signature reference id.
+	 * 
+	 * @return the signature reference id
+	 *
+	 */
+	public String getSignatureReferenceID() {
+		return null;
+	}
+
+	/**
+	 * Sets the citizen country code.
+	 * 
+	 * @param newCitizenCountryCode
+	 *            the new citizen country code
+	 *
+	 */
+	public void setCitizenCountryCode(CitizenCountryCode newCitizenCountryCode) {
+		this.citizenCountryCode = prepareForAssignment(this.citizenCountryCode, newCitizenCountryCode);
 	}
 
-    @Override
-    public int hashCode() {
-        LOGGER.warn("Hashcode has been called, passed to super. Nothing foreseen here");
-        return super.hashCode();
-    }
+	/**
+	 * Sets the SP information.
+	 * 
+	 * @param newSPInformation
+	 *            the new SP information
+	 *
+	 */
+	public void setSPInformation(SPInformation newSPInformation) {
+		this.spInformation = prepareForAssignment(this.spInformation, newSPInformation);
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesMarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesMarshaller.java
index 5635ddd6b..73e0ca6f5 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesMarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesMarshaller.java
@@ -24,10 +24,10 @@ import org.opensaml.common.impl.AbstractSAMLObjectMarshaller;
  */
 public class VIDPAuthenticationAttributesMarshaller extends AbstractSAMLObjectMarshaller {
 
-    /**
-     * Instantiates a new vIDP authentication attributes marshaller.
-     */
-    public VIDPAuthenticationAttributesMarshaller() {
-	super();
-    }
+	/**
+	 * Instantiates a new vIDP authentication attributes marshaller.
+	 */
+	public VIDPAuthenticationAttributesMarshaller() {
+		super();
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java
index ba4a4fe3a..dadf86254 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/impl/VIDPAuthenticationAttributesUnmarshaller.java
@@ -28,28 +28,29 @@ import eu.stork.peps.auth.engine.core.VIDPAuthenticationAttributes;
  * 
  * @author fjquevedo
  */
-public class VIDPAuthenticationAttributesUnmarshaller extends
-	AbstractSAMLObjectUnmarshaller {
+public class VIDPAuthenticationAttributesUnmarshaller extends AbstractSAMLObjectUnmarshaller {
 
-    /**
-     * Process child element.
-     * 
-     * @param parentObject the parent object
-     * @param childObject the child object
-     * 
-     * @throws UnmarshallingException the unmarshalling exception
-     *
-     */
-    protected final void processChildElement(final XMLObject parentObject,
-	    final XMLObject childObject) throws UnmarshallingException {
-	final VIDPAuthenticationAttributes vIDPAuthenticationAttr = (VIDPAuthenticationAttributes) parentObject;
+	/**
+	 * Process child element.
+	 * 
+	 * @param parentObject
+	 *            the parent object
+	 * @param childObject
+	 *            the child object
+	 * 
+	 * @throws UnmarshallingException
+	 *             the unmarshalling exception
+	 *
+	 */
+	protected final void processChildElement(final XMLObject parentObject, final XMLObject childObject) throws UnmarshallingException {
+		final VIDPAuthenticationAttributes vIDPAuthenticationAttr = (VIDPAuthenticationAttributes) parentObject;
 
-	if (childObject instanceof CitizenCountryCode) {
-	    vIDPAuthenticationAttr.setCitizenCountryCode((CitizenCountryCode) childObject);
-	} else if (childObject instanceof SPInformation) {
-		vIDPAuthenticationAttr.setSPInformation((SPInformation) childObject);
-	} else {
-	    super.processChildElement(parentObject, childObject);
-	}	
-    }
+		if (childObject instanceof CitizenCountryCode) {
+			vIDPAuthenticationAttr.setCitizenCountryCode((CitizenCountryCode) childObject);
+		} else if (childObject instanceof SPInformation) {
+			vIDPAuthenticationAttr.setSPInformation((SPInformation) childObject);
+		} else {
+			super.processChildElement(parentObject, childObject);
+		}
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
index 4fce4df3f..a4015eed1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/CustomAttributeQueryValidator.java
@@ -7,13 +7,15 @@ import org.opensaml.xml.validation.Validator;
 import eu.stork.peps.auth.engine.core.CustomAttributeQuery;
 
 public class CustomAttributeQueryValidator implements Validator<CustomAttributeQuery> {
-	
+
 	/**
 	 * Validate action.
 	 * 
-	 * @param attrQuery the attribute query to validate
+	 * @param attrQuery
+	 *            the attribute query to validate
 	 * 
-	 * @throws ValidationException the validation exception
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	public final void validate(final CustomAttributeQuery attrQuery) throws ValidationException {
 		validateAssertion(attrQuery);
@@ -21,45 +23,54 @@ public class CustomAttributeQueryValidator implements Validator<CustomAttributeQ
 		validateDestination(attrQuery);
 	}
 
-
 	/**
 	 * Validate assertion.
 	 * 
-	 * @param attrQuery the attribute query
+	 * @param attrQuery
+	 *            the attribute query
 	 * 
-	 * @throws ValidationException the validation exception
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
-	protected final void validateAssertion(final CustomAttributeQuery attrQuery)
-	throws ValidationException {
+	protected final void validateAssertion(final CustomAttributeQuery attrQuery) throws ValidationException {
 		if (DatatypeHelper.isEmpty(attrQuery.getAssertionConsumerServiceURL())) {
 			throw new ValidationException("Consumer Service URL must be specified.");
 		}
 	}
-	
+
 	/**
 	 * Validate subject
-	 * @param query the attribute query to validate
-	 * @throws ValidationException the validation exception
-	 */ 
+	 * 
+	 * @param query
+	 *            the attribute query to validate
+	 * @throws ValidationException
+	 *             the validation exception
+	 */
 	protected void validateSubject(CustomAttributeQuery query) throws ValidationException {
-        if (query.getSubject() == null)
-            throw new ValidationException("Subject is required");
-    }
-	
+		if (query.getSubject() == null)
+			throw new ValidationException("Subject is required");
+	}
+
 	/**
 	 * Validate the destination
-	 * @param query the query to validate
-	 * @throws ValidationException the validation exception
+	 * 
+	 * @param query
+	 *            the query to validate
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	protected void validateDestination(CustomAttributeQuery query) throws ValidationException {
-        if (query.getDestination() == null)
-            throw new ValidationException("Destination is required");
-    }
-	
+		if (query.getDestination() == null)
+			throw new ValidationException("Destination is required");
+	}
+
 	/**
 	 * Validate the destination
-	 * @param query the query to validate
-	 * @throws ValidationException the validation exception
+	 * 
+	 * @param query
+	 *            the query to validate
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	protected void validateTime(CustomAttributeQuery query) throws ValidationException {
         if (query.getIssueInstant().minusMinutes(5).isAfterNow())
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/ExtensionsSchemaValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/ExtensionsSchemaValidator.java
index 491549aac..6a709a7bc 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/ExtensionsSchemaValidator.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/ExtensionsSchemaValidator.java
@@ -31,31 +31,29 @@ import eu.stork.peps.auth.engine.core.QAAAttribute;
  */
 public class ExtensionsSchemaValidator implements Validator<Extensions> {
 
+	/**
+	 * validate the extensions.
+	 * 
+	 * @param extensions
+	 *            the extensions
+	 * 
+	 * @throws ValidationException
+	 *             the validation exception
+	 */
+	public final void validate(final Extensions extensions) throws ValidationException {
+		if (extensions.getUnknownXMLObjects() == null || extensions.getUnknownXMLObjects().size() <= 0) {
+			throw new ValidationException("Extension element is empty or not exist.");
+		}
+
+		List<XMLObject> qaa = extensions.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME);
+
+		if (qaa.size() == 1) {
+			final Validator<QAAAttribute> validatorQaa = new QAAAttributeSchemaValidator();
+			validatorQaa.validate((QAAAttribute) qaa.get(0));
+		} else {
+			throw new ValidationException("Extensions must contain only one element QAALevel.");
+		}
 
-    /**
-     * validate the extensions.
-     * 
-     * @param extensions the extensions
-     * 
-     * @throws ValidationException the validation exception
-     */
-    public final void validate(final Extensions extensions)
-    throws ValidationException {
-	if (extensions.getUnknownXMLObjects() == null
-		|| extensions.getUnknownXMLObjects().size() <= 0) {
-	    throw new ValidationException("Extension element is empty or not exist.");
 	}
-	
-	List<XMLObject> qaa = extensions.getUnknownXMLObjects(QAAAttribute.DEF_ELEMENT_NAME);
-	
-	if (qaa.size() == 1) {
-		final Validator<QAAAttribute> validatorQaa = new QAAAttributeSchemaValidator();
-		validatorQaa.validate((QAAAttribute) qaa.get(0));
-	} else {
-		throw new ValidationException(
-	    "Extensions must contain only one element QAALevel.");
-	}
-
-    }
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
index 7e1242a88..9c8c1e6a1 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/MultipleAssertionResponseValidator.java
@@ -4,63 +4,73 @@ import org.opensaml.saml2.core.Response;
 import org.opensaml.xml.validation.ValidationException;
 import org.opensaml.xml.validation.Validator;
 
-
 public class MultipleAssertionResponseValidator implements Validator<Response> {
-	
+
 	/**
 	 * Validate action.
 	 * 
-	 * @param response the response to validate
+	 * @param response
+	 *            the response to validate
 	 * 
-	 * @throws ValidationException the validation exception
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	public final void validate(final Response response) throws ValidationException {
 		validateAssertion(response);
 		validateConsent(response);
-		validateDestination(response);		
+		validateDestination(response);
 		validateTime(response);
 		validateId(response);
 	}
 
-
 	/**
 	 * Validate assertion.
 	 * 
-	 * @param response the attribute query
+	 * @param response
+	 *            the attribute query
 	 * 
-	 * @throws ValidationException the validation exception
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
-	protected final void validateAssertion(final Response response)
-	throws ValidationException {
+	protected final void validateAssertion(final Response response) throws ValidationException {
 		if (response.getAssertions() == null || response.getAssertions().size() < 2) {
 			throw new ValidationException("Multiple assertions must be specified.");
 		}
 	}
-	
+
 	/**
 	 * Validate the Consent
-	 * @param response the response to validate
-	 * @throws ValidationException the validation exception
+	 * 
+	 * @param response
+	 *            the response to validate
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	protected void validateConsent(Response response) throws ValidationException {
-        if (response.getConsent() == null)
-            throw new ValidationException("Consent is required");
-    }
-	
+		if (response.getConsent() == null)
+			throw new ValidationException("Consent is required");
+	}
+
 	/**
 	 * Validate the destination
-	 * @param response the response to validate
-	 * @throws ValidationException the validation exception
+	 * 
+	 * @param response
+	 *            the response to validate
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	protected void validateDestination(Response response) throws ValidationException {
-        if (response.getDestination() == null)
-            throw new ValidationException("Destination is required");
-    }
-	
+		if (response.getDestination() == null)
+			throw new ValidationException("Destination is required");
+	}
+
 	/**
 	 * Validate issue times
-	 * @param response the response to validate
-	 * @throws ValidationException the validation exception
+	 * 
+	 * @param response
+	 *            the response to validate
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	protected void validateTime(Response response) throws ValidationException {		
         if (response.getIssueInstant().minusMinutes(5).isAfterNow())
@@ -69,12 +79,15 @@ public class MultipleAssertionResponseValidator implements Validator<Response> {
 	
 	/**
 	 * Validate ids
-	 * @param response the response to validate
-	 * @throws ValidationException the validation exception
+	 * 
+	 * @param response
+	 *            the response to validate
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
-	protected void validateId(Response response) throws ValidationException {		
-        if (response.getID() == null || response.getInResponseTo() == null)
-            throw new ValidationException("Id and response id is required");
-    }
+	protected void validateId(Response response) throws ValidationException {
+		if (response.getID() == null || response.getInResponseTo() == null)
+			throw new ValidationException("Id and response id is required");
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
index 44c9db380..04ff153d3 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/auth/engine/core/validator/QAAAttributeSchemaValidator.java
@@ -28,37 +28,41 @@ import eu.stork.peps.auth.engine.core.QAAAttribute;
  */
 public class QAAAttributeSchemaValidator implements Validator<QAAAttribute> {
 
-
 	/**
 	 * Validate action.
 	 * 
-	 * @param qaa the quality authentication assurance level attribute
+	 * @param qaa
+	 *            the quality authentication assurance level attribute
 	 * 
-	 * @throws ValidationException the validation exception
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
 	public final void validate(final QAAAttribute qaa) throws ValidationException {
 		validateAction(qaa);
 	}
 
-
 	/**
 	 * Validate action.
 	 * 
-	 * @param qaaAttribute the quality authentication assurance level attribute.
+	 * @param qaaAttribute
+	 *            the quality authentication assurance level attribute.
 	 * 
-	 * @throws ValidationException the validation exception
+	 * @throws ValidationException
+	 *             the validation exception
 	 */
-	protected final void validateAction(final QAAAttribute qaaAttribute)
-	throws ValidationException {
+	protected final void validateAction(final QAAAttribute qaaAttribute) throws ValidationException {
 		if (DatatypeHelper.isEmpty(qaaAttribute.getQaaLevel())) {
 			throw new ValidationException("QAALevel label must be specified.");
 		}
-
-		final int qaa = Integer.valueOf(qaaAttribute.getQaaLevel());
+		int qaa = 0;
+		try {
+			qaa = Integer.valueOf(qaaAttribute.getQaaLevel());
+		} catch (Exception e) {
+			throw new ValidationException("QAALevel is not a valid number!");
+		}
 
 		if (qaa < QAAAttribute.MIN_VALUE || qaa > QAAAttribute.MAX_VALUE) {
-			throw new ValidationException(
-					"QAALevel label must be greater than 0.");
+			throw new ValidationException("QAALevel label must be greater than 0.");
 		}
 	}
 
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
index c53e18662..e513c6add 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationCreator.java
@@ -12,14 +12,8 @@
  * Licence for the specific language governing permissions and limitations under
  * the Licence.
  */
-
 package eu.stork.peps.configuration;
 
-import eu.stork.peps.exceptions.STORKSAMLEngineException;
-import org.apache.commons.io.IOUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -28,6 +22,12 @@ import java.util.InvalidPropertiesFormatException;
 import java.util.Map;
 import java.util.Properties;
 
+import org.apache.commons.io.IOUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import eu.stork.peps.exceptions.STORKSAMLEngineException;
+
 /**
  * The Class InstanceCreator.
  *
@@ -35,108 +35,100 @@ import java.util.Properties;
  */
 public final class ConfigurationCreator {
 
-    /**
-     * The Constant LOGGER.
-     */
-    private static final Logger LOGGER = LoggerFactory
-            .getLogger(ConfigurationCreator.class.getName());
-
-    /**
-     * Creates the configuration.
-     *
-     * @param instanceConfs the instance configuration
-     * @return the map< string, map< string, object>>
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    public static Map<String, Map<String, Object>> createConfiguration(
-            final Map<String, InstanceEngine> instanceConfs) throws STORKSAMLEngineException {
-
-        final HashMap<String, Map<String, Object>> instances =
-                new HashMap<String, Map<String, Object>>();
-
-        LOGGER.info("Create configuration.");
-        try {
-            // Only create instances for SAMLEngine configuration.
-            // INSTANCE
-            for (Map.Entry<String, InstanceEngine> entry : instanceConfs
-                    .entrySet()) {
-                final InstanceEngine iEngine = entry.getValue();
-
-                final Map<String, Object> intance = new HashMap<String, Object>();
-
-                // CONFIGURATION
-                for (ConfigurationEngine configuration : iEngine
-                        .getConfiguration()) {
-                    // Properties only for configuration SamlEngine.
-                    if (configuration.getName().equalsIgnoreCase(
-                            "SamlEngineConf")) {
-                        intance.put(configuration.getName(),
-                                getNewInstance(configuration.getParameters()
-                                        .get("fileConfiguration")));
-                    } else {
-                        intance.put(configuration.getName(), configuration
-                                .getParameters());
-                    }
-                }
-                instances.put(entry.getKey(), intance);
-            }
-        } catch (STORKSAMLEngineException ex) {
-            LOGGER.error("Can not create instance from file configuration.");
-            throw new STORKSAMLEngineException(ex);
-        }
-        return instances;
-    }
-
-
-    /**
-     * Gets the new instance.
-     *
-     * @param fileName the file name
-     * @return the properties from the new instance
-     * @throws STORKSAMLEngineException the STORKSAML engine
-     *                                  runtime exception
-     */
-    private static Properties getNewInstance(final String fileName)
-            throws STORKSAMLEngineException {
-        InputStream fileEngineProp = null;
-
-        // fetch base from system properties, give a default if there is nothing configured
-        String base = System.getProperty("eu.stork.samlengine.config.location");
-        if (null != base) {
-            if (!base.endsWith("/")) {
-                base += "/";
-            }
-        } else {
-            base = "/";
-        }
-
-        LOGGER.info("Create file configuration properties to Stork Saml Engine: " + base + fileName);
-
-        try {
-
-            if (null != base)
-                fileEngineProp = new FileInputStream(base + fileName);
-            else
-                fileEngineProp = ConfigurationCreator.class
-                        .getResourceAsStream(base + fileName);
-
-            final Properties configuration = new Properties();
-            configuration.loadFromXML(fileEngineProp);
-            return configuration;
-        } catch (InvalidPropertiesFormatException e) {
-            LOGGER.error("Invalid properties format.");
-            throw new STORKSAMLEngineException(e);
-        } catch (IOException e) {
-            LOGGER.error("Error read file: " + base + fileName);
-            throw new STORKSAMLEngineException(e);
-        } finally {
-            IOUtils.closeQuietly(fileEngineProp);
-        }
-    }
-
-    /**
-     * Instantiates a new instance creator.
-     */
-    private ConfigurationCreator() {
-    }
+	/**
+	 * The Constant LOGGER.
+	 */
+	private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationCreator.class.getName());
+
+	/**
+	 * Creates the configuration.
+	 *
+	 * @param instanceConfs
+	 *            the instance configuration
+	 * @return the map< string, map< string, object>>
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	public static Map<String, Map<String, Object>> createConfiguration(final Map<String, InstanceEngine> instanceConfs) throws STORKSAMLEngineException {
+
+		final HashMap<String, Map<String, Object>> instances = new HashMap<String, Map<String, Object>>();
+
+		LOGGER.info("Create configuration.");
+		try {
+			// Only create instances for SAMLEngine configuration.
+			// INSTANCE
+			for (Map.Entry<String, InstanceEngine> entry : instanceConfs.entrySet()) {
+				final InstanceEngine iEngine = entry.getValue();
+
+				final Map<String, Object> intance = new HashMap<String, Object>();
+
+				// CONFIGURATION
+				for (ConfigurationEngine configuration : iEngine.getConfiguration()) {
+					// Properties only for configuration SamlEngine.
+					if (configuration.getName().equalsIgnoreCase("SamlEngineConf")) {
+						intance.put(configuration.getName(), getNewInstance(configuration.getParameters().get("fileConfiguration")));
+					} else {
+						intance.put(configuration.getName(), configuration.getParameters());
+					}
+				}
+				instances.put(entry.getKey(), intance);
+			}
+		} catch (STORKSAMLEngineException ex) {
+			LOGGER.error("Can not create instance from file configuration.");
+			throw new STORKSAMLEngineException(ex);
+		}
+		return instances;
+	}
+
+	/**
+	 * Gets the new instance.
+	 *
+	 * @param fileName
+	 *            the file name
+	 * @return the properties from the new instance
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine runtime exception
+	 */
+	private static Properties getNewInstance(final String fileName) throws STORKSAMLEngineException {
+		LOGGER.info("Create file configuration properties to Stork Saml Engine: " + fileName);
+		InputStream fileEngineProp = null;
+
+		// fetch base from system properties, give a default if there is nothing configured
+		String base = System.getProperty("eu.stork.samlengine.config.location");
+		if (null != base) {
+			if (!base.endsWith("/")) {
+				base += "/";
+			}
+		} else {
+			base = "/";
+		}
+
+		LOGGER.info("Create file configuration properties to Stork Saml Engine: " + base + fileName);
+
+		try {
+
+			if (null != base)
+				fileEngineProp = new FileInputStream(base + fileName);
+			else
+				fileEngineProp = ConfigurationCreator.class.getResourceAsStream(base + fileName);
+
+			final Properties configuration = new Properties();
+			configuration.loadFromXML(fileEngineProp);
+			return configuration;
+		} catch (InvalidPropertiesFormatException e) {
+			LOGGER.error("Invalid properties format: " + fileName);
+			throw new STORKSAMLEngineException(e);
+		} catch (IOException e) {
+			LOGGER.error("Error read file: " + fileName);
+			throw new STORKSAMLEngineException(e);
+		} finally {
+			IOUtils.closeQuietly(fileEngineProp);
+		}
+	}
+
+	/**
+	 * Instantiates a new instance creator.
+	 */
+	private ConfigurationCreator() {
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java
index d9e7e467a..9dbed386e 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationEngine.java
@@ -24,46 +24,48 @@ import java.util.Map;
  */
 public class ConfigurationEngine {
 
-    /** The name of the configuration file. */
-    private String name;
+	/** The name of the configuration file. */
+	private String name;
 
-    /** The parameters. */
-    private Map<String, String> parameters;
+	/** The parameters. */
+	private Map<String, String> parameters;
 
-    /**
-     * Gets the name.
-     * 
-     * @return the name
-     */
-    public final String getName() {
-	return name;
-    }
+	/**
+	 * Gets the name.
+	 * 
+	 * @return the name
+	 */
+	public final String getName() {
+		return name;
+	}
 
-    /**
-     * Gets the parameters.
-     * 
-     * @return the parameters
-     */
-    public final Map<String, String> getParameters() {
-	return parameters;
-    }
+	/**
+	 * Gets the parameters.
+	 * 
+	 * @return the parameters
+	 */
+	public final Map<String, String> getParameters() {
+		return parameters;
+	}
 
-    /**
-     * Sets the name.
-     * 
-     * @param newName the new name
-     */
-    public final void setName(final String newName) {
-	this.name = newName;
-    }
+	/**
+	 * Sets the name.
+	 * 
+	 * @param newName
+	 *            the new name
+	 */
+	public final void setName(final String newName) {
+		this.name = newName;
+	}
 
-    /**
-     * Sets the parameters.
-     * 
-     * @param newParameters the parameters
-     */
-    public final void setParameters(final Map<String, String> newParameters) {
-	this.parameters = newParameters;
-    }
+	/**
+	 * Sets the parameters.
+	 * 
+	 * @param newParameters
+	 *            the parameters
+	 */
+	public final void setParameters(final Map<String, String> newParameters) {
+		this.parameters = newParameters;
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationReader.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationReader.java
index 7968c77ff..f68060154 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationReader.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationReader.java
@@ -46,189 +46,172 @@ import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
  */
 public final class ConfigurationReader {
 
-    /** The Constant SAML_ENGINE_CONFIGURATION_FILE. */
-    private static final String ENGINE_CONF_FILE = "SamlEngine.xml";
-
-    /** The Constant LOGGER. */
-    private static final Logger LOGGER = LoggerFactory
-    .getLogger(ConfigurationReader.class.getName());
-
-    /** The Constant NODE_CONFIGURATION. */
-    private static final String NODE_CONF = "configuration";
-
-    /** The Constant NODE_CONFIGURATION_NAME. */
-    private static final String NODE_CONF_NAME = "name";
-
-    /** The Constant NODE_INSTANCE_NAME. */
-    private static final String NODE_INST_NAME = "name";
-
-    /** The Constant NODE_INSTANCE. */
-    private static final String NODE_INSTANCE = "instance";
-
-    /** The Constant NODE_CONFIGURATION_NAME. */
-    private static final String NODE_PARAM_NAME = "name";
-
-    /** The Constant NODE_CONFIGURATION_NAME. */
-    private static final String NODE_PARAM_VALUE = "value";
-
-    /** The Constant NODE_CONFIGURATION_NAME. */
-    private static final String NODE_PARAMETER = "parameter";
-
-    /**
-     * Generate parameters.
-     * 
-     * @param configurationNode the configuration node
-     * 
-     * @return the map< string, string>
-     */
-    private static Map<String, String> generateParam(
-	    final Element configurationNode) {
-
-	final HashMap<String, String> parameters = new HashMap<String, String>();
-
-	final NodeList parameterNodes = configurationNode
-	.getElementsByTagName(NODE_PARAMETER);
-
-	String parameterName;
-	String parameterValue;
-
-	for (int k = 0; k < parameterNodes.getLength(); ++k) {
-	    // for every parameter find, process.
-	    final Element parameterNode = (Element) parameterNodes.item(k);
-	    parameterName = parameterNode.getAttribute(NODE_PARAM_NAME);
-	    parameterValue = parameterNode.getAttribute(NODE_PARAM_VALUE);
-
-	    // verified the content.
-	    if (StringUtils.isBlank(parameterName)
-		    || StringUtils.isBlank(parameterValue)) {
-		throw new STORKSAMLEngineRuntimeException(
-		"Error reader parameters (name - value).");
-	    } else {
-		parameters.put(parameterName.trim(), parameterValue.trim());
-	    }
-	}
-	return parameters;
-    }
-
-    /**
-     * Read configuration.
-     * 
-     * @return the map< string, instance engine>
-     * 
-     * @throws SAMLEngineException the STORKSAML engine runtime
-     *             exception
-     */
-    public static Map<String, InstanceEngine> readConfiguration()
-    throws SAMLEngineException {
-
-        // fetch base from system properties, give a default if there is nothing configured
-        String base = System.getProperty("eu.stork.samlengine.config.location");
-        if(null != base)
-            if(!base.endsWith("/"))
-                base += "/";
-
-
-	LOGGER.info("Init reader: " + base + ENGINE_CONF_FILE);
-	final Map<String, InstanceEngine> instanceConfs = 
-	    new HashMap<String, InstanceEngine>();
-
-	Document document = null;
-	// Load configuration file
-	final DocumentBuilderFactory factory = DocumentBuilderFactory
-	.newInstance();
-	DocumentBuilder builder;
-
-	InputStream engineConf = null;
-	try {
-
-	    factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-
-	    builder = factory.newDocumentBuilder();
-	    
-	    if (null != base)
-            engineConf = new FileInputStream(base + ENGINE_CONF_FILE);
-        else
-            engineConf = ConfigurationReader.class.getResourceAsStream("/" + ENGINE_CONF_FILE);
-	    
-	    document = builder.parse(engineConf);
-
-	    // Read instance
-	    final NodeList list = document.getElementsByTagName(NODE_INSTANCE);
-
-	    for (int indexElem = 0; indexElem < list.getLength(); ++indexElem) {
-		final Element element = (Element) list.item(indexElem);
-
-		final InstanceEngine instanceConf = new InstanceEngine();
-
-		// read every configuration.
-		final String instanceName = element
-		.getAttribute(NODE_INST_NAME);
-
-		if (StringUtils.isBlank(instanceName)) {
-		    throw new STORKSAMLEngineRuntimeException(
-		    "Error reader instance name.");
+	/** The Constant SAML_ENGINE_CONFIGURATION_FILE. */
+	private static final String ENGINE_CONF_FILE = "SamlEngine.xml";
+
+	/** The Constant LOGGER. */
+	private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationReader.class.getName());
+
+	/** The Constant NODE_CONFIGURATION. */
+	private static final String NODE_CONF = "configuration";
+
+	/** The Constant NODE_CONFIGURATION_NAME. */
+	private static final String NODE_CONF_NAME = "name";
+
+	/** The Constant NODE_INSTANCE_NAME. */
+	private static final String NODE_INST_NAME = "name";
+
+	/** The Constant NODE_INSTANCE. */
+	private static final String NODE_INSTANCE = "instance";
+
+	/** The Constant NODE_CONFIGURATION_NAME. */
+	private static final String NODE_PARAM_NAME = "name";
+
+	/** The Constant NODE_CONFIGURATION_NAME. */
+	private static final String NODE_PARAM_VALUE = "value";
+
+	/** The Constant NODE_CONFIGURATION_NAME. */
+	private static final String NODE_PARAMETER = "parameter";
+
+	/**
+	 * Generate parameters.
+	 * 
+	 * @param configurationNode
+	 *            the configuration node
+	 * 
+	 * @return the map< string, string>
+	 */
+	private static Map<String, String> generateParam(final Element configurationNode) {
+
+		final HashMap<String, String> parameters = new HashMap<String, String>();
+
+		final NodeList parameterNodes = configurationNode.getElementsByTagName(NODE_PARAMETER);
+
+		String parameterName;
+		String parameterValue;
+
+		for (int k = 0; k < parameterNodes.getLength(); ++k) {
+			// for every parameter find, process.
+			final Element parameterNode = (Element) parameterNodes.item(k);
+			parameterName = parameterNode.getAttribute(NODE_PARAM_NAME);
+			parameterValue = parameterNode.getAttribute(NODE_PARAM_VALUE);
+
+			// verified the content.
+			if (StringUtils.isBlank(parameterName) || StringUtils.isBlank(parameterValue)) {
+				throw new STORKSAMLEngineRuntimeException("Error reader parameters (name - value).");
+			} else {
+				parameters.put(parameterName.trim(), parameterValue.trim());
+			}
 		}
-		instanceConf.setName(instanceName.trim());
+		return parameters;
+	}
+
+	/**
+	 * Read configuration.
+	 * 
+	 * @return the map< string, instance engine>
+	 * 
+	 * @throws SAMLEngineException
+	 *             the STORKSAML engine runtime exception
+	 */
+	public static Map<String, InstanceEngine> readConfiguration() throws SAMLEngineException {
 
-		final NodeList confNodes = element
-		.getElementsByTagName(NODE_CONF);
+		// fetch base from system properties, give a default if there is nothing configured
+		String base = System.getProperty("eu.stork.samlengine.config.location");
+		if (null != base)
+			if (!base.endsWith("/"))
+				base += "/";
 
-		for (int indexNode = 0; indexNode < confNodes.getLength(); ++indexNode) {
+		LOGGER.info("Init reader: " + base + ENGINE_CONF_FILE);
+		final Map<String, InstanceEngine> instanceConfs = new HashMap<String, InstanceEngine>();
 
-		    final Element configurationNode = (Element) confNodes
-		    .item(indexNode);
+		Document document = null;
+		// Load configuration file
+		final DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
+		DocumentBuilder builder;
 
-		    final String configurationName = configurationNode
-		    .getAttribute(NODE_CONF_NAME);
+		InputStream engineConf = null;
+		try {
 
-		    if (StringUtils.isBlank(configurationName)) {
-			throw new STORKSAMLEngineRuntimeException(
-				"Error reader configuration name.");
-		    }
+			factory.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
 
-		    final ConfigurationEngine confSamlEngine = 
-			new ConfigurationEngine();
+			builder = factory.newDocumentBuilder();
 
-		    // Set configuration name.
-		    confSamlEngine.setName(configurationName.trim());
+			if (null != base)
+				engineConf = new FileInputStream(base + ENGINE_CONF_FILE);
+			else
+				engineConf = ConfigurationReader.class.getResourceAsStream("/" + ENGINE_CONF_FILE);
 
-		    // Read every parameter for this configuration.
-		    final Map<String, String> parameters = 
-			generateParam(configurationNode);
+			document = builder.parse(engineConf);
 
-		    // Set parameters
-		    confSamlEngine.setParameters(parameters);
+			// Read instance
+			final NodeList list = document.getElementsByTagName(NODE_INSTANCE);
 
-		    // Add parameters to the configuration.
-		    instanceConf.getConfiguration().add(confSamlEngine);
+			for (int indexElem = 0; indexElem < list.getLength(); ++indexElem) {
+				final Element element = (Element) list.item(indexElem);
+
+				final InstanceEngine instanceConf = new InstanceEngine();
+
+				// read every configuration.
+				final String instanceName = element.getAttribute(NODE_INST_NAME);
+
+				if (StringUtils.isBlank(instanceName)) {
+					throw new STORKSAMLEngineRuntimeException("Error reader instance name.");
+				}
+				instanceConf.setName(instanceName.trim());
+
+				final NodeList confNodes = element.getElementsByTagName(NODE_CONF);
+
+				for (int indexNode = 0; indexNode < confNodes.getLength(); ++indexNode) {
+
+					final Element configurationNode = (Element) confNodes.item(indexNode);
+
+					final String configurationName = configurationNode.getAttribute(NODE_CONF_NAME);
+
+					if (StringUtils.isBlank(configurationName)) {
+						throw new STORKSAMLEngineRuntimeException("Error reader configuration name.");
+					}
+
+					final ConfigurationEngine confSamlEngine = new ConfigurationEngine();
+
+					// Set configuration name.
+					confSamlEngine.setName(configurationName.trim());
+
+					// Read every parameter for this configuration.
+					final Map<String, String> parameters = generateParam(configurationNode);
+
+					// Set parameters
+					confSamlEngine.setParameters(parameters);
+
+					// Add parameters to the configuration.
+					instanceConf.getConfiguration().add(confSamlEngine);
+				}
+
+				// Add to the list of configurations.
+				instanceConfs.put(element.getAttribute(NODE_INST_NAME), instanceConf);
+			}
+
+		} catch (SAXException e) {
+			LOGGER.error("Error: init library parser.");
+			throw new SAMLEngineException(e);
+		} catch (ParserConfigurationException e) {
+			LOGGER.error("Error: parser configuration file xml.");
+			throw new SAMLEngineException(e);
+		} catch (IOException e) {
+			LOGGER.error("Error: read configuration file.");
+			throw new SAMLEngineException(e);
+		} finally {
+			IOUtils.closeQuietly(engineConf);
 		}
 
-		// Add to the list of configurations.
-		instanceConfs.put(element.getAttribute(NODE_INST_NAME),
-			instanceConf);
-	    }
-
-	} catch (SAXException e) {
-	    LOGGER.error("Error: init library parser.");
-	    throw new SAMLEngineException(e);
-	} catch (ParserConfigurationException e) {
-	    LOGGER.error("Error: parser configuration file xml.");
-	    throw new SAMLEngineException(e);
-	} catch (IOException e) {
-	    LOGGER.error("Error: read configuration file.");
-	    throw new SAMLEngineException(e);
-	} finally {
-	    IOUtils.closeQuietly(engineConf);
+		return instanceConfs;
 	}
 
-	return instanceConfs;
-    }
+	/**
+	 * Instantiates a new configuration reader.
+	 */
+	private ConfigurationReader() {
 
-    /**
-     * Instantiates a new configuration reader.
-     */
-    private ConfigurationReader() {
-
-    }
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationSingleton.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationSingleton.java
index d00607853..4a382fe99 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationSingleton.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/ConfigurationSingleton.java
@@ -31,44 +31,44 @@ import eu.stork.peps.exceptions.STORKSAMLEngineRuntimeException;
  */
 public final class ConfigurationSingleton {
 
-    /** The instance of every engine SAML. */
-    private static Map<String, InstanceEngine> instanceConfigs;
+	/** The instance of every engine SAML. */
+	private static Map<String, InstanceEngine> instanceConfigs;
 
-    /** The instances of SAML engine. */
-    private static Map<String, Map<String, Object>> instances;
+	/** The instances of SAML engine. */
+	private static Map<String, Map<String, Object>> instances;
 
-    /** The Constant LOGGER. */
-    private static final Logger LOGGER = LoggerFactory
-	    .getLogger(ConfigurationSingleton.class.getName());
+	/** The Constant LOGGER. */
+	private static final Logger LOGGER = LoggerFactory.getLogger(ConfigurationSingleton.class.getName());
 
-    static {
-	LOGGER.debug("Read all file configurations. (instances of SAMLEngine)");
-	try {
-	    instanceConfigs = ConfigurationReader.readConfiguration();
-	} catch (SAMLEngineException e) {
-	    LOGGER.error("Error read configuration file.");
-	    throw new STORKSAMLEngineRuntimeException(e);
+	static {
+		LOGGER.debug("Read all file configurations. (instances of SAMLEngine)");
+		try {
+			instanceConfigs = ConfigurationReader.readConfiguration();
+		} catch (SAMLEngineException e) {
+			LOGGER.error("Error read configuration file.");
+			throw new STORKSAMLEngineRuntimeException(e);
+		}
 	}
-    }
 
-    /**
-     * Gets the new instance.
-     * 
-     * @param fileName the file name
-     * 
-     * @return the properties from the new instance
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine runtime exception
-     */
-    private static Map<String, Map<String, Object>> getInstance(
-	    final String fileName) throws STORKSAMLEngineException {
-	return ConfigurationCreator.createConfiguration(instanceConfigs);
-    }
+	/**
+	 * Gets the new instance.
+	 * 
+	 * @param fileName
+	 *            the file name
+	 * 
+	 * @return the properties from the new instance
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine runtime exception
+	 */
+	private static Map<String, Map<String, Object>> getInstance(final String fileName) throws STORKSAMLEngineException {
+		return ConfigurationCreator.createConfiguration(instanceConfigs);
+	}
 
-    /**
-     * Instantiates a new instance creator.
-     */
-    private ConfigurationSingleton() {
-    }
+	/**
+	 * Instantiates a new instance creator.
+	 */
+	private ConfigurationSingleton() {
+	}
 
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java
index 4d9bba8e7..0343d915a 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/InstanceEngine.java
@@ -25,46 +25,48 @@ import java.util.List;
  */
 public class InstanceEngine {
 
-    /** The configuration. */
-    private List<ConfigurationEngine> configuration = new ArrayList<ConfigurationEngine>();
+	/** The configuration. */
+	private List<ConfigurationEngine> configuration = new ArrayList<ConfigurationEngine>();
 
-    /** The name. */
-    private String name;
+	/** The name. */
+	private String name;
 
-    /**
-     * Gets the parameters.
-     * 
-     * @return the parameters
-     */
-    public final List<ConfigurationEngine> getConfiguration() {
-	return this.configuration;
-    }
+	/**
+	 * Gets the parameters.
+	 * 
+	 * @return the parameters
+	 */
+	public final List<ConfigurationEngine> getConfiguration() {
+		return this.configuration;
+	}
 
-    /**
-     * Gets the name.
-     * 
-     * @return the name
-     */
-    public final String getName() {
-	return name;
-    }
+	/**
+	 * Gets the name.
+	 * 
+	 * @return the name
+	 */
+	public final String getName() {
+		return name;
+	}
 
-    /**
-     * Sets the parameters.
-     * 
-     * @param newConfiguration the new parameters
-     */
-    public final void setConfiguration(final List<ConfigurationEngine> newConfiguration) {
-	this.configuration = newConfiguration;
-    }
+	/**
+	 * Sets the parameters.
+	 * 
+	 * @param newConfiguration
+	 *            the new parameters
+	 */
+	public final void setConfiguration(final List<ConfigurationEngine> newConfiguration) {
+		this.configuration = newConfiguration;
+	}
 
-    /**
-     * Sets the name.
-     * 
-     * @param newName the new name
-     */
-    public final void setName(final String newName) {
-	this.name = newName;
-    }
+	/**
+	 * Sets the name.
+	 * 
+	 * @param newName
+	 *            the new name
+	 */
+	public final void setName(final String newName) {
+		this.name = newName;
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/package-info.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/package-info.java
index 344368e03..e6676342d 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/package-info.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/configuration/package-info.java
@@ -17,3 +17,4 @@
  * Provides the classes necessary to create a SAML message instance.
  */
 package eu.stork.peps.configuration;
+
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java
index ac46f73e4..cc3bf3676 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/SAMLEngineException.java
@@ -22,36 +22,39 @@ package eu.stork.peps.exceptions;
  */
 public class SAMLEngineException extends Exception {
 
-    /** The Constant serialVersionUID. */
-    private static final long serialVersionUID = 2611361164977849837L;
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = 2611361164977849837L;
 
-    /**
-     * Instantiates a new SAMLEngine exception.
-     * 
-     * @param wrappedException the wrapped exception
-     */
-    public SAMLEngineException(final Exception wrappedException) {
-	super(wrappedException);
-    }
+	/**
+	 * Instantiates a new SAMLEngine exception.
+	 * 
+	 * @param wrappedException
+	 *            the wrapped exception
+	 */
+	public SAMLEngineException(final Exception wrappedException) {
+		super(wrappedException);
+	}
 
-    /**
-     * Instantiates a new SAMLEngine exception.
-     * 
-     * @param message the message
-     */
-    public SAMLEngineException(final String message) {
-	super(message);
-    }
+	/**
+	 * Instantiates a new SAMLEngine exception.
+	 * 
+	 * @param message
+	 *            the message
+	 */
+	public SAMLEngineException(final String message) {
+		super(message);
+	}
 
-    /**
-     * Instantiates a new SAMLEngine exception.
-     * 
-     * @param message the message
-     * @param wrappedException the wrapped exception
-     */
-    public SAMLEngineException(final String message,
-	    final Exception wrappedException) {
-	super(message, wrappedException);
-    }
+	/**
+	 * Instantiates a new SAMLEngine exception.
+	 * 
+	 * @param message
+	 *            the message
+	 * @param wrappedException
+	 *            the wrapped exception
+	 */
+	public SAMLEngineException(final String message, final Exception wrappedException) {
+		super(message, wrappedException);
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineException.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineException.java
index bddcbd1b3..d0d9d721d 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineException.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineException.java
@@ -22,114 +22,119 @@ package eu.stork.peps.exceptions;
  */
 public class STORKSAMLEngineException extends Exception {
 
-    /** The Constant serialVersionUID. */
-    private static final long serialVersionUID = -8319723167019122930L;
-
-    /** The error code. */
-    private String errorCode;
-
-    /** The error detail. */
-    private String errorDetail;
-
-    /**
-     * Instantiates a new sTORKSAML engine exception.
-     * 
-     * @param wrappedException the wrapped exception
-     */
-    public STORKSAMLEngineException(final Exception wrappedException) {
-	super(wrappedException);
-    }
-
-    /**
-     * Instantiates a new sTORKSAML engine exception.
-     * 
-     * @param errorMessage the error message
-     */
-    public STORKSAMLEngineException(final String errorMessage) {
-	super(errorMessage);
-    }
-
-    /**
-     * Instantiates a new sTORKSAML engine exception.
-     * 
-     * @param message the message
-     * @param wrappedException the wrapped exception
-     */
-    public STORKSAMLEngineException(final String message,
-	    final Exception wrappedException) {
-	super(message, wrappedException);
-    }
-
-    /**
-     * Instantiates a new sTORKSAML engine exception.
-     * 
-     * @param newErrorCode the error code
-     * @param errorMessage the error message
-     * @param newErrorDetail the error detail
-     */
-    public STORKSAMLEngineException(final String newErrorCode,
-	    final String errorMessage, final String newErrorDetail) {
-	super(errorMessage);
-	this.errorCode = newErrorCode;
-	this.errorDetail = newErrorDetail;
-    }
-
-    /**
-     * Gets the error code.
-     * 
-     * @return the error code
-     */
-    public final String getErrorCode() {
-	return this.errorCode;
-    }
-
-    /**
-     * Gets the error detail.
-     * 
-     * @return the error detail
-     */
-    public final String getErrorDetail() {
-	return errorDetail;
-    }
-
-    /**
-     * Gets the error message.
-     * 
-     * @return the error message
-     */
-    public final String getErrorMessage() {
-	return super.getMessage();
-    }
-
-
-    /**
-     * Gets the message.
-     * 
-     * @return the message of the exception.
-     * 
-     * @see java.lang.Throwable#getMessage()
-     */
-    public final String getMessage() {
-	return "Error (no. " + errorCode + ") processing request : "
-		+ super.getMessage();
-    }
-
-    /**
-     * Sets the error code.
-     * 
-     * @param newErrorCode the new error code
-     */
-    public final void setErrorCode(final String newErrorCode) {
-        this.errorCode = newErrorCode;
-    }
-
-    /**
-     * Sets the error detail.
-     * 
-     * @param newErrorDetail the new error detail
-     */
-    public final void setErrorDetail(final String newErrorDetail) {
-        this.errorDetail = newErrorDetail;
-    }
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = -8319723167019122930L;
+
+	/** The error code. */
+	private String errorCode;
+
+	/** The error detail. */
+	private String errorDetail;
+
+	/**
+	 * Instantiates a new sTORKSAML engine exception.
+	 * 
+	 * @param wrappedException
+	 *            the wrapped exception
+	 */
+	public STORKSAMLEngineException(final Exception wrappedException) {
+		super(wrappedException);
+	}
+
+	/**
+	 * Instantiates a new sTORKSAML engine exception.
+	 * 
+	 * @param errorMessage
+	 *            the error message
+	 */
+	public STORKSAMLEngineException(final String errorMessage) {
+		super(errorMessage);
+	}
+
+	/**
+	 * Instantiates a new sTORKSAML engine exception.
+	 * 
+	 * @param message
+	 *            the message
+	 * @param wrappedException
+	 *            the wrapped exception
+	 */
+	public STORKSAMLEngineException(final String message, final Exception wrappedException) {
+		super(message, wrappedException);
+	}
+
+	/**
+	 * Instantiates a new sTORKSAML engine exception.
+	 * 
+	 * @param newErrorCode
+	 *            the error code
+	 * @param errorMessage
+	 *            the error message
+	 * @param newErrorDetail
+	 *            the error detail
+	 */
+	public STORKSAMLEngineException(final String newErrorCode, final String errorMessage, final String newErrorDetail) {
+		super(errorMessage);
+		this.errorCode = newErrorCode;
+		this.errorDetail = newErrorDetail;
+	}
+
+	/**
+	 * Gets the error code.
+	 * 
+	 * @return the error code
+	 */
+	public final String getErrorCode() {
+		return this.errorCode;
+	}
+
+	/**
+	 * Gets the error detail.
+	 * 
+	 * @return the error detail
+	 */
+	public final String getErrorDetail() {
+		return errorDetail;
+	}
+
+	/**
+	 * Gets the error message.
+	 * 
+	 * @return the error message
+	 */
+	public final String getErrorMessage() {
+		return super.getMessage();
+	}
+
+	/**
+	 * Gets the message.
+	 * 
+	 * @return the message of the exception.
+	 * 
+	 * @see java.lang.Throwable#getMessage()
+	 */
+	public final String getMessage() {
+		return "Error (no. " + errorCode + ") processing request : " + super.getMessage();
+	}
+
+	/**
+	 * Sets the error code.
+	 * 
+	 * @param newErrorCode
+	 *            the new error code
+	 */
+	public final void setErrorCode(final String newErrorCode) {
+		this.errorCode = newErrorCode;
+	}
+
+	/**
+	 * Sets the error detail.
+	 * 
+	 * @param newErrorDetail
+	 *            the new error detail
+	 */
+	public final void setErrorDetail(final String newErrorDetail) {
+		this.errorDetail = newErrorDetail;
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java
index fb01fd5aa..f43c1bd78 100644
--- a/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java
+++ b/id/server/stork2-saml-engine/src/main/java/eu/stork/peps/exceptions/STORKSAMLEngineRuntimeException.java
@@ -22,35 +22,38 @@ package eu.stork.peps.exceptions;
  */
 public class STORKSAMLEngineRuntimeException extends RuntimeException {
 
-    /** The Constant serialVersionUID. */
-    private static final long serialVersionUID = 5829810358581493517L;
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = 5829810358581493517L;
 
-    /**
-     * Instantiates a new sTORKSAML engine runtime exception.
-     * 
-     * @param wrappedException the wrapped exception
-     */
-    public STORKSAMLEngineRuntimeException(final Exception wrappedException) {
-	super(wrappedException);
-    }
+	/**
+	 * Instantiates a new sTORKSAML engine runtime exception.
+	 * 
+	 * @param wrappedException
+	 *            the wrapped exception
+	 */
+	public STORKSAMLEngineRuntimeException(final Exception wrappedException) {
+		super(wrappedException);
+	}
 
-    /**
-     * Creates a new instance of application exception.
-     * 
-     * @param cause the exception cause.
-     */
-    public STORKSAMLEngineRuntimeException(final String cause) {
-	super(cause);
-    }
+	/**
+	 * Creates a new instance of application exception.
+	 * 
+	 * @param cause
+	 *            the exception cause.
+	 */
+	public STORKSAMLEngineRuntimeException(final String cause) {
+		super(cause);
+	}
 
-    /**
-     * Instantiates a new sTORKSAML engine runtime exception.
-     * 
-     * @param message the message
-     * @param wrappedException the wrapped exception
-     */
-    public STORKSAMLEngineRuntimeException(final String message,
-	    final Exception wrappedException) {
-	super(message, wrappedException);
-    }
+	/**
+	 * Instantiates a new sTORKSAML engine runtime exception.
+	 * 
+	 * @param message
+	 *            the message
+	 * @param wrappedException
+	 *            the wrapped exception
+	 */
+	public STORKSAMLEngineRuntimeException(final String message, final Exception wrappedException) {
+		super(message, wrappedException);
+	}
 }
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SSETestUtils.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SSETestUtils.java
index eb885eea9..b421dce8c 100644
--- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SSETestUtils.java
+++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SSETestUtils.java
@@ -44,130 +44,130 @@ import org.w3c.dom.Element;
  * The Class SSETestUtils.
  */
 public final class SSETestUtils {
-    
-    
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory
-	    .getLogger(SSETestUtils.class.getName());
-    
-    /**
-     * Instantiates a new sSE test utils.
-     */
-    private SSETestUtils() {	
-    }
-
-    /**
-     * Prints the tree DOM.
-     * 
-     * @param samlToken the SAML token
-     * @param isIndent the is indent
-     * 
-     * @return the string
-     * @throws TransformerException the exception     
-     */
-    public static String printTreeDOM(final Element samlToken, final boolean isIndent) throws TransformerException {
-	// set up a transformer
-	final TransformerFactory transfac = TransformerFactory.newInstance();
-	final Transformer trans = transfac.newTransformer();
-	trans.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
-	trans.setOutputProperty(OutputKeys.INDENT, String.valueOf(isIndent));
-
-	// create string from XML tree
-	final StringWriter stringWriter = new StringWriter();
-	final StreamResult result = new StreamResult(stringWriter);
-	final DOMSource source = new DOMSource(samlToken);
-	trans.transform(source, result);
-	final String xmlString = stringWriter.toString();
-
-	return xmlString;
-    }
-
-    /**
-     * Marshall.
-     * 
-     * @param samlToken the SAML token
-     * 
-     * @return the byte[]
-     * 
-     * @throws MarshallingException the marshalling exception
-     * @throws ParserConfigurationException the parser configuration exception
-     * @throws TransformerException the transformer exception
-     */
-    public static byte[] marshall(final XMLObject samlToken)
-	    throws MarshallingException, ParserConfigurationException,
-	    TransformerException {
-
-	final javax.xml.parsers.DocumentBuilderFactory dbf = javax.xml.parsers.DocumentBuilderFactory
-		.newInstance();
-	dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
-	dbf.setNamespaceAware(true);
-	dbf.setIgnoringComments(true);
-	final javax.xml.parsers.DocumentBuilder docBuild = dbf
-		.newDocumentBuilder();
-
-	// Get the marshaller factory
-	final MarshallerFactory marshallerFactory = Configuration
-		.getMarshallerFactory();
-
-	// Get the Subject marshaller
-	final Marshaller marshaller = marshallerFactory
-		.getMarshaller(samlToken);
-
-	final Document doc = docBuild.newDocument();
-
-	// Marshall the SAML token
-	marshaller.marshall(samlToken, doc);
-
-	// Obtain a byte array representation of the marshalled SAML object
-	final DOMSource domSource = new DOMSource(doc);
-	final StringWriter writer = new StringWriter();
-	final StreamResult result = new StreamResult(writer);
-	final TransformerFactory transFact = TransformerFactory.newInstance();
-	final Transformer transformer = transFact.newTransformer();
-	transformer.transform(domSource, result);
-
-	return writer.toString().getBytes();
-    }
-
-    /**
-     * Encode SAML token.
-     * 
-     * @param samlToken the SAML token
-     * 
-     * @return the string
-     */
-    public static String encodeSAMLToken(final byte[] samlToken) {
-    	return new String(Base64.encode(samlToken));
-    }
-
-    /**
-     * Read stork SAML from file.
-     * 
-     * @param resource the resource
-     * 
-     * @return the byte[]
-     * @throws IOException the exception
-     * 
-     */
-    public static byte[] readStorkSamlFromFile(final String resource)
-	    throws IOException {
-	InputStream inputStream = null;
-	byte[] bytes;
-	
-	try {
-	    inputStream = StorkAuthRequestTest.class
-		.getResourceAsStream(resource);
-	
-	    // Create the byte array to hold the data
-	    bytes = new byte[(int) inputStream.available()];
-	    inputStream.read(bytes);
-	} catch (IOException e) {	    
-	    LOG.error("Error read from file: " + resource);
-	    throw e;
-	} finally {
-	    IOUtils.closeQuietly(inputStream);
+
+	/** The Constant LOG. */
+	private static final Logger LOG = LoggerFactory.getLogger(SSETestUtils.class.getName());
+
+	/**
+	 * Instantiates a new sSE test utils.
+	 */
+	private SSETestUtils() {
+	}
+
+	/**
+	 * Prints the tree DOM.
+	 * 
+	 * @param samlToken
+	 *            the SAML token
+	 * @param isIndent
+	 *            the is indent
+	 * 
+	 * @return the string
+	 * @throws TransformerException
+	 *             the exception
+	 */
+	public static String printTreeDOM(final Element samlToken, final boolean isIndent) throws TransformerException {
+		// set up a transformer
+		final TransformerFactory transfac = TransformerFactory.newInstance();
+		final Transformer trans = transfac.newTransformer();
+		trans.setOutputProperty(OutputKeys.OMIT_XML_DECLARATION, "yes");
+		trans.setOutputProperty(OutputKeys.INDENT, String.valueOf(isIndent));
+
+		// create string from XML tree
+		final StringWriter stringWriter = new StringWriter();
+		final StreamResult result = new StreamResult(stringWriter);
+		final DOMSource source = new DOMSource(samlToken);
+		trans.transform(source, result);
+		final String xmlString = stringWriter.toString();
+
+		return xmlString;
+	}
+
+	/**
+	 * Marshall.
+	 * 
+	 * @param samlToken
+	 *            the SAML token
+	 * 
+	 * @return the byte[]
+	 * 
+	 * @throws MarshallingException
+	 *             the marshalling exception
+	 * @throws ParserConfigurationException
+	 *             the parser configuration exception
+	 * @throws TransformerException
+	 *             the transformer exception
+	 */
+	public static byte[] marshall(final XMLObject samlToken) throws MarshallingException, ParserConfigurationException, TransformerException {
+
+		final javax.xml.parsers.DocumentBuilderFactory dbf = javax.xml.parsers.DocumentBuilderFactory.newInstance();
+		dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, true);
+		dbf.setNamespaceAware(true);
+		dbf.setIgnoringComments(true);
+		final javax.xml.parsers.DocumentBuilder docBuild = dbf.newDocumentBuilder();
+
+		// Get the marshaller factory
+		final MarshallerFactory marshallerFactory = Configuration.getMarshallerFactory();
+
+		// Get the Subject marshaller
+		final Marshaller marshaller = marshallerFactory.getMarshaller(samlToken);
+
+		final Document doc = docBuild.newDocument();
+
+		// Marshall the SAML token
+		marshaller.marshall(samlToken, doc);
+
+		// Obtain a byte array representation of the marshalled SAML object
+		final DOMSource domSource = new DOMSource(doc);
+		final StringWriter writer = new StringWriter();
+		final StreamResult result = new StreamResult(writer);
+		final TransformerFactory transFact = TransformerFactory.newInstance();
+		final Transformer transformer = transFact.newTransformer();
+		transformer.transform(domSource, result);
+
+		return writer.toString().getBytes();
+	}
+
+	/**
+	 * Encode SAML token.
+	 * 
+	 * @param samlToken
+	 *            the SAML token
+	 * 
+	 * @return the string
+	 */
+	public static String encodeSAMLToken(final byte[] samlToken) {
+		return new String(Base64.encode(samlToken));
 	}
-	return bytes;
 
-    }
+	/**
+	 * Read stork SAML from file.
+	 * 
+	 * @param resource
+	 *            the resource
+	 * 
+	 * @return the byte[]
+	 * @throws IOException
+	 *             the exception
+	 * 
+	 */
+	public static byte[] readStorkSamlFromFile(final String resource) throws IOException {
+		InputStream inputStream = null;
+		byte[] bytes;
+
+		try {
+			inputStream = StorkAuthRequestTest.class.getResourceAsStream(resource);
+
+			// Create the byte array to hold the data
+			bytes = new byte[(int) inputStream.available()];
+			inputStream.read(bytes);
+		} catch (IOException e) {
+			LOG.error("Error read from file: " + resource);
+			throw e;
+		} finally {
+			IOUtils.closeQuietly(inputStream);
+		}
+		return bytes;
+
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SimpleBaseTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SimpleBaseTest.java
index c52b8a779..bdb8780c3 100644
--- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SimpleBaseTest.java
+++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/SimpleBaseTest.java
@@ -22,43 +22,42 @@ import junit.framework.TestCase;
 import eu.stork.peps.auth.engine.STORKSAMLEngine;
 
 /**
- * The Class SimpleBaseTest. Defines a set of test the initialization of the
- * SAML engine.
+ * The Class SimpleBaseTest. Defines a set of test the initialization of the SAML engine.
  */
 @SuppressWarnings("deprecation")
 public class SimpleBaseTest extends TestCase {
 
-    /**
-     * Test SAML engine correct configuration name.
-     */
-    
+	/**
+	 * Test SAML engine correct configuration name.
+	 */
+
 	@Test
-    public final void testSamlEngineCorrectInit() {
-	Assert.assertNotNull(STORKSAMLEngine.getInstance("CONF1"));
-    }
+	public final void testSamlEngineCorrectInit() {
+		Assert.assertNotNull(STORKSAMLEngine.getInstance("CONF1"));
+	}
 
-    /**
-     * Test SAML engine error configuration name.
-     */
-    @Test
-    public final void testSamlEngineErrorNameConf() {
-	Assert.assertNull(STORKSAMLEngine.getInstance("CONF_ERROR"));
-    }
+	/**
+	 * Test SAML engine error configuration name.
+	 */
+	@Test
+	public final void testSamlEngineErrorNameConf() {
+		Assert.assertNull(STORKSAMLEngine.getInstance("CONF_ERROR"));
+	}
 
-    /**
-     * Test SAML engine error name null.
-     */
-    @Test
-    public final void testSamlEngineErrorNameNull() {	
-	Assert.assertNull(STORKSAMLEngine.getInstance(null));
-    }
+	/**
+	 * Test SAML engine error name null.
+	 */
+	@Test
+	public final void testSamlEngineErrorNameNull() {
+		Assert.assertNull(STORKSAMLEngine.getInstance(null));
+	}
+
+	/**
+	 * Test SAML engine correct name configuration with spaces.
+	 */
+	@Test
+	public final void testSamlEngineErrorNameSpaces() {
+		Assert.assertNotNull(STORKSAMLEngine.getInstance("   CONF1    "));
+	}
 
-    /**
-     * Test SAML engine correct name configuration with spaces.
-     */
-    @Test
-    public final void testSamlEngineErrorNameSpaces() {
-	Assert.assertNotNull(STORKSAMLEngine.getInstance("   CONF1    "));
-    }
-    
 }
diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java
index 0eda1bfbf..4f22df7fb 100644
--- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java
+++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryRequestTest.java
@@ -20,845 +20,833 @@ import eu.stork.peps.auth.engine.STORKSAMLEngine;
 import eu.stork.peps.exceptions.STORKSAMLEngineException;
 
 public class StorkAttrQueryRequestTest {
-	
-	/** The engines. */	
-    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
-    private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
-    private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");    
-    private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
-            
-
-    /**
-     * Instantiates a new stork authentication request test.
-     */
-    public StorkAttrQueryRequestTest() {
-	pal = new PersonalAttributeList();
-
-	final PersonalAttribute isAgeOver = new PersonalAttribute();
-	isAgeOver.setName("isAgeOver");
-	isAgeOver.setIsRequired(true);
-	final ArrayList<String> ages = new ArrayList<String>();
-	ages.add("16");
-	ages.add("18");
-	isAgeOver.setValue(ages);
-	pal.add(isAgeOver);
-	
-	final PersonalAttribute dateOfBirth = new PersonalAttribute();
-	dateOfBirth.setName("dateOfBirth");
-	dateOfBirth.setIsRequired(false);
-	pal.add(dateOfBirth);
-	
-		final PersonalAttribute eIDNumber = new PersonalAttribute();	
-	eIDNumber.setName("eIdentifier");
-	eIDNumber.setIsRequired(true);
-	eIDNumber.setValue(Arrays.asList("ES/IS/1234567890"));
-	pal.add(eIDNumber);
-	
-	final PersonalAttribute givenName = new PersonalAttribute();
-	givenName.setName("givenName");
-	givenName.setIsRequired(true);
-	givenName.setValue(Arrays.asList("Sveinbjorn"));
-	pal.add(givenName);
-
-	destination = "http://A-PEPS.gov.xx/PEPS/AttributeColleagueRequest";
-	assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
-	//spName = "University of Oxford";
-	spSector = "EDU001";
-	spInstitution = "OXF001";
-	spApplication = "APP001";
-	spCountry = "IS";
-	
-	spId = "EDU001-OXF001-APP001";
-	
-    }
-
-    /** The destination. */
-    private String destination;
-
-    /** The service provider sector. */
-    private String spSector;
-
-    /** The service provider institution. */
-    private String spInstitution;
-
-    /** The service provider application. */
-    private String spApplication;
-
-    /** The service provider country. */
-    private String spCountry;
-    
-    /** The service provider id. */
-    private String spId;
-    
-    /** The assertion consumer URL. */
-    private String assertConsumerUrl;
-
-    /** The quality authentication assurance level. */
-    private static final int QAAL = 3;
-
-    /** The List of Personal Attributes. */
-    private IPersonalAttributeList pal;
-
-    /** The attribute query request. */
-    private static byte[] attrRequest;
-
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory
-	    .getLogger(StorkAttrQueryRequestTest.class.getName());
-
-    /** Parser manager used to parse XML. */
-    private static BasicParserPool parser;
-
-    static {
-	parser = new BasicParserPool();
-	parser.setNamespaceAware(true);
-    }
-    
-    /**
-     * Test generate authentication request.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAttrQueryRequest() throws STORKSAMLEngineException {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-
-	// new parameters
-	request.setEIDSectorShare(false);	
-	request.setEIDCrossSectorShare(false);
-	request.setEIDCrossBorderShare(false);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-	request.setSpCountry(spCountry);
-
-	STORKAttrQueryRequest req1 = engine0.generateSTORKAttrQueryRequest(request);
-	byte[] reqByte = req1.getTokenSaml();
-	FileOutputStream output = null;
-	
-	try {
-		output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml"));
-	} catch (FileNotFoundException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
+
+	/** The engines. */
+	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
+	private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
+	private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");
+	private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
+
+	/**
+	 * Instantiates a new stork authentication request test.
+	 */
+	public StorkAttrQueryRequestTest() {
+		pal = new PersonalAttributeList();
+
+		final PersonalAttribute isAgeOver = new PersonalAttribute();
+		isAgeOver.setName("isAgeOver");
+		isAgeOver.setIsRequired(true);
+		final ArrayList<String> ages = new ArrayList<String>();
+		ages.add("16");
+		ages.add("18");
+		isAgeOver.setValue(ages);
+		pal.add(isAgeOver);
+
+		final PersonalAttribute dateOfBirth = new PersonalAttribute();
+		dateOfBirth.setName("dateOfBirth");
+		dateOfBirth.setIsRequired(false);
+		pal.add(dateOfBirth);
+
+		final PersonalAttribute eIDNumber = new PersonalAttribute();
+		eIDNumber.setName("eIdentifier");
+		eIDNumber.setIsRequired(true);
+		eIDNumber.setValue(Arrays.asList("ES/IS/1234567890"));
+		pal.add(eIDNumber);
+
+		final PersonalAttribute givenName = new PersonalAttribute();
+		givenName.setName("givenName");
+		givenName.setIsRequired(true);
+		givenName.setValue(Arrays.asList("Sveinbjorn"));
+		pal.add(givenName);
+
+		final PersonalAttribute fiscalNumber = new PersonalAttribute();
+		fiscalNumber.setName("fiscalNumber");
+		fiscalNumber.setIsRequired(true);
+		fiscalNumber.setValue(Arrays.asList("fiscalNumber"));
+		pal.add(fiscalNumber);
+
+		final PersonalAttribute LPFiscalNumber = new PersonalAttribute();
+		LPFiscalNumber.setName("LPFiscalNumber");
+		LPFiscalNumber.setIsRequired(true);
+		LPFiscalNumber.setValue(Arrays.asList("LPFiscalNumber"));
+		pal.add(LPFiscalNumber);
+
+		destination = "http://A-PEPS.gov.xx/PEPS/AttributeColleagueRequest";
+		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
+		// spName = "University of Oxford";
+		spSector = "EDU001";
+		spInstitution = "OXF001";
+		spApplication = "APP001";
+		spCountry = "IS";
+
+		spId = "EDU001-OXF001-APP001";
+
 	}
-	try {
-		output.write(reqByte);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
+
+	/** The destination. */
+	private String destination;
+
+	/** The service provider sector. */
+	private String spSector;
+
+	/** The service provider institution. */
+	private String spInstitution;
+
+	/** The service provider application. */
+	private String spApplication;
+
+	/** The service provider country. */
+	private String spCountry;
+
+	/** The service provider id. */
+	private String spId;
+
+	/** The assertion consumer URL. */
+	private String assertConsumerUrl;
+
+	/** The quality authentication assurance level. */
+	private static final int QAAL = 3;
+
+	/** The List of Personal Attributes. */
+	private IPersonalAttributeList pal;
+
+	/** The attribute query request. */
+	private static byte[] attrRequest;
+
+	/** The Constant LOG. */
+	private static final Logger LOG = LoggerFactory.getLogger(StorkAttrQueryRequestTest.class.getName());
+
+	/** Parser manager used to parse XML. */
+	private static BasicParserPool parser;
+
+	static {
+		parser = new BasicParserPool();
+		parser.setNamespaceAware(true);
 	}
-	
-	LOG.info("STORKAttrQueryRequest 1: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
-	
-	request.setCitizenCountryCode("IS");
-	LOG.info("STORKAttrQueryRequest 2: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
-    }
-    
-    /**
-     * Test generate authentication request error personal attribute name error.
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestPALsErr1() {
-	
-	final IPersonalAttributeList palWrong = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();
-	worngAttr.setName("attrNotValid");
-	worngAttr.setIsRequired(true);
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(palWrong);
-
-	// news parameters
-	request.setEIDSectorShare(false);	
-	request.setEIDCrossSectorShare(false);
-	request.setEIDCrossBorderShare(false);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-
-	try {
-	    engine.generateSTORKAttrQueryRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequest() throws STORKSAMLEngineException {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+
+		// new parameters
+		request.setEIDSectorShare(false);
+		request.setEIDCrossSectorShare(false);
+		request.setEIDCrossBorderShare(false);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+		request.setSpCountry(spCountry);
+
+		STORKAttrQueryRequest req1 = engine0.generateSTORKAttrQueryRequest(request);
+		byte[] reqByte = req1.getTokenSaml();
+		FileOutputStream output = null;
+
+		try {
+			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml"));
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		try {
+			output.write(reqByte);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		LOG.info("STORKAttrQueryRequest 1: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
+
+		request.setCitizenCountryCode("IS");
+		LOG.info("STORKAttrQueryRequest 2: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
 	}
-    }
-    
-    
-    
-    /**
-     * Test generate authentication request error personal attribute value error.
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestPALsErr2() {
-	
-	final IPersonalAttributeList palWrong = new PersonalAttributeList();
-
-	final PersonalAttribute attrNotValid = new PersonalAttribute();
-	attrNotValid.setName("attrNotValid");
-	attrNotValid.setIsRequired(true);
-	palWrong.add(attrNotValid);
-
-
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(palWrong);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-
-	try {
-	    engine.generateSTORKAttrQueryRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request error personal attribute name error.
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestPALsErr1() {
+
+		final IPersonalAttributeList palWrong = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		worngAttr.setName("attrNotValid");
+		worngAttr.setIsRequired(true);
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(palWrong);
+
+		// news parameters
+		request.setEIDSectorShare(false);
+		request.setEIDCrossSectorShare(false);
+		request.setEIDCrossBorderShare(false);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+
+		try {
+			engine.generateSTORKAttrQueryRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request authentication assurance level
-     * negative value.
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestQaalErr1() {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(-1);
-	request.setPersonalAttributeList(pal);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-
-	try {
-	    engine.generateSTORKAttrQueryRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request error personal attribute value error.
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestPALsErr2() {
+
+		final IPersonalAttributeList palWrong = new PersonalAttributeList();
+
+		final PersonalAttribute attrNotValid = new PersonalAttribute();
+		attrNotValid.setName("attrNotValid");
+		attrNotValid.setIsRequired(true);
+		palWrong.add(attrNotValid);
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(palWrong);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+
+		try {
+			engine.generateSTORKAttrQueryRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request service provider sector null.
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestSectorErr() {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(null);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-
-	try {
-	    engine.generateSTORKAttrQueryRequest(request);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
 
+	/**
+	 * Test generate authentication request authentication assurance level negative value.
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestQaalErr1() {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(-1);
+		request.setPersonalAttributeList(pal);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+
+		try {
+			engine.generateSTORKAttrQueryRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request service provider institution null.
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestDestinationErr() {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(null);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(null);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-
-	try {
-	    engine.generateSTORKAttrQueryRequest(request);
-	    fail("generateSTORKAttrQueryRequest(...) should've thrown an STORKSAMLEngineException!");
-	    
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");	    
+
+	/**
+	 * Test generate authentication request service provider sector null.
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestSectorErr() {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(null);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+
+		try {
+			engine.generateSTORKAttrQueryRequest(request);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request service provider application null.
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestApplicationErr() {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(null);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-
-	try {
-	    engine.generateSTORKAttrQueryRequest(request);
-	    
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+
+	/**
+	 * Test generate authentication request service provider institution null.
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestDestinationErr() {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(null);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(null);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+
+		try {
+			engine.generateSTORKAttrQueryRequest(request);
+			fail("generateSTORKAttrQueryRequest(...) should've thrown an STORKSAMLEngineException!");
+
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request service provider country null.
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestCountryErr() {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(null);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-
-	try {
-	    engine.generateSTORKAttrQueryRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	    
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");	    
+
+	/**
+	 * Test generate authentication request service provider application null.
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestApplicationErr() {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(null);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+
+		try {
+			engine.generateSTORKAttrQueryRequest(request);
+
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		}
+	}
+
+	/**
+	 * Test generate authentication request service provider country null.
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestCountryErr() {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(null);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+
+		try {
+			engine.generateSTORKAttrQueryRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request error with quality authentication
-     * assurance level wrong.
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestQaalErr2() {
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(0);
-	request.setPersonalAttributeList(pal);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-
-	try {
-	    engine.generateSTORKAttrQueryRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request error with quality authentication assurance level wrong.
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestQaalErr2() {
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(0);
+		request.setPersonalAttributeList(pal);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+
+		try {
+			engine.generateSTORKAttrQueryRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test generate authentication request personal attribute list null value.
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestPALErr1() {
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(null);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+
+		try {
+			engine.generateSTORKAttrQueryRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test validate authentication request null parameter.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAttrQueryRequestNullParam() throws STORKSAMLEngineException {
+		try {
+			engine.validateSTORKAttrQueryRequest(null);
+			fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test validate authentication request error bytes encode.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAttrQueryRequestErrorEncode() throws STORKSAMLEngineException {
+		try {
+			engine.validateSTORKAttrQueryRequest("messageError".getBytes());
+			fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test validate authentication request.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAttrQueryRequest() throws STORKSAMLEngineException {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		attrRequest = engine.generateSTORKAttrQueryRequest(request).getTokenSaml();
+
+		final STORKAttrQueryRequest validatedRequest = engine.validateSTORKAttrQueryRequest(attrRequest);
+
+		assertEquals("CrossBorderShare incorrect: ", validatedRequest.isEIDCrossBorderShare(), false);
+		assertEquals("CrossSectorShare incorrect: ", validatedRequest.isEIDCrossSectorShare(), false);
+		assertEquals("SectorShare incorrect: ", validatedRequest.isEIDSectorShare(), false);
+
+	}
+
+	/**
+	 * Test validate data authenticate request. Verified parameters after validation.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateDataAttrQueryRequest() throws STORKSAMLEngineException {
+
+		final STORKAttrQueryRequest request = engine.validateSTORKAttrQueryRequest(attrRequest);
+
+		assertEquals("Sestination incorrect: ", request.getDestination(), destination);
+
+		assertEquals("CrossBorderShare incorrect: ", request.isEIDCrossBorderShare(), false);
+		assertEquals("CrossSectorShare incorrect: ", request.isEIDCrossSectorShare(), false);
+		assertEquals("SectorShare incorrect: ", request.isEIDSectorShare(), false);
+
+		assertEquals("QAAL incorrect: ", request.getQaa(), QAAL);
+		assertEquals("SPSector incorrect: ", request.getSpSector(), spSector);
+		assertEquals("SPInstitution incorrect: ", request.getSpInstitution(), null);
+		assertEquals("SPApplication incorrect: ", request.getSpApplication(), spApplication);
+		assertEquals("CitizenCountryCode incorrect: ", request.getCitizenCountryCode(), null);
+
 	}
-    }
-
-    /**
-     * Test generate authentication request personal attribute list null value.
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestPALErr1() {
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(null);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-
-	try {
-	    engine.generateSTORKAttrQueryRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate file attribute query request. Validate from XML file.
+	 * 
+	 * @throws Exception
+	 *             the exception
+	 */
+	@Test
+	public final void testValidateFileAttrQueryRequest() throws Exception {
+
+		final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AttrQueryRequest1.xml");
+
+		try {
+			engine.validateSTORKAttrQueryRequest(bytes);
+			fail("testValidateFileAttrQueryRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error(e.getMessage());
+		}
 	}
-    }
-   
-    /**
-     * Test validate authentication request null parameter.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAttrQueryRequestNullParam()
-	    throws STORKSAMLEngineException {
-	try {
-	    engine.validateSTORKAttrQueryRequest(null);
-	    fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate file authentication request tag delete.
+	 * 
+	 * @throws Exception
+	 *             the exception
+	 */
+	@Test
+	public final void testValidateFileAttrRequestTagDelete() throws Exception {
+
+		final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml");
+
+		try {
+			engine.validateSTORKAttrQueryRequest(bytes);
+			fail("validateSTORKAttrQueryRequest(...) should have thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error(e.getMessage());
+
+		}
 	}
-    }
-
-    /**
-     * Test validate authentication request error bytes encode.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAttrQueryRequestErrorEncode()
-	    throws STORKSAMLEngineException {
-	try {
-	    engine.validateSTORKAttrQueryRequest("messageError".getBytes());
-	    fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate authentication request not trusted token.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAttrQueryRequestNotTrustedErr1() throws STORKSAMLEngineException {
+
+		try {
+			final STORKSAMLEngine engineNotTrusted = STORKSAMLEngine.getInstance("CONF2");
+
+			final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+			request.setDestination(destination);
+			request.setQaa(QAAL);
+			request.setPersonalAttributeList(pal);
+			request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+			// news parameters
+			request.setSpSector(spSector);
+			request.setSpInstitution(spInstitution);
+			request.setSpApplication(spApplication);
+			request.setSpCountry(spCountry);
+
+			final byte[] authReqNotTrust = engineNotTrusted.generateSTORKAttrQueryRequest(request).getTokenSaml();
+
+			engine.validateSTORKAttrQueryRequest(authReqNotTrust);
+			fail("validateSTORKAttrQueryRequestNotTrusted(...) should have thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test validate authentication request.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAttrQueryRequest() throws STORKSAMLEngineException {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-	
-	attrRequest = engine.generateSTORKAttrQueryRequest(request).getTokenSaml();
-	
-	final STORKAttrQueryRequest validatedRequest = engine.validateSTORKAttrQueryRequest(attrRequest);	 
-		
-	assertEquals("CrossBorderShare incorrect: ", validatedRequest.isEIDCrossBorderShare(), false);
-	assertEquals("CrossSectorShare incorrect: ", validatedRequest.isEIDCrossSectorShare(),	false);
-	assertEquals("SectorShare incorrect: ", validatedRequest.isEIDSectorShare(), false);
-	
-    }
-
-    /**
-     * Test validate data authenticate request. Verified parameters after
-     * validation.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateDataAttrQueryRequest() throws STORKSAMLEngineException {
-    	
-    final STORKAttrQueryRequest request = engine.validateSTORKAttrQueryRequest(attrRequest);
-
-	assertEquals("Sestination incorrect: ", request.getDestination(), destination);
-	
-	assertEquals("CrossBorderShare incorrect: ", request.isEIDCrossBorderShare(), false);
-	assertEquals("CrossSectorShare incorrect: ", request.isEIDCrossSectorShare(), false);
-	assertEquals("SectorShare incorrect: ", request.isEIDSectorShare(), false);	
-
-	assertEquals("QAAL incorrect: ", request.getQaa(), QAAL);
-	assertEquals("SPSector incorrect: ", request.getSpSector(), spSector);		
-	assertEquals("SPInstitution incorrect: ", request.getSpInstitution(), null);
-	assertEquals("SPApplication incorrect: ", request.getSpApplication(), spApplication);
-	assertEquals("CitizenCountryCode incorrect: ", request.getCitizenCountryCode(), null);
-		
-    }
-
-    /**
-     * Test validate file attribute query request. Validate from XML file.
-     *     
-     * @throws Exception the exception
-     */
-    @Test
-    public final void testValidateFileAttrQueryRequest() throws Exception {
-
-	final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AttrQueryRequest1.xml");
-
-	try {
-	    engine.validateSTORKAttrQueryRequest(bytes);
-        fail("testValidateFileAttrQueryRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error(e.getMessage());
+
+	/**
+	 * Test validate authentication request trusted.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAttrQueryRequestTrusted() throws STORKSAMLEngineException {
+
+		final STORKSAMLEngine engineTrusted = STORKSAMLEngine.getInstance("CONF3");
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		final byte[] authReqNotTrust = engineTrusted.generateSTORKAttrQueryRequest(request).getTokenSaml();
+
+		// engine ("CONF1") no have trust certificate from "CONF2"
+		engine.validateSTORKAttrQueryRequest(authReqNotTrust);
+
 	}
-    }
 
-    /**
-     * Test validate file authentication request tag delete.
-     * 
-     * @throws Exception the exception
-     */
-    @Test
-    public final void testValidateFileAttrRequestTagDelete() throws Exception {
+	/**
+	 * Test generate authentication request service provider application null.
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestNADA() {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+
+		// news parameters
+		request.setSpSector(null);
+		request.setSpInstitution(null);
+		request.setSpApplication(null);
+		request.setSpCountry(null);
 
-	final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml");
+		try {
 
-	try {
-	    engine.validateSTORKAttrQueryRequest(bytes);
-        fail("validateSTORKAttrQueryRequest(...) should have thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error(e.getMessage());
+			engine.validateSTORKAttrQueryRequest(attrRequest);
 
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		}
 	}
-    }
-
-    /**
-     * Test validate authentication request not trusted token.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAttrQueryRequestNotTrustedErr1()
-	    throws STORKSAMLEngineException {
-	
-	try {
-	    final STORKSAMLEngine engineNotTrusted = STORKSAMLEngine
-		    .getInstance("CONF2");
-
-	    final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	    request.setDestination(destination);
-	    request.setQaa(QAAL);
-	    request.setPersonalAttributeList(pal);
-	    request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	    // news parameters
-	    request.setSpSector(spSector);
-	    request.setSpInstitution(spInstitution);
-	    request.setSpApplication(spApplication);
-	    request.setSpCountry(spCountry);
-
-	    final byte[] authReqNotTrust = engineNotTrusted
-		    .generateSTORKAttrQueryRequest(request).getTokenSaml();
-
-	    engine.validateSTORKAttrQueryRequest(authReqNotTrust);
-	    fail("validateSTORKAttrQueryRequestNotTrusted(...) should have thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");        
-    }
-    }
-
-    /**
-     * Test validate authentication request trusted.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAttrQueryRequestTrusted()
-	    throws STORKSAMLEngineException {
-
-	final STORKSAMLEngine engineTrusted = STORKSAMLEngine
-		.getInstance("CONF3");
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	final byte[] authReqNotTrust = engineTrusted.generateSTORKAttrQueryRequest(
-		request).getTokenSaml();
-
-	// engine ("CONF1") no have trust certificate from "CONF2"
-	engine.validateSTORKAttrQueryRequest(authReqNotTrust);
-	
-    }
-    
-    
-    
-    
-    /**
-     * Test generate authentication request service provider application null.
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestNADA() {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-
-	// news parameters
-	request.setSpSector(null);
-	request.setSpInstitution(null);
-	request.setSpApplication(null);
-	request.setSpCountry(null);
-
-	try {
-	       	
-		engine.validateSTORKAttrQueryRequest(attrRequest);
-	    
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+
+	/**
+	 * Test validate authentication request with unknown elements.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAttrQueryRequestWithUnknownElements() throws STORKSAMLEngineException {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+
+		IPersonalAttributeList pAttList = new PersonalAttributeList();
+
+		final PersonalAttribute unknown = new PersonalAttribute();
+		unknown.setName("unknown");
+		unknown.setIsRequired(true);
+		pAttList.add(unknown);
+
+		final PersonalAttribute eIdentifier = new PersonalAttribute();
+		eIdentifier.setName("eIdentifier");
+		eIdentifier.setIsRequired(true);
+		pAttList.add(eIdentifier);
+
+		request.setPersonalAttributeList(pAttList);
+
+		// new parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		STORKAttrQueryRequest req = new STORKAttrQueryRequest();
+
+		req = engine3.generateSTORKAttrQueryRequest(request);
+
+		req = engine.validateSTORKAttrQueryRequest(req.getTokenSaml());
+
+		assertNull("The value shouldn't exist", req.getPersonalAttributeList().get("unknown"));
+		assertNotNull("The value should exist", req.getPersonalAttributeList().get("eIdentifier"));
+
 	}
-    }
-    
-    /**
-     * Test validate authentication request with unknown elements.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAttrQueryRequestWithUnknownElements() throws STORKSAMLEngineException {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	
-	IPersonalAttributeList pAttList = new PersonalAttributeList();
-		
-	final PersonalAttribute unknown = new PersonalAttribute();
-	unknown.setName("unknown");
-	unknown.setIsRequired(true);
-	pAttList.add(unknown);	
-	
-	final PersonalAttribute eIdentifier = new PersonalAttribute();
-	eIdentifier.setName("eIdentifier");
-	eIdentifier.setIsRequired(true);
-	pAttList.add(eIdentifier);	
-	
-	request.setPersonalAttributeList(pAttList);
-
-	// new parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-	
-	STORKAttrQueryRequest req = new STORKAttrQueryRequest();
-		
-	req  = engine3.generateSTORKAttrQueryRequest(request);
-	
-	req = engine.validateSTORKAttrQueryRequest(req.getTokenSaml());
-	
-	assertNull("The value shouldn't exist", req.getPersonalAttributeList().get("unknown"));
-	assertNotNull("The value should exist", req.getPersonalAttributeList().get("eIdentifier"));
-	
-    }
-    
-    /**
-     * Test generate Request with required elements by default
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAttrQueryRequestWithIsRequiredElementsByDefault() throws STORKSAMLEngineException {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	
-	IPersonalAttributeList pAttList = new PersonalAttributeList();
-		
-	final PersonalAttribute eIdentifier = new PersonalAttribute();
-	eIdentifier.setName("eIdentifier");
-	eIdentifier.setIsRequired(true);
-	pAttList.add(eIdentifier);	
-	
-	request.setPersonalAttributeList(pAttList);
-
-	// new parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-	
-	STORKAttrQueryRequest req = new STORKAttrQueryRequest();
-	STORKAttrQueryRequest reqTrue = new STORKAttrQueryRequest();
-	STORKAttrQueryRequest reqFalse = new STORKAttrQueryRequest();
-		
-	reqTrue  = engine.generateSTORKAttrQueryRequest(request);
-	reqFalse = engine2.generateSTORKAttrQueryRequest(request);
-	req  	 = engine3.generateSTORKAttrQueryRequest(request);
-	
-	
-	String token = new String(req.getTokenSaml());
-	String reqTrueToken = new String(reqTrue.getTokenSaml());
-	String reqFalseToken = new String(reqFalse.getTokenSaml());
-	
-	assertTrue("The token must contain the chain 'isRequired'", token.contains("isRequired"));
-	assertTrue("The token must contain the chain 'isRequired'", reqTrueToken.contains("isRequired"));
-	assertFalse("The token must contain the chain 'isRequired'", reqFalseToken.contains("isRequired"));
-		
-    }
-    
-    /**
-     * Test validating attribute query and getting alias used to save 
-     * the saml trusted certificate into trustore
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    /*@Test
-    public final void testValidateAtrrQueryRequestGettingItsAlias() throws STORKSAMLEngineException {
-
-    	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-    	request.setDestination(destination);
-    	request.setQaa(QAAL);
-    	request.setPersonalAttributeList(pal);
-    	
-    	IPersonalAttributeList pAttList = new PersonalAttributeList();
-    		
-    	final PersonalAttribute eIdentifier = new PersonalAttribute();
-    	eIdentifier.setName("eIdentifier");
-    	eIdentifier.setIsRequired(true);
-    	pAttList.add(eIdentifier);	
-    	
-    	request.setPersonalAttributeList(pAttList);
-
-    	// new parameters
-    	request.setSpSector(spSector);
-    	request.setSpInstitution(spInstitution);
-    	request.setSpApplication(spApplication);
-    	request.setSpCountry(spCountry);
-    	request.setSPID(spId);
-    	request.setCitizenCountryCode("IS");
-    	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-    	
-    	STORKAttrQueryRequest req = new STORKAttrQueryRequest();
-    		
-    	req  = engine3.generateSTORKAttrQueryRequest(request);
-    	req = engine.validateSTORKAttrQueryRequest(req.getTokenSaml());
-    	String prufa = req.getAlias();
-    	assertTrue("The alias should match this value", req.getAlias().equals("local-demo"));
-    	
-    	req  = engine2.generateSTORKAttrQueryRequest(request);
-    	req = engine2.validateSTORKAttrQueryRequest(req.getTokenSaml());
-    	assertTrue("The alias should match this value", req.getAlias().equals("local-demo2"));	
-    }*/
-    
-    @Test
-    public final void testGenerateAttrQueryRequestSignDoc() throws STORKSAMLEngineException {
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-
-	request.setDestination(destination);
-	request.setQaa(QAAL);
-	PersonalAttributeList pal0 = new PersonalAttributeList();
-	
-	final PersonalAttribute signDoc = new PersonalAttribute();	
-	signDoc.setName("docRequest");
-	signDoc.setIsRequired(true);
-	signDoc.setValue(Arrays.asList("IS/IS/fbea6e68-0393-401b-b616-f767fff9418c"));
-	pal0.add(signDoc);
-	
-	request.setPersonalAttributeList(pal0);
-
-	// new parameters
-	/*request.setEIDSectorShare(false);	
-	request.setEIDCrossSectorShare(false);
-	request.setEIDCrossBorderShare(false);*/
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-	request.setSpCountry(spCountry);
-
-	STORKAttrQueryRequest req1 = engine0.generateSTORKAttrQueryRequest(request);
-	byte[] reqByte = req1.getTokenSaml();
-	FileOutputStream output = null;
-	
-	STORKAttrQueryRequest req2 = engine0.validateSTORKAttrQueryRequest(reqByte);
-	//reqByte = req2.getTokenSaml();
-	
-	try {
-		//output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml"));
-		FileOutputStream fos;
-        File outputDir = new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine");
-        File saveFile = new File(outputDir, "AttrQueryRequestSdoc.xml");
-        fos = new FileOutputStream(saveFile);
-        fos.write(reqByte);
-        fos.flush();
-        fos.close();
-	} catch (Exception e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
+
+	/**
+	 * Test generate Request with required elements by default
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAttrQueryRequestWithIsRequiredElementsByDefault() throws STORKSAMLEngineException {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+
+		IPersonalAttributeList pAttList = new PersonalAttributeList();
+
+		final PersonalAttribute eIdentifier = new PersonalAttribute();
+		eIdentifier.setName("eIdentifier");
+		eIdentifier.setIsRequired(true);
+		pAttList.add(eIdentifier);
+
+		request.setPersonalAttributeList(pAttList);
+
+		// new parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		STORKAttrQueryRequest req = new STORKAttrQueryRequest();
+		STORKAttrQueryRequest reqTrue = new STORKAttrQueryRequest();
+		STORKAttrQueryRequest reqFalse = new STORKAttrQueryRequest();
+
+		reqTrue = engine.generateSTORKAttrQueryRequest(request);
+		reqFalse = engine2.generateSTORKAttrQueryRequest(request);
+		req = engine3.generateSTORKAttrQueryRequest(request);
+
+		String token = new String(req.getTokenSaml());
+		String reqTrueToken = new String(reqTrue.getTokenSaml());
+		String reqFalseToken = new String(reqFalse.getTokenSaml());
+
+		assertTrue("The token must contain the chain 'isRequired'", token.contains("isRequired"));
+		assertTrue("The token must contain the chain 'isRequired'", reqTrueToken.contains("isRequired"));
+		assertFalse("The token must contain the chain 'isRequired'", reqFalseToken.contains("isRequired"));
+
 	}
-	try {
-		output.write(reqByte);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
+
+	/**
+	 * Test validating attribute query and getting alias used to save the saml trusted certificate into trustore
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	/*
+	 * @Test public final void testValidateAtrrQueryRequestGettingItsAlias() throws STORKSAMLEngineException {
+	 * 
+	 * final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+	 * 
+	 * request.setDestination(destination); request.setQaa(QAAL); request.setPersonalAttributeList(pal);
+	 * 
+	 * IPersonalAttributeList pAttList = new PersonalAttributeList();
+	 * 
+	 * final PersonalAttribute eIdentifier = new PersonalAttribute(); eIdentifier.setName("eIdentifier"); eIdentifier.setIsRequired(true); pAttList.add(eIdentifier);
+	 * 
+	 * request.setPersonalAttributeList(pAttList);
+	 * 
+	 * // new parameters request.setSpSector(spSector); request.setSpInstitution(spInstitution); request.setSpApplication(spApplication); request.setSpCountry(spCountry); request.setSPID(spId);
+	 * request.setCitizenCountryCode("IS"); request.setAssertionConsumerServiceURL(assertConsumerUrl);
+	 * 
+	 * STORKAttrQueryRequest req = new STORKAttrQueryRequest();
+	 * 
+	 * req = engine3.generateSTORKAttrQueryRequest(request); req = engine.validateSTORKAttrQueryRequest(req.getTokenSaml()); String prufa = req.getAlias();
+	 * assertTrue("The alias should match this value", req.getAlias().equals("local-demo"));
+	 * 
+	 * req = engine2.generateSTORKAttrQueryRequest(request); req = engine2.validateSTORKAttrQueryRequest(req.getTokenSaml()); assertTrue("The alias should match this value",
+	 * req.getAlias().equals("local-demo2")); }
+	 */
+
+	@Test
+	public final void testGenerateAttrQueryRequestSignDoc() throws STORKSAMLEngineException {
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+
+		request.setDestination(destination);
+		request.setQaa(QAAL);
+		PersonalAttributeList pal0 = new PersonalAttributeList();
+
+		final PersonalAttribute signDoc = new PersonalAttribute();
+		signDoc.setName("docRequest");
+		signDoc.setIsRequired(true);
+		signDoc.setValue(Arrays.asList("IS/IS/fbea6e68-0393-401b-b616-f767fff9418c"));
+		pal0.add(signDoc);
+
+		request.setPersonalAttributeList(pal0);
+
+		// new parameters
+		/*
+		 * request.setEIDSectorShare(false); request.setEIDCrossSectorShare(false); request.setEIDCrossBorderShare(false);
+		 */
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+		request.setSpCountry(spCountry);
+
+		STORKAttrQueryRequest req1 = engine0.generateSTORKAttrQueryRequest(request);
+		byte[] reqByte = req1.getTokenSaml();
+		FileOutputStream output = null;
+
+		STORKAttrQueryRequest req2 = engine0.validateSTORKAttrQueryRequest(reqByte);
+		// reqByte = req2.getTokenSaml();
+
+		try {
+			// output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml"));
+			FileOutputStream fos;
+			File outputDir = new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine");
+			File saveFile = new File(outputDir, "AttrQueryRequestSdoc.xml");
+			fos = new FileOutputStream(saveFile);
+			fos.write(reqByte);
+			fos.flush();
+			fos.close();
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		try {
+			output.write(reqByte);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		LOG.info("STORKAttrQueryRequest 1: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
+
+		request.setCitizenCountryCode("IS");
+		LOG.info("STORKAttrQueryRequest 2: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
 	}
-	
-	LOG.info("STORKAttrQueryRequest 1: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
-	
-	request.setCitizenCountryCode("IS");
-	LOG.info("STORKAttrQueryRequest 2: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAttrQueryRequest(request).getTokenSaml()));
-    }
-    
+
 }
diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java
index a98d5b7c3..0ecca1eab 100644
--- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java
+++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAttrQueryResponseTest.java
@@ -36,842 +36,763 @@ import eu.stork.peps.auth.engine.STORKSAMLEngine;
 import eu.stork.peps.exceptions.STORKSAMLEngineException;
 
 public class StorkAttrQueryResponseTest {
-	
+
 	/** The engine. */
-    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
-
-    /**
-     * Gets the engine.
-     * 
-     * @return the engine
-     */
-    public static STORKSAMLEngine getEngine() {
-        return engine;
-    }
-
-    /**
-     * Sets the engine.
-     * 
-     * @param newEngine the new engine
-     */
-    public static void setEngine(final STORKSAMLEngine newEngine) {
-    	StorkAttrQueryResponseTest.engine = newEngine;
-    }
-
-    /** The destination. */
-    private static String destination;
-
-        /** The service provider sector. */
-    private static String spSector;
-
-    /** The service provider institution. */
-    private static String spInstitution;
-
-    /** The service provider application. */
-    private static String spApplication;
-
-    /** The service provider country. */
-    private static String spCountry;
-    
-    /** The service provider id. */
-    private static String spId;
-
-    /** The quality authentication assurance level. */
-    private static final int QAAL = 3;
-
-    /** The state. */
-    private static String state = "IS";
-    
-    /** The town. */
-    private static String town = "Reykjavik";
-    
-    /** The postal code. */
-    private static String postalCode = "105";
-    
-    /** The street name. */
-    private static String streetName = "Gudrunartun";
-    
-    /** The street number. */
-    private static String streetNumber = "10";    
-
-    /** The List of Personal Attributes. */
-    private static IPersonalAttributeList pal;
-
-    /** The assertion consumer URL. */
-    private static String assertConsumerUrl;
-
-    /** The attribute query request. */
-    private static byte[] attrQueryRequest;
-
-    /** The attribute query response. */
-    private static byte[] attrQueryResponse;
-
-    /** The attribute query request. */
-    private static STORKAttrQueryRequest attrQueryenRequest;
-
-    /** The attribute query response. */
-    private static STORKAttrQueryResponse attrQeuryenResponse;
-
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory
-	    .getLogger(StorkAttrQueryResponseTest.class.getName());
-
-    /**
-     * Instantiates a new stork response test.
-     */
-    public StorkAttrQueryResponseTest() {
-	super();
-    }
-
-    /** The IP address. */
-    private static String ipAddress;
-    
-    /** The destination URL. */
-    private static String destinationUrl;
-
-    /** The is hashing. */
-    private final boolean isHashing = Boolean.TRUE;
-
-    /** The is not hashing. */
-    private final boolean isNotHashing = Boolean.FALSE;
-
-    /** The ERROR text. */
-    private static final String ERROR_TXT = "generateAttrQueryResponse(...) should've thrown an STORKSAMLEngineException!";
-
-
-    /** Parser manager used to parse XML. */
-    private static BasicParserPool parser;
-    
-    
-
-    static {
-	parser = new BasicParserPool();
-	parser.setNamespaceAware(true);
-
-	pal = new PersonalAttributeList();
-
-	PersonalAttribute isAgeOver = new PersonalAttribute();
-	isAgeOver.setName("isAgeOver");
-	isAgeOver.setIsRequired(false);
-	ArrayList<String> ages = new ArrayList<String>();
-	ages.add("16");
-	ages.add("18");
-	isAgeOver.setValue(ages);
-	pal.add(isAgeOver);
-
-	PersonalAttribute dateOfBirth = new PersonalAttribute();
-	dateOfBirth.setName("dateOfBirth");
-	dateOfBirth.setIsRequired(false);
-	pal.add(dateOfBirth);
-
-	PersonalAttribute eIDNumber = new PersonalAttribute();
-	eIDNumber.setName("eIdentifier");
-	List<String> eid = Arrays.asList("IS/IS/1234567890");	
-	eIDNumber.setValue(eid);
-	eIDNumber.setIsRequired(true);
-	pal.add(eIDNumber);
-
-	final PersonalAttribute givenName = new PersonalAttribute();
-	givenName.setName("givenName");
-	givenName.setIsRequired(true);
-	pal.add(givenName);
-
-	PersonalAttribute canRessAddress = new PersonalAttribute();
-	canRessAddress.setName("canonicalResidenceAddress");
-	canRessAddress.setIsRequired(true);
-	pal.add(canRessAddress);
-	
-	PersonalAttribute newAttribute = new PersonalAttribute();
-	newAttribute.setName("newAttribute2");
-	newAttribute.setIsRequired(true);
-	pal.add(newAttribute);
-
-	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
-	assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";	
-	spSector = "EDU001";
-	spInstitution = "OXF001";
-	spApplication = "APP001";
-	spCountry = "EN";
-	
-	spId = "EDU001-APP001-APP001";
-
-	final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
-	request.setDestination(destination);
-	//request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// new parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("IS");
-
-	try {
-	    attrQueryRequest = getEngine().generateSTORKAttrQueryRequest(request)
-		    .getTokenSaml();
-	    	    
-	    attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
-	    
-	} catch (STORKSAMLEngineException e) {
-	    fail("Error create STORKAuthnRequest");
+	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
+
+	/**
+	 * Gets the engine.
+	 * 
+	 * @return the engine
+	 */
+	public static STORKSAMLEngine getEngine() {
+		return engine;
 	}
 
-	ipAddress = "111.222.333.444";
-	
-	destinationUrl = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
-
-	pal = new PersonalAttributeList();
-
-	isAgeOver = new PersonalAttribute();
-	isAgeOver.setName("isAgeOver");
-	isAgeOver.setIsRequired(true);
-	ages = new ArrayList<String>();
-
-	ages.add("16");
-	ages.add("18");
-
-	isAgeOver.setValue(ages);
-	isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	pal.add(isAgeOver);
-
-	dateOfBirth = new PersonalAttribute();
-	dateOfBirth.setName("dateOfBirth");
-	dateOfBirth.setIsRequired(false);
-	final ArrayList<String> date = new ArrayList<String>();
-	date.add("16/12/2008");
-	dateOfBirth.setValue(date);
-	dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	pal.add(dateOfBirth);
-
-	eIDNumber = new PersonalAttribute();
-	eIDNumber.setName("eIdentifier");
-	eIDNumber.setIsRequired(true);
-	final ArrayList<String> idNumber = new ArrayList<String>();
-	idNumber.add("123456789IS");
-	eIDNumber.setValue(idNumber);
-	eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	pal.add(eIDNumber);
-
-	canRessAddress = new PersonalAttribute();
-	canRessAddress.setName("canonicalResidenceAddress");
-	canRessAddress.setIsRequired(true);
-	canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	final HashMap<String, String> address = new HashMap<String, String>();
-
-	address.put("state", state);
-	address.put("town", town);
-	address.put("postalCode", postalCode);
-	address.put("streetName", streetName);
-	address.put("streetNumber", streetNumber);
-
-	canRessAddress.setComplexValue(address);
-	pal.add(canRessAddress);
-    
-	newAttribute = new PersonalAttribute();
-	newAttribute.setName("newAttribute2");
-	newAttribute.setIsRequired(true);
-	newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	final HashMap<String, String> values = new HashMap<String, String>();
-	
-	values.put("value1", "value1");
-	values.put("value2", "value2");
-	values.put("value3", "value3");
-	values.put("value4", "value4");
-	
-	newAttribute.setComplexValue(values);
-	pal.add(newAttribute);
-	
-    }
-
-    /**
-     * Test generate attribute query request without errors.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAttrQueryResponse() throws STORKSAMLEngineException {
-
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	response.setPersonalAttributeList(pal);
-
-	final STORKAttrQueryResponse storkResponse = getEngine()
-		.generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress,
-				destinationUrl, isNotHashing);
-
-	attrQueryResponse = storkResponse.getTokenSaml();
-	
-	FileOutputStream output = null;
-	
-	try {
-		output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml"));
-	} catch (FileNotFoundException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
+	/**
+	 * Sets the engine.
+	 * 
+	 * @param newEngine
+	 *            the new engine
+	 */
+	public static void setEngine(final STORKSAMLEngine newEngine) {
+		StorkAttrQueryResponseTest.engine = newEngine;
 	}
-	try {
-		output.write(attrQueryResponse);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
+
+	/** The destination. */
+	private static String destination;
+
+	/** The service provider sector. */
+	private static String spSector;
+
+	/** The service provider institution. */
+	private static String spInstitution;
+
+	/** The service provider application. */
+	private static String spApplication;
+
+	/** The service provider country. */
+	private static String spCountry;
+
+	/** The service provider id. */
+	private static String spId;
+
+	/** The quality authentication assurance level. */
+	private static final int QAAL = 3;
+
+	/** The state. */
+	private static String state = "IS";
+
+	/** The town. */
+	private static String town = "Reykjavik";
+
+	/** The postal code. */
+	private static String postalCode = "105";
+
+	/** The street name. */
+	private static String streetName = "Gudrunartun";
+
+	/** The street number. */
+	private static String streetNumber = "10";
+
+	/** The List of Personal Attributes. */
+	private static IPersonalAttributeList pal;
+
+	/** The assertion consumer URL. */
+	private static String assertConsumerUrl;
+
+	/** The attribute query request. */
+	private static byte[] attrQueryRequest;
+
+	/** The attribute query response. */
+	private static byte[] attrQueryResponse;
+
+	/** The attribute query request. */
+	private static STORKAttrQueryRequest attrQueryenRequest;
+
+	/** The attribute query response. */
+	private static STORKAttrQueryResponse attrQeuryenResponse;
+
+	/** The Constant LOG. */
+	private static final Logger LOG = LoggerFactory.getLogger(StorkAttrQueryResponseTest.class.getName());
+
+	/**
+	 * Instantiates a new stork response test.
+	 */
+	public StorkAttrQueryResponseTest() {
+		super();
 	}
-	
-	LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(attrQueryResponse));
-	
-	
-    }
-
-    /**
-     * Test validation id parameter mandatory.
-     */
-    @Test
-    public final void testResponseMandatoryId() {
-	final String identifier = attrQueryenRequest.getSamlId();
-	attrQueryenRequest.setSamlId(null);
-
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	response.setPersonalAttributeList(pal);
-
-	try {
-	    getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response,
-		    ipAddress, destinationUrl, isHashing);
-	    fail(ERROR_TXT);
-	} catch (STORKSAMLEngineException e) {
-	    attrQueryenRequest.setSamlId(identifier);
-	    LOG.error("Error");
+
+	/** The IP address. */
+	private static String ipAddress;
+
+	/** The destination URL. */
+	private static String destinationUrl;
+
+	/** The is hashing. */
+	private final boolean isHashing = Boolean.TRUE;
+
+	/** The is not hashing. */
+	private final boolean isNotHashing = Boolean.FALSE;
+
+	/** The ERROR text. */
+	private static final String ERROR_TXT = "generateAttrQueryResponse(...) should've thrown an STORKSAMLEngineException!";
+
+	/** Parser manager used to parse XML. */
+	private static BasicParserPool parser;
+
+	static {
+		parser = new BasicParserPool();
+		parser.setNamespaceAware(true);
+
+		pal = new PersonalAttributeList();
+
+		PersonalAttribute isAgeOver = new PersonalAttribute();
+		isAgeOver.setName("isAgeOver");
+		isAgeOver.setIsRequired(false);
+		ArrayList<String> ages = new ArrayList<String>();
+		ages.add("16");
+		ages.add("18");
+		isAgeOver.setValue(ages);
+		pal.add(isAgeOver);
+
+		PersonalAttribute dateOfBirth = new PersonalAttribute();
+		dateOfBirth.setName("dateOfBirth");
+		dateOfBirth.setIsRequired(false);
+		pal.add(dateOfBirth);
+
+		PersonalAttribute eIDNumber = new PersonalAttribute();
+		eIDNumber.setName("eIdentifier");
+		List<String> eid = Arrays.asList("IS/IS/1234567890");
+		eIDNumber.setValue(eid);
+		eIDNumber.setIsRequired(true);
+		pal.add(eIDNumber);
+
+		final PersonalAttribute givenName = new PersonalAttribute();
+		givenName.setName("givenName");
+		givenName.setIsRequired(true);
+		pal.add(givenName);
+
+		PersonalAttribute canRessAddress = new PersonalAttribute();
+		canRessAddress.setName("canonicalResidenceAddress");
+		canRessAddress.setIsRequired(true);
+		pal.add(canRessAddress);
+
+		PersonalAttribute newAttribute = new PersonalAttribute();
+		newAttribute.setName("newAttribute2");
+		newAttribute.setIsRequired(true);
+		pal.add(newAttribute);
+
+		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
+		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
+		spSector = "EDU001";
+		spInstitution = "OXF001";
+		spApplication = "APP001";
+		spCountry = "EN";
+
+		spId = "EDU001-APP001-APP001";
+
+		final STORKAttrQueryRequest request = new STORKAttrQueryRequest();
+		request.setDestination(destination);
+		// request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// new parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("IS");
+
+		try {
+			attrQueryRequest = getEngine().generateSTORKAttrQueryRequest(request).getTokenSaml();
+
+			attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
+
+		} catch (STORKSAMLEngineException e) {
+			fail("Error create STORKAuthnRequest");
+		}
+
+		ipAddress = "111.222.333.444";
+
+		destinationUrl = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
+
+		pal = new PersonalAttributeList();
+
+		isAgeOver = new PersonalAttribute();
+		isAgeOver.setName("isAgeOver");
+		isAgeOver.setIsRequired(true);
+		ages = new ArrayList<String>();
+
+		ages.add("16");
+		ages.add("18");
+
+		isAgeOver.setValue(ages);
+		isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		pal.add(isAgeOver);
+
+		dateOfBirth = new PersonalAttribute();
+		dateOfBirth.setName("dateOfBirth");
+		dateOfBirth.setIsRequired(false);
+		final ArrayList<String> date = new ArrayList<String>();
+		date.add("16/12/2008");
+		dateOfBirth.setValue(date);
+		dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		pal.add(dateOfBirth);
+
+		eIDNumber = new PersonalAttribute();
+		eIDNumber.setName("eIdentifier");
+		eIDNumber.setIsRequired(true);
+		final ArrayList<String> idNumber = new ArrayList<String>();
+		idNumber.add("123456789IS");
+		eIDNumber.setValue(idNumber);
+		eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		pal.add(eIDNumber);
+
+		canRessAddress = new PersonalAttribute();
+		canRessAddress.setName("canonicalResidenceAddress");
+		canRessAddress.setIsRequired(true);
+		canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		final HashMap<String, String> address = new HashMap<String, String>();
+
+		address.put("state", state);
+		address.put("town", town);
+		address.put("postalCode", postalCode);
+		address.put("streetName", streetName);
+		address.put("streetNumber", streetNumber);
+
+		canRessAddress.setComplexValue(address);
+		pal.add(canRessAddress);
+
+		newAttribute = new PersonalAttribute();
+		newAttribute.setName("newAttribute2");
+		newAttribute.setIsRequired(true);
+		newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		final HashMap<String, String> values = new HashMap<String, String>();
+
+		values.put("value1", "value1");
+		values.put("value2", "value2");
+		values.put("value3", "value3");
+		values.put("value4", "value4");
+
+		newAttribute.setComplexValue(values);
+		pal.add(newAttribute);
+
 	}
-    }
-
-    /**
-     * Test generate attribute query response in response to err1.
-     */
-    @Test
-    public final void testResponseMandatoryIssuer() {
-
-	final String issuer = attrQueryenRequest.getIssuer();
-	attrQueryenRequest.setIssuer(null);
-
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	response.setPersonalAttributeList(pal);
-
-	try {
-	    getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response,
-		    ipAddress, destinationUrl, isHashing);
-	    fail(ERROR_TXT);
-	} catch (STORKSAMLEngineException e) {
-	    attrQueryenRequest.setIssuer(issuer);
-	    LOG.error("Error");
+
+	/**
+	 * Test generate attribute query request without errors.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAttrQueryResponse() throws STORKSAMLEngineException {
+
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		response.setPersonalAttributeList(pal);
+
+		final STORKAttrQueryResponse storkResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing);
+
+		attrQueryResponse = storkResponse.getTokenSaml();
+
+		FileOutputStream output = null;
+
+		try {
+			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml"));
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		try {
+			output.write(attrQueryResponse);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(attrQueryResponse));
+
 	}
-    }
-
-    
-    /**
-     * Test generate attribute query response assertion consumer null.
-     */
-    /*@Test
-    public final void testResponseMandatoryAssertionConsumerServiceURL() {
-	final String asserConsumerUrl = attrQueryenRequest
-		.getAssertionConsumerServiceURL();
-	attrQueryenRequest.setAssertionConsumerServiceURL(null);
-
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setPersonalAttributeList(pal);
-	try {
-	    getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response,
-		    ipAddress, isHashing);
-	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    attrQueryenRequest.setAssertionConsumerServiceURL(asserConsumerUrl);
-	    LOG.error("Error");
+
+	/**
+	 * Test validation id parameter mandatory.
+	 */
+	@Test
+	public final void testResponseMandatoryId() {
+		final String identifier = attrQueryenRequest.getSamlId();
+		attrQueryenRequest.setSamlId(null);
+
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		response.setPersonalAttributeList(pal);
+
+		try {
+			getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isHashing);
+			fail(ERROR_TXT);
+		} catch (STORKSAMLEngineException e) {
+			attrQueryenRequest.setSamlId(identifier);
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate attribute query response IP address null.
-     */
-    @Test
-    public final void testResponseValidationIP() {
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	response.setPersonalAttributeList(pal);
-
-	try {
-	    getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, null, 
-	    		destinationUrl, isHashing);
-	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate attribute query response in response to err1.
+	 */
+	@Test
+	public final void testResponseMandatoryIssuer() {
+
+		final String issuer = attrQueryenRequest.getIssuer();
+		attrQueryenRequest.setIssuer(null);
+
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		response.setPersonalAttributeList(pal);
+
+		try {
+			getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isHashing);
+			fail(ERROR_TXT);
+		} catch (STORKSAMLEngineException e) {
+			attrQueryenRequest.setIssuer(issuer);
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate attribute query response with personal attribute list null.
-     */
-    @Test
-    public final void testResponseMandatoryPersonalAttributeList() {
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	response.setPersonalAttributeList(null);
-	
-	
-	try {
-	    getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response,
-		    ipAddress, destinationUrl, isHashing);
-	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate attribute query response assertion consumer null.
+	 */
+	/*
+	 * @Test public final void testResponseMandatoryAssertionConsumerServiceURL() { final String asserConsumerUrl = attrQueryenRequest .getAssertionConsumerServiceURL();
+	 * attrQueryenRequest.setAssertionConsumerServiceURL(null);
+	 * 
+	 * final STORKAuthnResponse response = new STORKAuthnResponse(); response.setPersonalAttributeList(pal); try { getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress,
+	 * isHashing); fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!"); } catch (STORKSAMLEngineException e) {
+	 * attrQueryenRequest.setAssertionConsumerServiceURL(asserConsumerUrl); LOG.error("Error"); } }
+	 * 
+	 * /** Test generate attribute query response IP address null.
+	 */
+	@Test
+	public final void testResponseValidationIP() {
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		response.setPersonalAttributeList(pal);
+
+		try {
+			getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, null, destinationUrl, isHashing);
+			fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    /**
-     * Test validate attribute query response token null.
-     */
-    @Test
-    public final void testResponseInvalidParametersToken() {
-	try {
-	    getEngine().validateSTORKAttrQueryResponse(null, ipAddress);
-	    fail(ERROR_TXT);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate attribute query response with personal attribute list null.
+	 */
+	@Test
+	public final void testResponseMandatoryPersonalAttributeList() {
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		response.setPersonalAttributeList(null);
+
+		try {
+			getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isHashing);
+			fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test validate attribute query response IP null.
-     */
-    @Test
-    public final void STORKAttrQueryResponse() {
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	response.setPersonalAttributeList(pal);
-	try {
-	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
-		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false	    
-	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate attribute query response token null.
+	 */
+	@Test
+	public final void testResponseInvalidParametersToken() {
+		try {
+			getEngine().validateSTORKAttrQueryResponse(null, ipAddress);
+			fail(ERROR_TXT);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    
-    /**
-     * Test validate attribute query response parameter name wrong.
-     */
-    @Test
-    public final void testResponseInvalidParametersAttr() {
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	final IPersonalAttributeList wrongList = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();
-	worngAttr.setName("AttrWrong");
-	wrongList.add(worngAttr);
-	
-	
-	response.setPersonalAttributeList(wrongList);
-	try {
-	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
-		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate attribute query response IP null.
+	 */
+	@Test
+	public final void STORKAttrQueryResponse() {
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		response.setPersonalAttributeList(pal);
+		try {
+			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    
-    /**
-     * Test validate attribute query response set null value into attribute.
-     */
-    @Test
-    public final void testResponseInvalidParametersAttrSimpleValue() {
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	final IPersonalAttributeList wrongList = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();
-	worngAttr.setName("isAgeOver");
-	worngAttr.setValue(null);
-	wrongList.add(worngAttr);
-	
-	response.setPersonalAttributeList(wrongList);
-	try {
-	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
-		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate attribute query response parameter name wrong.
+	 */
+	@Test
+	public final void testResponseInvalidParametersAttr() {
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		final IPersonalAttributeList wrongList = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		worngAttr.setName("AttrWrong");
+		wrongList.add(worngAttr);
+
+		response.setPersonalAttributeList(wrongList);
+		try {
+			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    
-    /**
-     * Test validate attribute query response set null value into attribute.
-     */
-    @Test
-    public final void testResponseInvalidParametersAttrNoValue() {
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	final IPersonalAttributeList wrongList = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();
-	worngAttr.setName("isAgeOver");
-	wrongList.add(worngAttr);
-	
-	response.setPersonalAttributeList(wrongList);
-	try {
-	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
-		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate attribute query response set null value into attribute.
+	 */
+	@Test
+	public final void testResponseInvalidParametersAttrSimpleValue() {
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		final IPersonalAttributeList wrongList = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		worngAttr.setName("isAgeOver");
+		worngAttr.setValue(null);
+		wrongList.add(worngAttr);
+
+		response.setPersonalAttributeList(wrongList);
+		try {
+			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    
-    /**
-     * Test validate attribute query response set null value into attribute.
-     */
-    @Test
-    public final void testResponseInvalidParametersAttrNoName() {
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	final IPersonalAttributeList wrongList = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();	
-	wrongList.add(worngAttr);
-	
-	response.setPersonalAttributeList(wrongList);
-	try {
-	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
-		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate attribute query response set null value into attribute.
+	 */
+	@Test
+	public final void testResponseInvalidParametersAttrNoValue() {
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		final IPersonalAttributeList wrongList = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		worngAttr.setName("isAgeOver");
+		wrongList.add(worngAttr);
+
+		response.setPersonalAttributeList(wrongList);
+		try {
+			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test validate attribute query response set null value into attribute.
+	 */
+	@Test
+	public final void testResponseInvalidParametersAttrNoName() {
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		final IPersonalAttributeList wrongList = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		wrongList.add(worngAttr);
+
+		response.setPersonalAttributeList(wrongList);
+		try {
+			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test validate attribute query response set null complex value into attribute.
+	 */
+	@Test
+	public final void testResponseInvalidParametersAttrComplexValue() {
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		final IPersonalAttributeList wrongList = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		worngAttr.setName("isAgeOver");
+		worngAttr.setComplexValue(null);
+		wrongList.add(worngAttr);
+
+		response.setPersonalAttributeList(wrongList);
+		try {
+			attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    
-    /**
-     * Test validate attribute query response set null complex value into attribute.
-     */
-    @Test
-    public final void testResponseInvalidParametersAttrComplexValue() {
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	final IPersonalAttributeList wrongList = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();
-	worngAttr.setName("isAgeOver");
-	worngAttr.setComplexValue(null);
-	wrongList.add(worngAttr);
-	
-	response.setPersonalAttributeList(wrongList);
-	try {
-	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest,
-		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate attribute query response IP distinct and disabled validation IP.
+	 */
+	@Test
+	public final void testResponseInvalidParametersIPDistinct() {
+		try {
+			// ipAddress origin "111.222.333.444"
+			// ipAddrValidation = false
+			// Subject Confirmation Bearer.
+
+			getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, "127.0.0.1");
+		} catch (STORKSAMLEngineException e) {
+			fail("validateAttributeQueryResponse(...) should've thrown an STORKSAMLEngineException!");
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test response invalid parameters invalid token.
+	 */
+	@Test
+	public final void testResponseInvalidParametersTokenMsg() {
+		try {
+			// ipAddress origin "111.222.333.444"
+			// Subject Confirmation Bearer.
+			getEngine().validateSTORKAttrQueryResponse("errorMessage".getBytes(), ipAddress);
+			fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-	
-    
-    
-
-    /**
-     * Test validate attribute query response IP distinct and disabled validation
-     * IP.
-     */
-    @Test
-    public final void testResponseInvalidParametersIPDistinct() {
-	try {
-	    // ipAddress origin "111.222.333.444"
-	    // ipAddrValidation = false
-	    // Subject Confirmation Bearer.
-
-	    getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, "127.0.0.1");	    
-	} catch (STORKSAMLEngineException e) {
-		fail("validateAttributeQueryResponse(...) should've thrown an STORKSAMLEngineException!");
-	    LOG.error("Error");	    
+
+	/**
+	 * Test validate attribute query response is fail.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	/*
+	 * @Test public final void testValidateAuthenticationResponseIsFail() throws STORKSAMLEngineException { attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
+	 * ipAddress);
+	 * 
+	 * assertFalse("Generate incorrect response: ", attrQeuryenResponse.isFail()); }
+	 * 
+	 * /** Test validate attribute query response destination.
+	 * 
+	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthenticationResponseDestination() throws STORKSAMLEngineException {
+		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
+
+		assertEquals("Destination incorrect: ", attrQeuryenResponse.getInResponseTo(), attrQueryenRequest.getSamlId());
 	}
-    }
-
-    /**
-     * Test response invalid parameters invalid token.
-     */
-    @Test
-    public final void testResponseInvalidParametersTokenMsg() {
-	try {
-	    // ipAddress origin "111.222.333.444"
-	    // Subject Confirmation Bearer.
-	    getEngine().validateSTORKAttrQueryResponse("errorMessage".getBytes(),
-		    ipAddress);
-	    fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate attribute query response values.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthenticationResponseValuesComplex() throws STORKSAMLEngineException {
+		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
+
+		assertEquals("Country incorrect:", attrQeuryenResponse.getCountry(), "ES");
+
+		final Iterator<PersonalAttribute> iterator = attrQeuryenResponse.getPersonalAttributeList().iterator();
+
+		while (iterator.hasNext()) {
+			final PersonalAttribute attribute = iterator.next();
+			if (attribute.getName().equalsIgnoreCase("canonicalResidenceAddress")) {
+				assertEquals("State incorrect: ", state, attribute.getComplexValue().get("state"));
+				assertEquals("Town incorrect: ", town, attribute.getComplexValue().get("town"));
+				assertEquals("Postal code incorrect: ", postalCode, attribute.getComplexValue().get("postalCode"));
+				assertEquals("Street name incorrect: ", streetName, attribute.getComplexValue().get("streetName"));
+				assertEquals("Street number incorrect: ", streetNumber, attribute.getComplexValue().get("streetNumber"));
+			}
+		}
 	}
-    }
-
-    /**
-     * Test validate attribute query response is fail.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    /*@Test
-    public final void testValidateAuthenticationResponseIsFail()
-	    throws STORKSAMLEngineException {
-    	attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
-		ipAddress);
-
-	assertFalse("Generate incorrect response: ", attrQeuryenResponse.isFail());
-    }
-
-    /**
-     * Test validate attribute query response destination.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthenticationResponseDestination()
-	    throws STORKSAMLEngineException {
-    	attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
-		ipAddress);
-
-	assertEquals("Destination incorrect: ",
-			attrQeuryenResponse.getInResponseTo(), attrQueryenRequest.getSamlId());
-    }
-
-    /**
-     * Test validate attribute query response values.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthenticationResponseValuesComplex()
-	    throws STORKSAMLEngineException {
-    	attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
-		ipAddress);
-	
-	assertEquals("Country incorrect:", attrQeuryenResponse.getCountry(), "ES");
-	
-	final Iterator<PersonalAttribute> iterator = attrQeuryenResponse
-		.getPersonalAttributeList().iterator();
-
-	while (iterator.hasNext()) {
-	    final PersonalAttribute attribute = iterator.next();
-	    if (attribute.getName().equalsIgnoreCase(
-		    "canonicalResidenceAddress")) {
-		assertEquals("State incorrect: ", state, attribute
-			.getComplexValue().get("state"));		
-		assertEquals("Town incorrect: ", town, attribute
-			.getComplexValue().get("town"));
-		assertEquals("Postal code incorrect: ", postalCode, attribute
-			.getComplexValue().get("postalCode"));
-		assertEquals("Street name incorrect: ", streetName, attribute
-			.getComplexValue().get("streetName"));
-		assertEquals("Street number incorrect: ", streetNumber,
-			attribute.getComplexValue().get("streetNumber"));		
-	    }
+
+	/**
+	 * Test generate attribute query response fail in response to it's null.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	// ( expected=STORKSAMLEngineException.class)
+	public final void testGenerateAttrQueryResponseFailInResponseToNull() throws STORKSAMLEngineException {
+		final String identifier = attrQueryenRequest.getSamlId();
+		attrQueryenRequest.setSamlId(null);
+
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
+		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
+		response.setMessage("");
+
+		try {
+			attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
+			fail(ERROR_TXT);
+		} catch (STORKSAMLEngineException e) {
+			attrQueryenRequest.setSamlId(identifier);
+			LOG.error("Error");
+			// throw new STORKSAMLEngineException(e);
+		}
 	}
-    }
-
-    /**
-     * Test generate attribute query response fail in response to it's null.
-     * @throws STORKSAMLEngineException 
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test //( expected=STORKSAMLEngineException.class)
-    public final void testGenerateAttrQueryResponseFailInResponseToNull() throws STORKSAMLEngineException {
-	final String identifier = attrQueryenRequest.getSamlId();
-	attrQueryenRequest.setSamlId(null);
-
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
-	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
-	response.setMessage("");
-
-	try {
-	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest,
-		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
-	    fail(ERROR_TXT);
-	} catch (STORKSAMLEngineException e) {
-	    attrQueryenRequest.setSamlId(identifier);
-	    LOG.error("Error");
-	    //throw new STORKSAMLEngineException(e);
+
+	/**
+	 * Test generate attribute query response fail assertion consumer URL err1.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	/*
+	 * @Test public final void testGenerateAuthnResponseFailAssertionConsumerUrlNull() throws STORKSAMLEngineException {
+	 * 
+	 * final String assertConsumerUrl = attrQueryenRequest .getAssertionConsumerServiceURL(); attrQueryenRequest.setAssertionConsumerServiceURL(null);
+	 * 
+	 * final STORKAuthnResponse response = new STORKAuthnResponse(); response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
+	 * response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString()); response.setMessage("");
+	 * 
+	 * try { attrQueryResponse = getEngine().generateSTORKAuthnResponseFail(attrQueryenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+	 * fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!"); } catch (STORKSAMLEngineException e) {
+	 * attrQueryenRequest.setAssertionConsumerServiceURL(assertConsumerUrl); LOG.error("Error"); } }
+	 * 
+	 * /** Test generate attribute query response fail code error err1.
+	 * 
+	 * @throws STORKSAMLEngineException the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAttrQueryResponseFailCodeErrorNull() throws STORKSAMLEngineException {
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		response.setStatusCode(null);
+		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
+		response.setMessage("");
+
+		try {
+			attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
+			fail("generateAttrQueryResponseFail(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate attribute query response fail assertion consumer URL err1.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    /*@Test
-    public final void testGenerateAuthnResponseFailAssertionConsumerUrlNull()
-	    throws STORKSAMLEngineException {
-
-	final String assertConsumerUrl = attrQueryenRequest
-		.getAssertionConsumerServiceURL();
-	attrQueryenRequest.setAssertionConsumerServiceURL(null);
-
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
-	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
-	response.setMessage("");
-
-	try {
-	    attrQueryResponse = getEngine().generateSTORKAuthnResponseFail(attrQueryenRequest,
-		    response, ipAddress, isNotHashing).getTokenSaml();
-	    fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    attrQueryenRequest.setAssertionConsumerServiceURL(assertConsumerUrl);
-	    LOG.error("Error");
+
+	/**
+	 * Test generate attribute query request without errors.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAttrQueryResponse() throws STORKSAMLEngineException {
+
+		IPersonalAttributeList palist = new PersonalAttributeList();
+
+		PersonalAttribute isAgeOver = new PersonalAttribute();
+		isAgeOver.setName("isAgeOver");
+		isAgeOver.setIsRequired(true);
+		ArrayList<String> ages = new ArrayList<String>();
+		ages.add("16");
+		ages.add("18");
+		isAgeOver.setValue(ages);
+		isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		palist.add(isAgeOver);
+
+		PersonalAttribute dateOfBirth = new PersonalAttribute();
+		dateOfBirth.setName("dateOfBirth");
+		dateOfBirth.setIsRequired(false);
+		final ArrayList<String> date = new ArrayList<String>();
+		date.add("16/12/2008");
+		dateOfBirth.setValue(date);
+		dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		palist.add(dateOfBirth);
+
+		PersonalAttribute eIDNumber = new PersonalAttribute();
+		eIDNumber.setName("eIdentifier");
+		eIDNumber.setIsRequired(true);
+
+		final ArrayList<String> idNumber = new ArrayList<String>();
+		idNumber.add("123456789PÑ");
+
+		final HashMap<String, String> complex = new HashMap<String, String>();
+		complex.put("one", "two");
+
+		// eIDNumber.setValue(null);
+		// eIDNumber.setValue(idNumber);
+		// eIDNumber.setComplexValue(complex);
+
+		eIDNumber.setStatus(STORKStatusCode.STATUS_NOT_AVAILABLE.toString());
+		palist.add(eIDNumber);
+
+		PersonalAttribute canRessAddress = new PersonalAttribute();
+		canRessAddress.setName("canonicalResidenceAddress");
+		canRessAddress.setIsRequired(true);
+		canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		final HashMap<String, String> address = new HashMap<String, String>();
+
+		address.put("state", state);
+		address.put("town", town);
+		address.put("postalCode", postalCode);
+		address.put("streetName", streetName);
+		address.put("streetNumber", streetNumber);
+
+		canRessAddress.setComplexValue(address);
+		palist.add(canRessAddress);
+
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+
+		response.setPersonalAttributeList(palist);
+
+		final STORKAttrQueryResponse storkResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing);
+
+		attrQueryResponse = storkResponse.getTokenSaml();
+		LOG.info("Request id: " + attrQueryenRequest.getSamlId());
+
+		LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(attrQueryResponse));
+
+		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
+
+		LOG.info("RESPONSE ID: " + attrQeuryenResponse.getSamlId());
+		LOG.info("RESPONSE IN_RESPONSE_TO: " + attrQeuryenResponse.getInResponseTo());
+		LOG.info("RESPONSE COUNTRY: " + attrQeuryenResponse.getCountry());
+
 	}
-    }
-
-    /**
-     * Test generate attribute query response fail code error err1.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAttrQueryResponseFailCodeErrorNull()
-	    throws STORKSAMLEngineException {
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	response.setStatusCode(null);
-	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
-	response.setMessage("");
-
-	try {
-	    attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest,
-		    response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
-	    fail("generateAttrQueryResponseFail(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate attribute query response fail is fail.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAttrQueryResponseFailIsFail() throws STORKSAMLEngineException {
+
+		final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+		response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
+		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
+		response.setMessage("message");
+
+		attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
+
+		LOG.error("ERROR_FAIL: " + PEPSUtil.encodeSAMLToken(attrQueryResponse));
+
+		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
+
+		LOG.info("COUNTRY: " + attrQeuryenResponse.getCountry());
+		assertTrue("Generate incorrect response: ", attrQeuryenResponse.isFail());
 	}
-    }
-    
-    
-    
-    
-    /**
-     * Test generate attribute query request without errors.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAttrQueryResponse() throws STORKSAMLEngineException {
-	
-	IPersonalAttributeList palist = new PersonalAttributeList();
-
-	PersonalAttribute isAgeOver = new PersonalAttribute();
-	isAgeOver.setName("isAgeOver");
-	isAgeOver.setIsRequired(true);
-	ArrayList<String> ages = new ArrayList<String>();
-	ages.add("16");
-	ages.add("18");
-	isAgeOver.setValue(ages);
-	isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	palist.add(isAgeOver);
-
-	PersonalAttribute dateOfBirth = new PersonalAttribute();
-	dateOfBirth.setName("dateOfBirth");
-	dateOfBirth.setIsRequired(false);
-	final ArrayList<String> date = new ArrayList<String>();
-	date.add("16/12/2008");
-	dateOfBirth.setValue(date);
-	dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	palist.add(dateOfBirth);
-
-	
-	PersonalAttribute eIDNumber = new PersonalAttribute();
-	eIDNumber.setName("eIdentifier");
-	eIDNumber.setIsRequired(true);
-
-	final ArrayList<String> idNumber = new ArrayList<String>();
-	idNumber.add("123456789PÑ");
-	
-	final HashMap<String, String> complex = new HashMap<String, String>();
-	complex.put("one", "two");
-
-	//eIDNumber.setValue(null);
-	//eIDNumber.setValue(idNumber);
-	//eIDNumber.setComplexValue(complex);
-	
-	eIDNumber.setStatus(STORKStatusCode.STATUS_NOT_AVAILABLE.toString());
-	palist.add(eIDNumber);
-
-	PersonalAttribute canRessAddress = new PersonalAttribute();	
-	canRessAddress.setName("canonicalResidenceAddress");
-	canRessAddress.setIsRequired(true);
-	canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	final HashMap<String, String> address = new HashMap<String, String>();
-
-	address.put("state", state);
-	address.put("town", town);
-	address.put("postalCode", postalCode);
-	address.put("streetName", streetName);
-	address.put("streetNumber", streetNumber);
-
-	canRessAddress.setComplexValue(address);
-	palist.add(canRessAddress);
-
-	
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-
-	response.setPersonalAttributeList(palist);
-
-	final STORKAttrQueryResponse storkResponse = getEngine()
-		.generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress,
-			destinationUrl, isNotHashing);
-
-	attrQueryResponse = storkResponse.getTokenSaml();
-	LOG.info("Request id: " + attrQueryenRequest.getSamlId());
-	
-	LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(attrQueryResponse));
-	
-	
-	attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
-		ipAddress);
-	
-	LOG.info("RESPONSE ID: " + attrQeuryenResponse.getSamlId());
-	LOG.info("RESPONSE IN_RESPONSE_TO: " + attrQeuryenResponse.getInResponseTo());
-	LOG.info("RESPONSE COUNTRY: " + attrQeuryenResponse.getCountry());
-	
-    }
-    
-    
-   
-
-	
-    /**
-     * Test validate attribute query response fail is fail.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAttrQueryResponseFailIsFail()
-	    throws STORKSAMLEngineException {
-
-	final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
-	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
-	response.setMessage("message");
-
-	attrQueryResponse = getEngine().generateSTORKAttrQueryResponseFail(attrQueryenRequest,
-		response, ipAddress, destinationUrl, isNotHashing).getTokenSaml();
-	
-	LOG.error("ERROR_FAIL: " + PEPSUtil.encodeSAMLToken(attrQueryResponse));
-
-	attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
-		ipAddress);
-
-	LOG.info("COUNTRY: " + attrQeuryenResponse.getCountry());
-	assertTrue("Generate incorrect response: ", attrQeuryenResponse.isFail());
-    }  
-    
+
 	/**
 	 * Test generate/validate response with signedDoc
 	 * 
@@ -879,8 +800,7 @@ public class StorkAttrQueryResponseTest {
 	 *             the STORKSAML engine exception
 	 */
 	@Test
-	public final void testGenerateAttrQueryResponseWithSignedDoc()
-			throws STORKSAMLEngineException {
+	public final void testGenerateAttrQueryResponseWithSignedDoc() throws STORKSAMLEngineException {
 
 		String signedDocResponse = "<dss:SignResponse xmlns:dss=\"urn:oasis:names:tc:dss:1.0:core:schema\" RequestID=\"123456\"> <dss:Result> <dss:ResultMajor>urn:oasis:names:tc:dss:1.0:resultmajor:Success</dss:ResultMajor> </dss:Result> <dss:SignatureObject> <dss:Base64Signature Type=\"urn:ietf:rfc:3275\"><?xml version="1.0" encoding="UTF-8"?><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-Signature"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ds:Reference Id="Reference-baba4d1a-a17e-42c6-97d2-beee13509503" Type="http://www.w3.org/2000/09/xmldsig#Object" URI="#Object-98733cde-8bcc-48a0-9b77-0e9997bdd058"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>Ck1VqNd45QIvq3AZd8XYQLvEhtA=</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignedProperties"><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>A5Y91n4qpLgytTW7fxjXCUeRv54=</ds:DigestValue></ds:Reference><ds:Reference URI="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-KeyInfo"><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>VPX4nKFyS6rF+F6cRR0PrNZdw6g=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignatureValue">LbKN//C7XkyxTtYTiCURr8nZzxAmstcMd0CgEACrK1dygRHqGcK4xts+WCU8PyEqWrRITYzIuw/7
V4Zz9TT60p4KTMewuQL64skESx2Yg2EdikSO+tKxWkhraUsmVbGbPmmcmDv97tHDw88747eFq5F5
v+aVSyAz03iUKmuSeH8=</ds:SignatureValue><ds:KeyInfo Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-KeyInfo"><ds:KeyValue><ds:RSAKeyValue><ds:Modulus>wucmj9tIWrvwbSTUDfwKl+JtDMMER0cLd6DkBSr790t+rGNjESqYjRwEIeBnKoQHPx5HoReF88/t
qY9+ChEXpLHLs9p5aX7SDJubpQMfp1tDFX34ywgxSQvceeJQWBXjieuImfC21s4bOcgJbV1hbigS
zOKTQKr1TzdGR+uRy00=</ds:Modulus><ds:Exponent>AQAB</ds:Exponent></ds:RSAKeyValue></ds:KeyValue><ds:X509Data><ds:X509Certificate>MIIImTCCB4GgAwIBAgIDAXUUMA0GCSqGSIb3DQEBBQUAMIIBOzELMAkGA1UEBhMCRVMxOzA5BgNV
BAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMTQw
MgYDVQQHEytQYXNzYXRnZSBkZSBsYSBDb25jZXBjaW8gMTEgMDgwMDggQmFyY2Vsb25hMS4wLAYD
VQQLEyVTZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvIEVDVi0yMTUwMwYDVQQLEyxWZWdl
dSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJDSUMtMiAoYykwMzE1MDMGA1UECxMsRW50aXRh
dCBwdWJsaWNhIGRlIGNlcnRpZmljYWNpbyBkZSBjaXV0YWRhbnMxGzAZBgNVBAMTElBSRVBST0RV
Q0NJTyBJRENhdDAeFw0xMDAyMTExODIyMDRaFw0xNDAyMTAxODIyMDRaMIGwMQswCQYDVQQGEwJF
UzE1MDMGA1UECxMsVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVySURDYXQgKGMpMDMx
FjAUBgNVBAQTDUJFUkxBTkdBIFNPVE8xFzAVBgNVBCoTDk1BUklBIEVOR1JBQ0lBMRIwEAYDVQQF
EwkxMDAwMDk0NFMxJTAjBgNVBAMTHE1BUklBIEVOR1JBQ0lBIEJFUkxBTkdBIFNPVE8wgZ8wDQYJ
KoZIhvcNAQEBBQADgY0AMIGJAoGBAMLnJo/bSFq78G0k1A38CpfibQzDBEdHC3eg5AUq+/dLfqxj
YxEqmI0cBCHgZyqEBz8eR6EXhfPP7amPfgoRF6Sxy7PaeWl+0gybm6UDH6dbQxV9+MsIMUkL3Hni
UFgV44nriJnwttbOGznICW1dYW4oEszik0Cq9U83RkfrkctNAgMBAAGjggSwMIIErDAMBgNVHRMB
Af8EAjAAMA4GA1UdDwEB/wQEAwIFoDCBzAYDVR0RBIHEMIHBgQ9ic290b0BnbWFpbC5jb22kgYUw
gYIxCzAJBgNVBAYTAkVTMSswKQYDVQQKFCJBZ8OobmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2Fj
acOzMQ4wDAYDVQQLEwVJRENBVDEPMA0GA1UEBRMGMDE3NTE0MSUwIwYDVQQDExxNQVJJQSBFTkdS
QUNJQSBCRVJMQU5HQSBTT1RPoBAGCisGAQQB9XgBAQGgAgwAoBQGDlYEAAEDBgEEAfV4AQECoAIM
ADAfBgNVHRIEGDAWgRRlY19pZGNhdEBjYXRjZXJ0Lm5ldDAdBgNVHQ4EFgQUAFXjuNskB2MlyvUB
h7p8TJ0uJ0wwggFIBgNVHSMEggE/MIIBO4AURKvckUhN14h4Cn/gdODn6723KVyhggEPpIIBCzCC
AQcxCzAJBgNVBAYTAkVTMTswOQYDVQQKEzJBZ2VuY2lhIENhdGFsYW5hIGRlIENlcnRpZmljYWNp
byAoTklGIFEtMDgwMTE3Ni1JKTEoMCYGA1UECxMfU2VydmVpcyBQdWJsaWNzIGRlIENlcnRpZmlj
YWNpbzE8MDoGA1UECxMzVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVycHJlcHJvZHVj
Y2lvIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENh
dGFsYW5lczEcMBoGA1UEAxMTUFJFUFJPRFVDQ0lPIEVDLUFDQ4IQdwKTtM1EEU9FEPXUYHgghDAd
BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwEQYJYIZIAYb4QgEBBAQDAgWgMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cHM6Ly9vY3NwLmNhdGNlcnQubmV0MBgGCCsGAQUFBwED
BAwwCjAIBgYEAI5GAQEwgYYGA1UdHwR/MH0wPKA6oDiGNmh0dHA6Ly9lcHNjZC5jYXRjZXJ0Lm5l
dC9jcmwvcHJlcHJvZHVjY2lvX2VjLWlkY2F0LmNybDA9oDugOYY3aHR0cDovL2Vwc2NkMi5jYXRj
ZXJ0Lm5ldC9jcmwvcHJlcHJvZHVjY2lvX2VjLWlkY2F0LmNybDCB9gYDVR0gBIHuMIHrMIHoBgwr
BgEEAfV4AQMBVgEwgdcwLAYIKwYBBQUHAgEWIGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcklE
Q2F0MIGmBggrBgEFBQcCAjCBmRqBlkFxdWVzdCDvv71zIHVuIGNlcnRpZmljYXQgcGVyc29uYWwg
SURDQVQsIHJlY29uZWd1dCBkJ2lkZW50aWZpY2Fj77+9LCBzaWduYXR1cmEgaSB4aWZyYXQgZGUg
Y2xhc3NlIDIgaW5kaXZpZHVhbC4gVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVyRENh
dDAtBgNVHQkEJjAkMBAGCCsGAQUFBwkEMQQTAkVTMBAGCCsGAQUFBwkFMQQTAkVTMA0GCSqGSIb3
DQEBBQUAA4IBAQCq7780RGQMLB1gkdNMfLXngqMoRHGKZbvzkrqIAmT8WAd1E8rAphR9/xLJUtp5
lbg2fRr5bl2j8OVDBK2YmG41h8ADn4STI/ApeNINSfjZs6NRsnWzFyfXXmPCHYFB/XWzyimCExgv
vtuH+3QAwcwhn50PLEuhw5C5vlX7Ly5K6rLLMFNUUMbWVy1hZelK/CBTcAjIO38NY+vYRAMKSf4M
/gZQz4qBeFVJa52R7NcAqCfrfLfaXpbDSg98xoBeNs2inGzx8USgErLZjKJsdn/KjTD9gS/sTdQ6
Q7idqld2LFVlO2/b94ZNZBcS/78EODXgdWfkyPC7Rw8re9nI3/jT</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object Encoding="base64" Id="Object-98733cde-8bcc-48a0-9b77-0e9997bdd058" MimeType="application/octet-stream">SGVsbG8gV29ybGQ=</ds:Object><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-QualifyingProperties" Target="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-Signature"><xades:SignedProperties Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignedProperties"><xades:SignedSignatureProperties><xades:SigningTime>2011-03-21T11:44:42+01:00</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>3m6w99ToySd9JpBl1gBk8Dz/bbU=</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=PREPRODUCCIO IDCat, OU=Entitat publica de certificacio de ciutadans, OU=Vegeu https://www.catcert.net/verCIC-2 (c)03, OU=Serveis Publics de Certificacio ECV-2, L=Passatge de la Concepcio 11 08008 Barcelona, O=Agencia Catalana de Certificacio (NIF Q-0801176-I), C=ES</ds:X509IssuerName><ds:X509SerialNumber>95508</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#Reference-baba4d1a-a17e-42c6-97d2-beee13509503"><xades:MimeType>application/octet-stream</xades:MimeType><xades:Encoding>base64</xades:Encoding></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></dss:Base64Signature> </dss:SignatureObject> </dss:SignResponse>";
 
@@ -909,117 +829,107 @@ public class StorkAttrQueryResponseTest {
 
 		response.setPersonalAttributeList(palist);
 
-		final STORKAttrQueryResponse storkResponse = getEngine()
-				.generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, 
-						destinationUrl, isNotHashing);
+		final STORKAttrQueryResponse storkResponse = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, response, ipAddress, destinationUrl, isNotHashing);
 
 		attrQueryResponse = storkResponse.getTokenSaml();
-		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse,
-				ipAddress);
+		attrQeuryenResponse = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
 
-		assertTrue("SignedDoc response should be the same: ", attrQeuryenResponse
-				.getPersonalAttributeList().get("signedDoc").getValue().get(0)
-				.equals(signedDocResponse));
+		assertTrue("SignedDoc response should be the same: ", attrQeuryenResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0).equals(signedDocResponse));
 
 	}
-	
+
 	@Test
 	public final void testEncodeDecode() {
-	      STORKAttrQueryRequest attrRequest = new STORKAttrQueryRequest();
-	      STORKAttrQueryRequest request;
-	      IPersonalAttributeList list = null;
-	      boolean outcome = false;
-	      
-	      try {
-	    	 //STEP 1: Create the STORKAttrQueryRequest and get the SAML bytes
-	    	 attrRequest.setSpSector("NOT AVAILABLE");
-	    	 attrRequest.setSpInstitution("NOT AVAILABLE");
-	    	 attrRequest.setSpApplication("NOT AVAILABLE");
-	         attrRequest.setSpCountry("NOT AVAILABLE");
-
-	         attrRequest.setIssuer("123");
-	         attrRequest.setDestination("456");
-	         attrRequest.setAssertionConsumerServiceURL("789");
-	         attrRequest.setQaa(2);
-	         attrRequest.setPersonalAttributeList(pal);
-
-	         System.out.println("Original PAL:");
-	         System.out.println(pal.toString());
-
-	         attrRequest = engine.generateSTORKAttrQueryRequest(attrRequest);
-
-	         byte[] saml = attrRequest.getTokenSaml();
-
-	    	 //STEP 2: RE-Create the STORKAttrQueryRequest from the SAML bytes
-	         request = engine.validateSTORKAttrQueryRequest(saml);
-
-	         System.out.println("STORKAttrQueryRequest Issuer: " + request.getIssuer());
-	         System.out.println("STORKAttrQueryRequest Destination: " + request.getDestination());
-	         System.out.println("STORKAttrQueryRequest ServiceURL: " + request.getAssertionConsumerServiceURL());
-	         System.out.println("STORKAttrQueryRequest Attributes: " + request.getPersonalAttributeList().toString());
-	         System.out.println("STORKAttrQueryRequest QAA: " + request.getQaa());
-			 //------------------------------
-			 list = request.getPersonalAttributeList();
-
-			 List<String> values = new ArrayList<String>();
-			 values.add("test1");
-			 values.add("test2");
-			 values.add("test3");
-			 list.get("newAttribute2").setValue(values);
-
-			 System.out.println("Values added in newAttribute2 PAL:");
-			 System.out.println(list.toString());
-
-	         //////////////////////////////////////////////////////////////////////////
-			 final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
-			 response.setPersonalAttributeList(list);
-
-			 final STORKAttrQueryResponse storkResponse =
-						engine.generateSTORKAttrQueryResponse(request, response, "127.0.0.1",
-								request.getAssertionConsumerServiceURL(), false);
-
-			 byte[] samlBytes = storkResponse.getTokenSaml();
-
-	    	 //STEP 3: RE-Create the STORKAttrQueryResponse from the SAML bytes
-		     STORKAttrQueryResponse attrResponse = null;
-		     attrResponse =
-		         engine.validateSTORKAttrQueryResponse(samlBytes, "127.0.0.1");
-
-		     System.out.println("Response decoded PAL:");
-		     System.out.println(attrResponse.getPersonalAttributeList().toString());
-
-		     values = attrResponse.getPersonalAttributeList().get("newAttribute2").getValue();
-		     if ( values.contains("test1") && values.contains("test2") && values.contains("test3") )
-		    	 outcome = true;
-	      } catch (final STORKSAMLEngineException e) {
-	         LOG.error("Errror genereating SAML Token for Authentication Request", e);
-	      }
-
-	      assertTrue(outcome);
+		STORKAttrQueryRequest attrRequest = new STORKAttrQueryRequest();
+		STORKAttrQueryRequest request;
+		IPersonalAttributeList list = null;
+		boolean outcome = false;
+
+		try {
+			// STEP 1: Create the STORKAttrQueryRequest and get the SAML bytes
+			attrRequest.setSpSector("NOT AVAILABLE");
+			attrRequest.setSpInstitution("NOT AVAILABLE");
+			attrRequest.setSpApplication("NOT AVAILABLE");
+			attrRequest.setSpCountry("NOT AVAILABLE");
+
+			attrRequest.setIssuer("123");
+			attrRequest.setDestination("456");
+			attrRequest.setAssertionConsumerServiceURL("789");
+			attrRequest.setQaa(2);
+			attrRequest.setPersonalAttributeList(pal);
+
+			System.out.println("Original PAL:");
+			System.out.println(pal.toString());
+
+			attrRequest = engine.generateSTORKAttrQueryRequest(attrRequest);
+
+			byte[] saml = attrRequest.getTokenSaml();
+
+			// STEP 2: RE-Create the STORKAttrQueryRequest from the SAML bytes
+			request = engine.validateSTORKAttrQueryRequest(saml);
+
+			System.out.println("STORKAttrQueryRequest Issuer: " + request.getIssuer());
+			System.out.println("STORKAttrQueryRequest Destination: " + request.getDestination());
+			System.out.println("STORKAttrQueryRequest ServiceURL: " + request.getAssertionConsumerServiceURL());
+			System.out.println("STORKAttrQueryRequest Attributes: " + request.getPersonalAttributeList().toString());
+			System.out.println("STORKAttrQueryRequest QAA: " + request.getQaa());
+			// ------------------------------
+			list = request.getPersonalAttributeList();
+
+			List<String> values = new ArrayList<String>();
+			values.add("test1");
+			values.add("test2");
+			values.add("test3");
+			list.get("newAttribute2").setValue(values);
+
+			System.out.println("Values added in newAttribute2 PAL:");
+			System.out.println(list.toString());
+
+			// ////////////////////////////////////////////////////////////////////////
+			final STORKAttrQueryResponse response = new STORKAttrQueryResponse();
+			response.setPersonalAttributeList(list);
+
+			final STORKAttrQueryResponse storkResponse = engine.generateSTORKAttrQueryResponse(request, response, "127.0.0.1", request.getAssertionConsumerServiceURL(), false);
+
+			byte[] samlBytes = storkResponse.getTokenSaml();
+
+			// STEP 3: RE-Create the STORKAttrQueryResponse from the SAML bytes
+			STORKAttrQueryResponse attrResponse = null;
+			attrResponse = engine.validateSTORKAttrQueryResponse(samlBytes, "127.0.0.1");
+
+			System.out.println("Response decoded PAL:");
+			System.out.println(attrResponse.getPersonalAttributeList().toString());
+
+			values = attrResponse.getPersonalAttributeList().get("newAttribute2").getValue();
+			if (values.contains("test1") && values.contains("test2") && values.contains("test3"))
+				outcome = true;
+		} catch (final STORKSAMLEngineException e) {
+			LOG.error("Errror genereating SAML Token for Authentication Request", e);
+		}
+
+		assertTrue(outcome);
 	}
-	
+
 	@Test
-	public final void testGenerateAttrRequestWithMultipleAssertions()
-	throws STORKSAMLEngineException {
+	public final void testGenerateAttrRequestWithMultipleAssertions() throws STORKSAMLEngineException {
 		STORKAttrQueryRequest req = null;
 		STORKAttrQueryResponse res0 = null;
 		STORKAttrQueryResponse res1 = null;
 		STORKAttrQueryResponse res2 = null;
 		STORKAttrQueryResponse res = null;
 		STORKAttrQueryResponse restotal = null;
-		
+
 		try {
 			req = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
-		    	    
-		    attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
-		    
+
+			attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
+
 		} catch (STORKSAMLEngineException e) {
-		    fail("Error validating STORKAuthnRequest");
+			fail("Error validating STORKAuthnRequest");
 		}
-		
+
 		IPersonalAttributeList pList = req.getPersonalAttributeList();
-		for (int i =0; i < pList.size(); i++)
-		{
+		for (int i = 0; i < pList.size(); i++) {
 			PersonalAttribute attr = pList.get("dateOfBirth");
 			attr.setValue(Arrays.asList("19820919"));
 			pList.remove("dateOfBirth");
@@ -1031,37 +941,30 @@ public class StorkAttrQueryResponseTest {
 			PersonalAttribute attr2 = pList.get("isAgeOver");
 			attr2.setValue(Arrays.asList("true"));
 			pList.remove("isAgeOver");
-			pList.add(attr2);			
+			pList.add(attr2);
 		}
-		
+
 		res = new STORKAttrQueryResponse();
 		res.setPersonalAttributeList(pList);
-		
-		STORKAttrQueryResponse storkResponse = getEngine()
-		.generateSTORKAttrQueryResponse(req, res, ipAddress,
-				destinationUrl, isNotHashing);
-		
+
+		STORKAttrQueryResponse storkResponse = getEngine().generateSTORKAttrQueryResponse(req, res, ipAddress, destinationUrl, isNotHashing);
+
 		res0 = getEngine().validateSTORKAttrQueryResponse(storkResponse.getTokenSaml(), ipAddress);
-		
-		storkResponse = getEngine()
-		.generateSTORKAttrQueryResponse(req, res, ipAddress,
-				destinationUrl, isNotHashing);
+
+		storkResponse = getEngine().generateSTORKAttrQueryResponse(req, res, ipAddress, destinationUrl, isNotHashing);
 		res1 = getEngine().validateSTORKAttrQueryResponse(storkResponse.getTokenSaml(), ipAddress);
-		
-		storkResponse = getEngine()
-		.generateSTORKAttrQueryResponse(req, res, ipAddress,
-				destinationUrl, isNotHashing);
+
+		storkResponse = getEngine().generateSTORKAttrQueryResponse(req, res, ipAddress, destinationUrl, isNotHashing);
 		res2 = getEngine().validateSTORKAttrQueryResponse(storkResponse.getTokenSaml(), ipAddress);
-		
+
 		List<STORKAttrQueryResponse> responses = new ArrayList();
 		responses.add(res0);
 		responses.add(res1);
 		responses.add(res2);
-		
+
 		STORKAttrQueryResponse resfinal = new STORKAttrQueryResponse();
-		storkResponse = getEngine().generateSTORKAttrQueryResponseWithAssertions(req, resfinal, responses, 
-				ipAddress, destinationUrl, isNotHashing);
-		
+		storkResponse = getEngine().generateSTORKAttrQueryResponseWithAssertions(req, resfinal, responses, ipAddress, destinationUrl, isNotHashing);
+
 		attrQueryResponse = storkResponse.getTokenSaml();
 		FileOutputStream output = null;
 		try {
@@ -1076,7 +979,7 @@ public class StorkAttrQueryResponseTest {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
+
 		res = null;
 		res = getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress);
 		System.out.println(res.getTotalPersonalAttributeList().toString());
diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java
index 02a8a6fab..d476ad26e 100644
--- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java
+++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkAuthRequestTest.java
@@ -21,15 +21,12 @@ import java.util.ArrayList;
 
 import org.junit.Ignore;
 import org.junit.Test;
-
 import org.opensaml.xml.parse.BasicParserPool;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import eu.stork.peps.auth.commons.IPersonalAttributeList;
-import eu.stork.peps.auth.commons.PersonalAttribute;
-import eu.stork.peps.auth.commons.PersonalAttributeList;
-import eu.stork.peps.auth.commons.STORKAuthnRequest;
+import eu.stork.peps.*;
+import eu.stork.peps.auth.commons.*;
 import eu.stork.peps.auth.engine.STORKSAMLEngine;
 import eu.stork.peps.exceptions.STORKSAMLEngineException;
 
@@ -38,869 +35,855 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
  */
 public class StorkAuthRequestTest {
 
-    /** The engines. */
-    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");    
-    private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");    
-    private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
-            
-
-    /**
-     * Instantiates a new stork authentication request test.
-     */
-    public StorkAuthRequestTest() {
-	pal = new PersonalAttributeList();
-
-	final PersonalAttribute isAgeOver = new PersonalAttribute();
-	isAgeOver.setName("isAgeOver");
-	isAgeOver.setIsRequired(true);
-	final ArrayList<String> ages = new ArrayList<String>();
-	ages.add("16");
-	ages.add("18");
-	isAgeOver.setValue(ages);
-	pal.add(isAgeOver);
-	
-	final PersonalAttribute dateOfBirth = new PersonalAttribute();
-	dateOfBirth.setName("dateOfBirth");
-	dateOfBirth.setIsRequired(false);
-	pal.add(dateOfBirth);
-	
+	/** The engines. */
+	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
+	private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");
+	private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
+
+	/**
+	 * Instantiates a new stork authentication request test.
+	 */
+	public StorkAuthRequestTest() {
+		pal = new PersonalAttributeList();
+
+		final PersonalAttribute isAgeOver = new PersonalAttribute();
+		isAgeOver.setName("isAgeOver");
+		isAgeOver.setIsRequired(true);
+		final ArrayList<String> ages = new ArrayList<String>();
+		ages.add("16");
+		ages.add("18");
+		isAgeOver.setValue(ages);
+		pal.add(isAgeOver);
+
+		final PersonalAttribute dateOfBirth = new PersonalAttribute();
+		dateOfBirth.setName("dateOfBirth");
+		dateOfBirth.setIsRequired(false);
+		pal.add(dateOfBirth);
+
 		final PersonalAttribute eIDNumber = new PersonalAttribute();
-	eIDNumber.setName("eIdentifier");
-	eIDNumber.setIsRequired(true);
-	pal.add(eIDNumber);
-
-	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
-	assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
-
-	spName = "University of Oxford";
-	spSector = "EDU001";
-	spInstitution = "OXF001";
-	spApplication = "APP001";
-	spCountry = "EN";
-	
-	spId = "EDU001-OXF001-APP001";
-	
-    }
-
-    /** The destination. */
-    private String destination;
-
-    /** The service provider name. */
-    private String spName;
-
-    /** The service provider sector. */
-    private String spSector;
-
-    /** The service provider institution. */
-    private String spInstitution;
-
-    /** The service provider application. */
-    private String spApplication;
-
-    /** The service provider country. */
-    private String spCountry;
-    
-    /** The service provider id. */
-    private String spId;
-
-    /** The quality authentication assurance level. */
-    private static final int QAAL = 3;
-
-    /** The List of Personal Attributes. */
-    private IPersonalAttributeList pal;
-
-    /** The assertion consumer URL. */
-    private String assertConsumerUrl;
-
-    /** The authentication request. */
-    private static byte[] authRequest;
-
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory
-	    .getLogger(StorkAuthRequestTest.class.getName());
-
-    /** Parser manager used to parse XML. */
-    private static BasicParserPool parser;
-
-    static {
-	parser = new BasicParserPool();
-	parser.setNamespaceAware(true);
-    }
-
-    /**
-     * Test generate authentication request.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAuthnRequest() throws STORKSAMLEngineException {
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// new parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	//engine.generateSTORKAuthnRequest(request);
-	
-	LOG.info("STORKAuthnRequest 1: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAuthnRequest(request).getTokenSaml()));
-	request.setCitizenCountryCode("ES");
-	LOG.info("STORKAuthnRequest 2: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKAuthnRequest(request).getTokenSaml()));
-    }
-    
-    
-    /**
-     * Test generate authentication request error personal attribute name error.
-     */
-    @Test
-    public final void testGenerateAuthnRequestPALsErr1() {
-	
-	final IPersonalAttributeList palWrong = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();
-	worngAttr.setName("attrNotValid");
-	worngAttr.setIsRequired(true);
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(palWrong);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    engine.generateSTORKAuthnRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+		eIDNumber.setName("eIdentifier");
+		eIDNumber.setIsRequired(true);
+		pal.add(eIDNumber);
+
+		final PersonalAttribute LPFiscalNumber = new PersonalAttribute();
+		LPFiscalNumber.setName("LPFiscalNumber");
+		LPFiscalNumber.setIsRequired(true);
+		pal.add(LPFiscalNumber);
+
+		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
+		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
+
+		spName = "University of Oxford";
+		spSector = "EDU001";
+		spInstitution = "OXF001";
+		spApplication = "APP001";
+		spCountry = "EN";
+
+		spId = "EDU001-OXF001-APP001";
+
 	}
-    }
-    
-    
-    
-    /**
-     * Test generate authentication request error personal attribute value error.
-     */
-    @Test
-    public final void testGenerateAuthnRequestPALsErr2() {
-	
-	final IPersonalAttributeList palWrong = new PersonalAttributeList();
-
-	final PersonalAttribute attrNotValid = new PersonalAttribute();
-	attrNotValid.setName("attrNotValid");
-	attrNotValid.setIsRequired(true);
-	palWrong.add(attrNotValid);
-
-
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(palWrong);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    engine.generateSTORKAuthnRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/** The destination. */
+	private String destination;
+
+	/** The service provider name. */
+	private String spName;
+
+	/** The service provider sector. */
+	private String spSector;
+
+	/** The service provider institution. */
+	private String spInstitution;
+
+	/** The service provider application. */
+	private String spApplication;
+
+	/** The service provider country. */
+	private String spCountry;
+
+	/** The service provider id. */
+	private String spId;
+
+	/** The quality authentication assurance level. */
+	private static final int QAAL = 3;
+
+	/** The List of Personal Attributes. */
+	private IPersonalAttributeList pal;
+
+	/** The assertion consumer URL. */
+	private String assertConsumerUrl;
+
+	/** The authentication request. */
+	private static byte[] authRequest;
+
+	/** The Constant LOG. */
+	private static final Logger LOG = LoggerFactory.getLogger(StorkAuthRequestTest.class.getName());
+
+	/** Parser manager used to parse XML. */
+	private static BasicParserPool parser;
+
+	static {
+		parser = new BasicParserPool();
+		parser.setNamespaceAware(true);
 	}
-    }
-
-    /**
-     * Test generate authentication request error provider name null.
-     */
-    @Test
-    public final void testGenerateAuthnRequestSPNAmeErr1() {
-	
- 
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(null);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try 
-	{
-		engine.generateSTORKAuthnRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+
+	/**
+	 * Test generate authentication request.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAuthnRequest() throws STORKSAMLEngineException {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// new parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		// engine.generateSTORKAuthnRequest(request);
+
+		LOG.info("STORKAuthnRequest 1: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAuthnRequest(request).getTokenSaml()));
+		request.setCitizenCountryCode("ES");
+		LOG.info("STORKAuthnRequest 2: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKAuthnRequest(request).getTokenSaml()));
 	}
-	catch (STORKSAMLEngineException e)
-	{
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request error personal attribute name error.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestPALsErr1() {
+
+		final IPersonalAttributeList palWrong = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		worngAttr.setName("attrNotValid");
+		worngAttr.setIsRequired(true);
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(palWrong);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request authentication assurance level
-     * negative value.
-     */
-    @Test
-    public final void testGenerateAuthnRequestQaalErr1() {
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(-1);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-
-	try {
-	    engine.generateSTORKAuthnRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request error personal attribute value error.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestPALsErr2() {
+
+		final IPersonalAttributeList palWrong = new PersonalAttributeList();
+
+		final PersonalAttribute attrNotValid = new PersonalAttribute();
+		attrNotValid.setName("attrNotValid");
+		attrNotValid.setIsRequired(true);
+		palWrong.add(attrNotValid);
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(palWrong);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request service provider sector null.
-     */
-    @Test
-    public final void testGenerateAuthnRequestSectorErr() {
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(null);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    engine.generateSTORKAuthnRequest(request);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
 
+	/**
+	 * Test generate authentication request error provider name null.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestSPNAmeErr1() {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(null);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request service provider institution null.
-     */
-    @Test
-    public final void testGenerateAuthnRequestInstitutionrErr() {
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(null);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    engine.generateSTORKAuthnRequest(request);
-	    
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+
+	/**
+	 * Test generate authentication request authentication assurance level negative value.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestQaalErr1() {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(-1);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request service provider application null.
-     */
-    @Test
-    public final void testGenerateAuthnRequestApplicationErr() {
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(null);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    engine.generateSTORKAuthnRequest(request);
-	    
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+
+	/**
+	 * Test generate authentication request service provider sector null.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestSectorErr() {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(null);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request service provider country null.
-     */
-    @Test
-    public final void testGenerateAuthnRequestCountryErr() {
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(null);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    engine.generateSTORKAuthnRequest(request);
-	    LOG.error("Error");
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	    
-	} catch (STORKSAMLEngineException e) {	 
-		LOG.error("Error");
+
+	/**
+	 * Test generate authentication request service provider institution null.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestInstitutionrErr() {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(null);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request error with quality authentication
-     * assurance level wrong.
-     */
-    @Test
-    public final void testGenerateAuthnRequestQaalErr2() {
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(0);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    engine.generateSTORKAuthnRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request service provider application null.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestApplicationErr() {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(null);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request personal attribute list null value.
-     */
-    @Test
-    public final void testGenerateAuthnRequestPALErr1() {
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(null);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    engine.generateSTORKAuthnRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request service provider country null.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestCountryErr() {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(null);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+			LOG.error("Error");
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication request error with assertion consumer URL
-     * null.
-     */
-    @Test
-    public final void testGenerateAuthnRequestAssertionConsumerErr1() {
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(null);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    engine.generateSTORKAuthnRequest(request);
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request error with quality authentication assurance level wrong.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestQaalErr2() {
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(0);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test validate authentication request null parameter.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthnRequestNullParam()
-	    throws STORKSAMLEngineException {
-	try {
-	    engine.validateSTORKAuthnRequest(null);
-	    fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request personal attribute list null value.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestPALErr1() {
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(null);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test validate authentication request error bytes encode.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthnRequestErrorEncode()
-	    throws STORKSAMLEngineException {
-	try {
-	    engine.validateSTORKAuthnRequest("messageError".getBytes());
-	    fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request error with assertion consumer URL null.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestAssertionConsumerErr1() {
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(null);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			engine.generateSTORKAuthnRequest(request);
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test validate authentication request.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthnRequest() throws STORKSAMLEngineException {
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-	
-	authRequest = engine.generateSTORKAuthnRequest(request).getTokenSaml();
-	
-	final STORKAuthnRequest validatedRequest = engine.validateSTORKAuthnRequest(authRequest);	 
-		
-	assertEquals("CrossBorderShare incorrect: ", validatedRequest.isEIDCrossBorderShare(), false);
-	assertEquals("CrossSectorShare incorrect: ", validatedRequest.isEIDCrossSectorShare(),	false);
-	assertEquals("SectorShare incorrect: ", validatedRequest.isEIDSectorShare(), false);
-	
-    }
-
-    /**
-     * Test validate data authenticate request. Verified parameters after
-     * validation.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateDataAuthnRequest() throws STORKSAMLEngineException {
-    	
-    final STORKAuthnRequest request = engine.validateSTORKAuthnRequest(authRequest);
-
-	assertEquals("Sestination incorrect: ", request.getDestination(), destination);
-	
-	assertEquals("CrossBorderShare incorrect: ", request.isEIDCrossBorderShare(), false);
-	assertEquals("CrossSectorShare incorrect: ", request.isEIDCrossSectorShare(), false);
-	assertEquals("SectorShare incorrect: ", request.isEIDSectorShare(), false);	
-
-	assertEquals("Service provider incorrect: ", request.getProviderName(), spName);
-	assertEquals("QAAL incorrect: ", request.getQaa(), QAAL);
-	assertEquals("SPSector incorrect: ", request.getSpSector(), spSector);		
-	assertEquals("SPInstitution incorrect: ", request.getSpInstitution(), null);
-	assertEquals("SPApplication incorrect: ", request.getSpApplication(), spApplication);
-	assertEquals("Asserition consumer URL incorrect: ", request.getAssertionConsumerServiceURL(), assertConsumerUrl);
-				
-	assertEquals("SP Country incorrect: ", request.getSpCountry(), spCountry);
-	assertEquals("SP Id incorrect: ", request.getSPID(), spId);
-	assertEquals("CitizenCountryCode incorrect: ", request.getCitizenCountryCode(), "ES");
-		
-    }
-
-    /**
-     * Test validate file authentication request. Validate from XML file.
-     *     
-     * @throws Exception the exception
-     */
-    @Test
-    public final void testValidateFileAuthnRequest() throws Exception {
-
-	final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml");
-
-	try {
-	    engine.validateSTORKAuthnRequest(bytes);
-        fail("testValidateFileAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error(e.getMessage());
+
+	/**
+	 * Test validate authentication request null parameter.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthnRequestNullParam() throws STORKSAMLEngineException {
+		try {
+			engine.validateSTORKAuthnRequest(null);
+			fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
 
-    /**
-     * Test validate file authentication request tag delete.
-     * 
-     * @throws Exception the exception
-     */
-    @Test
-    public final void testValidateFileAuthnRequestTagDelete() throws Exception {
+	/**
+	 * Test validate authentication request error bytes encode.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthnRequestErrorEncode() throws STORKSAMLEngineException {
+		try {
+			engine.validateSTORKAuthnRequest("messageError".getBytes());
+			fail("validateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test validate authentication request.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthnRequest() throws STORKSAMLEngineException {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
 
-	final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml");
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		authRequest = engine.generateSTORKAuthnRequest(request).getTokenSaml();
+
+		final STORKAuthnRequest validatedRequest = engine.validateSTORKAuthnRequest(authRequest);
 
-	try {
-	    engine.validateSTORKAuthnRequest(bytes);
-        fail("validateSTORKAuthnRequest(...) should have thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error(e.getMessage());
+		assertEquals("CrossBorderShare incorrect: ", validatedRequest.isEIDCrossBorderShare(), false);
+		assertEquals("CrossSectorShare incorrect: ", validatedRequest.isEIDCrossSectorShare(), false);
+		assertEquals("SectorShare incorrect: ", validatedRequest.isEIDSectorShare(), false);
 
 	}
-    }
-
-    /**
-     * Test validate authentication request not trusted token.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthnRequestNotTrustedErr1()
-	    throws STORKSAMLEngineException {
-	
-	try {
-	    final STORKSAMLEngine engineNotTrusted = STORKSAMLEngine
-		    .getInstance("CONF2");
-
-	    final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	    request.setDestination(destination);
-	    request.setProviderName(spName);
-	    request.setQaa(QAAL);
-	    request.setPersonalAttributeList(pal);
-	    request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	    // news parameters
-	    request.setSpSector(spSector);
-	    request.setSpInstitution(spInstitution);
-	    request.setSpApplication(spApplication);
-	    request.setSpCountry(spCountry);
-
-	    final byte[] authReqNotTrust = engineNotTrusted
-		    .generateSTORKAuthnRequest(request).getTokenSaml();
-
-	    engine.validateSTORKAuthnRequest(authReqNotTrust);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
-        fail("validateSTORKAuthnRequestNotTrusted(...) should not have thrown an STORKSAMLEngineException!");
-    }
-    }
-
-    /**
-     * Test validate authentication request trusted.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthnRequestTrusted()
-	    throws STORKSAMLEngineException {
-
-	final STORKSAMLEngine engineTrusted = STORKSAMLEngine
-		.getInstance("CONF3");
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-
-	final byte[] authReqNotTrust = engineTrusted.generateSTORKAuthnRequest(
-		request).getTokenSaml();
-
-	// engine ("CONF1") no have trust certificate from "CONF2"
-	engine.validateSTORKAuthnRequest(authReqNotTrust);
-	
-    }
-    
-    
-    
-    
-    /**
-     * Test generate authentication request service provider application null.
-     */
-    @Test
-    public final void testGenerateAuthnRequestNADA() {
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(null);
-	request.setSpInstitution(null);
-	request.setSpApplication(null);
-	request.setSpCountry(null);
-
-	try {
-	       	
-		engine.validateSTORKAuthnRequest(authRequest);
-	    
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
-	    fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+
+	/**
+	 * Test validate data authenticate request. Verified parameters after validation.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateDataAuthnRequest() throws STORKSAMLEngineException {
+
+		final STORKAuthnRequest request = engine.validateSTORKAuthnRequest(authRequest);
+
+		assertEquals("Sestination incorrect: ", request.getDestination(), destination);
+
+		assertEquals("CrossBorderShare incorrect: ", request.isEIDCrossBorderShare(), false);
+		assertEquals("CrossSectorShare incorrect: ", request.isEIDCrossSectorShare(), false);
+		assertEquals("SectorShare incorrect: ", request.isEIDSectorShare(), false);
+
+		assertEquals("Service provider incorrect: ", request.getProviderName(), spName);
+		assertEquals("QAAL incorrect: ", request.getQaa(), QAAL);
+		assertEquals("SPSector incorrect: ", request.getSpSector(), spSector);
+		assertEquals("SPInstitution incorrect: ", request.getSpInstitution(), null);
+		assertEquals("SPApplication incorrect: ", request.getSpApplication(), spApplication);
+		assertEquals("Asserition consumer URL incorrect: ", request.getAssertionConsumerServiceURL(), assertConsumerUrl);
+
+		assertEquals("SP Country incorrect: ", request.getSpCountry(), spCountry);
+		assertEquals("SP Id incorrect: ", request.getSPID(), spId);
+		assertEquals("CitizenCountryCode incorrect: ", request.getCitizenCountryCode(), "ES");
+
+	}
+
+	/**
+	 * Test validate file authentication request. Validate from XML file.
+	 * 
+	 * @throws Exception
+	 *             the exception
+	 */
+	@Test
+	public final void testValidateFileAuthnRequest() throws Exception {
+
+		final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml");
+
+		try {
+			engine.validateSTORKAuthnRequest(bytes);
+			fail("testValidateFileAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error(e.getMessage());
+		}
+	}
+
+	/**
+	 * Test validate file authentication request tag delete.
+	 * 
+	 * @throws Exception
+	 *             the exception
+	 */
+	@Test
+	public final void testValidateFileAuthnRequestTagDelete() throws Exception {
+
+		final byte[] bytes = SSETestUtils.readStorkSamlFromFile("/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml");
+
+		try {
+			engine.validateSTORKAuthnRequest(bytes);
+			fail("validateSTORKAuthnRequest(...) should have thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error(e.getMessage());
+
+		}
+	}
+
+	/**
+	 * Test validate authentication request not trusted token.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthnRequestNotTrustedErr1() throws STORKSAMLEngineException {
+
+		try {
+			final STORKSAMLEngine engineNotTrusted = STORKSAMLEngine.getInstance("CONF2");
+
+			final STORKAuthnRequest request = new STORKAuthnRequest();
+
+			request.setDestination(destination);
+			request.setProviderName(spName);
+			request.setQaa(QAAL);
+			request.setPersonalAttributeList(pal);
+			request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+			// news parameters
+			request.setSpSector(spSector);
+			request.setSpInstitution(spInstitution);
+			request.setSpApplication(spApplication);
+			request.setSpCountry(spCountry);
+
+			final byte[] authReqNotTrust = engineNotTrusted.generateSTORKAuthnRequest(request).getTokenSaml();
+
+			engine.validateSTORKAuthnRequest(authReqNotTrust);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+			fail("validateSTORKAuthnRequestNotTrusted(...) should not have thrown an STORKSAMLEngineException!");
+		}
 	}
-    }
-    
-    /**
-     * Test validate authentication request with unknown elements.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthnRequestWithUnknownElements() throws STORKSAMLEngineException {
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-	
-	IPersonalAttributeList pAttList = new PersonalAttributeList();
-		
-	final PersonalAttribute unknown = new PersonalAttribute();
-	unknown.setName("unknown");
-	unknown.setIsRequired(true);
-	pAttList.add(unknown);	
-	
-	final PersonalAttribute eIdentifier = new PersonalAttribute();
-	eIdentifier.setName("eIdentifier");
-	eIdentifier.setIsRequired(true);
-	pAttList.add(eIdentifier);	
-	
-	request.setPersonalAttributeList(pAttList);
-
-	// new parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-	
-	STORKAuthnRequest req = new STORKAuthnRequest();
-		
-	req  = engine3.generateSTORKAuthnRequest(request);
-	
-	req = engine.validateSTORKAuthnRequest(req.getTokenSaml());
-	
-	assertNull("The value shouldn't exist", req.getPersonalAttributeList().get("unknown"));
-	assertNotNull("The value should exist", req.getPersonalAttributeList().get("eIdentifier"));
-	
-    }
-    
-    /**
-     * Test generate Request with required elements by default
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAuthnRequestWithIsRequiredElementsByDefault() throws STORKSAMLEngineException {
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-	
-	IPersonalAttributeList pAttList = new PersonalAttributeList();
-		
-	final PersonalAttribute eIdentifier = new PersonalAttribute();
-	eIdentifier.setName("eIdentifier");
-	eIdentifier.setIsRequired(true);
-	pAttList.add(eIdentifier);	
-	
-	request.setPersonalAttributeList(pAttList);
-
-	// new parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-	
-	STORKAuthnRequest req = new STORKAuthnRequest();
-	STORKAuthnRequest reqTrue = new STORKAuthnRequest();
-	STORKAuthnRequest reqFalse = new STORKAuthnRequest();
-		
-	reqTrue  = engine.generateSTORKAuthnRequest(request);
-	reqFalse = engine2.generateSTORKAuthnRequest(request);
-	req  	 = engine3.generateSTORKAuthnRequest(request);
-	
-	
-	String token = new String(req.getTokenSaml());
-	String reqTrueToken = new String(reqTrue.getTokenSaml());
-	String reqFalseToken = new String(reqFalse.getTokenSaml());
-	
-	assertTrue("The token must contain the chain 'isRequired'", token.contains("isRequired"));
-	assertTrue("The token must contain the chain 'isRequired'", reqTrueToken.contains("isRequired"));
-	assertFalse("The token must contain the chain 'isRequired'", reqFalseToken.contains("isRequired"));
-		
-    }
-    
-    /**
-     * Test validating request and getting alias used to save 
-     * the saml trusted certificate into trustore
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthnRequestGettingItsAlias() throws STORKSAMLEngineException {
-
-    	final STORKAuthnRequest request = new STORKAuthnRequest();
-
-    	request.setDestination(destination);
-    	request.setProviderName(spName);
-    	request.setQaa(QAAL);
-    	request.setPersonalAttributeList(pal);
-    	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-    	
-    	IPersonalAttributeList pAttList = new PersonalAttributeList();
-    		
-    	final PersonalAttribute eIdentifier = new PersonalAttribute();
-    	eIdentifier.setName("eIdentifier");
-    	eIdentifier.setIsRequired(true);
-    	pAttList.add(eIdentifier);	
-    	
-    	request.setPersonalAttributeList(pAttList);
-
-    	// new parameters
-    	request.setSpSector(spSector);
-    	request.setSpInstitution(spInstitution);
-    	request.setSpApplication(spApplication);
-    	request.setSpCountry(spCountry);
-    	request.setSPID(spId);
-    	request.setCitizenCountryCode("ES");
-    	
-    	STORKAuthnRequest req = new STORKAuthnRequest();
-    		
-    	req  = engine3.generateSTORKAuthnRequest(request);
-    	req = engine.validateSTORKAuthnRequest(req.getTokenSaml());
-    	assertTrue("The alias should match this value", req.getAlias().equals("local-demo-cert"));
-    	
-    	req  = engine2.generateSTORKAuthnRequest(request);
-    	req = engine2.validateSTORKAuthnRequest(req.getTokenSaml());
-    	assertTrue("The alias should match this value", req.getAlias().equals("local-demo-cert"));
-    	
-
-		
-    }
-    
+
+	/**
+	 * Test validate authentication request trusted.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthnRequestTrusted() throws STORKSAMLEngineException {
+
+		final STORKSAMLEngine engineTrusted = STORKSAMLEngine.getInstance("CONF3");
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+
+		final byte[] authReqNotTrust = engineTrusted.generateSTORKAuthnRequest(request).getTokenSaml();
+
+		// engine ("CONF1") no have trust certificate from "CONF2"
+		engine.validateSTORKAuthnRequest(authReqNotTrust);
+
+	}
+
+	/**
+	 * Test generate authentication request service provider application null.
+	 */
+	@Test
+	public final void testGenerateAuthnRequestNADA() {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(null);
+		request.setSpInstitution(null);
+		request.setSpApplication(null);
+		request.setSpCountry(null);
+
+		try {
+
+			engine.validateSTORKAuthnRequest(authRequest);
+
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+			fail("generateSTORKAuthnRequest(...) should've thrown an STORKSAMLEngineException!");
+		}
+	}
+
+	/**
+	 * Test validate authentication request with unknown elements.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthnRequestWithUnknownElements() throws STORKSAMLEngineException {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		IPersonalAttributeList pAttList = new PersonalAttributeList();
+
+		final PersonalAttribute unknown = new PersonalAttribute();
+		unknown.setName("unknown");
+		unknown.setIsRequired(true);
+		pAttList.add(unknown);
+
+		final PersonalAttribute eIdentifier = new PersonalAttribute();
+		eIdentifier.setName("eIdentifier");
+		eIdentifier.setIsRequired(true);
+		pAttList.add(eIdentifier);
+
+		request.setPersonalAttributeList(pAttList);
+
+		// new parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		STORKAuthnRequest req = new STORKAuthnRequest();
+
+		req = engine3.generateSTORKAuthnRequest(request);
+
+		req = engine.validateSTORKAuthnRequest(req.getTokenSaml());
+
+		assertNull("The value shouldn't exist", req.getPersonalAttributeList().get("unknown"));
+		assertNotNull("The value should exist", req.getPersonalAttributeList().get("eIdentifier"));
+
+	}
+
+	/**
+	 * Test generate Request with required elements by default
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAuthnRequestWithIsRequiredElementsByDefault() throws STORKSAMLEngineException {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		IPersonalAttributeList pAttList = new PersonalAttributeList();
+
+		final PersonalAttribute eIdentifier = new PersonalAttribute();
+		eIdentifier.setName("eIdentifier");
+		eIdentifier.setIsRequired(true);
+		pAttList.add(eIdentifier);
+
+		request.setPersonalAttributeList(pAttList);
+
+		// new parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		STORKAuthnRequest req = new STORKAuthnRequest();
+		STORKAuthnRequest reqTrue = new STORKAuthnRequest();
+		STORKAuthnRequest reqFalse = new STORKAuthnRequest();
+
+		reqTrue = engine.generateSTORKAuthnRequest(request);
+		reqFalse = engine2.generateSTORKAuthnRequest(request);
+		req = engine3.generateSTORKAuthnRequest(request);
+
+		String token = new String(req.getTokenSaml());
+		String reqTrueToken = new String(reqTrue.getTokenSaml());
+		String reqFalseToken = new String(reqFalse.getTokenSaml());
+
+		assertTrue("The token must contain the chain 'isRequired'", token.contains("isRequired"));
+		assertTrue("The token must contain the chain 'isRequired'", reqTrueToken.contains("isRequired"));
+		assertFalse("The token must contain the chain 'isRequired'", reqFalseToken.contains("isRequired"));
+
+	}
+
+	/**
+	 * Test validating request and getting alias used to save the saml trusted certificate into trustore
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthnRequestGettingItsAlias() throws STORKSAMLEngineException {
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		IPersonalAttributeList pAttList = new PersonalAttributeList();
+
+		final PersonalAttribute eIdentifier = new PersonalAttribute();
+		eIdentifier.setName("eIdentifier");
+		eIdentifier.setIsRequired(true);
+		pAttList.add(eIdentifier);
+
+		request.setPersonalAttributeList(pAttList);
+
+		// new parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		STORKAuthnRequest req = new STORKAuthnRequest();
+
+		req = engine3.generateSTORKAuthnRequest(request);
+		req = engine.validateSTORKAuthnRequest(req.getTokenSaml());
+		assertTrue("The alias should match this value", req.getAlias().equals("local-demo-cert"));
+
+		req = engine2.generateSTORKAuthnRequest(request);
+		req = engine2.validateSTORKAuthnRequest(req.getTokenSaml());
+		assertTrue("The alias should match this value", req.getAlias().equals("local-demo-cert"));
+
+	}
+
 	/**
 	 * Test generating/validating request with signedDoc
 	 * 
@@ -908,8 +891,7 @@ public class StorkAuthRequestTest {
 	 *             the STORKSAML engine exception
 	 */
 	@Test
-	public final void testGenerateAuthnRequestWithSignedDoc()
-			throws STORKSAMLEngineException {
+	public final void testGenerateAuthnRequestWithSignedDoc() throws STORKSAMLEngineException {
 
 		String signedDocRequest = "<dss:SignRequest xmlns:dss=\"urn:oasis:names:tc:dss:1.0:core:schema\" RequestID=\"_d96b62a87d18f1095170c1f44c90b5fd\"><dss:InputDocuments><dss:Document><dss:Base64Data MimeType=\"text/plain\">VGVzdCB0ZXh0</dss:Base64Data></dss:Document></dss:InputDocuments></dss:SignRequest>";
 
@@ -958,10 +940,7 @@ public class StorkAuthRequestTest {
 		req = engine.generateSTORKAuthnRequest(request);
 		req = engine.validateSTORKAuthnRequest(req.getTokenSaml());
 
-		assertTrue("SignedDoc request should be the same: ", req
-				.getPersonalAttributeList().get("signedDoc").getValue().get(0)
-				.equals(signedDocRequest));
-		
+		assertTrue("SignedDoc request should be the same: ", req.getPersonalAttributeList().get("signedDoc").getValue().get(0).equals(signedDocRequest));
 
 	}
 
diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutRequestTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutRequestTest.java
index 46904788f..e05c660ea 100644
--- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutRequestTest.java
+++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutRequestTest.java
@@ -15,75 +15,74 @@ import eu.stork.peps.auth.commons.STORKLogoutRequest;
 import eu.stork.peps.auth.engine.STORKSAMLEngine;
 import eu.stork.peps.exceptions.STORKSAMLEngineException;
 
-
 public class StorkLogoutRequestTest {
-	
-	/** The engines. */	
-    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
-    private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
-    private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");    
-    private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
-    
-    public StorkLogoutRequestTest() {           
-    	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
-    	spUserId = "IS/IS/1234567890";
-    }
-
-    /** The destination. */
-    private String destination;
-   
-    /** The user id. */
-    private String spUserId;
-    
-    /** The logout request. */
-    private static byte[] logoutRequest;
-
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory
-	    .getLogger(StorkLogoutRequestTest.class.getName());
-
-    /** Parser manager used to parse XML. */
-    private static BasicParserPool parser;
-
-    static {
+
+	/** The engines. */
+	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
+	private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
+	private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");
+	private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
+
+	public StorkLogoutRequestTest() {
+		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
+		spUserId = "IS/IS/1234567890";
+	}
+
+	/** The destination. */
+	private String destination;
+
+	/** The user id. */
+	private String spUserId;
+
+	/** The logout request. */
+	private static byte[] logoutRequest;
+
+	/** The Constant LOG. */
+	private static final Logger LOG = LoggerFactory.getLogger(StorkLogoutRequestTest.class.getName());
+
+	/** Parser manager used to parse XML. */
+	private static BasicParserPool parser;
+
+	static {
 		parser = new BasicParserPool();
 		parser.setNamespaceAware(true);
-    }
-    
-    /**
-     * Test generate authentication request.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateLogoutRequest() throws STORKSAMLEngineException {
-
-	final STORKLogoutRequest request = new STORKLogoutRequest();
-
-	request.setDestination(destination);	
-
-	request.setSpProvidedId(spUserId);
-
-	STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
-	byte[] reqByte = req1.getTokenSaml();
-	FileOutputStream output = null;
-	
-	try {
-		output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutRequest.xml"));
-	} catch (FileNotFoundException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
 	}
-	try {
-		output.write(reqByte);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
+
+	/**
+	 * Test generate authentication request.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateLogoutRequest() throws STORKSAMLEngineException {
+
+		final STORKLogoutRequest request = new STORKLogoutRequest();
+
+		request.setDestination(destination);
+
+		request.setSpProvidedId(spUserId);
+
+		STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
+		byte[] reqByte = req1.getTokenSaml();
+		FileOutputStream output = null;
+
+		try {
+			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutRequest.xml"));
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		try {
+			output.write(reqByte);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		LOG.info("STORKAttrQueryRequest 1: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKLogoutRequest(request).getTokenSaml()));
+
+		LOG.info("STORKAttrQueryRequest 2: " + SSETestUtils.encodeSAMLToken(engine.generateSTORKLogoutRequest(request).getTokenSaml()));
 	}
-	
-	LOG.info("STORKAttrQueryRequest 1: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKLogoutRequest(request).getTokenSaml()));
-	
-	LOG.info("STORKAttrQueryRequest 2: "  + SSETestUtils.encodeSAMLToken(engine.generateSTORKLogoutRequest(request).getTokenSaml()));
-    }
 
 }
diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutResponseTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutResponseTest.java
index 2d05e04aa..b9907002a 100644
--- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutResponseTest.java
+++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkLogoutResponseTest.java
@@ -19,124 +19,123 @@ import eu.stork.peps.auth.commons.STORKLogoutResponse;
 import eu.stork.peps.auth.engine.STORKSAMLEngine;
 import eu.stork.peps.exceptions.STORKSAMLEngineException;
 
-
 public class StorkLogoutResponseTest {
-	
-	/** The engines. */	
-    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
-    private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
-    private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");    
-    private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
-    
-    public StorkLogoutResponseTest() {           
-    	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
-    	spUserId = "IS/IS/1234567890";
-    }
-
-    /** The destination. */
-    private String destination;
-   
-    /** The user id. */
-    private String spUserId;
-    
-    /** The logout request. */
-    private static byte[] logoutRequest;
-    
-    /** The logout response. */
-    private static byte[] logoutResponse;
-
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory
-	    .getLogger(StorkLogoutResponseTest.class.getName());
-
-    /** Parser manager used to parse XML. */
-    private static BasicParserPool parser;
-
-    static {
+
+	/** The engines. */
+	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
+	private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
+	private static STORKSAMLEngine engine2 = STORKSAMLEngine.getInstance("CONF2");
+	private static STORKSAMLEngine engine3 = STORKSAMLEngine.getInstance("CONF3");
+
+	public StorkLogoutResponseTest() {
+		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
+		spUserId = "IS/IS/1234567890";
+	}
+
+	/** The destination. */
+	private String destination;
+
+	/** The user id. */
+	private String spUserId;
+
+	/** The logout request. */
+	private static byte[] logoutRequest;
+
+	/** The logout response. */
+	private static byte[] logoutResponse;
+
+	/** The Constant LOG. */
+	private static final Logger LOG = LoggerFactory.getLogger(StorkLogoutResponseTest.class.getName());
+
+	/** Parser manager used to parse XML. */
+	private static BasicParserPool parser;
+
+	static {
 		parser = new BasicParserPool();
 		parser.setNamespaceAware(true);
-    }
-    
-    /**
-     * Test generate authentication request.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateLogoutRequest() throws STORKSAMLEngineException {
-
-	final STORKLogoutRequest request = new STORKLogoutRequest();
-	
-	final STORKLogoutResponse response = new STORKLogoutResponse();
-
-	request.setDestination(destination);
-	response.setDestination(destination);
-
-	request.setSpProvidedId(spUserId);
-
-	STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
-	
-	STORKLogoutResponse res = engine0.generateSTORKLogoutResponse(req1, response);
-	
-	byte[] reqByte = res.getTokenSaml();
-	FileOutputStream output = null;
-	
-	try {
-		output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutResponse.xml"));
-	} catch (FileNotFoundException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-	try {
-		output.write(reqByte);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
 	}
-		
-	
+
+	/**
+	 * Test generate authentication request.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateLogoutRequest() throws STORKSAMLEngineException {
+
+		final STORKLogoutRequest request = new STORKLogoutRequest();
+
+		final STORKLogoutResponse response = new STORKLogoutResponse();
+
+		request.setDestination(destination);
+		response.setDestination(destination);
+
+		request.setSpProvidedId(spUserId);
+
+		STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
+
+		STORKLogoutResponse res = engine0.generateSTORKLogoutResponse(req1, response);
+
+		byte[] reqByte = res.getTokenSaml();
+		FileOutputStream output = null;
+
+		try {
+			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutResponse.xml"));
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		try {
+			output.write(reqByte);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
 		assertNotNull(reqByte);
-    }
-    
-    /**
-     * Test generate authentication request.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateLogoutRequestFail() throws STORKSAMLEngineException {
-
-	final STORKLogoutRequest request = new STORKLogoutRequest();
-	
-	final STORKLogoutResponse response = new STORKLogoutResponse();
-
-	request.setDestination(destination);
-	response.setDestination(destination);
-	response.setStatusMessage("User not found.");
-	response.setStatusCode("1234");
-	request.setSpProvidedId(spUserId);
-
-	STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
-	
-	STORKLogoutResponse res = engine0.generateSTORKLogoutResponseFail(req1, response);
-	
-	byte[] reqByte = res.getTokenSaml();
-	FileOutputStream output = null;
-	
-	try {
-		output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutResponseFail.xml"));
-	} catch (FileNotFoundException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
-	}
-	try {
-		output.write(reqByte);
-	} catch (IOException e) {
-		// TODO Auto-generated catch block
-		e.printStackTrace();
 	}
-	
+
+	/**
+	 * Test generate authentication request.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateLogoutRequestFail() throws STORKSAMLEngineException {
+
+		final STORKLogoutRequest request = new STORKLogoutRequest();
+
+		final STORKLogoutResponse response = new STORKLogoutResponse();
+
+		request.setDestination(destination);
+		response.setDestination(destination);
+		response.setStatusMessage("User not found.");
+		response.setStatusCode("1234");
+		request.setSpProvidedId(spUserId);
+
+		STORKLogoutRequest req1 = engine0.generateSTORKLogoutRequest(request);
+
+		STORKLogoutResponse res = engine0.generateSTORKLogoutResponseFail(req1, response);
+
+		byte[] reqByte = res.getTokenSaml();
+		FileOutputStream output = null;
+
+		try {
+			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/LogoutResponseFail.xml"));
+		} catch (FileNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		try {
+			output.write(reqByte);
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
 		assertNotNull(reqByte);
-    }
+	}
 
 }
diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkNewResponseTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkNewResponseTest.java
index 62e9cfb18..876c2c14d 100644
--- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkNewResponseTest.java
+++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkNewResponseTest.java
@@ -27,382 +27,370 @@ import eu.stork.peps.auth.commons.STORKStatusCode;
 import eu.stork.peps.auth.engine.STORKSAMLEngine;
 import eu.stork.peps.exceptions.STORKSAMLEngineException;
 
-
 public class StorkNewResponseTest {
 	/** The engine. */
-    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
-    private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
-
-    /**
-     * Gets the engine.
-     * 
-     * @return the engine
-     */
-    public static STORKSAMLEngine getEngine() {
-        return engine;
-    }
-    
-    public static STORKSAMLEngine getEngine2() {
-        return engine0;
-    }
-
-    /**
-     * Sets the engine.
-     * 
-     * @param newEngine the new engine
-     */
-    public static void setEngine(final STORKSAMLEngine newEngine) {
-    	StorkNewResponseTest.engine = newEngine;
-    }
-
-    /** The destination. */
-    private static String destination;
-
-    /** The service provider name. */
-    private static String spName;
-
-    /** The service provider sector. */
-    private static String spSector;
-
-    /** The service provider institution. */
-    private static String spInstitution;
-
-    /** The service provider application. */
-    private static String spApplication;
-
-    /** The service provider country. */
-    private static String spCountry;
-    
-    /** The service provider id. */
-    private static String spId;
-
-    /** The quality authentication assurance level. */
-    private static final int QAAL = 3;
-
-    /** The state. */
-    private static String state = "ES";
-    
-    /** The town. */
-    private static String town = "Madrid";
-    
-    /** The municipality code. */
-    private static String municipalityCode = "MA001";
-    
-    /** The postal code. */
-    private static String postalCode = "28038";
-    
-    /** The street name. */
-    private static String streetName = "Marchamalo";
-    
-    /** The street number. */
-    private static String streetNumber = "3";
-    
-    /** The apartament number. */
-    private static String apartamentNumber = "5º E";
-
-    /** The List of Personal Attributes. */
-    private static IPersonalAttributeList pal;    
-    
-    /** The List of Personal Attributes. */
-    private static IPersonalAttributeList pal2;
-
-    /** The assertion consumer URL. */
-    private static String assertConsumerUrl;
-
-    /** The authentication request. */
-    private static byte[] authRequest;
-
-    /** The authentication response. */
-    private static byte[] authResponse;
-
-    /** The authentication request. */
-    private static STORKAuthnRequest authenRequest;
-
-    /** The authentication response. */
-    private static STORKAuthnResponse authnResponse;
-
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory
-	    .getLogger(StorkResponseTest.class.getName());
-
-    /**
-     * Instantiates a new stork response test.
-     */
-    public StorkNewResponseTest() {
-	super();
-    }
-
-    /** The IP address. */
-    private static String ipAddress;
-
-    /** The is hashing. */
-    private final boolean isHashing = Boolean.TRUE;
-
-    /** The is not hashing. */
-    private final boolean isNotHashing = Boolean.FALSE;
-
-    /** The ERROR text. */
-    private static final String ERROR_TXT = "generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!";
-
-
-    /** Parser manager used to parse XML. */
-    private static BasicParserPool parser;
-    
-    /** The attribute query request. */
-    private static STORKAttrQueryRequest attrQueryenRequest;
-
-    /** The attribute query response. */
-    private static STORKAttrQueryResponse attrQeuryenResponse;
-    
-    /** The attribute query request. */
-    private static byte[] attrQueryRequest;
-    
-    /** The attribute query response. */
-    private static byte[] attrQueryResponse;
-    
-    
-
-    static {
-	parser = new BasicParserPool();
-	parser.setNamespaceAware(true);
-
-	pal = new PersonalAttributeList();
-	pal2 = new PersonalAttributeList();
-
-	PersonalAttribute isAgeOver = new PersonalAttribute();
-	isAgeOver.setName("isAgeOver");
-	isAgeOver.setIsRequired(false);
-	ArrayList<String> ages = new ArrayList<String>();
-	ages.add("16");
-	ages.add("18");
-	isAgeOver.setValue(ages);
-	pal.add(isAgeOver);
-
-	PersonalAttribute dateOfBirth = new PersonalAttribute();
-	dateOfBirth.setName("dateOfBirth");
-	dateOfBirth.setIsRequired(false);
-	pal.add(dateOfBirth);
-
-	PersonalAttribute eIDNumber = new PersonalAttribute();
-	eIDNumber.setName("eIdentifier");
-	eIDNumber.setIsRequired(true);
-	pal.add(eIDNumber);
-
-	final PersonalAttribute givenName = new PersonalAttribute();
-	givenName.setName("givenName");
-	givenName.setIsRequired(true);
-	pal.add(givenName);
-
-	PersonalAttribute canRessAddress = new PersonalAttribute();
-	canRessAddress.setName("canonicalResidenceAddress");
-	canRessAddress.setIsRequired(true);
-	pal.add(canRessAddress);
-	
-	PersonalAttribute newAttribute = new PersonalAttribute();
-	newAttribute.setName("newAttribute2");
-	newAttribute.setIsRequired(true);
-	pal.add(newAttribute);
-	
-	PersonalAttribute hasDegree = new PersonalAttribute();
-	hasDegree.setName("hasDegree");
-	List<String> vals = new ArrayList<String>();
-	vals.add("Engineering");
-	vals.add("Computer Science");
-	hasDegree.setValue(vals);
-	pal2.add(hasDegree);
-	
-	PersonalAttribute mandate = new PersonalAttribute();
-	mandate.setName("mandateContent");
-	List<String> manvalues = new ArrayList<String>();
-	manvalues.add("Powers");
-	mandate.setValue(manvalues);
-	pal2.add(mandate);
-
-	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
-	assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
-	spName = "University Oxford";
-	
-	spName = "University of Oxford";
-	spSector = "EDU001";
-	spInstitution = "OXF001";
-	spApplication = "APP001";
-	spCountry = "EN";
-	
-	spId = "EDU001-APP001-APP001";
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    authRequest = getEngine().generateSTORKAuthnRequest(request)
-		    .getTokenSaml();
-	    	    
-	    authenRequest = getEngine().validateSTORKAuthnRequest(authRequest);
-	    
-	} catch (STORKSAMLEngineException e) {
-	    fail("Error create STORKAuthnRequest");
+	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
+	private static STORKSAMLEngine engine0 = STORKSAMLEngine.getInstance("CONF0");
+
+	/**
+	 * Gets the engine.
+	 * 
+	 * @return the engine
+	 */
+	public static STORKSAMLEngine getEngine() {
+		return engine;
+	}
+
+	public static STORKSAMLEngine getEngine2() {
+		return engine0;
 	}
 
-	ipAddress = "111.222.333.444";
-
-	pal = new PersonalAttributeList();
-
-	isAgeOver = new PersonalAttribute();
-	isAgeOver.setName("isAgeOver");
-	isAgeOver.setIsRequired(true);
-	ages = new ArrayList<String>();
-
-	ages.add("16");
-	ages.add("18");
-
-	isAgeOver.setValue(ages);
-	isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	pal.add(isAgeOver);
-
-	dateOfBirth = new PersonalAttribute();
-	dateOfBirth.setName("dateOfBirth");
-	dateOfBirth.setIsRequired(false);
-	final ArrayList<String> date = new ArrayList<String>();
-	date.add("16/12/2008");
-	dateOfBirth.setValue(date);
-	dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	pal.add(dateOfBirth);
-
-	eIDNumber = new PersonalAttribute();
-	eIDNumber.setName("eIdentifier");
-	eIDNumber.setIsRequired(true);
-	final ArrayList<String> idNumber = new ArrayList<String>();
-	idNumber.add("123456789PA");
-	eIDNumber.setValue(idNumber);
-	eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	pal.add(eIDNumber);
-
-	canRessAddress = new PersonalAttribute();
-	canRessAddress.setName("canonicalResidenceAddress");
-	canRessAddress.setIsRequired(true);
-	canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	final HashMap<String, String> address = new HashMap<String, String>();
-
-	address.put("state", state);
-	address.put("municipalityCode", municipalityCode);
-	address.put("town", town);
-	address.put("postalCode", postalCode);
-	address.put("streetName", streetName);
-	address.put("streetNumber", streetNumber);
-	address.put("apartamentNumber", apartamentNumber);
-
-	canRessAddress.setComplexValue(address);
-	pal.add(canRessAddress);
-    
-	newAttribute = new PersonalAttribute();
-	newAttribute.setName("newAttribute2");
-	newAttribute.setIsRequired(true);
-	newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	final HashMap<String, String> values = new HashMap<String, String>();
-	
-	values.put("value1", "value1");
-	values.put("value2", "value2");
-	values.put("value3", "value3");
-	values.put("value4", "value4");
-	
-	newAttribute.setComplexValue(values);
-	pal.add(newAttribute);
-	
-	final STORKAttrQueryRequest arequest = new STORKAttrQueryRequest();
-	arequest.setDestination(destination);
-	//request.setProviderName(spName);
-	arequest.setQaa(QAAL);
-	arequest.setPersonalAttributeList(pal2);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	arequest.setSpSector(spSector);
-	arequest.setSpInstitution(spInstitution);
-	arequest.setSpApplication(spApplication);
-	arequest.setSpCountry(spCountry);
-	arequest.setSPID(spId);
-	arequest.setCitizenCountryCode("IS");
-	arequest.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	try {
-	    attrQueryRequest = getEngine().generateSTORKAttrQueryRequest(arequest)
-		    .getTokenSaml();
-	    	    
-	    attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
-	    
-	} catch (STORKSAMLEngineException e) {
-	    fail("Error create STORKAuthnRequest");
+	/**
+	 * Sets the engine.
+	 * 
+	 * @param newEngine
+	 *            the new engine
+	 */
+	public static void setEngine(final STORKSAMLEngine newEngine) {
+		StorkNewResponseTest.engine = newEngine;
 	}
-	
-    }
-
-    /**
-     * Test generate authentication request without errors.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAuthnResponseWithSimpleRes() throws STORKSAMLEngineException {
-
-    	//Create the response holding pal
+
+	/** The destination. */
+	private static String destination;
+
+	/** The service provider name. */
+	private static String spName;
+
+	/** The service provider sector. */
+	private static String spSector;
+
+	/** The service provider institution. */
+	private static String spInstitution;
+
+	/** The service provider application. */
+	private static String spApplication;
+
+	/** The service provider country. */
+	private static String spCountry;
+
+	/** The service provider id. */
+	private static String spId;
+
+	/** The quality authentication assurance level. */
+	private static final int QAAL = 3;
+
+	/** The state. */
+	private static String state = "ES";
+
+	/** The town. */
+	private static String town = "Madrid";
+
+	/** The municipality code. */
+	private static String municipalityCode = "MA001";
+
+	/** The postal code. */
+	private static String postalCode = "28038";
+
+	/** The street name. */
+	private static String streetName = "Marchamalo";
+
+	/** The street number. */
+	private static String streetNumber = "3";
+
+	/** The apartament number. */
+	private static String apartamentNumber = "5º E";
+
+	/** The List of Personal Attributes. */
+	private static IPersonalAttributeList pal;
+
+	/** The List of Personal Attributes. */
+	private static IPersonalAttributeList pal2;
+
+	/** The assertion consumer URL. */
+	private static String assertConsumerUrl;
+
+	/** The authentication request. */
+	private static byte[] authRequest;
+
+	/** The authentication response. */
+	private static byte[] authResponse;
+
+	/** The authentication request. */
+	private static STORKAuthnRequest authenRequest;
+
+	/** The authentication response. */
+	private static STORKAuthnResponse authnResponse;
+
+	/** The Constant LOG. */
+	private static final Logger LOG = LoggerFactory.getLogger(StorkResponseTest.class.getName());
+
+	/**
+	 * Instantiates a new stork response test.
+	 */
+	public StorkNewResponseTest() {
+		super();
+	}
+
+	/** The IP address. */
+	private static String ipAddress;
+
+	/** The is hashing. */
+	private final boolean isHashing = Boolean.TRUE;
+
+	/** The is not hashing. */
+	private final boolean isNotHashing = Boolean.FALSE;
+
+	/** The ERROR text. */
+	private static final String ERROR_TXT = "generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!";
+
+	/** Parser manager used to parse XML. */
+	private static BasicParserPool parser;
+
+	/** The attribute query request. */
+	private static STORKAttrQueryRequest attrQueryenRequest;
+
+	/** The attribute query response. */
+	private static STORKAttrQueryResponse attrQeuryenResponse;
+
+	/** The attribute query request. */
+	private static byte[] attrQueryRequest;
+
+	/** The attribute query response. */
+	private static byte[] attrQueryResponse;
+
+	static {
+		parser = new BasicParserPool();
+		parser.setNamespaceAware(true);
+
+		pal = new PersonalAttributeList();
+		pal2 = new PersonalAttributeList();
+
+		PersonalAttribute isAgeOver = new PersonalAttribute();
+		isAgeOver.setName("isAgeOver");
+		isAgeOver.setIsRequired(false);
+		ArrayList<String> ages = new ArrayList<String>();
+		ages.add("16");
+		ages.add("18");
+		isAgeOver.setValue(ages);
+		pal.add(isAgeOver);
+
+		PersonalAttribute dateOfBirth = new PersonalAttribute();
+		dateOfBirth.setName("dateOfBirth");
+		dateOfBirth.setIsRequired(false);
+		pal.add(dateOfBirth);
+
+		PersonalAttribute eIDNumber = new PersonalAttribute();
+		eIDNumber.setName("eIdentifier");
+		eIDNumber.setIsRequired(true);
+		pal.add(eIDNumber);
+
+		final PersonalAttribute givenName = new PersonalAttribute();
+		givenName.setName("givenName");
+		givenName.setIsRequired(true);
+		pal.add(givenName);
+
+		PersonalAttribute canRessAddress = new PersonalAttribute();
+		canRessAddress.setName("canonicalResidenceAddress");
+		canRessAddress.setIsRequired(true);
+		pal.add(canRessAddress);
+
+		PersonalAttribute newAttribute = new PersonalAttribute();
+		newAttribute.setName("newAttribute2");
+		newAttribute.setIsRequired(true);
+		pal.add(newAttribute);
+
+		PersonalAttribute hasDegree = new PersonalAttribute();
+		hasDegree.setName("hasDegree");
+		List<String> vals = new ArrayList<String>();
+		vals.add("Engineering");
+		vals.add("Computer Science");
+		hasDegree.setValue(vals);
+		pal2.add(hasDegree);
+
+		PersonalAttribute mandate = new PersonalAttribute();
+		mandate.setName("mandateContent");
+		List<String> manvalues = new ArrayList<String>();
+		manvalues.add("Powers");
+		mandate.setValue(manvalues);
+		pal2.add(mandate);
+
+		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
+		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
+		spName = "University Oxford";
+
+		spName = "University of Oxford";
+		spSector = "EDU001";
+		spInstitution = "OXF001";
+		spApplication = "APP001";
+		spCountry = "EN";
+
+		spId = "EDU001-APP001-APP001";
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			authRequest = getEngine().generateSTORKAuthnRequest(request).getTokenSaml();
+
+			authenRequest = getEngine().validateSTORKAuthnRequest(authRequest);
+
+		} catch (STORKSAMLEngineException e) {
+			fail("Error create STORKAuthnRequest");
+		}
+
+		ipAddress = "111.222.333.444";
+
+		pal = new PersonalAttributeList();
+
+		isAgeOver = new PersonalAttribute();
+		isAgeOver.setName("isAgeOver");
+		isAgeOver.setIsRequired(true);
+		ages = new ArrayList<String>();
+
+		ages.add("16");
+		ages.add("18");
+
+		isAgeOver.setValue(ages);
+		isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		pal.add(isAgeOver);
+
+		dateOfBirth = new PersonalAttribute();
+		dateOfBirth.setName("dateOfBirth");
+		dateOfBirth.setIsRequired(false);
+		final ArrayList<String> date = new ArrayList<String>();
+		date.add("16/12/2008");
+		dateOfBirth.setValue(date);
+		dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		pal.add(dateOfBirth);
+
+		eIDNumber = new PersonalAttribute();
+		eIDNumber.setName("eIdentifier");
+		eIDNumber.setIsRequired(true);
+		final ArrayList<String> idNumber = new ArrayList<String>();
+		idNumber.add("123456789PA");
+		eIDNumber.setValue(idNumber);
+		eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		pal.add(eIDNumber);
+
+		canRessAddress = new PersonalAttribute();
+		canRessAddress.setName("canonicalResidenceAddress");
+		canRessAddress.setIsRequired(true);
+		canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		final HashMap<String, String> address = new HashMap<String, String>();
+
+		address.put("state", state);
+		address.put("municipalityCode", municipalityCode);
+		address.put("town", town);
+		address.put("postalCode", postalCode);
+		address.put("streetName", streetName);
+		address.put("streetNumber", streetNumber);
+		address.put("apartamentNumber", apartamentNumber);
+
+		canRessAddress.setComplexValue(address);
+		pal.add(canRessAddress);
+
+		newAttribute = new PersonalAttribute();
+		newAttribute.setName("newAttribute2");
+		newAttribute.setIsRequired(true);
+		newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		final HashMap<String, String> values = new HashMap<String, String>();
+
+		values.put("value1", "value1");
+		values.put("value2", "value2");
+		values.put("value3", "value3");
+		values.put("value4", "value4");
+
+		newAttribute.setComplexValue(values);
+		pal.add(newAttribute);
+
+		final STORKAttrQueryRequest arequest = new STORKAttrQueryRequest();
+		arequest.setDestination(destination);
+		// request.setProviderName(spName);
+		arequest.setQaa(QAAL);
+		arequest.setPersonalAttributeList(pal2);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		arequest.setSpSector(spSector);
+		arequest.setSpInstitution(spInstitution);
+		arequest.setSpApplication(spApplication);
+		arequest.setSpCountry(spCountry);
+		arequest.setSPID(spId);
+		arequest.setCitizenCountryCode("IS");
+		arequest.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		try {
+			attrQueryRequest = getEngine().generateSTORKAttrQueryRequest(arequest).getTokenSaml();
+
+			attrQueryenRequest = getEngine().validateSTORKAttrQueryRequest(attrQueryRequest);
+
+		} catch (STORKSAMLEngineException e) {
+			fail("Error create STORKAuthnRequest");
+		}
+
+	}
+
+	/**
+	 * Test generate authentication request without errors.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAuthnResponseWithSimpleRes() throws STORKSAMLEngineException {
+
+		// Create the response holding pal
 		final STORKAuthnResponse response = new STORKAuthnResponse();
 		response.setPersonalAttributeList(pal);
-		
-		//List of query responses
+
+		// List of query responses
 		List<STORKAttrQueryResponse> resList = new ArrayList<STORKAttrQueryResponse>();
-		
+
 		final STORKAttrQueryResponse aResponse1 = new STORKAttrQueryResponse();
 		aResponse1.setPersonalAttributeList(pal2);
-	
-		final STORKAttrQueryResponse aStorkResponse1 = getEngine2()
-			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse1, ipAddress,
-					destination, isNotHashing);
-	
+
+		final STORKAttrQueryResponse aStorkResponse1 = getEngine2().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse1, ipAddress, destination, isNotHashing);
+
 		attrQueryResponse = aStorkResponse1.getTokenSaml();
-			
+
 		resList.add(getEngine2().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
-		
+
 		final STORKAttrQueryResponse aResponse2 = new STORKAttrQueryResponse();
 		aResponse2.setPersonalAttributeList(pal2);
-	
-		final STORKAttrQueryResponse aStorkResponse2 = getEngine()
-			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse2, ipAddress,
-					destination, isNotHashing);
-	
+
+		final STORKAttrQueryResponse aStorkResponse2 = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse2, ipAddress, destination, isNotHashing);
+
 		attrQueryResponse = aStorkResponse2.getTokenSaml();
-			
+
 		resList.add(getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
-		
-		//Create the final response containing query responses
-		final STORKAuthnResponse storkResponse = getEngine()
-		.generateSTORKAuthnResponseAfterQuery(authenRequest, response, ipAddress,
-			isNotHashing, resList);
+
+		// Create the final response containing query responses
+		final STORKAuthnResponse storkResponse = getEngine().generateSTORKAuthnResponseAfterQuery(authenRequest, response, ipAddress, isNotHashing, resList);
 
 		authResponse = storkResponse.getTokenSaml();
-		
-		//Validate, write out and print out the attribute lists a
+
+		// Validate, write out and print out the attribute lists a
 		STORKAuthnResponse finalResponse = getEngine().validateSTORKAuthnResponseWithQuery(authResponse, ipAddress);
 		System.out.println("The original pal: " + finalResponse.getPersonalAttributeList().toString());
-		for (int i = 0; i < finalResponse.getPersonalAttributeLists().size(); i++)
-		{
-			System.out.println("Pal "+ Integer.toString(i) + ": " + finalResponse.getPersonalAttributeLists().get(i).toString());
+		for (int i = 0; i < finalResponse.getPersonalAttributeLists().size(); i++) {
+			System.out.println("Pal " + Integer.toString(i) + ": " + finalResponse.getPersonalAttributeLists().get(i).toString());
 		}
 		System.out.println("The total pal: " + finalResponse.getTotalPersonalAttributeList().toString());
-		
+
 		FileOutputStream output = null;
-		
+
 		try {
 			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthAttrQResponse.xml"));
 		} catch (FileNotFoundException e) {
@@ -415,107 +403,96 @@ public class StorkNewResponseTest {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-    }
-    
-    /**
-     * Test generate authentication request without errors.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAuthnResponseWithComplexRes() throws STORKSAMLEngineException {
-    	
-    	//Create the response holding pal
+	}
+
+	/**
+	 * Test generate authentication request without errors.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAuthnResponseWithComplexRes() throws STORKSAMLEngineException {
+
+		// Create the response holding pal
 		final STORKAuthnResponse response = new STORKAuthnResponse();
 		response.setPersonalAttributeList(pal);
-		
-		//Create a list for the attribute query responses we have
+
+		// Create a list for the attribute query responses we have
 		List<STORKAttrQueryResponse> resList = new ArrayList<STORKAttrQueryResponse>();
-		
-		//Create the first attribute query response
+
+		// Create the first attribute query response
 		final STORKAttrQueryResponse aResponse1 = new STORKAttrQueryResponse();
 		aResponse1.setPersonalAttributeList(pal2);
-	
-		//Generate the first response
-		final STORKAttrQueryResponse aStorkResponse1 = getEngine2()
-			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse1, ipAddress,
-					destination, isNotHashing);
-	
+
+		// Generate the first response
+		final STORKAttrQueryResponse aStorkResponse1 = getEngine2().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse1, ipAddress, destination, isNotHashing);
+
 		attrQueryResponse = aStorkResponse1.getTokenSaml();
-			
-		//Validate it and add to the response list
+
+		// Validate it and add to the response list
 		resList.add(getEngine2().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
-		
-		//Create a second response like the first
+
+		// Create a second response like the first
 		final STORKAttrQueryResponse aResponse2 = new STORKAttrQueryResponse();
 		aResponse2.setPersonalAttributeList(pal2);
-	
-		final STORKAttrQueryResponse aStorkResponse2 = getEngine()
-			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse2, ipAddress,
-					destination, isNotHashing);
-	
+
+		final STORKAttrQueryResponse aStorkResponse2 = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse2, ipAddress, destination, isNotHashing);
+
 		attrQueryResponse = aStorkResponse2.getTokenSaml();
-			
+
 		resList.add(getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
-		
-		//Create a attribute query response which contains multiple assertions from an AP
+
+		// Create a attribute query response which contains multiple assertions from an AP
 		final STORKAttrQueryResponse aResponseMulti = new STORKAttrQueryResponse();
 		aResponseMulti.setPersonalAttributeList(pal2);
-	
-		//Create a list for the responses which the multiple assertion response will hold 
+
+		// Create a list for the responses which the multiple assertion response will hold
 		List<STORKAttrQueryResponse> multiResponses = new ArrayList();
-			
-		//Create two more simple responses which the multi assertion response will hold
+
+		// Create two more simple responses which the multi assertion response will hold
 		final STORKAttrQueryResponse aResponse3 = new STORKAttrQueryResponse();
 		aResponse3.setPersonalAttributeList(pal2);
-	
-		final STORKAttrQueryResponse aStorkResponse3 = getEngine2()
-			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse3, ipAddress,
-					destination, isNotHashing);
-	
+
+		final STORKAttrQueryResponse aStorkResponse3 = getEngine2().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse3, ipAddress, destination, isNotHashing);
+
 		attrQueryResponse = aStorkResponse3.getTokenSaml();
-		//Validate and add to the multi response 	
+		// Validate and add to the multi response
 		multiResponses.add(getEngine2().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
-		
+
 		final STORKAttrQueryResponse aResponse4 = new STORKAttrQueryResponse();
 		aResponse4.setPersonalAttributeList(pal2);
-	
-		final STORKAttrQueryResponse aStorkResponse4 = getEngine()
-			.generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse4, ipAddress,
-					destination, isNotHashing);
-	
+
+		final STORKAttrQueryResponse aStorkResponse4 = getEngine().generateSTORKAttrQueryResponse(attrQueryenRequest, aResponse4, ipAddress, destination, isNotHashing);
+
 		attrQueryResponse = aStorkResponse4.getTokenSaml();
-		
+
 		multiResponses.add(getEngine2().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
-		
-		//Generate the multi assertion query response
-		final STORKAttrQueryResponse aStorkResponseMulti = getEngine()
-		.generateSTORKAttrQueryResponseWithAssertions(attrQueryenRequest, aResponseMulti, multiResponses, 
-				ipAddress, destination, isNotHashing);
-	
+
+		// Generate the multi assertion query response
+		final STORKAttrQueryResponse aStorkResponseMulti = getEngine().generateSTORKAttrQueryResponseWithAssertions(attrQueryenRequest, aResponseMulti, multiResponses, ipAddress, destination,
+				isNotHashing);
+
 		attrQueryResponse = aStorkResponseMulti.getTokenSaml();
-		
-		//Add to the list of query responses
+
+		// Add to the list of query responses
 		resList.add(getEngine().validateSTORKAttrQueryResponse(attrQueryResponse, ipAddress));
-		
-		//Generate the stork response with all the query responses
-		final STORKAuthnResponse storkResponse = getEngine()
-		.generateSTORKAuthnResponseAfterQuery(authenRequest, response, ipAddress,
-			isNotHashing, resList);
+
+		// Generate the stork response with all the query responses
+		final STORKAuthnResponse storkResponse = getEngine().generateSTORKAuthnResponseAfterQuery(authenRequest, response, ipAddress, isNotHashing, resList);
 
 		authResponse = storkResponse.getTokenSaml();
-		
-		//Validate it, write out and print out the personal attribute lists
+
+		// Validate it, write out and print out the personal attribute lists
 		STORKAuthnResponse finalResponse = getEngine().validateSTORKAuthnResponseWithQuery(authResponse, ipAddress);
 		System.out.println("The original pal: " + finalResponse.getPersonalAttributeList().toString());
-		for (int i = 0; i < finalResponse.getPersonalAttributeLists().size(); i++)
-		{
-			System.out.println("Pal "+ Integer.toString(i) + ": " + finalResponse.getPersonalAttributeLists().get(i).toString());
+		for (int i = 0; i < finalResponse.getPersonalAttributeLists().size(); i++) {
+			System.out.println("Pal " + Integer.toString(i) + ": " + finalResponse.getPersonalAttributeLists().get(i).toString());
 		}
 		System.out.println("The total pal: " + finalResponse.getTotalPersonalAttributeList().toString());
-		
+
 		FileOutputStream output = null;
-		
+
 		try {
 			output = new FileOutputStream(new File(System.getProperty("user.dir") + "/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthAttrQMultiAssertResponse.xml"));
 		} catch (FileNotFoundException e) {
@@ -529,5 +506,5 @@ public class StorkNewResponseTest {
 			e.printStackTrace();
 		}
 		assertNotNull(finalResponse);
-    }
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkResponseTest.java b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkResponseTest.java
index fe6fcd4f6..d09ed7648 100644
--- a/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkResponseTest.java
+++ b/id/server/stork2-saml-engine/src/test/java/eu/stork/peps/test/simple/StorkResponseTest.java
@@ -49,839 +49,783 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
  * The Class AuthRequestTest.
  */
 public class StorkResponseTest {
-    
-    /** The engine. */
-    private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
-
-    /**
-     * Gets the engine.
-     * 
-     * @return the engine
-     */
-    public static STORKSAMLEngine getEngine() {
-        return engine;
-    }
-
-    /**
-     * Sets the engine.
-     * 
-     * @param newEngine the new engine
-     */
-    public static void setEngine(final STORKSAMLEngine newEngine) {
-        StorkResponseTest.engine = newEngine;
-    }
-
-    /** The destination. */
-    private static String destination;
-
-    /** The service provider name. */
-    private static String spName;
-
-    /** The service provider sector. */
-    private static String spSector;
-
-    /** The service provider institution. */
-    private static String spInstitution;
-
-    /** The service provider application. */
-    private static String spApplication;
-
-    /** The service provider country. */
-    private static String spCountry;
-    
-    /** The service provider id. */
-    private static String spId;
-
-    /** The quality authentication assurance level. */
-    private static final int QAAL = 3;
-
-    /** The state. */
-    private static String state = "ES";
-    
-    /** The town. */
-    private static String town = "Madrid";
-    
-    /** The municipality code. */
-    private static String municipalityCode = "MA001";
-    
-    /** The postal code. */
-    private static String postalCode = "28038";
-    
-    /** The street name. */
-    private static String streetName = "Marchamalo";
-    
-    /** The street number. */
-    private static String streetNumber = "3";
-    
-    /** The apartament number. */
-    private static String apartamentNumber = "5º E";
-
-    /** The List of Personal Attributes. */
-    private static IPersonalAttributeList pal;
-
-    /** The assertion consumer URL. */
-    private static String assertConsumerUrl;
-
-    /** The authentication request. */
-    private static byte[] authRequest;
-
-    /** The authentication response. */
-    private static byte[] authResponse;
-
-    /** The authentication request. */
-    private static STORKAuthnRequest authenRequest;
-
-    /** The authentication response. */
-    private static STORKAuthnResponse authnResponse;
-
-    /** The Constant LOG. */
-    private static final Logger LOG = LoggerFactory
-	    .getLogger(StorkResponseTest.class.getName());
-
-    /**
-     * Instantiates a new stork response test.
-     */
-    public StorkResponseTest() {
-	super();
-    }
-
-    /** The IP address. */
-    private static String ipAddress;
-
-    /** The is hashing. */
-    private final boolean isHashing = Boolean.TRUE;
-
-    /** The is not hashing. */
-    private final boolean isNotHashing = Boolean.FALSE;
-
-    /** The ERROR text. */
-    private static final String ERROR_TXT = "generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!";
-
-
-    /** Parser manager used to parse XML. */
-    private static BasicParserPool parser;
-
-    static {
-	parser = new BasicParserPool();
-	parser.setNamespaceAware(true);
-
-	pal = new PersonalAttributeList();
-
-	PersonalAttribute isAgeOver = new PersonalAttribute();
-	isAgeOver.setName("isAgeOver");
-	isAgeOver.setIsRequired(false);
-	ArrayList<String> ages = new ArrayList<String>();
-	ages.add("16");
-	ages.add("18");
-	isAgeOver.setValue(ages);
-	pal.add(isAgeOver);
-
-	PersonalAttribute dateOfBirth = new PersonalAttribute();
-	dateOfBirth.setName("dateOfBirth");
-	dateOfBirth.setIsRequired(false);
-	pal.add(dateOfBirth);
-
-	PersonalAttribute eIDNumber = new PersonalAttribute();
-	eIDNumber.setName("eIdentifier");
-	eIDNumber.setIsRequired(true);
-	pal.add(eIDNumber);
-
-	final PersonalAttribute givenName = new PersonalAttribute();
-	givenName.setName("givenName");
-	givenName.setIsRequired(true);
-	pal.add(givenName);
-
-	PersonalAttribute canRessAddress = new PersonalAttribute();
-	canRessAddress.setName("canonicalResidenceAddress");
-	canRessAddress.setIsRequired(true);
-	pal.add(canRessAddress);
-	
-	PersonalAttribute newAttribute = new PersonalAttribute();
-	newAttribute.setName("newAttribute2");
-	newAttribute.setIsRequired(true);
-	pal.add(newAttribute);
-
-	destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
-	assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
-	spName = "University Oxford";
-	
-	spName = "University of Oxford";
-	spSector = "EDU001";
-	spInstitution = "OXF001";
-	spApplication = "APP001";
-	spCountry = "EN";
-	
-	spId = "EDU001-APP001-APP001";	
-
-	final STORKAuthnRequest request = new STORKAuthnRequest();
-	request.setDestination(destination);
-	request.setProviderName(spName);
-	request.setQaa(QAAL);
-	request.setPersonalAttributeList(pal);
-	request.setAssertionConsumerServiceURL(assertConsumerUrl);
-
-	// news parameters
-	request.setSpSector(spSector);
-	request.setSpInstitution(spInstitution);
-	request.setSpApplication(spApplication);
-	request.setSpCountry(spCountry);
-	request.setSPID(spId);
-	request.setCitizenCountryCode("ES");
-
-	try {
-	    authRequest = getEngine().generateSTORKAuthnRequest(request)
-		    .getTokenSaml();
-	    	    
-	    authenRequest = getEngine().validateSTORKAuthnRequest(authRequest);
-	    
-	} catch (STORKSAMLEngineException e) {
-	    fail("Error create STORKAuthnRequest");
+
+	/** The engine. */
+	private static STORKSAMLEngine engine = STORKSAMLEngine.getInstance("CONF1");
+
+	/**
+	 * Gets the engine.
+	 * 
+	 * @return the engine
+	 */
+	public static STORKSAMLEngine getEngine() {
+		return engine;
+	}
+
+	/**
+	 * Sets the engine.
+	 * 
+	 * @param newEngine
+	 *            the new engine
+	 */
+	public static void setEngine(final STORKSAMLEngine newEngine) {
+		StorkResponseTest.engine = newEngine;
+	}
+
+	/** The destination. */
+	private static String destination;
+
+	/** The service provider name. */
+	private static String spName;
+
+	/** The service provider sector. */
+	private static String spSector;
+
+	/** The service provider institution. */
+	private static String spInstitution;
+
+	/** The service provider application. */
+	private static String spApplication;
+
+	/** The service provider country. */
+	private static String spCountry;
+
+	/** The service provider id. */
+	private static String spId;
+
+	/** The quality authentication assurance level. */
+	private static final int QAAL = 3;
+
+	/** The state. */
+	private static String state = "ES";
+
+	/** The town. */
+	private static String town = "Madrid";
+
+	/** The municipality code. */
+	private static String municipalityCode = "MA001";
+
+	/** The postal code. */
+	private static String postalCode = "28038";
+
+	/** The street name. */
+	private static String streetName = "Marchamalo";
+
+	/** The street number. */
+	private static String streetNumber = "3";
+
+	/** The apartament number. */
+	private static String apartamentNumber = "5º E";
+
+	/** The List of Personal Attributes. */
+	private static IPersonalAttributeList pal;
+
+	/** The assertion consumer URL. */
+	private static String assertConsumerUrl;
+
+	/** The authentication request. */
+	private static byte[] authRequest;
+
+	/** The authentication response. */
+	private static byte[] authResponse;
+
+	/** The authentication request. */
+	private static STORKAuthnRequest authenRequest;
+
+	/** The authentication response. */
+	private static STORKAuthnResponse authnResponse;
+
+	/** The Constant LOG. */
+	private static final Logger LOG = LoggerFactory.getLogger(StorkResponseTest.class.getName());
+
+	/**
+	 * Instantiates a new stork response test.
+	 */
+	public StorkResponseTest() {
+		super();
+	}
+
+	/** The IP address. */
+	private static String ipAddress;
+
+	/** The is hashing. */
+	private final boolean isHashing = Boolean.TRUE;
+
+	/** The is not hashing. */
+	private final boolean isNotHashing = Boolean.FALSE;
+
+	/** The ERROR text. */
+	private static final String ERROR_TXT = "generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!";
+
+	/** Parser manager used to parse XML. */
+	private static BasicParserPool parser;
+
+	static {
+		parser = new BasicParserPool();
+		parser.setNamespaceAware(true);
+
+		pal = new PersonalAttributeList();
+
+		PersonalAttribute isAgeOver = new PersonalAttribute();
+		isAgeOver.setName("isAgeOver");
+		isAgeOver.setIsRequired(false);
+		ArrayList<String> ages = new ArrayList<String>();
+		ages.add("16");
+		ages.add("18");
+		isAgeOver.setValue(ages);
+		pal.add(isAgeOver);
+
+		PersonalAttribute dateOfBirth = new PersonalAttribute();
+		dateOfBirth.setName("dateOfBirth");
+		dateOfBirth.setIsRequired(false);
+		pal.add(dateOfBirth);
+
+		PersonalAttribute eIDNumber = new PersonalAttribute();
+		eIDNumber.setName("eIdentifier");
+		eIDNumber.setIsRequired(true);
+		pal.add(eIDNumber);
+
+		final PersonalAttribute givenName = new PersonalAttribute();
+		givenName.setName("givenName");
+		givenName.setIsRequired(true);
+		pal.add(givenName);
+
+		PersonalAttribute canRessAddress = new PersonalAttribute();
+		canRessAddress.setName("canonicalResidenceAddress");
+		canRessAddress.setIsRequired(true);
+		pal.add(canRessAddress);
+
+		PersonalAttribute newAttribute = new PersonalAttribute();
+		newAttribute.setName("newAttribute2");
+		newAttribute.setIsRequired(true);
+		pal.add(newAttribute);
+
+		destination = "http://C-PEPS.gov.xx/PEPS/ColleagueRequest";
+		assertConsumerUrl = "http://S-PEPS.gov.xx/PEPS/ColleagueResponse";
+		spName = "University Oxford";
+
+		spName = "University of Oxford";
+		spSector = "EDU001";
+		spInstitution = "OXF001";
+		spApplication = "APP001";
+		spCountry = "EN";
+
+		spId = "EDU001-APP001-APP001";
+
+		final STORKAuthnRequest request = new STORKAuthnRequest();
+		request.setDestination(destination);
+		request.setProviderName(spName);
+		request.setQaa(QAAL);
+		request.setPersonalAttributeList(pal);
+		request.setAssertionConsumerServiceURL(assertConsumerUrl);
+
+		// news parameters
+		request.setSpSector(spSector);
+		request.setSpInstitution(spInstitution);
+		request.setSpApplication(spApplication);
+		request.setSpCountry(spCountry);
+		request.setSPID(spId);
+		request.setCitizenCountryCode("ES");
+
+		try {
+			authRequest = getEngine().generateSTORKAuthnRequest(request).getTokenSaml();
+
+			authenRequest = getEngine().validateSTORKAuthnRequest(authRequest);
+
+		} catch (STORKSAMLEngineException e) {
+			fail("Error create STORKAuthnRequest");
+		}
+
+		ipAddress = "111.222.333.444";
+
+		pal = new PersonalAttributeList();
+
+		isAgeOver = new PersonalAttribute();
+		isAgeOver.setName("isAgeOver");
+		isAgeOver.setIsRequired(true);
+		ages = new ArrayList<String>();
+
+		ages.add("16");
+		ages.add("18");
+
+		isAgeOver.setValue(ages);
+		isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		pal.add(isAgeOver);
+
+		dateOfBirth = new PersonalAttribute();
+		dateOfBirth.setName("dateOfBirth");
+		dateOfBirth.setIsRequired(false);
+		final ArrayList<String> date = new ArrayList<String>();
+		date.add("16/12/2008");
+		dateOfBirth.setValue(date);
+		dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		pal.add(dateOfBirth);
+
+		eIDNumber = new PersonalAttribute();
+		eIDNumber.setName("eIdentifier");
+		eIDNumber.setIsRequired(true);
+		final ArrayList<String> idNumber = new ArrayList<String>();
+		idNumber.add("123456789PÑ");
+		eIDNumber.setValue(idNumber);
+		eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		pal.add(eIDNumber);
+
+		canRessAddress = new PersonalAttribute();
+		canRessAddress.setName("canonicalResidenceAddress");
+		canRessAddress.setIsRequired(true);
+		canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		final HashMap<String, String> address = new HashMap<String, String>();
+
+		address.put("state", state);
+		address.put("municipalityCode", municipalityCode);
+		address.put("town", town);
+		address.put("postalCode", postalCode);
+		address.put("streetName", streetName);
+		address.put("streetNumber", streetNumber);
+		address.put("apartamentNumber", apartamentNumber);
+
+		canRessAddress.setComplexValue(address);
+		pal.add(canRessAddress);
+
+		newAttribute = new PersonalAttribute();
+		newAttribute.setName("newAttribute2");
+		newAttribute.setIsRequired(true);
+		newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		final HashMap<String, String> values = new HashMap<String, String>();
+
+		values.put("value1", "value1");
+		values.put("value2", "value2");
+		values.put("value3", "value3");
+		values.put("value4", "value4");
+
+		newAttribute.setComplexValue(values);
+		pal.add(newAttribute);
+
+	}
+
+	/**
+	 * Test generate authentication request without errors.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAuthnResponse() throws STORKSAMLEngineException {
+
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setPersonalAttributeList(pal);
+
+		final STORKAuthnResponse storkResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing);
+
+		authResponse = storkResponse.getTokenSaml();
+
+		LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(authResponse));
+
 	}
 
-	ipAddress = "111.222.333.444";
-
-	pal = new PersonalAttributeList();
-
-	isAgeOver = new PersonalAttribute();
-	isAgeOver.setName("isAgeOver");
-	isAgeOver.setIsRequired(true);
-	ages = new ArrayList<String>();
-
-	ages.add("16");
-	ages.add("18");
-
-	isAgeOver.setValue(ages);
-	isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	pal.add(isAgeOver);
-
-	dateOfBirth = new PersonalAttribute();
-	dateOfBirth.setName("dateOfBirth");
-	dateOfBirth.setIsRequired(false);
-	final ArrayList<String> date = new ArrayList<String>();
-	date.add("16/12/2008");
-	dateOfBirth.setValue(date);
-	dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	pal.add(dateOfBirth);
-
-	eIDNumber = new PersonalAttribute();
-	eIDNumber.setName("eIdentifier");
-	eIDNumber.setIsRequired(true);
-	final ArrayList<String> idNumber = new ArrayList<String>();
-	idNumber.add("123456789PÑ");
-	eIDNumber.setValue(idNumber);
-	eIDNumber.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	pal.add(eIDNumber);
-
-	canRessAddress = new PersonalAttribute();
-	canRessAddress.setName("canonicalResidenceAddress");
-	canRessAddress.setIsRequired(true);
-	canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	final HashMap<String, String> address = new HashMap<String, String>();
-
-	address.put("state", state);
-	address.put("municipalityCode", municipalityCode);
-	address.put("town", town);
-	address.put("postalCode", postalCode);
-	address.put("streetName", streetName);
-	address.put("streetNumber", streetNumber);
-	address.put("apartamentNumber", apartamentNumber);
-
-	canRessAddress.setComplexValue(address);
-	pal.add(canRessAddress);
-    
-	newAttribute = new PersonalAttribute();
-	newAttribute.setName("newAttribute2");
-	newAttribute.setIsRequired(true);
-	newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	final HashMap<String, String> values = new HashMap<String, String>();
-	
-	values.put("value1", "value1");
-	values.put("value2", "value2");
-	values.put("value3", "value3");
-	values.put("value4", "value4");
-	
-	newAttribute.setComplexValue(values);
-	pal.add(newAttribute);
-	
-    }
-
-    /**
-     * Test generate authentication request without errors.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAuthnResponse() throws STORKSAMLEngineException {
-
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setPersonalAttributeList(pal);
-
-	final STORKAuthnResponse storkResponse = getEngine()
-		.generateSTORKAuthnResponse(authenRequest, response, ipAddress,
-			isNotHashing);
-
-	authResponse = storkResponse.getTokenSaml();
-	
-	LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(authResponse));
-	
-	
-    }
-
-    /**
-     * Test validation id parameter mandatory.
-     */
-    @Test
-    public final void testResponseMandatoryId() {
-	final String identifier = authenRequest.getSamlId();
-	authenRequest.setSamlId(null);
-
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setPersonalAttributeList(pal);
-
-	try {
-	    getEngine().generateSTORKAuthnResponse(authenRequest, response,
-		    ipAddress, isHashing);
-	    fail(ERROR_TXT);
-	} catch (STORKSAMLEngineException e) {
-	    authenRequest.setSamlId(identifier);
-	    LOG.error("Error");
+	/**
+	 * Test validation id parameter mandatory.
+	 */
+	@Test
+	public final void testResponseMandatoryId() {
+		final String identifier = authenRequest.getSamlId();
+		authenRequest.setSamlId(null);
+
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setPersonalAttributeList(pal);
+
+		try {
+			getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isHashing);
+			fail(ERROR_TXT);
+		} catch (STORKSAMLEngineException e) {
+			authenRequest.setSamlId(identifier);
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication response in response to err1.
-     */
-    @Test
-    public final void testResponseMandatoryIssuer() {
-
-	final String issuer = authenRequest.getIssuer();
-	authenRequest.setIssuer(null);
-
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setPersonalAttributeList(pal);
-
-	try {
-	    getEngine().generateSTORKAuthnResponse(authenRequest, response,
-		    ipAddress, isHashing);
-	    fail(ERROR_TXT);
-	} catch (STORKSAMLEngineException e) {
-	    authenRequest.setIssuer(issuer);
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication response in response to err1.
+	 */
+	@Test
+	public final void testResponseMandatoryIssuer() {
+
+		final String issuer = authenRequest.getIssuer();
+		authenRequest.setIssuer(null);
+
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setPersonalAttributeList(pal);
+
+		try {
+			getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isHashing);
+			fail(ERROR_TXT);
+		} catch (STORKSAMLEngineException e) {
+			authenRequest.setIssuer(issuer);
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication response assertion consumer null.
-     */
-    @Test
-    public final void testResponseMandatoryAssertionConsumerServiceURL() {
-	final String asserConsumerUrl = authenRequest
-		.getAssertionConsumerServiceURL();
-	authenRequest.setAssertionConsumerServiceURL(null);
-
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setPersonalAttributeList(pal);
-	try {
-	    getEngine().generateSTORKAuthnResponse(authenRequest, response,
-		    ipAddress, isHashing);
-	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    authenRequest.setAssertionConsumerServiceURL(asserConsumerUrl);
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication response assertion consumer null.
+	 */
+	@Test
+	public final void testResponseMandatoryAssertionConsumerServiceURL() {
+		final String asserConsumerUrl = authenRequest.getAssertionConsumerServiceURL();
+		authenRequest.setAssertionConsumerServiceURL(null);
+
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setPersonalAttributeList(pal);
+		try {
+			getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isHashing);
+			fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			authenRequest.setAssertionConsumerServiceURL(asserConsumerUrl);
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication response IP address null.
-     */
-    @Test
-    public final void testResponseValidationIP() {
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setPersonalAttributeList(pal);
-
-	try {
-	    getEngine().generateSTORKAuthnResponse(authenRequest, response, null,
-		    isHashing);
-	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication response IP address null.
+	 */
+	@Test
+	public final void testResponseValidationIP() {
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setPersonalAttributeList(pal);
+
+		try {
+			getEngine().generateSTORKAuthnResponse(authenRequest, response, null, isHashing);
+			fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test generate authentication response with personal attribute list null.
+	 */
+	@Test
+	public final void testResponseMandatoryPersonalAttributeList() {
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setPersonalAttributeList(null);
+
+		try {
+			getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isHashing);
+			fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test validate authentication response token null.
+	 */
+	@Test
+	public final void testResponseInvalidParametersToken() {
+		try {
+			getEngine().validateSTORKAuthnResponse(null, ipAddress);
+			fail(ERROR_TXT);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test validate authentication response IP null.
+	 */
+	@Test
+	public final void testResponseInvalidParametersIP() {
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setPersonalAttributeList(pal);
+		try {
+			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAuthnResponse(authResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authentication response with personal attribute list null.
-     */
-    @Test
-    public final void testResponseMandatoryPersonalAttributeList() {
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setPersonalAttributeList(null);
-	
-	
-	try {
-	    getEngine().generateSTORKAuthnResponse(authenRequest, response,
-		    ipAddress, isHashing);
-	    fail("generateAuthnResponse(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate authentication response parameter name wrong.
+	 */
+	@Test
+	public final void testResponseInvalidParametersAttr() {
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		final IPersonalAttributeList wrongList = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		worngAttr.setName("AttrWrong");
+		wrongList.add(worngAttr);
+
+		response.setPersonalAttributeList(wrongList);
+		try {
+			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAuthnResponse(authResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
+	}
+
+	/**
+	 * Test validate authentication response set null value into attribute.
+	 */
+	@Test
+	public final void testResponseInvalidParametersAttrSimpleValue() {
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		final IPersonalAttributeList wrongList = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		worngAttr.setName("isAgeOver");
+		worngAttr.setValue(null);
+		wrongList.add(worngAttr);
+
+		response.setPersonalAttributeList(wrongList);
+		try {
+			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAuthnResponse(authResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    /**
-     * Test validate authentication response token null.
-     */
-    @Test
-    public final void testResponseInvalidParametersToken() {
-	try {
-	    getEngine().validateSTORKAuthnResponse(null, ipAddress);
-	    fail(ERROR_TXT);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate authentication response set null value into attribute.
+	 */
+	@Test
+	public final void testResponseInvalidParametersAttrNoValue() {
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		final IPersonalAttributeList wrongList = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		worngAttr.setName("isAgeOver");
+		wrongList.add(worngAttr);
+
+		response.setPersonalAttributeList(wrongList);
+		try {
+			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAuthnResponse(authResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test validate authentication response IP null.
-     */
-    @Test
-    public final void testResponseInvalidParametersIP() {
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setPersonalAttributeList(pal);
-	try {
-	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
-		    response, ipAddress, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAuthnResponse(authResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate authentication response set null value into attribute.
+	 */
+	@Test
+	public final void testResponseInvalidParametersAttrNoName() {
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		final IPersonalAttributeList wrongList = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		wrongList.add(worngAttr);
+
+		response.setPersonalAttributeList(wrongList);
+		try {
+			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAuthnResponse(authResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    
-    /**
-     * Test validate authentication response parameter name wrong.
-     */
-    @Test
-    public final void testResponseInvalidParametersAttr() {
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	final IPersonalAttributeList wrongList = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();
-	worngAttr.setName("AttrWrong");
-	wrongList.add(worngAttr);
-	
-	
-	response.setPersonalAttributeList(wrongList);
-	try {
-	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
-		    response, ipAddress, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAuthnResponse(authResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate authentication response set null complex value into attribute.
+	 */
+	@Test
+	public final void testResponseInvalidParametersAttrComplexValue() {
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		final IPersonalAttributeList wrongList = new PersonalAttributeList();
+
+		final PersonalAttribute worngAttr = new PersonalAttribute();
+		worngAttr.setName("isAgeOver");
+		worngAttr.setComplexValue(null);
+		wrongList.add(worngAttr);
+
+		response.setPersonalAttributeList(wrongList);
+		try {
+			authResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+			// In Conf1 ipValidate is false
+			getEngine().validateSTORKAuthnResponse(authResponse, null);
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    
-    /**
-     * Test validate authentication response set null value into attribute.
-     */
-    @Test
-    public final void testResponseInvalidParametersAttrSimpleValue() {
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	final IPersonalAttributeList wrongList = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();
-	worngAttr.setName("isAgeOver");
-	worngAttr.setValue(null);
-	wrongList.add(worngAttr);
-	
-	response.setPersonalAttributeList(wrongList);
-	try {
-	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
-		    response, ipAddress, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAuthnResponse(authResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate authentication response IP distinct and disabled validation IP.
+	 */
+	@Test
+	public final void testResponseInvalidParametersIPDistinct() {
+		try {
+			// ipAddress origin "111.222.333.444"
+			// ipAddrValidation = false
+			// Subject Confirmation Bearer.
+
+			getEngine().validateSTORKAuthnResponse(authResponse, "127.0.0.1");
+			fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    
-    /**
-     * Test validate authentication response set null value into attribute.
-     */
-    @Test
-    public final void testResponseInvalidParametersAttrNoValue() {
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	final IPersonalAttributeList wrongList = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();
-	worngAttr.setName("isAgeOver");
-	wrongList.add(worngAttr);
-	
-	response.setPersonalAttributeList(wrongList);
-	try {
-	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
-		    response, ipAddress, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAuthnResponse(authResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test response invalid parameters invalid token.
+	 */
+	@Test
+	public final void testResponseInvalidParametersTokenMsg() {
+		try {
+			// ipAddress origin "111.222.333.444"
+			// Subject Confirmation Bearer.
+			getEngine().validateSTORKAuthnResponse("errorMessage".getBytes(), ipAddress);
+			fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-    
-    
-    /**
-     * Test validate authentication response set null value into attribute.
-     */
-    @Test
-    public final void testResponseInvalidParametersAttrNoName() {
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	final IPersonalAttributeList wrongList = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();	
-	wrongList.add(worngAttr);
-	
-	response.setPersonalAttributeList(wrongList);
-	try {
-	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
-		    response, ipAddress, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAuthnResponse(authResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate authentication response is fail.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthenticationResponseIsFail() throws STORKSAMLEngineException {
+		if (authResponse == null)
+			testGenerateAuthnResponse();
+
+		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
+
+		assertFalse("Generate incorrect response: ", authnResponse.isFail());
 	}
-    }
-    
-    
-    /**
-     * Test validate authentication response set null complex value into attribute.
-     */
-    @Test
-    public final void testResponseInvalidParametersAttrComplexValue() {
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	final IPersonalAttributeList wrongList = new PersonalAttributeList();
-
-	final PersonalAttribute worngAttr = new PersonalAttribute();
-	worngAttr.setName("isAgeOver");
-	worngAttr.setComplexValue(null);
-	wrongList.add(worngAttr);
-	
-	response.setPersonalAttributeList(wrongList);
-	try {
-	    authResponse = getEngine().generateSTORKAuthnResponse(authenRequest,
-		    response, ipAddress, isNotHashing).getTokenSaml();
-	    // In Conf1 ipValidate is false
-	    getEngine().validateSTORKAuthnResponse(authResponse, null);
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate authentication response destination.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthenticationResponseDestination() throws STORKSAMLEngineException {
+		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
+
+		assertEquals("Destination incorrect: ", authnResponse.getInResponseTo(), authenRequest.getSamlId());
 	}
-    }
-	
-    
-    
-
-    /**
-     * Test validate authentication response IP distinct and disabled validation
-     * IP.
-     */
-    @Test
-    public final void testResponseInvalidParametersIPDistinct() {
-	try {
-	    // ipAddress origin "111.222.333.444"
-	    // ipAddrValidation = false
-	    // Subject Confirmation Bearer.
-
-	    getEngine().validateSTORKAuthnResponse(authResponse, "127.0.0.1");
-	    fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");	    
+
+	/**
+	 * Test validate authentication response values.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	public final void testValidateAuthenticationResponseValuesComplex() throws STORKSAMLEngineException {
+		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
+
+		assertEquals("Country incorrect:", authnResponse.getCountry(), "EN");
+
+		final Iterator<PersonalAttribute> iterator = authnResponse.getPersonalAttributeList().iterator();
+
+		while (iterator.hasNext()) {
+			final PersonalAttribute attribute = iterator.next();
+			if (attribute.getName().equalsIgnoreCase("canonicalResidenceAddress")) {
+				assertEquals("State incorrect: ", state, attribute.getComplexValue().get("state"));
+				assertEquals("Municipality Code incorrect: ", municipalityCode, attribute.getComplexValue().get("municipalityCode"));
+				assertEquals("Town incorrect: ", town, attribute.getComplexValue().get("town"));
+				assertEquals("Postal code incorrect: ", postalCode, attribute.getComplexValue().get("postalCode"));
+				assertEquals("Street name incorrect: ", streetName, attribute.getComplexValue().get("streetName"));
+				assertEquals("Street number incorrect: ", streetNumber, attribute.getComplexValue().get("streetNumber"));
+				assertEquals("Apartament number incorrect: ", apartamentNumber, attribute.getComplexValue().get("apartamentNumber"));
+			}
+		}
 	}
-    }
-
-    /**
-     * Test response invalid parameters invalid token.
-     */
-    @Test
-    public final void testResponseInvalidParametersTokenMsg() {
-	try {
-	    // ipAddress origin "111.222.333.444"
-	    // Subject Confirmation Bearer.
-	    getEngine().validateSTORKAuthnResponse("errorMessage".getBytes(),
-		    ipAddress);
-	    fail("validateAuthenticationResponse(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authenticate response fail in response to it's null.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	// ( expected=STORKSAMLEngineException.class)
+	public final void testGenerateAuthnResponseFailInResponseToNull() throws STORKSAMLEngineException {
+		final String identifier = authenRequest.getSamlId();
+		authenRequest.setSamlId(null);
+
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
+		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
+		response.setMessage("");
+
+		try {
+			authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+			fail(ERROR_TXT);
+		} catch (STORKSAMLEngineException e) {
+			authenRequest.setSamlId(identifier);
+			LOG.error("Error");
+			// throw new STORKSAMLEngineException(e);
+		}
 	}
-    }
-
-    /**
-     * Test validate authentication response is fail.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthenticationResponseIsFail()
-	    throws STORKSAMLEngineException {
-    	if (authResponse == null)
-    		testGenerateAuthnResponse();
-    	
-	authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
-		ipAddress);
-
-	assertFalse("Generate incorrect response: ", authnResponse.isFail());
-    }
-
-    /**
-     * Test validate authentication response destination.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthenticationResponseDestination()
-	    throws STORKSAMLEngineException {
-	authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
-		ipAddress);
-
-	assertEquals("Destination incorrect: ",
-		authnResponse.getInResponseTo(), authenRequest.getSamlId());
-    }
-
-    /**
-     * Test validate authentication response values.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    public final void testValidateAuthenticationResponseValuesComplex()
-	    throws STORKSAMLEngineException {
-	authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
-		ipAddress);
-	
-	assertEquals("Country incorrect:", authnResponse.getCountry(), "EN");
-	
-	final Iterator<PersonalAttribute> iterator = authnResponse
-		.getPersonalAttributeList().iterator();
-
-	while (iterator.hasNext()) {
-	    final PersonalAttribute attribute = iterator.next();
-	    if (attribute.getName().equalsIgnoreCase(
-		    "canonicalResidenceAddress")) {
-		assertEquals("State incorrect: ", state, attribute
-			.getComplexValue().get("state"));
-		assertEquals("Municipality Code incorrect: ", municipalityCode,
-			attribute.getComplexValue().get("municipalityCode"));
-		assertEquals("Town incorrect: ", town, attribute
-			.getComplexValue().get("town"));
-		assertEquals("Postal code incorrect: ", postalCode, attribute
-			.getComplexValue().get("postalCode"));
-		assertEquals("Street name incorrect: ", streetName, attribute
-			.getComplexValue().get("streetName"));
-		assertEquals("Street number incorrect: ", streetNumber,
-			attribute.getComplexValue().get("streetNumber"));
-		assertEquals("Apartament number incorrect: ", apartamentNumber,
-			attribute.getComplexValue().get("apartamentNumber"));
-	    }
+
+	/**
+	 * Test generate authenticate response fail assertion consumer URL err1.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAuthnResponseFailAssertionConsumerUrlNull() throws STORKSAMLEngineException {
+
+		final String assertConsumerUrl = authenRequest.getAssertionConsumerServiceURL();
+		authenRequest.setAssertionConsumerServiceURL(null);
+
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
+		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
+		response.setMessage("");
+
+		try {
+			authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+			fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			authenRequest.setAssertionConsumerServiceURL(assertConsumerUrl);
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authenticate response fail in response to it's null.
-     * @throws STORKSAMLEngineException 
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test //( expected=STORKSAMLEngineException.class)
-    public final void testGenerateAuthnResponseFailInResponseToNull() throws STORKSAMLEngineException {
-	final String identifier = authenRequest.getSamlId();
-	authenRequest.setSamlId(null);
-
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
-	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
-	response.setMessage("");
-
-	try {
-	    authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest,
-		    response, ipAddress, isNotHashing).getTokenSaml();
-	    fail(ERROR_TXT);
-	} catch (STORKSAMLEngineException e) {
-	    authenRequest.setSamlId(identifier);
-	    LOG.error("Error");
-	    //throw new STORKSAMLEngineException(e);
+
+	/**
+	 * Test generate authentication response fail code error err1.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testGenerateAuthnResponseFailCodeErrorNull() throws STORKSAMLEngineException {
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setStatusCode(null);
+		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
+		response.setMessage("");
+
+		try {
+			authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+			fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!");
+		} catch (STORKSAMLEngineException e) {
+			LOG.error("Error");
+		}
 	}
-    }
-
-    /**
-     * Test generate authenticate response fail assertion consumer URL err1.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAuthnResponseFailAssertionConsumerUrlNull()
-	    throws STORKSAMLEngineException {
-
-	final String assertConsumerUrl = authenRequest
-		.getAssertionConsumerServiceURL();
-	authenRequest.setAssertionConsumerServiceURL(null);
-
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
-	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
-	response.setMessage("");
-
-	try {
-	    authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest,
-		    response, ipAddress, isNotHashing).getTokenSaml();
-	    fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    authenRequest.setAssertionConsumerServiceURL(assertConsumerUrl);
-	    LOG.error("Error");
+
+	/**
+	 * Test generate authentication request without errors.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthnResponse() throws STORKSAMLEngineException {
+
+		IPersonalAttributeList palist = new PersonalAttributeList();
+
+		PersonalAttribute isAgeOver = new PersonalAttribute();
+		isAgeOver.setName("isAgeOver");
+		isAgeOver.setIsRequired(true);
+		ArrayList<String> ages = new ArrayList<String>();
+		ages.add("16");
+		ages.add("18");
+		isAgeOver.setValue(ages);
+		isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		palist.add(isAgeOver);
+
+		PersonalAttribute dateOfBirth = new PersonalAttribute();
+		dateOfBirth.setName("dateOfBirth");
+		dateOfBirth.setIsRequired(false);
+		final ArrayList<String> date = new ArrayList<String>();
+		date.add("16/12/2008");
+		dateOfBirth.setValue(date);
+		dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		palist.add(dateOfBirth);
+
+		PersonalAttribute eIDNumber = new PersonalAttribute();
+		eIDNumber.setName("eIdentifier");
+		eIDNumber.setIsRequired(true);
+
+		final ArrayList<String> idNumber = new ArrayList<String>();
+		idNumber.add("123456789PÑ");
+
+		final HashMap<String, String> complex = new HashMap<String, String>();
+		complex.put("one", "two");
+
+		// eIDNumber.setValue(null);
+		// eIDNumber.setValue(idNumber);
+		// eIDNumber.setComplexValue(complex);
+
+		eIDNumber.setStatus(STORKStatusCode.STATUS_NOT_AVAILABLE.toString());
+		palist.add(eIDNumber);
+
+		PersonalAttribute canRessAddress = new PersonalAttribute();
+		canRessAddress.setName("canonicalResidenceAddress");
+		canRessAddress.setIsRequired(true);
+		canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
+		final HashMap<String, String> address = new HashMap<String, String>();
+
+		address.put("state", state);
+		address.put("municipalityCode", municipalityCode);
+		address.put("town", town);
+		address.put("postalCode", postalCode);
+		address.put("streetName", streetName);
+		address.put("streetNumber", streetNumber);
+		address.put("apartamentNumber", apartamentNumber);
+
+		canRessAddress.setComplexValue(address);
+		palist.add(canRessAddress);
+
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+
+		response.setPersonalAttributeList(palist);
+
+		final STORKAuthnResponse storkResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing);
+
+		authResponse = storkResponse.getTokenSaml();
+		LOG.info("Request id: " + authenRequest.getSamlId());
+
+		LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(authResponse));
+
+		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
+
+		LOG.info("RESPONSE ID: " + authnResponse.getSamlId());
+		LOG.info("RESPONSE IN_RESPONSE_TO: " + authnResponse.getInResponseTo());
+		LOG.info("RESPONSE COUNTRY: " + authnResponse.getCountry());
+
 	}
-    }
-
-    /**
-     * Test generate authentication response fail code error err1.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testGenerateAuthnResponseFailCodeErrorNull()
-	    throws STORKSAMLEngineException {
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setStatusCode(null);
-	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
-	response.setMessage("");
-
-	try {
-	    authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest,
-		    response, ipAddress, isNotHashing).getTokenSaml();
-	    fail("generateAuthnResponseFail(...) should've thrown an STORKSAMLEngineException!");
-	} catch (STORKSAMLEngineException e) {
-	    LOG.error("Error");
+
+	/**
+	 * Test validate authentication response fail is fail.
+	 * 
+	 * @throws STORKSAMLEngineException
+	 *             the STORKSAML engine exception
+	 */
+	@Test
+	public final void testValidateAuthenticationResponseFailIsFail() throws STORKSAMLEngineException {
+
+		final STORKAuthnResponse response = new STORKAuthnResponse();
+		response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
+		response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
+		response.setMessage("message");
+
+		authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest, response, ipAddress, isNotHashing).getTokenSaml();
+
+		LOG.error("ERROR_FAIL: " + PEPSUtil.encodeSAMLToken(authResponse));
+
+		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
+
+		LOG.info("COUNTRY: " + authnResponse.getCountry());
+		assertTrue("Generate incorrect response: ", authnResponse.isFail());
 	}
-    }
-    
-    
-    
-    
-    /**
-     * Test generate authentication request without errors.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthnResponse() throws STORKSAMLEngineException {
-	
-	IPersonalAttributeList palist = new PersonalAttributeList();
-
-	PersonalAttribute isAgeOver = new PersonalAttribute();
-	isAgeOver.setName("isAgeOver");
-	isAgeOver.setIsRequired(true);
-	ArrayList<String> ages = new ArrayList<String>();
-	ages.add("16");
-	ages.add("18");
-	isAgeOver.setValue(ages);
-	isAgeOver.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	palist.add(isAgeOver);
-
-	PersonalAttribute dateOfBirth = new PersonalAttribute();
-	dateOfBirth.setName("dateOfBirth");
-	dateOfBirth.setIsRequired(false);
-	final ArrayList<String> date = new ArrayList<String>();
-	date.add("16/12/2008");
-	dateOfBirth.setValue(date);
-	dateOfBirth.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	palist.add(dateOfBirth);
-
-	
-	PersonalAttribute eIDNumber = new PersonalAttribute();
-	eIDNumber.setName("eIdentifier");
-	eIDNumber.setIsRequired(true);
-
-	final ArrayList<String> idNumber = new ArrayList<String>();
-	idNumber.add("123456789PÑ");
-	
-	final HashMap<String, String> complex = new HashMap<String, String>();
-	complex.put("one", "two");
-
-	//eIDNumber.setValue(null);
-	//eIDNumber.setValue(idNumber);
-	//eIDNumber.setComplexValue(complex);
-	
-	eIDNumber.setStatus(STORKStatusCode.STATUS_NOT_AVAILABLE.toString());
-	palist.add(eIDNumber);
-
-	PersonalAttribute canRessAddress = new PersonalAttribute();	
-	canRessAddress.setName("canonicalResidenceAddress");
-	canRessAddress.setIsRequired(true);
-	canRessAddress.setStatus(STORKStatusCode.STATUS_AVAILABLE.toString());
-	final HashMap<String, String> address = new HashMap<String, String>();
-
-	address.put("state", state);
-	address.put("municipalityCode", municipalityCode);
-	address.put("town", town);
-	address.put("postalCode", postalCode);
-	address.put("streetName", streetName);
-	address.put("streetNumber", streetNumber);
-	address.put("apartamentNumber", apartamentNumber);
-
-	canRessAddress.setComplexValue(address);
-	palist.add(canRessAddress);
-
-	
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-
-	response.setPersonalAttributeList(palist);
-
-	final STORKAuthnResponse storkResponse = getEngine()
-		.generateSTORKAuthnResponse(authenRequest, response, ipAddress,
-			isNotHashing);
-
-	authResponse = storkResponse.getTokenSaml();
-	LOG.info("Request id: " + authenRequest.getSamlId());
-	
-	LOG.info("RESPONSE: " + SSETestUtils.encodeSAMLToken(authResponse));
-	
-	
-	authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
-		ipAddress);
-	
-	LOG.info("RESPONSE ID: " + authnResponse.getSamlId());
-	LOG.info("RESPONSE IN_RESPONSE_TO: " + authnResponse.getInResponseTo());
-	LOG.info("RESPONSE COUNTRY: " + authnResponse.getCountry());
-	
-    }
-    
-    
-   
-
-	
-    /**
-     * Test validate authentication response fail is fail.
-     * 
-     * @throws STORKSAMLEngineException the STORKSAML engine exception
-     */
-    @Test
-    public final void testValidateAuthenticationResponseFailIsFail()
-	    throws STORKSAMLEngineException {
-
-	final STORKAuthnResponse response = new STORKAuthnResponse();
-	response.setStatusCode(STORKStatusCode.REQUESTER_URI.toString());
-	response.setSubStatusCode(STORKSubStatusCode.AUTHN_FAILED_URI.toString());
-	response.setMessage("message");
-
-	authResponse = getEngine().generateSTORKAuthnResponseFail(authenRequest,
-		response, ipAddress, isNotHashing).getTokenSaml();
-	
-	LOG.error("ERROR_FAIL: " + PEPSUtil.encodeSAMLToken(authResponse));
-
-	authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
-		ipAddress);
-
-	LOG.info("COUNTRY: " + authnResponse.getCountry());
-	assertTrue("Generate incorrect response: ", authnResponse.isFail());
-    }  
-    
+
 	/**
 	 * Test generate/validate response with signedDoc
 	 * 
@@ -889,8 +833,7 @@ public class StorkResponseTest {
 	 *             the STORKSAML engine exception
 	 */
 	@Test
-	public final void testGenerateAuthenResponseWithSignedDoc()
-			throws STORKSAMLEngineException {
+	public final void testGenerateAuthenResponseWithSignedDoc() throws STORKSAMLEngineException {
 
 		String signedDocResponse = "<dss:SignResponse xmlns:dss=\"urn:oasis:names:tc:dss:1.0:core:schema\" RequestID=\"123456\"> <dss:Result> <dss:ResultMajor>urn:oasis:names:tc:dss:1.0:resultmajor:Success</dss:ResultMajor> </dss:Result> <dss:SignatureObject> <dss:Base64Signature Type=\"urn:ietf:rfc:3275\"><?xml version="1.0" encoding="UTF-8"?><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#" Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-Signature"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/TR/2001/REC-xml-c14n-20010315"/><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/><ds:Reference Id="Reference-baba4d1a-a17e-42c6-97d2-beee13509503" Type="http://www.w3.org/2000/09/xmldsig#Object" URI="#Object-98733cde-8bcc-48a0-9b77-0e9997bdd058"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#base64"/></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>Ck1VqNd45QIvq3AZd8XYQLvEhtA=</ds:DigestValue></ds:Reference><ds:Reference Type="http://uri.etsi.org/01903#SignedProperties" URI="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignedProperties"><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>A5Y91n4qpLgytTW7fxjXCUeRv54=</ds:DigestValue></ds:Reference><ds:Reference URI="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-KeyInfo"><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>VPX4nKFyS6rF+F6cRR0PrNZdw6g=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignatureValue">LbKN//C7XkyxTtYTiCURr8nZzxAmstcMd0CgEACrK1dygRHqGcK4xts+WCU8PyEqWrRITYzIuw/7
V4Zz9TT60p4KTMewuQL64skESx2Yg2EdikSO+tKxWkhraUsmVbGbPmmcmDv97tHDw88747eFq5F5
v+aVSyAz03iUKmuSeH8=</ds:SignatureValue><ds:KeyInfo Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-KeyInfo"><ds:KeyValue><ds:RSAKeyValue><ds:Modulus>wucmj9tIWrvwbSTUDfwKl+JtDMMER0cLd6DkBSr790t+rGNjESqYjRwEIeBnKoQHPx5HoReF88/t
qY9+ChEXpLHLs9p5aX7SDJubpQMfp1tDFX34ywgxSQvceeJQWBXjieuImfC21s4bOcgJbV1hbigS
zOKTQKr1TzdGR+uRy00=</ds:Modulus><ds:Exponent>AQAB</ds:Exponent></ds:RSAKeyValue></ds:KeyValue><ds:X509Data><ds:X509Certificate>MIIImTCCB4GgAwIBAgIDAXUUMA0GCSqGSIb3DQEBBQUAMIIBOzELMAkGA1UEBhMCRVMxOzA5BgNV
BAoTMkFnZW5jaWEgQ2F0YWxhbmEgZGUgQ2VydGlmaWNhY2lvIChOSUYgUS0wODAxMTc2LUkpMTQw
MgYDVQQHEytQYXNzYXRnZSBkZSBsYSBDb25jZXBjaW8gMTEgMDgwMDggQmFyY2Vsb25hMS4wLAYD
VQQLEyVTZXJ2ZWlzIFB1YmxpY3MgZGUgQ2VydGlmaWNhY2lvIEVDVi0yMTUwMwYDVQQLEyxWZWdl
dSBodHRwczovL3d3dy5jYXRjZXJ0Lm5ldC92ZXJDSUMtMiAoYykwMzE1MDMGA1UECxMsRW50aXRh
dCBwdWJsaWNhIGRlIGNlcnRpZmljYWNpbyBkZSBjaXV0YWRhbnMxGzAZBgNVBAMTElBSRVBST0RV
Q0NJTyBJRENhdDAeFw0xMDAyMTExODIyMDRaFw0xNDAyMTAxODIyMDRaMIGwMQswCQYDVQQGEwJF
UzE1MDMGA1UECxMsVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVySURDYXQgKGMpMDMx
FjAUBgNVBAQTDUJFUkxBTkdBIFNPVE8xFzAVBgNVBCoTDk1BUklBIEVOR1JBQ0lBMRIwEAYDVQQF
EwkxMDAwMDk0NFMxJTAjBgNVBAMTHE1BUklBIEVOR1JBQ0lBIEJFUkxBTkdBIFNPVE8wgZ8wDQYJ
KoZIhvcNAQEBBQADgY0AMIGJAoGBAMLnJo/bSFq78G0k1A38CpfibQzDBEdHC3eg5AUq+/dLfqxj
YxEqmI0cBCHgZyqEBz8eR6EXhfPP7amPfgoRF6Sxy7PaeWl+0gybm6UDH6dbQxV9+MsIMUkL3Hni
UFgV44nriJnwttbOGznICW1dYW4oEszik0Cq9U83RkfrkctNAgMBAAGjggSwMIIErDAMBgNVHRMB
Af8EAjAAMA4GA1UdDwEB/wQEAwIFoDCBzAYDVR0RBIHEMIHBgQ9ic290b0BnbWFpbC5jb22kgYUw
gYIxCzAJBgNVBAYTAkVTMSswKQYDVQQKFCJBZ8OobmNpYSBDYXRhbGFuYSBkZSBDZXJ0aWZpY2Fj
acOzMQ4wDAYDVQQLEwVJRENBVDEPMA0GA1UEBRMGMDE3NTE0MSUwIwYDVQQDExxNQVJJQSBFTkdS
QUNJQSBCRVJMQU5HQSBTT1RPoBAGCisGAQQB9XgBAQGgAgwAoBQGDlYEAAEDBgEEAfV4AQECoAIM
ADAfBgNVHRIEGDAWgRRlY19pZGNhdEBjYXRjZXJ0Lm5ldDAdBgNVHQ4EFgQUAFXjuNskB2MlyvUB
h7p8TJ0uJ0wwggFIBgNVHSMEggE/MIIBO4AURKvckUhN14h4Cn/gdODn6723KVyhggEPpIIBCzCC
AQcxCzAJBgNVBAYTAkVTMTswOQYDVQQKEzJBZ2VuY2lhIENhdGFsYW5hIGRlIENlcnRpZmljYWNp
byAoTklGIFEtMDgwMTE3Ni1JKTEoMCYGA1UECxMfU2VydmVpcyBQdWJsaWNzIGRlIENlcnRpZmlj
YWNpbzE8MDoGA1UECxMzVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVycHJlcHJvZHVj
Y2lvIChjKTAzMTUwMwYDVQQLEyxKZXJhcnF1aWEgRW50aXRhdHMgZGUgQ2VydGlmaWNhY2lvIENh
dGFsYW5lczEcMBoGA1UEAxMTUFJFUFJPRFVDQ0lPIEVDLUFDQ4IQdwKTtM1EEU9FEPXUYHgghDAd
BgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwQwEQYJYIZIAYb4QgEBBAQDAgWgMDQGCCsGAQUF
BwEBBCgwJjAkBggrBgEFBQcwAYYYaHR0cHM6Ly9vY3NwLmNhdGNlcnQubmV0MBgGCCsGAQUFBwED
BAwwCjAIBgYEAI5GAQEwgYYGA1UdHwR/MH0wPKA6oDiGNmh0dHA6Ly9lcHNjZC5jYXRjZXJ0Lm5l
dC9jcmwvcHJlcHJvZHVjY2lvX2VjLWlkY2F0LmNybDA9oDugOYY3aHR0cDovL2Vwc2NkMi5jYXRj
ZXJ0Lm5ldC9jcmwvcHJlcHJvZHVjY2lvX2VjLWlkY2F0LmNybDCB9gYDVR0gBIHuMIHrMIHoBgwr
BgEEAfV4AQMBVgEwgdcwLAYIKwYBBQUHAgEWIGh0dHBzOi8vd3d3LmNhdGNlcnQubmV0L3ZlcklE
Q2F0MIGmBggrBgEFBQcCAjCBmRqBlkFxdWVzdCDvv71zIHVuIGNlcnRpZmljYXQgcGVyc29uYWwg
SURDQVQsIHJlY29uZWd1dCBkJ2lkZW50aWZpY2Fj77+9LCBzaWduYXR1cmEgaSB4aWZyYXQgZGUg
Y2xhc3NlIDIgaW5kaXZpZHVhbC4gVmVnZXUgaHR0cHM6Ly93d3cuY2F0Y2VydC5uZXQvdmVyRENh
dDAtBgNVHQkEJjAkMBAGCCsGAQUFBwkEMQQTAkVTMBAGCCsGAQUFBwkFMQQTAkVTMA0GCSqGSIb3
DQEBBQUAA4IBAQCq7780RGQMLB1gkdNMfLXngqMoRHGKZbvzkrqIAmT8WAd1E8rAphR9/xLJUtp5
lbg2fRr5bl2j8OVDBK2YmG41h8ADn4STI/ApeNINSfjZs6NRsnWzFyfXXmPCHYFB/XWzyimCExgv
vtuH+3QAwcwhn50PLEuhw5C5vlX7Ly5K6rLLMFNUUMbWVy1hZelK/CBTcAjIO38NY+vYRAMKSf4M
/gZQz4qBeFVJa52R7NcAqCfrfLfaXpbDSg98xoBeNs2inGzx8USgErLZjKJsdn/KjTD9gS/sTdQ6
Q7idqld2LFVlO2/b94ZNZBcS/78EODXgdWfkyPC7Rw8re9nI3/jT</ds:X509Certificate></ds:X509Data></ds:KeyInfo><ds:Object Encoding="base64" Id="Object-98733cde-8bcc-48a0-9b77-0e9997bdd058" MimeType="application/octet-stream">SGVsbG8gV29ybGQ=</ds:Object><ds:Object><xades:QualifyingProperties xmlns:xades="http://uri.etsi.org/01903/v1.3.2#" Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-QualifyingProperties" Target="#Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-Signature"><xades:SignedProperties Id="Signature-8eabd0a5-660d-4afd-9905-0abc7553d192-SignedProperties"><xades:SignedSignatureProperties><xades:SigningTime>2011-03-21T11:44:42+01:00</xades:SigningTime><xades:SigningCertificate><xades:Cert><xades:CertDigest><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>3m6w99ToySd9JpBl1gBk8Dz/bbU=</ds:DigestValue></xades:CertDigest><xades:IssuerSerial><ds:X509IssuerName>CN=PREPRODUCCIO IDCat, OU=Entitat publica de certificacio de ciutadans, OU=Vegeu https://www.catcert.net/verCIC-2 (c)03, OU=Serveis Publics de Certificacio ECV-2, L=Passatge de la Concepcio 11 08008 Barcelona, O=Agencia Catalana de Certificacio (NIF Q-0801176-I), C=ES</ds:X509IssuerName><ds:X509SerialNumber>95508</ds:X509SerialNumber></xades:IssuerSerial></xades:Cert></xades:SigningCertificate></xades:SignedSignatureProperties><xades:SignedDataObjectProperties><xades:DataObjectFormat ObjectReference="#Reference-baba4d1a-a17e-42c6-97d2-beee13509503"><xades:MimeType>application/octet-stream</xades:MimeType><xades:Encoding>base64</xades:Encoding></xades:DataObjectFormat></xades:SignedDataObjectProperties></xades:SignedProperties></xades:QualifyingProperties></ds:Object></ds:Signature></dss:Base64Signature> </dss:SignatureObject> </dss:SignResponse>";
 
@@ -919,17 +862,12 @@ public class StorkResponseTest {
 
 		response.setPersonalAttributeList(palist);
 
-		final STORKAuthnResponse storkResponse = getEngine()
-				.generateSTORKAuthnResponse(authenRequest, response, ipAddress,
-						isNotHashing);
+		final STORKAuthnResponse storkResponse = getEngine().generateSTORKAuthnResponse(authenRequest, response, ipAddress, isNotHashing);
 
 		authResponse = storkResponse.getTokenSaml();
-		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse,
-				ipAddress);
+		authnResponse = getEngine().validateSTORKAuthnResponse(authResponse, ipAddress);
 
-		assertTrue("SignedDoc response should be the same: ", authnResponse
-				.getPersonalAttributeList().get("signedDoc").getValue().get(0)
-				.equals(signedDocResponse));
+		assertTrue("SignedDoc response should be the same: ", authnResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0).equals(signedDocResponse));
 
-	}	
+	}
 }
diff --git a/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml b/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml
index 171e05f12..fadef82b2 100644
--- a/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/SamlEngine.xml
@@ -1,67 +1,85 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <instances>
 
-	<!-- Configuration name -->
-	<instance name="CONF0">
-		<!-- Configurations parameters StorkSamlEngine -->
-		<configuration name="SamlEngineConf">
-			<parameter name="fileConfiguration" value="StorkSamlEngine_Conf0.xml" />
-		</configuration>
+    <!-- Configuration name -->
+    <instance name="CONF0">
+        <!-- Configurations parameters StorkSamlEngine -->
+        <configuration name="SamlEngineConf">
+            <parameter name="fileConfiguration" value="StorkSamlEngine_Conf0.xml" />
+        </configuration>
 
-		<!-- Settings module signature -->
-		<configuration name="SignatureConf">
-			<!-- Specific signature module -->
-			<parameter name="class"
-				value="eu.stork.peps.auth.engine.core.impl.SignSW" />
-			<!-- Settings specific module -->
-			<parameter name="fileConfiguration" value="SignModule_Conf0.xml" />
-		</configuration>
-	</instance>
+        <!-- Settings module signature -->
+        <configuration name="SignatureConf">
+            <!-- Specific signature module -->
+            <parameter name="class"
+                       value="eu.stork.peps.auth.engine.core.impl.SignSW" />
+            <!-- Settings specific module -->
+            <parameter name="fileConfiguration" value="SignModule_Conf0.xml" />
+            <parameter name="softTrustStoreConfig" value="SignModule_Conf0.xml" />
+        </configuration>
+    </instance>
 
-	<!-- ******************** CONF1 ******************** -->
-	<!-- Configuration name -->
-	<instance name="CONF1">
-		<!-- Configurations parameters StorkSamlEngine -->
-		<configuration name="SamlEngineConf">
-			<parameter name="fileConfiguration" value="StorkSamlEngine_Conf1.xml" />
-		</configuration>
+    <!-- ******************** CONF1 ******************** -->
+    <!-- Configuration name -->
+    <instance name="CONF1">
+        <!-- Configurations parameters StorkSamlEngine -->
+        <configuration name="SamlEngineConf">
+            <parameter name="fileConfiguration" value="StorkSamlEngine_Conf1.xml" />
+        </configuration>
 
-		<!-- Settings module signature -->
-		<configuration name="SignatureConf">
-			<!-- Specific signature module -->
-			<parameter name="class"
-				value="eu.stork.peps.auth.engine.core.impl.SignSW" />
-			<!-- Settings specific module -->
-			<parameter name="fileConfiguration" value="SignModule_Conf1.xml" />
-		</configuration>
-	</instance>
+        <!-- Settings module signature -->
+        <configuration name="SignatureConf">
+            <!-- Specific signature module -->
+            <parameter name="class"
+                       value="eu.stork.peps.auth.engine.core.impl.SignSW" />
+            <!-- Settings specific module -->
+            <parameter name="fileConfiguration" value="SignModule_Conf1.xml" />
+        </configuration>
+    </instance>
 
-	<!-- ******************** CONF2 ******************** -->
+    <!-- ******************** CONF2 ******************** -->
 
-	<instance name="CONF2">
-		<configuration name="SamlEngineConf">
-			<parameter name="fileConfiguration" value="StorkSamlEngine_Conf2.xml" />
-		</configuration>
+    <instance name="CONF2">
+        <configuration name="SamlEngineConf">
+            <parameter name="fileConfiguration" value="StorkSamlEngine_Conf2.xml" />
+        </configuration>
 
-		<configuration name="SignatureConf">
-			<parameter name="class"
-				value="eu.stork.peps.auth.engine.core.impl.SignSW" />
-			<parameter name="fileConfiguration" value="SignModule_Conf2.xml" />
-		</configuration>
-	</instance>
+        <configuration name="SignatureConf">
+            <parameter name="class"
+                       value="eu.stork.peps.auth.engine.core.impl.SignSW" />
+            <parameter name="fileConfiguration" value="SignModule_Conf2.xml" />
+        </configuration>
+    </instance>
 
-	<!-- ******************** CONF3 ******************** -->
+    <!-- ******************** CONF3 ******************** -->
 
-	<instance name="CONF3">
-		<configuration name="SamlEngineConf">
-			<parameter name="fileConfiguration" value="StorkSamlEngine_Conf3.xml" />
-		</configuration>
+    <instance name="CONF3">
+        <configuration name="SamlEngineConf">
+            <parameter name="fileConfiguration" value="StorkSamlEngine_Conf3.xml" />
+        </configuration>
 
-		<configuration name="SignatureConf">
-			<parameter name="class"
-				value="eu.stork.peps.auth.engine.core.impl.SignSW" />
-			<parameter name="fileConfiguration" value="SignModule_Conf3.xml" />
-		</configuration>
-	</instance>
+        <configuration name="SignatureConf">
+            <parameter name="class"
+                       value="eu.stork.peps.auth.engine.core.impl.SignSW" />
+            <parameter name="fileConfiguration" value="SignModule_Conf3.xml" />
+        </configuration>
+    </instance>
+	
+    <!-- ******************** CONF4 ******************** -->
+    <instance name="CONF4">
+        <!-- Configurations parameters StorkSamlEngine -->
+        <configuration name="SamlEngineConf">
+            <parameter name="fileConfiguration" value="StorkSamlEngine_Conf0.xml" />
+        </configuration>
+
+        <!-- Settings module signature -->
+        <configuration name="SignatureConf">
+            <!-- Specific signature module -->
+            <parameter name="class" value="eu.stork.peps.auth.engine.core.impl.SignHW" />
+            <!-- Settings specific module -->
+            <parameter name="fileConfiguration" value="SignModule_P11.xml" />
+            <parameter name="softTrustStoreConfig" value="SignModule_Conf0.xml" />
+        </configuration>
+    </instance>
 
 </instances>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml
index a9f2038b8..295258bb2 100644
--- a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf0.xml
@@ -2,20 +2,20 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 
 <!-- properties>
-	<comment>SWModule sign with JKS.</comment>
-	<entry key="keystorePath">C:\opt\keystores\keyStoreCountry0.jks</entry>
-	<entry key="keyStorePassword">local-demo</entry>
-	<entry key="keyPassword">local-demo</entry>
-	<entry key="issuer">CN=saml-demo-cert,OU=STORK2,O=Advania,L=Reykjavik,ST=Reykjavik,C=IS</entry>
-	<entry key="serialNumber">524D4C6C</entry>
-	<entry key="keystoreType">JKS</entry>
+        <comment>SWModule sign with JKS.</comment>
+        <entry key="keystorePath">C:\opt\keystores\keyStoreCountry0.jks</entry>
+        <entry key="keyStorePassword">local-demo</entry>
+        <entry key="keyPassword">local-demo</entry>
+        <entry key="issuer">CN=saml-demo-cert,OU=STORK2,O=Advania,L=Reykjavik,ST=Reykjavik,C=IS</entry>
+        <entry key="serialNumber">524D4C6C</entry>
+        <entry key="keystoreType">JKS</entry>
 </properties-->
 <properties>
-	<comment>SWModule sign with JKS.</comment>
-	<entry key="keystorePath">C:\opt\keystores\storkDemoKeysTest.jks</entry>
-	<entry key="keyStorePassword">local-demo</entry>
-	<entry key="keyPassword">local-demo</entry>
-	<entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
-	<entry key="serialNumber">4BA89DB2</entry>
-	<entry key="keystoreType">JKS</entry>
+    <comment>SWModule sign with JKS.</comment>
+    <entry key="keystorePath">C:\opt\keystores\storkDemoKeysTest.jks</entry>
+    <entry key="keyStorePassword">local-demo</entry>
+    <entry key="keyPassword">local-demo</entry>
+    <entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
+    <entry key="serialNumber">4BA89DB2</entry>
+    <entry key="keystoreType">JKS</entry>
 </properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf1.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf1.xml
index e556a7331..ffd41cb61 100644
--- a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf1.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf1.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 
 <properties>
-	<comment>SWModule sign with JKS.</comment>
-	<entry key="keystorePath">C:\opt\keystores\storkDemoKeysTest.jks</entry>
-	<entry key="keyStorePassword">local-demo</entry>
-	<entry key="keyPassword">local-demo</entry>
-	<entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
-	<entry key="serialNumber">4BA89DB2</entry>
-	<entry key="keystoreType">JKS</entry>
+    <comment>SWModule sign with JKS.</comment>
+    <entry key="keystorePath">C:\opt\keystores\storkDemoKeysTest.jks</entry>
+    <entry key="keyStorePassword">local-demo</entry>
+    <entry key="keyPassword">local-demo</entry>
+    <entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
+    <entry key="serialNumber">4BA89DB2</entry>
+    <entry key="keystoreType">JKS</entry>
 </properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf2.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf2.xml
index 3da1e33df..21b73d49d 100644
--- a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf2.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf2.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 
 <properties>
-	<comment>SWModule sign with JKS.</comment>
-	<entry key="keystorePath">C:\opt\keystores\keyStoreCountry2.jks</entry>
-	<entry key="keyStorePassword">local-demo</entry>
-	<entry key="keyPassword">local-demo</entry>
-	<entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
-	<entry key="serialNumber">4BA89DB2</entry>
-	<entry key="keystoreType">JKS</entry>
+    <comment>SWModule sign with JKS.</comment>
+    <entry key="keystorePath">C:\opt\keystores\keyStoreCountry2.jks</entry>
+    <entry key="keyStorePassword">local-demo</entry>
+    <entry key="keyPassword">local-demo</entry>
+    <entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
+    <entry key="serialNumber">4BA89DB2</entry>
+    <entry key="keystoreType">JKS</entry>
 </properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
index 4c14a1711..f9ebc85cc 100644
--- a/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_Conf3.xml
@@ -2,11 +2,11 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 
 <properties>
-	<comment>SWModule sign with JKS.</comment>
-	<entry key="keystorePath">C:\opt\keystores\keyStoreCountry3.jks</entry>
-	<entry key="keyStorePassword">local-demo</entry>
-	<entry key="keyPassword">local-demo</entry>
-	<entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
-	<entry key="serialNumber">4BA89DB2</entry>
-	<entry key="keystoreType">JKS</entry>
+    <comment>SWModule sign with JKS.</comment>
+    <entry key="keystorePath">C:\opt\keystores\keyStoreCountry3.jks</entry>
+    <entry key="keyStorePassword">local-demo</entry>
+    <entry key="keyPassword">local-demo</entry>
+    <entry key="issuer">CN=local-demo, O=Indra, L=Madrid, ST=Spain, C=ES</entry>
+    <entry key="serialNumber">4BA89DB2</entry>
+    <entry key="keystoreType">JKS</entry>
 </properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/SignModule_P11.xml b/id/server/stork2-saml-engine/src/test/resources/SignModule_P11.xml
index c683d97c3..0e95da1f2 100644
--- a/id/server/stork2-saml-engine/src/test/resources/SignModule_P11.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/SignModule_P11.xml
@@ -2,10 +2,11 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 
 <properties>
-	<comment>HWModule sign with interface PKCS11.</comment>
-	<entry key="configurationFile">p11Config.cfg</entry>
-	<entry key="keyPassword">*******</entry>
-	<entry key="issuer">CN=XXXXXXXXX</entry>
-	<entry key="serialNumber">xxxxxxxxxxxxxx</entry>
-	<entry key="keystoreType">PKCS11</entry>
+    <comment>HWModule sign with interface PKCS11.</comment>
+    <entry key="configurationFile">p11Conf.cfg</entry>
+    <entry key="keyPassword">12345</entry>
+    <entry key="issuer">CN=Test Certificate</entry>
+    <entry key="serialNumber">147d4b07db8</entry>
+    <entry key="keystoreType">PKCS11</entry>
+    <entry key="trustStoreConfig">SignModule_Conf0.xml</entry>
 </properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml
index 8c3a94601..2a266a975 100644
--- a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf0.xml
@@ -2,86 +2,111 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 
 <properties>
-	<comment>SAML constants for AuthnRequests and Responses.</comment>
-
-	<!-- Types of consent obtained from the user for this authentication and 
-		data transfer. Allow values: 'unspecified'. -->
-	<entry key="consentAuthnRequest">unspecified</entry>
-
-	<!-- Allow values: 'obtained', 'prior', 'current-implicit', 'current-explicit', 
-		'unspecified'. -->
-	<entry key="consentAuthnResponse">obtained</entry>
-
-	<!--URI representing the classification of the identifier Allow values: 
-		'entity'. -->
-	<entry key="formatEntity">entity</entry>
-
-	<!--Only HTTP-POST binding is only supported for inter PEPS -->
-	<!--The SOAP binding is only supported for direct communication between 
-		SP-MW and VIdP -->
-	<entry key="protocolBinding">HTTP-POST</entry>
-
-
-
-
-	<!--URI representing the classification of the identifier Allow values: 
-		'entity'. <entry key="eIDSectorShare">true</entry> <entry key="eIDCrossSectorShare">true</entry> 
-		<entry key="eIDCrossBorderShare">true</entry> -->
-
-
-
-	<!-- A friendly name for the attribute that can be displayed to a user -->
-	<entry key="friendlyName">false</entry>
-
-	<!-- A friendly name for the attribute that can be displayed to a user -->
-	<entry key="isRequired">true</entry>
-
-	<!--PEPS in the Service Provider's country -->
-	<entry key="requester">http://S-PEPS.gov.xx</entry>
-
-	<!--PEPS in the citizen's origin country -->
-	<entry key="responder">http://C-PEPS.gov.xx</entry>
-
-	<!--Subject cannot be confirmed on or after this seconds time (positive 
-		number) -->
-	<entry key="timeNotOnOrAfter">300</entry>
-
-	<!--Validation IP of the response -->
-	<entry key="ipAddrValidation">false</entry>
-
-
-	<!--Subject Attribute Definitions -->
-	<entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>
-	<entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>
-	<entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>
-	<entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>
-	<entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>
-	<entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>
-	<entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>
-	<entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>
-	<entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>
-	<entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>
-	<entry key="residenceAddress">http://www.stork.gov.eu/1.0/residenceAddress</entry>
-	<entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>
-	<entry key="academicTitle">http://www.stork.gov.eu/1.0/academicTitle</entry>
-	<entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>
-	<entry key="age">http://www.stork.gov.eu/1.0/age</entry>
-	<entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>
-
-	<entry key="textResidenceAddress">http://www.stork.gov.eu/1.0/textResidenceAddress</entry>
-	<entry key="canonicalResidenceAddress">http://www.stork.gov.eu/1.0/canonicalResidenceAddress</entry>
-
-	<entry key="title">http://www.stork.gov.eu/1.0/title</entry>
-	<entry key="residencePermit">http://www.stork.gov.eu/1.0/residencePermit</entry>
-
-	<entry key="signedDoc">http://www.stork.gov.eu/1.0/signedDoc</entry>
-	<entry key="citizen509Certificate">http://www.stork.gov.eu/1.0/citizen509Certificate</entry>
-
-	<entry key="newAttribute1">http://www.stork.gov.eu/1.0/newAttribute1</entry>
-	<entry key="newAttribute2">http://www.stork.gov.eu/1.0/newAttribute2</entry>
-	<entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
-	<entry key="mandateContent">http://www.stork.gov.eu/1.0/mandateContent</entry>
-
-	<entry key="docRequest">http://www.stork.gov.eu/1.0/docRequest</entry>
+    <comment>SAML constants for AuthnRequests and Responses.</comment>
+
+    <!-- Types of consent obtained from the user for this authentication and 
+    data transfer. Allow values: 'unspecified'. -->
+    <entry key="consentAuthnRequest">unspecified</entry>
+
+    <!-- Allow values: 'obtained', 'prior', 'current-implicit', 'current-explicit', 
+    'unspecified'. -->
+    <entry key="consentAuthnResponse">obtained</entry>
+
+    <!--URI representing the classification of the identifier Allow values: 
+    'entity'. -->
+    <entry key="formatEntity">entity</entry>
+
+    <!--Only HTTP-POST binding is only supported for inter PEPS -->
+    <!--The SOAP binding is only supported for direct communication between 
+    SP-MW and VIdP -->
+    <entry key="protocolBinding">HTTP-POST</entry>
+
+
+
+
+    <!--URI representing the classification of the identifier Allow values: 
+    'entity'. <entry key="eIDSectorShare">true</entry> <entry key="eIDCrossSectorShare">true</entry> 
+    <entry key="eIDCrossBorderShare">true</entry> -->
+
+
+
+    <!-- A friendly name for the attribute that can be displayed to a user -->
+    <entry key="friendlyName">false</entry>
+
+    <!-- A friendly name for the attribute that can be displayed to a user -->
+    <entry key="isRequired">true</entry>
+
+    <!--PEPS in the Service Provider's country -->
+    <entry key="requester">http://S-PEPS.gov.xx</entry>
+
+    <!--PEPS in the citizen's origin country -->
+    <entry key="responder">http://C-PEPS.gov.xx</entry>
+        
+    <!-- Format --> 	
+    <entry key="format">urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</entry>
+
+    <!--Subject cannot be confirmed on or after this seconds time (positive 
+    number) -->
+    <entry key="timeNotOnOrAfter">300</entry>
+
+    <!--Validation IP of the response -->
+    <entry key="ipAddrValidation">false</entry>
+
+
+    <!--Subject Attribute Definitions-->
+    <entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>
+    <entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>
+    <entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>
+    <entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>
+    <entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>
+    <entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>
+    <entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>
+    <entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>
+    <entry key="placeOfBirth">http://www.stork.gov.eu/1.0/placeOfBirth</entry>
+    <entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>
+    <entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>
+    <entry key="textResidenceAddress">http://www.stork.gov.eu/1.0/textResidenceAddress</entry>
+    <entry key="canonicalResidenceAddress">http://www.stork.gov.eu/1.0/canonicalResidenceAddress</entry>
+    <entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>
+    <entry key="title">http://www.stork.gov.eu/1.0/title</entry>
+    <entry key="residencePermit">http://www.stork.gov.eu/1.0/residencePermit</entry>
+    <entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>
+    <entry key="age">http://www.stork.gov.eu/1.0/age</entry>
+    <entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>
+    <entry key="signedDoc">http://www.stork.gov.eu/1.0/signedDoc</entry>
+    <entry key="citizenQAALevel">http://www.stork.gov.eu/1.0/citizenQAALevel</entry>
+    <entry key="fiscalNumber">http://www.stork.gov.eu/1.0/fiscalNumber</entry>
+    <entry key="unknown">http://www.stork.gov.eu/1.0/unknown</entry>
+    <entry key="newAttribute1">http://www.stork.gov.eu/1.0/newAttribute1</entry>
+    <entry key="newAttribute2">http://www.stork.gov.eu/1.0/newAttribute2</entry>
+    <entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
+	
+    <entry key="diplomaSupplement">http://www.stork.gov.eu/1.0/diplomaSupplement</entry>
+    <entry key="currentStudiesSupplement">http://www.stork.gov.eu/1.0/currentStudiesSupplement</entry>
+    <entry key="isStudent">http://www.stork.gov.eu/1.0/isStudent</entry>
+    <entry key="isAcademicStaff">http://www.stork.gov.eu/1.0/isAcademicStaff</entry>
+    <entry key="isTeacherOf">http://www.stork.gov.eu/1.0/isTeacherOf</entry>
+    <entry key="isCourseCoordinator">http://www.stork.gov.eu/1.0/isCourseCoordinator</entry>
+    <entry key="isAdminStaff">http://www.stork.gov.eu/1.0/isAdminStaff</entry>
+    <entry key="habilitation">http://www.stork.gov.eu/1.0/habilitation</entry>
+    <entry key="Title">http://www.stork.gov.eu/1.0/Title</entry>
+    <entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
+    <entry key="hasAccountInBank">http://www.stork.gov.eu/1.0/hasAccountInBank</entry>
+    <entry key="isHealthCareProfessional">http://www.stork.gov.eu/1.0/isHealthCareProfessional</entry>	
+	
+    <entry key="eLPIdentifier">http://www.stork.gov.eu/1.0/eLPIdentifier</entry>
+    <entry key="legalName">http://www.stork.gov.eu/1.0/legalName</entry>
+    <entry key="alternativeName">http://www.stork.gov.eu/1.0/alternativeName</entry>
+    <entry key="type">http://www.stork.gov.eu/1.0/type</entry>
+    <entry key="translatableType">http://www.stork.gov.eu/1.0/translatableType</entry>
+    <entry key="status">http://www.stork.gov.eu/1.0/status</entry>
+    <entry key="activity">http://www.stork.gov.eu/1.0/activity</entry>
+    <entry key="registeredAddress">http://www.stork.gov.eu/1.0/registeredAddress</entry>
+    <entry key="registeredCanonicalAddress">http://www.stork.gov.eu/1.0/registeredCanonicalAddress</entry>
+    <entry key="contactInformation">http://www.stork.gov.eu/1.0/contactInformation</entry>
+    <entry key="LPFiscalNumber">http://www.stork.gov.eu/1.0/LPFiscalNumber</entry>
+    <entry key="mandate">http://www.stork.gov.eu/1.0/mandate</entry>
+    <entry key="docRequest">http://www.stork.gov.eu/1.0/docRequest</entry>
+	
 	
 </properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf1.xml b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf1.xml
index ad04cc3df..a65717a05 100644
--- a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf1.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf1.xml
@@ -2,84 +2,110 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 
 <properties>
-	<comment>SAML constants for AuthnRequests and Responses.</comment>
-
-	<!-- Types of consent obtained from the user for this authentication and 
-		data transfer. Allow values: 'unspecified'. -->
-	<entry key="consentAuthnRequest">unspecified</entry>
-
-	<!-- Allow values: 'obtained', 'prior', 'current-implicit', 'current-explicit', 
-		'unspecified'. -->
-	<entry key="consentAuthnResponse">obtained</entry>
-
-	<!--URI representing the classification of the identifier Allow values: 
-		'entity'. -->
-	<entry key="formatEntity">entity</entry>
-
-	<!--Only HTTP-POST binding is only supported for inter PEPS -->
-	<!--The SOAP binding is only supported for direct communication between 
-		SP-MW and VIdP -->
-	<entry key="protocolBinding">HTTP-POST</entry>
-
-
-
-
-	<!--URI representing the classification of the identifier Allow values: 
-		'entity'. <entry key="eIDSectorShare">true</entry> <entry key="eIDCrossSectorShare">true</entry> 
-		<entry key="eIDCrossBorderShare">true</entry> -->
-
-
-
-	<!-- A friendly name for the attribute that can be displayed to a user -->
-	<entry key="friendlyName">false</entry>
-
-	<!-- A friendly name for the attribute that can be displayed to a user -->
-	<entry key="isRequired">true</entry>
-
-	<!--PEPS in the Service Provider's country -->
-	<entry key="requester">http://S-PEPS.gov.xx</entry>
-
-	<!--PEPS in the citizen's origin country -->
-	<entry key="responder">http://C-PEPS.gov.xx</entry>
-
-	<!--Subject cannot be confirmed on or after this seconds time (positive 
-		number) -->
-	<entry key="timeNotOnOrAfter">300</entry>
-
-	<!--Validation IP of the response -->
-	<entry key="ipAddrValidation">false</entry>
-
-
-	<!--Subject Attribute Definitions -->
-	<entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>
-	<entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>
-	<entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>
-	<entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>
-	<entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>
-	<entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>
-	<entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>
-	<entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>
-	<entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>
-	<entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>
-	<entry key="residenceAddress">http://www.stork.gov.eu/1.0/residenceAddress</entry>
-	<entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>
-	<entry key="academicTitle">http://www.stork.gov.eu/1.0/academicTitle</entry>
-	<entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>
-	<entry key="age">http://www.stork.gov.eu/1.0/age</entry>
-	<entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>
-
-	<entry key="textResidenceAddress">http://www.stork.gov.eu/1.0/textResidenceAddress</entry>
-	<entry key="canonicalResidenceAddress">http://www.stork.gov.eu/1.0/canonicalResidenceAddress</entry>
-
-	<entry key="title">http://www.stork.gov.eu/1.0/title</entry>
-	<entry key="residencePermit">http://www.stork.gov.eu/1.0/residencePermit</entry>
-
-	<entry key="signedDoc">http://www.stork.gov.eu/1.0/signedDoc</entry>
-	<entry key="citizen509Certificate">http://www.stork.gov.eu/1.0/citizen509Certificate</entry>
-
-	<entry key="newAttribute1">http://www.stork.gov.eu/1.0/newAttribute1</entry>
-	<entry key="newAttribute2">http://www.stork.gov.eu/1.0/newAttribute2</entry>
-	<entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
-	<entry key="mandateContent">http://www.stork.gov.eu/1.0/mandateContent</entry>
+    <comment>SAML constants for AuthnRequests and Responses.</comment>
+
+    <!-- Types of consent obtained from the user for this authentication and 
+    data transfer. Allow values: 'unspecified'. -->
+    <entry key="consentAuthnRequest">unspecified</entry>
+
+    <!-- Allow values: 'obtained', 'prior', 'current-implicit', 'current-explicit', 
+    'unspecified'. -->
+    <entry key="consentAuthnResponse">obtained</entry>
+
+    <!--URI representing the classification of the identifier Allow values: 
+    'entity'. -->
+    <entry key="formatEntity">entity</entry>
+
+    <!--Only HTTP-POST binding is only supported for inter PEPS -->
+    <!--The SOAP binding is only supported for direct communication between 
+    SP-MW and VIdP -->
+    <entry key="protocolBinding">HTTP-POST</entry>
+
+
+
+
+    <!--URI representing the classification of the identifier Allow values: 
+    'entity'. <entry key="eIDSectorShare">true</entry> <entry key="eIDCrossSectorShare">true</entry> 
+    <entry key="eIDCrossBorderShare">true</entry> -->
+
+
+
+    <!-- A friendly name for the attribute that can be displayed to a user -->
+    <entry key="friendlyName">false</entry>
+
+    <!-- A friendly name for the attribute that can be displayed to a user -->
+    <entry key="isRequired">true</entry>
+
+    <!--PEPS in the Service Provider's country -->
+    <entry key="requester">http://S-PEPS.gov.xx</entry>
+
+    <!--PEPS in the citizen's origin country -->
+    <entry key="responder">http://C-PEPS.gov.xx</entry>  	
+        
+    <!-- Format --> 	
+    <entry key="format">urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</entry>
+
+    <!--Subject cannot be confirmed on or after this seconds time (positive 
+    number) -->
+    <entry key="timeNotOnOrAfter">300</entry>
+
+    <!--Validation IP of the response -->
+    <entry key="ipAddrValidation">false</entry>
+
+
+    <!--Subject Attribute Definitions-->
+    <entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>
+    <entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>
+    <entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>
+    <entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>
+    <entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>
+    <entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>
+    <entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>
+    <entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>
+    <entry key="placeOfBirth">http://www.stork.gov.eu/1.0/placeOfBirth</entry>
+    <entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>
+    <entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>
+    <entry key="textResidenceAddress">http://www.stork.gov.eu/1.0/textResidenceAddress</entry>
+    <entry key="canonicalResidenceAddress">http://www.stork.gov.eu/1.0/canonicalResidenceAddress</entry>
+    <entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>
+    <entry key="title">http://www.stork.gov.eu/1.0/title</entry>
+    <entry key="residencePermit">http://www.stork.gov.eu/1.0/residencePermit</entry>
+    <entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>
+    <entry key="age">http://www.stork.gov.eu/1.0/age</entry>
+    <entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>
+    <entry key="signedDoc">http://www.stork.gov.eu/1.0/signedDoc</entry>
+    <entry key="citizenQAALevel">http://www.stork.gov.eu/1.0/citizenQAALevel</entry>
+    <entry key="fiscalNumber">http://www.stork.gov.eu/1.0/fiscalNumber</entry>
+    <entry key="unknown">http://www.stork.gov.eu/1.0/unknown</entry>
+    <entry key="newAttribute1">http://www.stork.gov.eu/1.0/newAttribute1</entry>
+    <entry key="newAttribute2">http://www.stork.gov.eu/1.0/newAttribute2</entry>
+    <entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
+	
+    <entry key="diplomaSupplement">http://www.stork.gov.eu/1.0/diplomaSupplement</entry>
+    <entry key="currentStudiesSupplement">http://www.stork.gov.eu/1.0/currentStudiesSupplement</entry>
+    <entry key="isStudent">http://www.stork.gov.eu/1.0/isStudent</entry>
+    <entry key="isAcademicStaff">http://www.stork.gov.eu/1.0/isAcademicStaff</entry>
+    <entry key="isTeacherOf">http://www.stork.gov.eu/1.0/isTeacherOf</entry>
+    <entry key="isCourseCoordinator">http://www.stork.gov.eu/1.0/isCourseCoordinator</entry>
+    <entry key="isAdminStaff">http://www.stork.gov.eu/1.0/isAdminStaff</entry>
+    <entry key="habilitation">http://www.stork.gov.eu/1.0/habilitation</entry>
+    <entry key="Title">http://www.stork.gov.eu/1.0/Title</entry>
+    <entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
+    <entry key="hasAccountInBank">http://www.stork.gov.eu/1.0/hasAccountInBank</entry>
+    <entry key="isHealthCareProfessional">http://www.stork.gov.eu/1.0/isHealthCareProfessional</entry>	
+	
+    <entry key="eLPIdentifier">http://www.stork.gov.eu/1.0/eLPIdentifier</entry>
+    <entry key="legalName">http://www.stork.gov.eu/1.0/legalName</entry>
+    <entry key="alternativeName">http://www.stork.gov.eu/1.0/alternativeName</entry>
+    <entry key="type">http://www.stork.gov.eu/1.0/type</entry>
+    <entry key="translatableType">http://www.stork.gov.eu/1.0/translatableType</entry>
+    <entry key="status">http://www.stork.gov.eu/1.0/status</entry>
+    <entry key="activity">http://www.stork.gov.eu/1.0/activity</entry>
+    <entry key="registeredAddress">http://www.stork.gov.eu/1.0/registeredAddress</entry>
+    <entry key="registeredCanonicalAddress">http://www.stork.gov.eu/1.0/registeredCanonicalAddress</entry>
+    <entry key="contactInformation">http://www.stork.gov.eu/1.0/contactInformation</entry>
+    <entry key="LPFiscalNumber">http://www.stork.gov.eu/1.0/LPFiscalNumber</entry>
+    <entry key="mandate">http://www.stork.gov.eu/1.0/mandate</entry>
+    <entry key="docRequest">http://www.stork.gov.eu/1.0/docRequest</entry>
 
 </properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf2.xml b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf2.xml
index fd1db92ac..a0a5bea10 100644
--- a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf2.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf2.xml
@@ -2,59 +2,100 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 
 <properties>
-	<comment>SAML constants for AuthnRequests and Responses.</comment>
-
-	<!-- Types of consent obtained from the user for this authentication and 
-		data transfer. Allow values: 'unspecified'. -->
-	<entry key="consentAuthnRequest">unspecified</entry>
-	<!-- Allow values: 'obtained', 'prior', 'curent-implicit', 'curent-explicit', 
-		'unspecified'. -->
-	<entry key="consentAuthnResponse">obtained</entry>
-
-	<!--URI representing the classification of the identifier Allow values: 
-		'entity'. -->
-	<entry key="formatEntity">entity</entry>
-
-	<!--Only HTTP-POST binding is only supported for inter PEPS -->
-	<!--The SOAP binding is only supported for direct communication between 
-		SP-MW and VIdP -->
-	<entry key="protocolBinding">HTTP-POST</entry>
-
-	<entry key="eIDSectorShare">false</entry>
-	<entry key="eIDCrossSectorShare">false</entry>
-	<entry key="eIDCrossBorderShare">false</entry>
-
-	<!--PEPS in the Service Provider's country -->
-	<entry key="requester">http://S-PEPS.gov.xx</entry>
-
-	<!--PEPS in the citizen's origin country -->
-	<entry key="responder">http://C-PEPS.gov.xx</entry>
-
-	<!--Subject cannot be confirmed on or after this seconds time -->
-	<entry key="timeNotOnOrAfter">300</entry>
-
-	<!--Validation IP of the response -->
-	<entry key="ipAddrValidation">false</entry>
-
-	<!-- A friendly name for the attribute that can be displayed to a user -->
-	<entry key="isRequired">false</entry>
-
-
-	<!--Subject Attribute Definitions -->
-	<entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>
-	<entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>
-	<entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>
-	<entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>
-	<entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>
-	<entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>
-	<entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>
-	<entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>
-	<entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>
-	<entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>
-	<entry key="residenceAddress">http://www.stork.gov.eu/1.0/residenceAddress</entry>
-	<entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>
-	<entry key="academicTitle">http://www.stork.gov.eu/1.0/academicTitle</entry>
-	<entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>
-	<entry key="age">http://www.stork.gov.eu/1.0/age</entry>
-	<entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>
+    <comment>SAML constants for AuthnRequests and Responses.</comment>
+
+    <!-- Types of consent obtained from the user for this authentication and 
+    data transfer. Allow values: 'unspecified'. -->
+    <entry key="consentAuthnRequest">unspecified</entry>
+    <!-- Allow values: 'obtained', 'prior', 'curent-implicit', 'curent-explicit', 
+    'unspecified'. -->
+    <entry key="consentAuthnResponse">obtained</entry>
+
+    <!--URI representing the classification of the identifier Allow values: 
+    'entity'. -->
+    <entry key="formatEntity">entity</entry>
+
+    <!--Only HTTP-POST binding is only supported for inter PEPS -->
+    <!--The SOAP binding is only supported for direct communication between 
+    SP-MW and VIdP -->
+    <entry key="protocolBinding">HTTP-POST</entry>
+
+    <entry key="eIDSectorShare">false</entry>
+    <entry key="eIDCrossSectorShare">false</entry>
+    <entry key="eIDCrossBorderShare">false</entry>
+
+    <!--PEPS in the Service Provider's country -->
+    <entry key="requester">http://S-PEPS.gov.xx</entry>
+
+    <!--PEPS in the citizen's origin country -->
+    <entry key="responder">http://C-PEPS.gov.xx</entry>  	
+        
+    <!-- Format --> 	
+    <entry key="format">urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</entry>
+
+    <!--Subject cannot be confirmed on or after this seconds time -->
+    <entry key="timeNotOnOrAfter">300</entry>
+
+    <!--Validation IP of the response -->
+    <entry key="ipAddrValidation">false</entry>
+
+    <!-- A friendly name for the attribute that can be displayed to a user -->
+    <entry key="isRequired">false</entry>
+
+
+    <!--Subject Attribute Definitions-->
+    <entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>
+    <entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>
+    <entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>
+    <entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>
+    <entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>
+    <entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>
+    <entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>
+    <entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>
+    <entry key="placeOfBirth">http://www.stork.gov.eu/1.0/placeOfBirth</entry>
+    <entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>
+    <entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>
+    <entry key="textResidenceAddress">http://www.stork.gov.eu/1.0/textResidenceAddress</entry>
+    <entry key="canonicalResidenceAddress">http://www.stork.gov.eu/1.0/canonicalResidenceAddress</entry>
+    <entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>
+    <entry key="title">http://www.stork.gov.eu/1.0/title</entry>
+    <entry key="residencePermit">http://www.stork.gov.eu/1.0/residencePermit</entry>
+    <entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>
+    <entry key="age">http://www.stork.gov.eu/1.0/age</entry>
+    <entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>
+    <entry key="signedDoc">http://www.stork.gov.eu/1.0/signedDoc</entry>
+    <entry key="citizenQAALevel">http://www.stork.gov.eu/1.0/citizenQAALevel</entry>
+    <entry key="fiscalNumber">http://www.stork.gov.eu/1.0/fiscalNumber</entry>
+    <entry key="unknown">http://www.stork.gov.eu/1.0/unknown</entry>
+    <entry key="newAttribute1">http://www.stork.gov.eu/1.0/newAttribute1</entry>
+    <entry key="newAttribute2">http://www.stork.gov.eu/1.0/newAttribute2</entry>
+    <entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
+	
+    <entry key="diplomaSupplement">http://www.stork.gov.eu/1.0/diplomaSupplement</entry>
+    <entry key="currentStudiesSupplement">http://www.stork.gov.eu/1.0/currentStudiesSupplement</entry>
+    <entry key="isStudent">http://www.stork.gov.eu/1.0/isStudent</entry>
+    <entry key="isAcademicStaff">http://www.stork.gov.eu/1.0/isAcademicStaff</entry>
+    <entry key="isTeacherOf">http://www.stork.gov.eu/1.0/isTeacherOf</entry>
+    <entry key="isCourseCoordinator">http://www.stork.gov.eu/1.0/isCourseCoordinator</entry>
+    <entry key="isAdminStaff">http://www.stork.gov.eu/1.0/isAdminStaff</entry>
+    <entry key="habilitation">http://www.stork.gov.eu/1.0/habilitation</entry>
+    <entry key="Title">http://www.stork.gov.eu/1.0/Title</entry>
+    <entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
+    <entry key="hasAccountInBank">http://www.stork.gov.eu/1.0/hasAccountInBank</entry>
+    <entry key="isHealthCareProfessional">http://www.stork.gov.eu/1.0/isHealthCareProfessional</entry>	
+	
+    <entry key="eLPIdentifier">http://www.stork.gov.eu/1.0/eLPIdentifier</entry>
+    <entry key="legalName">http://www.stork.gov.eu/1.0/legalName</entry>
+    <entry key="alternativeName">http://www.stork.gov.eu/1.0/alternativeName</entry>
+    <entry key="type">http://www.stork.gov.eu/1.0/type</entry>
+    <entry key="translatableType">http://www.stork.gov.eu/1.0/translatableType</entry>
+    <entry key="status">http://www.stork.gov.eu/1.0/status</entry>
+    <entry key="activity">http://www.stork.gov.eu/1.0/activity</entry>
+    <entry key="registeredAddress">http://www.stork.gov.eu/1.0/registeredAddress</entry>
+    <entry key="registeredCanonicalAddress">http://www.stork.gov.eu/1.0/registeredCanonicalAddress</entry>
+    <entry key="contactInformation">http://www.stork.gov.eu/1.0/contactInformation</entry>
+    <entry key="LPFiscalNumber">http://www.stork.gov.eu/1.0/LPFiscalNumber</entry>
+    <entry key="mandate">http://www.stork.gov.eu/1.0/mandate</entry>
+    <entry key="docRequest">http://www.stork.gov.eu/1.0/docRequest</entry>
+	
 </properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf3.xml b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf3.xml
index bea40d274..61c6cd6d6 100644
--- a/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf3.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/StorkSamlEngine_Conf3.xml
@@ -2,56 +2,96 @@
 <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd">
 
 <properties>
-	<comment>SAML constants for AuthnRequests and Responses.</comment>
-
-	<!-- Types of consent obtained from the user for this authentication and 
-		data transfer. Allow values: 'unspecified'. -->
-	<entry key="consentAuthnRequest">unspecified</entry>
-	<!-- Allow values: 'obtained', 'prior', 'curent-implicit', 'curent-explicit', 
-		'unspecified'. -->
-	<entry key="consentAuthnResponse">obtained</entry>
-
-	<!--URI representing the classification of the identifier Allow values: 
-		'entity'. -->
-	<entry key="formatEntity">entity</entry>
-
-	<!--Only HTTP-POST binding is only supported for inter PEPS -->
-	<!--The SOAP binding is only supported for direct communication between 
-		SP-MW and VIdP -->
-	<entry key="protocolBinding">HTTP-POST</entry>
-
-	<entry key="eIDSectorShare">false</entry>
-	<entry key="eIDCrossSectorShare">false</entry>
-	<entry key="eIDCrossBorderShare">false</entry>
-
-	<!--PEPS in the Service Provider's country -->
-	<entry key="requester">http://S-PEPS.gov.xx</entry>
-
-	<!--PEPS in the citizen's origin country -->
-	<entry key="responder">http://C-PEPS.gov.xx</entry>
-
-	<!--Subject cannot be confirmed on or after this seconds time -->
-	<entry key="timeNotOnOrAfter">300</entry>
-
-	<!--Validation IP of the response -->
-	<entry key="ipAddrValidation">false</entry>
-
-	<!--Subject Attribute Definitions -->
-	<entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>
-	<entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>
-	<entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>
-	<entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>
-	<entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>
-	<entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>
-	<entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>
-	<entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>
-	<entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>
-	<entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>
-	<entry key="residenceAddress">http://www.stork.gov.eu/1.0/residenceAddress</entry>
-	<entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>
-	<entry key="academicTitle">http://www.stork.gov.eu/1.0/academicTitle</entry>
-	<entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>
-	<entry key="age">http://www.stork.gov.eu/1.0/age</entry>
-	<entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>
-	<entry key="unknown">http://www.stork.gov.eu/1.0/unknown</entry>
+    <comment>SAML constants for AuthnRequests and Responses.</comment>
+
+    <!-- Types of consent obtained from the user for this authentication and 
+    data transfer. Allow values: 'unspecified'. -->
+    <entry key="consentAuthnRequest">unspecified</entry>
+    <!-- Allow values: 'obtained', 'prior', 'curent-implicit', 'curent-explicit', 
+    'unspecified'. -->
+    <entry key="consentAuthnResponse">obtained</entry>
+
+    <!--URI representing the classification of the identifier Allow values: 
+    'entity'. -->
+    <entry key="formatEntity">entity</entry>
+
+    <!--Only HTTP-POST binding is only supported for inter PEPS -->
+    <!--The SOAP binding is only supported for direct communication between 
+    SP-MW and VIdP -->
+    <entry key="protocolBinding">HTTP-POST</entry>
+
+    <entry key="eIDSectorShare">false</entry>
+    <entry key="eIDCrossSectorShare">false</entry>
+    <entry key="eIDCrossBorderShare">false</entry>
+
+    <!--PEPS in the Service Provider's country -->
+    <entry key="requester">http://S-PEPS.gov.xx</entry>
+
+    <!--PEPS in the citizen's origin country -->
+    <entry key="responder">http://C-PEPS.gov.xx</entry>  	
+        
+    <!-- Format --> 	
+    <entry key="format">urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</entry>
+
+    <!--Subject cannot be confirmed on or after this seconds time -->
+    <entry key="timeNotOnOrAfter">300</entry>
+
+    <!--Validation IP of the response -->
+    <entry key="ipAddrValidation">false</entry>
+
+    <!--Subject Attribute Definitions-->
+    <entry key="eIdentifier">http://www.stork.gov.eu/1.0/eIdentifier</entry>
+    <entry key="givenName">http://www.stork.gov.eu/1.0/givenName</entry>
+    <entry key="surname">http://www.stork.gov.eu/1.0/surname</entry>
+    <entry key="inheritedFamilyName">http://www.stork.gov.eu/1.0/inheritedFamilyName</entry>
+    <entry key="adoptedFamilyName">http://www.stork.gov.eu/1.0/adoptedFamilyName</entry>
+    <entry key="gender">http://www.stork.gov.eu/1.0/gender</entry>
+    <entry key="dateOfBirth">http://www.stork.gov.eu/1.0/dateOfBirth</entry>
+    <entry key="countryCodeOfBirth">http://www.stork.gov.eu/1.0/countryCodeOfBirth</entry>
+    <entry key="placeOfBirth">http://www.stork.gov.eu/1.0/placeOfBirth</entry>
+    <entry key="nationalityCode">http://www.stork.gov.eu/1.0/nationalityCode</entry>
+    <entry key="maritalStatus">http://www.stork.gov.eu/1.0/maritalStatus</entry>
+    <entry key="textResidenceAddress">http://www.stork.gov.eu/1.0/textResidenceAddress</entry>
+    <entry key="canonicalResidenceAddress">http://www.stork.gov.eu/1.0/canonicalResidenceAddress</entry>
+    <entry key="eMail">http://www.stork.gov.eu/1.0/eMail</entry>
+    <entry key="title">http://www.stork.gov.eu/1.0/title</entry>
+    <entry key="residencePermit">http://www.stork.gov.eu/1.0/residencePermit</entry>
+    <entry key="pseudonym">http://www.stork.gov.eu/1.0/pseudonym</entry>
+    <entry key="age">http://www.stork.gov.eu/1.0/age</entry>
+    <entry key="isAgeOver">http://www.stork.gov.eu/1.0/isAgeOver</entry>
+    <entry key="signedDoc">http://www.stork.gov.eu/1.0/signedDoc</entry>
+    <entry key="citizenQAALevel">http://www.stork.gov.eu/1.0/citizenQAALevel</entry>
+    <entry key="fiscalNumber">http://www.stork.gov.eu/1.0/fiscalNumber</entry>
+    <entry key="unknown">http://www.stork.gov.eu/1.0/unknown</entry>
+    <entry key="newAttribute1">http://www.stork.gov.eu/1.0/newAttribute1</entry>
+    <entry key="newAttribute2">http://www.stork.gov.eu/1.0/newAttribute2</entry>
+    <entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
+	
+    <entry key="diplomaSupplement">http://www.stork.gov.eu/1.0/diplomaSupplement</entry>
+    <entry key="currentStudiesSupplement">http://www.stork.gov.eu/1.0/currentStudiesSupplement</entry>
+    <entry key="isStudent">http://www.stork.gov.eu/1.0/isStudent</entry>
+    <entry key="isAcademicStaff">http://www.stork.gov.eu/1.0/isAcademicStaff</entry>
+    <entry key="isTeacherOf">http://www.stork.gov.eu/1.0/isTeacherOf</entry>
+    <entry key="isCourseCoordinator">http://www.stork.gov.eu/1.0/isCourseCoordinator</entry>
+    <entry key="isAdminStaff">http://www.stork.gov.eu/1.0/isAdminStaff</entry>
+    <entry key="habilitation">http://www.stork.gov.eu/1.0/habilitation</entry>
+    <entry key="Title">http://www.stork.gov.eu/1.0/Title</entry>
+    <entry key="hasDegree">http://www.stork.gov.eu/1.0/hasDegree</entry>
+    <entry key="hasAccountInBank">http://www.stork.gov.eu/1.0/hasAccountInBank</entry>
+    <entry key="isHealthCareProfessional">http://www.stork.gov.eu/1.0/isHealthCareProfessional</entry>	
+	
+    <entry key="eLPIdentifier">http://www.stork.gov.eu/1.0/eLPIdentifier</entry>
+    <entry key="legalName">http://www.stork.gov.eu/1.0/legalName</entry>
+    <entry key="alternativeName">http://www.stork.gov.eu/1.0/alternativeName</entry>
+    <entry key="type">http://www.stork.gov.eu/1.0/type</entry>
+    <entry key="translatableType">http://www.stork.gov.eu/1.0/translatableType</entry>
+    <entry key="status">http://www.stork.gov.eu/1.0/status</entry>
+    <entry key="activity">http://www.stork.gov.eu/1.0/activity</entry>
+    <entry key="registeredAddress">http://www.stork.gov.eu/1.0/registeredAddress</entry>
+    <entry key="registeredCanonicalAddress">http://www.stork.gov.eu/1.0/registeredCanonicalAddress</entry>
+    <entry key="contactInformation">http://www.stork.gov.eu/1.0/contactInformation</entry>
+    <entry key="LPFiscalNumber">http://www.stork.gov.eu/1.0/LPFiscalNumber</entry>
+    <entry key="mandate">http://www.stork.gov.eu/1.0/mandate</entry>
+    <entry key="docRequest">http://www.stork.gov.eu/1.0/docRequest</entry>
+
 </properties>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml
index 3764389e4..d4f6f89da 100644
--- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequest.xml
@@ -1,82 +1,68 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<saml2p:AttributeQuery xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified"
-	Destination="http://A-PEPS.gov.xx/PEPS/AttributeColleagueRequest" ID="_939726f0a02072f40b548de378612a50"
-	IssueInstant="2013-10-04T16:57:55.547Z" Version="2.0">
-	<saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
-	<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-		<ds:SignedInfo>
-			<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-			<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-			<ds:Reference URI="#_939726f0a02072f40b548de378612a50">
-				<ds:Transforms>
-					<ds:Transform
-						Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
-					<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
-						<ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"
-							PrefixList="xs" />
-					</ds:Transform>
-				</ds:Transforms>
-				<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-				<ds:DigestValue>BgPDTVCv7BhiWIs6HsC06jaHaag=</ds:DigestValue>
-			</ds:Reference>
-		</ds:SignedInfo>
-		<ds:SignatureValue>dIC61bGi6Jqp1zSVojpjaVq9WaZcDtNImXgo1Dyze5/hJA07Sy4TaHu+/IuLEC99aLjM6rxh2UUNqpPaQCFlF5eVkVv/c4gHEZVyevhjJKTidqmnuhlI78PGMx2thfxFsHsPcqHqOzy1Z6w18K1ds6APQP+aXI9TNKis+pykn4nJititYuiSseD0VY0F4QnXx+U6k3raoi1CAFE5fe7EuI/KfxuhhQLAbLq90Vm8R94ITBjfSS25mXstXNe9zppTSjDB42ld1TjDovDwXAn5OxiZasIEb5m68sRlxgoQ/2/+ZdYNNINFLAwkCbb8MiCbGASd626Bme0Kx+ropeWdxw==</ds:SignatureValue>
-		<ds:KeyInfo>
-			<ds:X509Data>
-				<ds:X509Certificate>MIIDXjCCAkagAwIBAgIEUk1MbDANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQGEwJJUzESMBAGA1UE
-					CAwJUmV5a2phdmlrMRIwEAYDVQQHDAlSZXlramF2aWsxEDAOBgNVBAoMB0FkdmFuaWExDzANBgNV
-					BAsMBlNUT1JLMjEXMBUGA1UEAwwOc2FtbC1kZW1vLWNlcnQwHhcNMTMxMDAzMTA1MzEyWhcNMjMx
-					MDAzMTA1MzEyWjBxMQswCQYDVQQGEwJJUzESMBAGA1UECAwJUmV5a2phdmlrMRIwEAYDVQQHDAlS
-					ZXlramF2aWsxEDAOBgNVBAoMB0FkdmFuaWExDzANBgNVBAsMBlNUT1JLMjEXMBUGA1UEAwwOc2Ft
-					bC1kZW1vLWNlcnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCkSgTxZkNRXZTKLB0c
-					4oz7/8Dh56FX+0cYg7hjw4e8vn+ITXkxzrmUH57FtsvKln4mq1H0FHXL80u3IiWX8qY+QLgNeKeB
-					m85lXuyOb3wWpKAaQvpLAkejGLCx22AN2L0WZkKZV2puwRQVsRHCq6U6vToJXDZ6Ui6ltKsAl/ZS
-					8qUFpiIvqD5ea4ohz4JsFE/uApRc7pbJ4VbOmAAeH/tQTayptq2kPb2vvUVk+2cH5J7UD+GCI88E
-					e+mS+C33tV9NmWUHL69mYEe8FXjumbKA5e9i1ejn9i0/BLUtHFonHnL9YFMim0foI7NNc5mNg9aw
-					vm0PuByVU3kuibQkqGBLAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAA9X5B4NBmVuhjECi+KOnRRX
-					5oUV+jbYKhGZODDPi+F4Uo7ZtPFQ6sS3tE54+8AoDl5zQ5q5fDDVXhB42IIIjDxHKo8cBXie5FZ6
-					mJtErvWZWYWdO0uV2OQAUALq2LieidqSFDJ+Pjl8w1New8oi3migwyE0jZo4Q97lJGDfJTruV0A2
-					JE/Gt6QAAcWhhN2hZl92pYkIi5OeqHXyzBUp5vg8LLfNmeyziCAiXDC1Sy/aQU/cllZ3zFJMrqZM
-					s2xBpmB4sF1YRbIrr2OqEVE6M6DUx+pAQOd2uogV3AMT9D5MYpckI1jx/o/Tto7ju74nIVOskDiN
-					K0FR8izxcT0HixM=</ds:X509Certificate>
-			</ds:X509Data>
-		</ds:KeyInfo>
-	</ds:Signature>
-	<saml2p:Extensions>
-		<stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
-		<storkp:eIDSectorShare>false</storkp:eIDSectorShare>
-		<storkp:eIDCrossSectorShare>false</storkp:eIDCrossSectorShare>
-		<storkp:eIDCrossBorderShare>false</storkp:eIDCrossBorderShare>
-		<storkp:RequestedAttributes>
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="false" />
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/isAgeOver"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true">
-				<stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">16</stork:AttributeValue>
-				<stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">18</stork:AttributeValue>
-			</stork:RequestedAttribute>
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/givenName"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true">
-				<stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">Sveinbjorn</stork:AttributeValue>
-			</stork:RequestedAttribute>
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/eIdentifier"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true">
-				<stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">ES/IS/1234567890</stork:AttributeValue>
-			</stork:RequestedAttribute>
-		</storkp:RequestedAttributes>
-	</saml2p:Extensions>
-	<saml2:Subject>
-		<saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer" />
-	</saml2:Subject>
+<?xml version="1.0" encoding="UTF-8"?><saml2p:AttributeQuery xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol" xmlns:xs="http://www.w3.org/2001/XMLSchema" AssertionConsumerServiceURL="http://S-PEPS.gov.xx/PEPS/ColleagueResponse" Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://A-PEPS.gov.xx/PEPS/AttributeColleagueRequest" ID="_bf999e47edabb47770eb406a5d37f24e" IssueInstant="2014-04-25T12:49:39.398Z" Version="2.0">
+    <saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
+    <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:SignedInfo>
+            <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+            <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+            <ds:Reference URI="#_bf999e47edabb47770eb406a5d37f24e">
+                <ds:Transforms>
+                    <ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+                    <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
+                        <ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" PrefixList="xs"/>
+                    </ds:Transform>
+                </ds:Transforms>
+                <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+                <ds:DigestValue>NwBXMUys6XjoR7Ddbr6JI5gB+O8=</ds:DigestValue>
+            </ds:Reference>
+        </ds:SignedInfo>
+        <ds:SignatureValue>MFoAC5mncGKFyvZKygSIH7+9JrXWMJ18jolBHZ0WisxpIrDldS+K+Mf6uwOirL5mal2uktpIT2RRiT1Twk+fS5t94wnobaLpktpv+uoZCzd2BAqFpBBHnImwC/UEy7hCF9htsW8CCx97wRXHA4IGx5OX9Fg4f+ZJdPPFLrGpdfJ3bJXvQeQPwGLqhjWio/XnAYwJYQ8YGQvRywZDDodTZDWHsKMHAsrIdmNJz93wmMPceRtgcUceZdN4jDkPE8SPNrApe2ksd3dEKauyyJQ2DR5jryVQpGM7sJzQhP9Z57XIJta+c/nJ7bttw+M+QsZn/E+CLQpcI8MeuuhBb1+mGA==</ds:SignatureValue>
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>MIIDIjCCAgqgAwIBAgIES6idsjANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJFUzEOMAwGA1UE
+                    CAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxvY2Fs
+                    LWRlbW8wHhcNMTMwODI4MTY0NzM1WhcNMTUwODI4MTY0NzM1WjBTMQswCQYDVQQGEwJFUzEOMAwG
+                    A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxv
+                    Y2FsLWRlbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx+7zEQUbt8Ot9dByR5TuY
+                    NPmTwaKhECtnkxYAx9tl+Ga3kFiv+dOSeDoQOhxkICG1ZMaG0Gtk0EQWjscC1cLwDXpAOdhOm5xh
+                    ndFHxa3V3Y3zomFZA7A3nwP8wt17wDrc1xi2Ye8VrwO7Vjb/F8Rgutlcrvq+LF4g9nQLoRiKUq8w
+                    NFvDlvhBbLr8hMVBMY/jY7tSQ85qLqKUkWRcoDttJjgWZoO1vpBS4m+FywtYdOoHnN6fv4Dvf1r2
+                    rNLgebgBvSfwznxiulwW6FBLasYX0rYKP7RfwG8TJ+FumOgAjADj2LdwK25RZNg44XU2V1z1Fp37
+                    fNXhfo08LpdD1ueFAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADMRGTWOmadZyCoJNluV+M7LopjC
+                    9WpFUj76X0cAoNXmt12zYqYe8hjRmBr6l2V/FXT3/TyWET1nILG46zwwAxslw3b2LvkhU+9QcuB8
+                    yC8TCJJ0kgsTZ/EUZPSbwUG7Nn2jkMiyjlyKcjSCQOzEKQyR1xYwyZG40+BPeGbYjmRgm6kcmCxY
+                    USWoPwNyfke9gNT80f0pUj7wJ9YwWbTIz1rhf/h7rxoMYypXo+JXwaXW/Ra8v1uDcwfKpE5ZgwAU
+                    nubLXF4A+H7/N7ZvB5XDwJ4W+99nuPsKfwacD8m1sflTXcEPzzhOq6iQ9anJT94/pMctnp827zXA
+                    y66jvDrin5I=</ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+    </ds:Signature>
+    <saml2p:Extensions>
+        <stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
+        <stork:spCountry>IS</stork:spCountry>
+        <storkp:eIDSectorShare>false</storkp:eIDSectorShare>
+        <storkp:eIDCrossSectorShare>false</storkp:eIDCrossSectorShare>
+        <storkp:eIDCrossBorderShare>false</storkp:eIDCrossBorderShare>
+        <storkp:RequestedAttributes>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/eIdentifier" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">ES/IS/1234567890</stork:AttributeValue>
+            </stork:RequestedAttribute>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/givenName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">Sveinbjorn</stork:AttributeValue>
+            </stork:RequestedAttribute>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/dateOfBirth" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/fiscalNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">fiscalNumber</stork:AttributeValue>
+            </stork:RequestedAttribute>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/isAgeOver" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">16</stork:AttributeValue>
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">18</stork:AttributeValue>
+            </stork:RequestedAttribute>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/LPFiscalNumber" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">LPFiscalNumber</stork:AttributeValue>
+            </stork:RequestedAttribute>
+        </storkp:RequestedAttributes>
+    </saml2p:Extensions>
+    <saml2:Subject>
+        <saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"/>
+    </saml2:Subject>
 </saml2p:AttributeQuery>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml
index d64572829..fadc86d14 100644
--- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestSdoc.xml
@@ -1,15 +1,54 @@
-<?xml version="1.0" encoding="UTF-8"?><saml2p:AttributeQuery xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol" xmlns:xs="http://www.w3.org/2001/XMLSchema" AssertionConsumerServiceURL="http://S-PEPS.gov.xx/PEPS/ColleagueResponse" Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://A-PEPS.gov.xx/PEPS/AttributeColleagueRequest" ID="_334488599e0c2781ff34857c4964debb" IssueInstant="2014-02-06T22:09:18.113Z" Version="2.0"><saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer><ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#"><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/><ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/><ds:Reference URI="#_334488599e0c2781ff34857c4964debb"><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" PrefixList="xs"/></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/><ds:DigestValue>X1nUVB6qXdoKbJzNekiSo9ExLdw=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>ExCPHHC/9OhdhOl1Ou+43Qw1nvskpbMYMu9vqa7m16doxM2PIUmK7LUw7hZiKtjIdBxuhpca3OrjO8O6MuTDN1FksWoj+7B1KTLFtmspucT5O7Cu2OqhK5WIVuCaLuA7CD0N2UfFouRwR5NlLHyzn9Trd7IM5OjA41dGb5jqYl7Ir+62+MgjhZRlLooDzb5fDAczbxv9LHGiKRBpgnk40w3gDAvoSPNdEuKhZi8LPQWWNBvVi3N5ZmJmAIacZWBqePywXTjygmChWAc8p7ptAX6tw0hpBxyxoW3aaZZzWQNcwobTRYbn89fcM11gqIz/YK7VXtiQ7WEQt1enQD/GAA==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIIDIjCCAgqgAwIBAgIES6idsjANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJFUzEOMAwGA1UE
-CAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxvY2Fs
-LWRlbW8wHhcNMTMwODI4MTY0NzM1WhcNMTUwODI4MTY0NzM1WjBTMQswCQYDVQQGEwJFUzEOMAwG
-A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxv
-Y2FsLWRlbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx+7zEQUbt8Ot9dByR5TuY
-NPmTwaKhECtnkxYAx9tl+Ga3kFiv+dOSeDoQOhxkICG1ZMaG0Gtk0EQWjscC1cLwDXpAOdhOm5xh
-ndFHxa3V3Y3zomFZA7A3nwP8wt17wDrc1xi2Ye8VrwO7Vjb/F8Rgutlcrvq+LF4g9nQLoRiKUq8w
-NFvDlvhBbLr8hMVBMY/jY7tSQ85qLqKUkWRcoDttJjgWZoO1vpBS4m+FywtYdOoHnN6fv4Dvf1r2
-rNLgebgBvSfwznxiulwW6FBLasYX0rYKP7RfwG8TJ+FumOgAjADj2LdwK25RZNg44XU2V1z1Fp37
-fNXhfo08LpdD1ueFAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADMRGTWOmadZyCoJNluV+M7LopjC
-9WpFUj76X0cAoNXmt12zYqYe8hjRmBr6l2V/FXT3/TyWET1nILG46zwwAxslw3b2LvkhU+9QcuB8
-yC8TCJJ0kgsTZ/EUZPSbwUG7Nn2jkMiyjlyKcjSCQOzEKQyR1xYwyZG40+BPeGbYjmRgm6kcmCxY
-USWoPwNyfke9gNT80f0pUj7wJ9YwWbTIz1rhf/h7rxoMYypXo+JXwaXW/Ra8v1uDcwfKpE5ZgwAU
-nubLXF4A+H7/N7ZvB5XDwJ4W+99nuPsKfwacD8m1sflTXcEPzzhOq6iQ9anJT94/pMctnp827zXA
-y66jvDrin5I=</ds:X509Certificate></ds:X509Data></ds:KeyInfo></ds:Signature><saml2p:Extensions><stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel><stork:spCountry>IS</stork:spCountry><storkp:eIDSectorShare>false</storkp:eIDSectorShare><storkp:eIDCrossSectorShare>false</storkp:eIDCrossSectorShare><storkp:eIDCrossBorderShare>false</storkp:eIDCrossBorderShare><storkp:RequestedAttributes><stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/docRequest" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"><stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">IS/IS/fbea6e68-0393-401b-b616-f767fff9418c</stork:AttributeValue></stork:RequestedAttribute></storkp:RequestedAttributes></saml2p:Extensions><saml2:Subject><saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"/></saml2:Subject></saml2p:AttributeQuery>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?><saml2p:AttributeQuery xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol" xmlns:xs="http://www.w3.org/2001/XMLSchema" AssertionConsumerServiceURL="http://S-PEPS.gov.xx/PEPS/ColleagueResponse" Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://A-PEPS.gov.xx/PEPS/AttributeColleagueRequest" ID="_0b74cf761d490383ac5127629a39a458" IssueInstant="2014-04-25T12:49:39.848Z" Version="2.0">
+    <saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
+    <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:SignedInfo>
+            <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"/>
+            <ds:SignatureMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+            <ds:Reference URI="#_0b74cf761d490383ac5127629a39a458">
+                <ds:Transforms>
+                    <ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"/>
+                    <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
+                        <ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#" PrefixList="xs"/>
+                    </ds:Transform>
+                </ds:Transforms>
+                <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+                <ds:DigestValue>2WMvsIXoH1VpwqbNiXG8lWS2ZPc=</ds:DigestValue>
+            </ds:Reference>
+        </ds:SignedInfo>
+        <ds:SignatureValue>nMfUZiYHyHgSky4NHfDGch8a6UxWupS1Dhk2mu3L065Vq2eKLfDwWjgNkKPDoLcEkgAiDpNlLsS0+nDk8IexAMSq+T54Mlt4AhMRIrDP3SlWya5mqQ0VnxFENGlhi7kSKK2oIMfkiaeIBART7QBZggSZFnk0mw/BzmJM5bJ4Dipymndx7tv98BDlWFZEKH7iSc9uUuMpVygTNDxtEsdMcBKpqYiyVyTln8/xKsqXSL4RA10MYmqfvFsMZWUwQUgdl5tor910/XrAXHXJY50zH0CwekUXszOdvO7s3WvrG4lt3goqq2WDcaeDzizV93+Ih+lVl9PebTtMxCyO4fxw7Q==</ds:SignatureValue>
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>MIIDIjCCAgqgAwIBAgIES6idsjANBgkqhkiG9w0BAQUFADBTMQswCQYDVQQGEwJFUzEOMAwGA1UE
+                    CAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxvY2Fs
+                    LWRlbW8wHhcNMTMwODI4MTY0NzM1WhcNMTUwODI4MTY0NzM1WjBTMQswCQYDVQQGEwJFUzEOMAwG
+                    A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExEzARBgNVBAMMCmxv
+                    Y2FsLWRlbW8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx+7zEQUbt8Ot9dByR5TuY
+                    NPmTwaKhECtnkxYAx9tl+Ga3kFiv+dOSeDoQOhxkICG1ZMaG0Gtk0EQWjscC1cLwDXpAOdhOm5xh
+                    ndFHxa3V3Y3zomFZA7A3nwP8wt17wDrc1xi2Ye8VrwO7Vjb/F8Rgutlcrvq+LF4g9nQLoRiKUq8w
+                    NFvDlvhBbLr8hMVBMY/jY7tSQ85qLqKUkWRcoDttJjgWZoO1vpBS4m+FywtYdOoHnN6fv4Dvf1r2
+                    rNLgebgBvSfwznxiulwW6FBLasYX0rYKP7RfwG8TJ+FumOgAjADj2LdwK25RZNg44XU2V1z1Fp37
+                    fNXhfo08LpdD1ueFAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBADMRGTWOmadZyCoJNluV+M7LopjC
+                    9WpFUj76X0cAoNXmt12zYqYe8hjRmBr6l2V/FXT3/TyWET1nILG46zwwAxslw3b2LvkhU+9QcuB8
+                    yC8TCJJ0kgsTZ/EUZPSbwUG7Nn2jkMiyjlyKcjSCQOzEKQyR1xYwyZG40+BPeGbYjmRgm6kcmCxY
+                    USWoPwNyfke9gNT80f0pUj7wJ9YwWbTIz1rhf/h7rxoMYypXo+JXwaXW/Ra8v1uDcwfKpE5ZgwAU
+                    nubLXF4A+H7/N7ZvB5XDwJ4W+99nuPsKfwacD8m1sflTXcEPzzhOq6iQ9anJT94/pMctnp827zXA
+                    y66jvDrin5I=</ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+    </ds:Signature>
+    <saml2p:Extensions>
+        <stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
+        <stork:spCountry>IS</stork:spCountry>
+        <storkp:eIDSectorShare>false</storkp:eIDSectorShare>
+        <storkp:eIDCrossSectorShare>false</storkp:eIDCrossSectorShare>
+        <storkp:eIDCrossBorderShare>false</storkp:eIDCrossBorderShare>
+        <storkp:RequestedAttributes>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/docRequest" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:anyType">IS/IS/fbea6e68-0393-401b-b616-f767fff9418c</stork:AttributeValue>
+            </stork:RequestedAttribute>
+        </storkp:RequestedAttributes>
+    </saml2p:Extensions>
+    <saml2:Subject>
+        <saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer"/>
+    </saml2:Subject>
+</saml2p:AttributeQuery>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml
index becc689fe..5c04f5c93 100644
--- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryRequestTagDelete.xml
@@ -1,66 +1,66 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <saml2p:AttributeQuery xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified"
-	Destination="http://C-PEPS.gov.xx/PEPS/ColleagueRequest" ID="_f6c8fc355b9f125cb5283f038e1b3cdf"
-	IssueInstant="2013-10-03T10:28:15.449Z" Version="2.0">
-	<saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
-	<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-		<ds:SignatureValue>hhQXDKNrJJ3Yy/pkZNZF4GlWrA/Xsx4CH9chgVa5HK4qZQvFXvZwegdw6U7rm7qv0zmI4xaLTv/bpmqJzEPfY3sIvrDRu9EouEKwtjbMbcvVQsx7I+j0yy7/cBcQJe3lRwQwyvazfYVbnSeGFxBN6WOHPqv6uInaQO/hXkicT3tBtm8o3UgUDY6c8wIMuD5A0hWTkL6z6f893AbdN85OQYAdHItNsQWeLOIeiGC918X7qqTfhFtBAB2oGVjlsSEqWox1jNqrPl1jjA0dP76m5SIVSqF8XcDR306ZB9GLJywOHKba0lxGLsXOAzJ+8u9jeixJ6VZKFqZg2Fhl/saKbg==</ds:SignatureValue>
-		<ds:KeyInfo>
-			<ds:X509Data>
-				<ds:X509Certificate>MIIDJzCCAg8CBEuonbIwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNw
-					YWluMQ8wDQYDVQQHDAZNYWRyaWQxDjAMBgNVBAoMBUluZHJhMRgwFgYDVQQDDA9sb2NhbC1kZW1v
-					LWNlcnQwHhcNMTAwMzIzMTA1MzM4WhcNMTAwNjAxMTA1MzM4WjBYMQswCQYDVQQGEwJFUzEOMAwG
-					A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExGDAWBgNVBAMMD2xv
-					Y2FsLWRlbW8tY2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfdQ1/mkM9sqqab
-					ri8qqqX4s0J6UEEXyF+0AjLU8RC4WMeYFSZ5tfwnyLsoXY0/9bZLXnBxSibQYaf4SnpZJhlVA4sU
-					0d8qyEWA2OvXGDCm7uspGHG3CRQa7fpHsmHmfIAqho9XDlwpwJdx5gK4Edc6aArcMQfjqMhy1s1n
-					6Of1i1lMGGsGrERIRY7biIQu/8nITbHH18sUAZMG1u/Q0Avi9O3LWyswHXUouZ818fWwG6xru2N5
-					y6vtVO/SL3doRSdqYkEms93TgxTtaKg8XNe24zhNTte6nvWLaKesi2KzZGC57HU47HBFEs8NWk7z
-					9BDf8uLyPz9VDahwVKzMto8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAgpuReXQ7Dsfdoe5zzy2F
-					6kn1qqtMkRGsBPKnDFCI/GkIZpBiqlfwdh6sipnFKWfKEDlPKN1kEhbkDR2GA1Cp4F4ZSL/HumZM
-					pWabRhDxhTPvHIFbbShPDJY93+jw/yQeaWgMuhw3WzdH9TrVoRZH0Q7sG1pIJo5/6IogIZwFvJHT
-					/NDutKmurU6Lw8Vnde8PfnQd+FTEhz0SEGyKkWjAuhGbJfseBy/z3L+MJq1rdSQ9PF7wXDvWNzJq
-					yaNBUWWBV1TskvkNZXcaguroVPy2XhA1aixlAajWEXLk6Uuj5UYqalrV/reNYvDvY0BV2CIn51r7
-					Ppm8IFVTk8mYfX8/jw==</ds:X509Certificate>
-			</ds:X509Data>
-		</ds:KeyInfo>
-	</ds:Signature>
-	<saml2p:Extensions>
-		<stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
-		<storkp:eIDSectorShare>false</storkp:eIDSectorShare>
-		<storkp:eIDCrossSectorShare>false</storkp:eIDCrossSectorShare>
-		<storkp:eIDCrossBorderShare>false</storkp:eIDCrossBorderShare>
-		<storkp:RequestedAttributes>
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="false" />
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/isAgeOver"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true">
-				<stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">16</stork:AttributeValue>
-				<stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">18</stork:AttributeValue>
-			</stork:RequestedAttribute>
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/givenName"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true">
-				<stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">Sveinbjörn</stork:AttributeValue>
-			</stork:RequestedAttribute>
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/eIdentifier"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true">
-				<stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">ES/IS/1234567890</stork:AttributeValue>
-			</stork:RequestedAttribute>
-		</storkp:RequestedAttributes>
-	</saml2p:Extensions>
-	<saml2:Subject>
-		<saml2:SubjectConfirmation
-			Method="urn:oasis:names:tc:SAML:1.0:cm:sender-vouches" />
-	</saml2:Subject>
+                       xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
+                       xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
+                       xmlns:xs="http://www.w3.org/2001/XMLSchema" Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified"
+                       Destination="http://C-PEPS.gov.xx/PEPS/ColleagueRequest" ID="_f6c8fc355b9f125cb5283f038e1b3cdf"
+                       IssueInstant="2013-10-03T10:28:15.449Z" Version="2.0">
+    <saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
+    <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:SignatureValue>hhQXDKNrJJ3Yy/pkZNZF4GlWrA/Xsx4CH9chgVa5HK4qZQvFXvZwegdw6U7rm7qv0zmI4xaLTv/bpmqJzEPfY3sIvrDRu9EouEKwtjbMbcvVQsx7I+j0yy7/cBcQJe3lRwQwyvazfYVbnSeGFxBN6WOHPqv6uInaQO/hXkicT3tBtm8o3UgUDY6c8wIMuD5A0hWTkL6z6f893AbdN85OQYAdHItNsQWeLOIeiGC918X7qqTfhFtBAB2oGVjlsSEqWox1jNqrPl1jjA0dP76m5SIVSqF8XcDR306ZB9GLJywOHKba0lxGLsXOAzJ+8u9jeixJ6VZKFqZg2Fhl/saKbg==</ds:SignatureValue>
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>MIIDJzCCAg8CBEuonbIwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNw
+                    YWluMQ8wDQYDVQQHDAZNYWRyaWQxDjAMBgNVBAoMBUluZHJhMRgwFgYDVQQDDA9sb2NhbC1kZW1v
+                    LWNlcnQwHhcNMTAwMzIzMTA1MzM4WhcNMTAwNjAxMTA1MzM4WjBYMQswCQYDVQQGEwJFUzEOMAwG
+                    A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExGDAWBgNVBAMMD2xv
+                    Y2FsLWRlbW8tY2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfdQ1/mkM9sqqab
+                    ri8qqqX4s0J6UEEXyF+0AjLU8RC4WMeYFSZ5tfwnyLsoXY0/9bZLXnBxSibQYaf4SnpZJhlVA4sU
+                    0d8qyEWA2OvXGDCm7uspGHG3CRQa7fpHsmHmfIAqho9XDlwpwJdx5gK4Edc6aArcMQfjqMhy1s1n
+                    6Of1i1lMGGsGrERIRY7biIQu/8nITbHH18sUAZMG1u/Q0Avi9O3LWyswHXUouZ818fWwG6xru2N5
+                    y6vtVO/SL3doRSdqYkEms93TgxTtaKg8XNe24zhNTte6nvWLaKesi2KzZGC57HU47HBFEs8NWk7z
+                    9BDf8uLyPz9VDahwVKzMto8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAgpuReXQ7Dsfdoe5zzy2F
+                    6kn1qqtMkRGsBPKnDFCI/GkIZpBiqlfwdh6sipnFKWfKEDlPKN1kEhbkDR2GA1Cp4F4ZSL/HumZM
+                    pWabRhDxhTPvHIFbbShPDJY93+jw/yQeaWgMuhw3WzdH9TrVoRZH0Q7sG1pIJo5/6IogIZwFvJHT
+                    /NDutKmurU6Lw8Vnde8PfnQd+FTEhz0SEGyKkWjAuhGbJfseBy/z3L+MJq1rdSQ9PF7wXDvWNzJq
+                    yaNBUWWBV1TskvkNZXcaguroVPy2XhA1aixlAajWEXLk6Uuj5UYqalrV/reNYvDvY0BV2CIn51r7
+                    Ppm8IFVTk8mYfX8/jw==</ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+    </ds:Signature>
+    <saml2p:Extensions>
+        <stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
+        <storkp:eIDSectorShare>false</storkp:eIDSectorShare>
+        <storkp:eIDCrossSectorShare>false</storkp:eIDCrossSectorShare>
+        <storkp:eIDCrossBorderShare>false</storkp:eIDCrossBorderShare>
+        <storkp:RequestedAttributes>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="false" />
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/isAgeOver"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="true">
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                      xsi:type="xs:anyType">16</stork:AttributeValue>
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                      xsi:type="xs:anyType">18</stork:AttributeValue>
+            </stork:RequestedAttribute>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/givenName"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="true">
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                      xsi:type="xs:anyType">Sveinbjörn</stork:AttributeValue>
+            </stork:RequestedAttribute>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/eIdentifier"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="true">
+                <stork:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                      xsi:type="xs:anyType">ES/IS/1234567890</stork:AttributeValue>
+            </stork:RequestedAttribute>
+        </storkp:RequestedAttributes>
+    </saml2p:Extensions>
+    <saml2:Subject>
+        <saml2:SubjectConfirmation
+            Method="urn:oasis:names:tc:SAML:1.0:cm:sender-vouches" />
+    </saml2:Subject>
 </saml2p:AttributeQuery>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml
index 7ea486812..79c59f5ed 100644
--- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AttrQueryResponse.xml
@@ -1,124 +1,124 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <saml2p:Response xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" Consent="urn:oasis:names:tc:SAML:2.0:consent:obtained"
-	Destination="http://C-PEPS.gov.xx/PEPS/ColleagueRequest" ID="_483140d440fc4eef8e949ace49669f2e"
-	InResponseTo="_0a22c1120bf2de912714c24e99dd38ed" IssueInstant="2013-10-08T09:11:17.255Z"
-	Version="2.0">
-	<saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://C-PEPS.gov.xx</saml2:Issuer>
-	<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-		<ds:SignedInfo>
-			<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-			<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-			<ds:Reference URI="#_483140d440fc4eef8e949ace49669f2e">
-				<ds:Transforms>
-					<ds:Transform
-						Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
-					<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
-						<ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"
-							PrefixList="xs" />
-					</ds:Transform>
-				</ds:Transforms>
-				<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-				<ds:DigestValue>yMOVS1T/yRiVh3L6IBM9rR9Ie3w=</ds:DigestValue>
-			</ds:Reference>
-		</ds:SignedInfo>
-		<ds:SignatureValue>d8e/RyNNPmnHRIzTIuRSnW6B60oWGBGxjRua/HvNxTuod0qSarYJxEedhY9Wl1Z9WYXlry28FuKjp3DA3HhzNaVd7A7QpFqNC4dnizSVWFjxlhmoE/Uv3Y/ha9P/fk6nbtHCSKW4kHSX7QfFLeggcLmUG0IULRF8UmRdQ0WerCl0aSZZeSp8J3LsFBPeWCRSwXgfiLn+RehggzZmQU6g0ssxrpnsYEAtjAiOli+YVQGuumsZGaJ8zHA/DgJ2FTGovNUyfuSUFLhd9nLlSqFs2Avnx0Ck7Q1dxDO5truOm6e285YLHqLaGdetFyPQAj/Z4w4RJ5u5X6d7rhBjTfRAAw==</ds:SignatureValue>
-		<ds:KeyInfo>
-			<ds:X509Data>
-				<ds:X509Certificate>MIIDJzCCAg8CBEuonbIwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNw
-					YWluMQ8wDQYDVQQHDAZNYWRyaWQxDjAMBgNVBAoMBUluZHJhMRgwFgYDVQQDDA9sb2NhbC1kZW1v
-					LWNlcnQwHhcNMTAwMzIzMTA1MzM4WhcNMTAwNjAxMTA1MzM4WjBYMQswCQYDVQQGEwJFUzEOMAwG
-					A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExGDAWBgNVBAMMD2xv
-					Y2FsLWRlbW8tY2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfdQ1/mkM9sqqab
-					ri8qqqX4s0J6UEEXyF+0AjLU8RC4WMeYFSZ5tfwnyLsoXY0/9bZLXnBxSibQYaf4SnpZJhlVA4sU
-					0d8qyEWA2OvXGDCm7uspGHG3CRQa7fpHsmHmfIAqho9XDlwpwJdx5gK4Edc6aArcMQfjqMhy1s1n
-					6Of1i1lMGGsGrERIRY7biIQu/8nITbHH18sUAZMG1u/Q0Avi9O3LWyswHXUouZ818fWwG6xru2N5
-					y6vtVO/SL3doRSdqYkEms93TgxTtaKg8XNe24zhNTte6nvWLaKesi2KzZGC57HU47HBFEs8NWk7z
-					9BDf8uLyPz9VDahwVKzMto8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAgpuReXQ7Dsfdoe5zzy2F
-					6kn1qqtMkRGsBPKnDFCI/GkIZpBiqlfwdh6sipnFKWfKEDlPKN1kEhbkDR2GA1Cp4F4ZSL/HumZM
-					pWabRhDxhTPvHIFbbShPDJY93+jw/yQeaWgMuhw3WzdH9TrVoRZH0Q7sG1pIJo5/6IogIZwFvJHT
-					/NDutKmurU6Lw8Vnde8PfnQd+FTEhz0SEGyKkWjAuhGbJfseBy/z3L+MJq1rdSQ9PF7wXDvWNzJq
-					yaNBUWWBV1TskvkNZXcaguroVPy2XhA1aixlAajWEXLk6Uuj5UYqalrV/reNYvDvY0BV2CIn51r7
-					Ppm8IFVTk8mYfX8/jw==</ds:X509Certificate>
-			</ds:X509Data>
-		</ds:KeyInfo>
-	</ds:Signature>
-	<saml2p:Status>
-		<saml2p:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success" />
-		<saml2p:StatusMessage>urn:oasis:names:tc:SAML:2.0:status:Success</saml2p:StatusMessage>
-	</saml2p:Status>
-	<saml2:Assertion ID="_9ed05849dee5c154e62fa9e3ba53e9f3"
-		IssueInstant="2013-10-08T09:11:17.255Z" Version="2.0">
-		<saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://C-PEPS.gov.xx</saml2:Issuer>
-		<saml2:Subject>
-			<saml2:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
-				NameQualifier="http://C-PEPS.gov.xx">urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</saml2:NameID>
-			<saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
-				<saml2:SubjectConfirmationData
-					Address="111.222.333.444" InResponseTo="_0a22c1120bf2de912714c24e99dd38ed"
-					NotOnOrAfter="2013-10-08T09:16:17.255Z" />
-			</saml2:SubjectConfirmation>
-		</saml2:Subject>
-		<saml2:Conditions NotBefore="2013-10-08T09:11:17.255Z"
-			NotOnOrAfter="2013-10-08T09:16:17.255Z">
-			<saml2:AudienceRestriction>
-				<saml2:Audience>http://S-PEPS.gov.xx</saml2:Audience>
-			</saml2:AudienceRestriction>
-			<saml2:OneTimeUse />
-		</saml2:Conditions>
-		<saml2:AuthnStatement AuthnInstant="2013-10-08T09:11:17.255Z">
-			<saml2:SubjectLocality Address="111.222.333.444" />
-			<saml2:AuthnContext>
-				<saml2:AuthnContextDecl />
-			</saml2:AuthnContext>
-		</saml2:AuthnStatement>
-		<saml2:AttributeStatement>
-			<saml2:Attribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				stork:AttributeStatus="Available">
-				<saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">16/12/2008</saml2:AttributeValue>
-			</saml2:Attribute>
-			<saml2:Attribute
-				Name="http://www.stork.gov.eu/1.0/canonicalResidenceAddress"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				stork:AttributeStatus="Available">
-				<saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">
-					<stork:postalCode xsi:type="xs:anyType">105</stork:postalCode>
-					<stork:state xsi:type="xs:anyType">IS</stork:state>
-					<stork:streetNumber xsi:type="xs:anyType">10</stork:streetNumber>
-					<stork:streetName xsi:type="xs:anyType">Gudrunartun</stork:streetName>
-					<stork:town xsi:type="xs:anyType">Reykjavik</stork:town>
-				</saml2:AttributeValue>
-			</saml2:Attribute>
-			<saml2:Attribute Name="http://www.stork.gov.eu/1.0/newAttribute2"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				stork:AttributeStatus="Available">
-				<saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">
-					<stork:value3 xsi:type="xs:anyType">value3</stork:value3>
-					<stork:value4 xsi:type="xs:anyType">value4</stork:value4>
-					<stork:value1 xsi:type="xs:anyType">value1</stork:value1>
-					<stork:value2 xsi:type="xs:anyType">value2</stork:value2>
-				</saml2:AttributeValue>
-			</saml2:Attribute>
-			<saml2:Attribute Name="http://www.stork.gov.eu/1.0/isAgeOver"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				stork:AttributeStatus="Available">
-				<saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">16</saml2:AttributeValue>
-				<saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">18</saml2:AttributeValue>
-			</saml2:Attribute>
-			<saml2:Attribute Name="http://www.stork.gov.eu/1.0/eIdentifier"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				stork:AttributeStatus="Available">
-				<saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-					xsi:type="xs:anyType">123456789IS</saml2:AttributeValue>
-			</saml2:Attribute>
-		</saml2:AttributeStatement>
-	</saml2:Assertion>
+                 xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
+                 xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
+                 xmlns:xs="http://www.w3.org/2001/XMLSchema" Consent="urn:oasis:names:tc:SAML:2.0:consent:obtained"
+                 Destination="http://C-PEPS.gov.xx/PEPS/ColleagueRequest" ID="_483140d440fc4eef8e949ace49669f2e"
+                 InResponseTo="_0a22c1120bf2de912714c24e99dd38ed" IssueInstant="2013-10-08T09:11:17.255Z"
+                 Version="2.0">
+    <saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://C-PEPS.gov.xx</saml2:Issuer>
+    <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:SignedInfo>
+            <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+            <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+            <ds:Reference URI="#_483140d440fc4eef8e949ace49669f2e">
+                <ds:Transforms>
+                    <ds:Transform
+                        Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+                    <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
+                        <ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"
+                                                PrefixList="xs" />
+                    </ds:Transform>
+                </ds:Transforms>
+                <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+                <ds:DigestValue>yMOVS1T/yRiVh3L6IBM9rR9Ie3w=</ds:DigestValue>
+            </ds:Reference>
+        </ds:SignedInfo>
+        <ds:SignatureValue>d8e/RyNNPmnHRIzTIuRSnW6B60oWGBGxjRua/HvNxTuod0qSarYJxEedhY9Wl1Z9WYXlry28FuKjp3DA3HhzNaVd7A7QpFqNC4dnizSVWFjxlhmoE/Uv3Y/ha9P/fk6nbtHCSKW4kHSX7QfFLeggcLmUG0IULRF8UmRdQ0WerCl0aSZZeSp8J3LsFBPeWCRSwXgfiLn+RehggzZmQU6g0ssxrpnsYEAtjAiOli+YVQGuumsZGaJ8zHA/DgJ2FTGovNUyfuSUFLhd9nLlSqFs2Avnx0Ck7Q1dxDO5truOm6e285YLHqLaGdetFyPQAj/Z4w4RJ5u5X6d7rhBjTfRAAw==</ds:SignatureValue>
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>MIIDJzCCAg8CBEuonbIwDQYJKoZIhvcNAQEFBQAwWDELMAkGA1UEBhMCRVMxDjAMBgNVBAgMBVNw
+                    YWluMQ8wDQYDVQQHDAZNYWRyaWQxDjAMBgNVBAoMBUluZHJhMRgwFgYDVQQDDA9sb2NhbC1kZW1v
+                    LWNlcnQwHhcNMTAwMzIzMTA1MzM4WhcNMTAwNjAxMTA1MzM4WjBYMQswCQYDVQQGEwJFUzEOMAwG
+                    A1UECAwFU3BhaW4xDzANBgNVBAcMBk1hZHJpZDEOMAwGA1UECgwFSW5kcmExGDAWBgNVBAMMD2xv
+                    Y2FsLWRlbW8tY2VydDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJfdQ1/mkM9sqqab
+                    ri8qqqX4s0J6UEEXyF+0AjLU8RC4WMeYFSZ5tfwnyLsoXY0/9bZLXnBxSibQYaf4SnpZJhlVA4sU
+                    0d8qyEWA2OvXGDCm7uspGHG3CRQa7fpHsmHmfIAqho9XDlwpwJdx5gK4Edc6aArcMQfjqMhy1s1n
+                    6Of1i1lMGGsGrERIRY7biIQu/8nITbHH18sUAZMG1u/Q0Avi9O3LWyswHXUouZ818fWwG6xru2N5
+                    y6vtVO/SL3doRSdqYkEms93TgxTtaKg8XNe24zhNTte6nvWLaKesi2KzZGC57HU47HBFEs8NWk7z
+                    9BDf8uLyPz9VDahwVKzMto8CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAgpuReXQ7Dsfdoe5zzy2F
+                    6kn1qqtMkRGsBPKnDFCI/GkIZpBiqlfwdh6sipnFKWfKEDlPKN1kEhbkDR2GA1Cp4F4ZSL/HumZM
+                    pWabRhDxhTPvHIFbbShPDJY93+jw/yQeaWgMuhw3WzdH9TrVoRZH0Q7sG1pIJo5/6IogIZwFvJHT
+                    /NDutKmurU6Lw8Vnde8PfnQd+FTEhz0SEGyKkWjAuhGbJfseBy/z3L+MJq1rdSQ9PF7wXDvWNzJq
+                    yaNBUWWBV1TskvkNZXcaguroVPy2XhA1aixlAajWEXLk6Uuj5UYqalrV/reNYvDvY0BV2CIn51r7
+                    Ppm8IFVTk8mYfX8/jw==</ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+    </ds:Signature>
+    <saml2p:Status>
+        <saml2p:StatusCode Value="urn:oasis:names:tc:SAML:2.0:status:Success" />
+        <saml2p:StatusMessage>urn:oasis:names:tc:SAML:2.0:status:Success</saml2p:StatusMessage>
+    </saml2p:Status>
+    <saml2:Assertion ID="_9ed05849dee5c154e62fa9e3ba53e9f3"
+                     IssueInstant="2013-10-08T09:11:17.255Z" Version="2.0">
+        <saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://C-PEPS.gov.xx</saml2:Issuer>
+        <saml2:Subject>
+            <saml2:NameID Format="urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified"
+                          NameQualifier="http://C-PEPS.gov.xx">urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</saml2:NameID>
+            <saml2:SubjectConfirmation Method="urn:oasis:names:tc:SAML:2.0:cm:bearer">
+                <saml2:SubjectConfirmationData
+                    Address="111.222.333.444" InResponseTo="_0a22c1120bf2de912714c24e99dd38ed"
+                    NotOnOrAfter="2013-10-08T09:16:17.255Z" />
+            </saml2:SubjectConfirmation>
+        </saml2:Subject>
+        <saml2:Conditions NotBefore="2013-10-08T09:11:17.255Z"
+                          NotOnOrAfter="2013-10-08T09:16:17.255Z">
+            <saml2:AudienceRestriction>
+                <saml2:Audience>http://S-PEPS.gov.xx</saml2:Audience>
+            </saml2:AudienceRestriction>
+            <saml2:OneTimeUse />
+        </saml2:Conditions>
+        <saml2:AuthnStatement AuthnInstant="2013-10-08T09:11:17.255Z">
+            <saml2:SubjectLocality Address="111.222.333.444" />
+            <saml2:AuthnContext>
+                <saml2:AuthnContextDecl />
+            </saml2:AuthnContext>
+        </saml2:AuthnStatement>
+        <saml2:AttributeStatement>
+            <saml2:Attribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
+                             NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                             stork:AttributeStatus="Available">
+                <saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                      xsi:type="xs:anyType">16/12/2008</saml2:AttributeValue>
+            </saml2:Attribute>
+            <saml2:Attribute
+                Name="http://www.stork.gov.eu/1.0/canonicalResidenceAddress"
+                NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                stork:AttributeStatus="Available">
+                <saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                      xsi:type="xs:anyType">
+                    <stork:postalCode xsi:type="xs:anyType">105</stork:postalCode>
+                    <stork:state xsi:type="xs:anyType">IS</stork:state>
+                    <stork:streetNumber xsi:type="xs:anyType">10</stork:streetNumber>
+                    <stork:streetName xsi:type="xs:anyType">Gudrunartun</stork:streetName>
+                    <stork:town xsi:type="xs:anyType">Reykjavik</stork:town>
+                </saml2:AttributeValue>
+            </saml2:Attribute>
+            <saml2:Attribute Name="http://www.stork.gov.eu/1.0/newAttribute2"
+                             NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                             stork:AttributeStatus="Available">
+                <saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                      xsi:type="xs:anyType">
+                    <stork:value3 xsi:type="xs:anyType">value3</stork:value3>
+                    <stork:value4 xsi:type="xs:anyType">value4</stork:value4>
+                    <stork:value1 xsi:type="xs:anyType">value1</stork:value1>
+                    <stork:value2 xsi:type="xs:anyType">value2</stork:value2>
+                </saml2:AttributeValue>
+            </saml2:Attribute>
+            <saml2:Attribute Name="http://www.stork.gov.eu/1.0/isAgeOver"
+                             NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                             stork:AttributeStatus="Available">
+                <saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                      xsi:type="xs:anyType">16</saml2:AttributeValue>
+                <saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                      xsi:type="xs:anyType">18</saml2:AttributeValue>
+            </saml2:Attribute>
+            <saml2:Attribute Name="http://www.stork.gov.eu/1.0/eIdentifier"
+                             NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                             stork:AttributeStatus="Available">
+                <saml2:AttributeValue xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                                      xsi:type="xs:anyType">123456789IS</saml2:AttributeValue>
+            </saml2:Attribute>
+        </saml2:AttributeStatement>
+    </saml2:Assertion>
 </saml2p:Response>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml
index c48bfde95..93e778113 100644
--- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequest.xml
@@ -1,72 +1,72 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <saml2p:AuthnRequest xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
-	AssertionConsumerServiceURL="http://S-PEPS.gov.xx/PEPS/ColleagueResponse"
-	Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://C-PEPS.gov.xx/PEPS/ColleagueRequest"
-	ForceAuthn="true" ID="_e54eee285e7b8e2772875c406ec39674" IsPassive="false"
-	IssueInstant="2010-06-08T07:37:54.533Z" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-	ProviderName="University of Oxford" Version="2.0">
-	<saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
-	<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-		<ds:SignedInfo>
-			<ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
-			<ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
-			<ds:Reference URI="#_e54eee285e7b8e2772875c406ec39674">
-				<ds:Transforms>
-					<ds:Transform
-						Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
-					<ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
-						<ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"
-							PrefixList="ds saml2 saml2p stork storkp xs" />
-					</ds:Transform>
-				</ds:Transforms>
-				<ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
-				<ds:DigestValue>yzsqaxBNicOrixBUno5cL0CBOpE=</ds:DigestValue>
-			</ds:Reference>
-		</ds:SignedInfo>
-		<ds:SignatureValue>
-			Xycll1PF7hh3Xdykpr6nIr8Q6PQ6OxLIBBBugoGpAm/V4Hu7tKakHJp8TgtRWZ30jG5eolOXnJkC
-			wiaTVUFaQz7cNn27syRJkdA+eYlz9doiwUJ5eD1cAyddZYsNPpSeAj5UK45oN0qCH+/pI9mRw8Oi
-			YIN/BUEtXkoYTjPtkmA=
-		</ds:SignatureValue>
-		<ds:KeyInfo>
-			<ds:X509Data>
-				<ds:X509Certificate>MIIBmDCCAQECBEuWisIwDQYJKoZIhvcNAQEFBQAwEzERMA8GA1UEAxMIY291bnRyeTEwHhcNMTAw
-					MzA5MTc1MjAyWhcNMTAwNjA3MTc1MjAyWjATMREwDwYDVQQDEwhjb3VudHJ5MTCBnzANBgkqhkiG
-					9w0BAQEFAAOBjQAwgYkCgYEAnb2gcchwxvJBclcsfCBWJnYefLJYQnDGCQ3RUtYZc26JznnLXclu
-					h1XfLJlWgYk/pFKz7B9KfJztal47c6mBfisnxjhdcLqcbXOuRIm7E8TZPzdbHEd60WHPDv20jr+r
-					/WkOQs12tKQMbgDX2wtBBcJODLYCDiYa1oQsnyhdOGkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBk
-					3luVRc0EqEE1zZeYvRPi5a2yOZfI9H+/rXI1qNLwmICnuJX++ukUbqJHm/FV1iSPM9O9oqzifJ/K
-					eKL5EcUugJ76Tu5XO8za2FoJvYr+jIZDsEkCg+OSzcp/eljiWAIh2enZcQ/ON6QxWXeSNJPH0xOq
-					KAoZgbUK0Zld3Dsheg==</ds:X509Certificate>
-			</ds:X509Data>
-		</ds:KeyInfo>
-	</ds:Signature>
-	<saml2p:Extensions>
-		<stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
-		<stork:spSector>EDU001</stork:spSector>
-		<stork:spInstitution>OXF001</stork:spInstitution>
-		<stork:spApplication>APP001</stork:spApplication>
-		<stork:spCountry>EN</stork:spCountry>
-		<storkp:eIDSectorShare>true</storkp:eIDSectorShare>
-		<storkp:eIDCrossSectorShare>true</storkp:eIDCrossSectorShare>
-		<storkp:eIDCrossBorderShare>true</storkp:eIDCrossBorderShare>
-		<storkp:RequestedAttributes>
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/isAgeOver"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true">
-				<stork:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema"
-					xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">16</stork:AttributeValue>
-				<stork:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema"
-					xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">18</stork:AttributeValue>
-			</stork:RequestedAttribute>
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="false" />
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/eIdentifier"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true" />
-		</storkp:RequestedAttributes>
-	</saml2p:Extensions>
+                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
+                     xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:assertion" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
+                     AssertionConsumerServiceURL="http://S-PEPS.gov.xx/PEPS/ColleagueResponse"
+                     Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://C-PEPS.gov.xx/PEPS/ColleagueRequest"
+                     ForceAuthn="true" ID="_e54eee285e7b8e2772875c406ec39674" IsPassive="false"
+                     IssueInstant="2010-06-08T07:37:54.533Z" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+                     ProviderName="University of Oxford" Version="2.0">
+    <saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
+    <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:SignedInfo>
+            <ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#" />
+            <ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1" />
+            <ds:Reference URI="#_e54eee285e7b8e2772875c406ec39674">
+                <ds:Transforms>
+                    <ds:Transform
+                        Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature" />
+                    <ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#">
+                        <ec:InclusiveNamespaces xmlns:ec="http://www.w3.org/2001/10/xml-exc-c14n#"
+                                                PrefixList="ds saml2 saml2p stork storkp xs" />
+                    </ds:Transform>
+                </ds:Transforms>
+                <ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1" />
+                <ds:DigestValue>yzsqaxBNicOrixBUno5cL0CBOpE=</ds:DigestValue>
+            </ds:Reference>
+        </ds:SignedInfo>
+        <ds:SignatureValue>
+            Xycll1PF7hh3Xdykpr6nIr8Q6PQ6OxLIBBBugoGpAm/V4Hu7tKakHJp8TgtRWZ30jG5eolOXnJkC
+            wiaTVUFaQz7cNn27syRJkdA+eYlz9doiwUJ5eD1cAyddZYsNPpSeAj5UK45oN0qCH+/pI9mRw8Oi
+            YIN/BUEtXkoYTjPtkmA=
+        </ds:SignatureValue>
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>MIIBmDCCAQECBEuWisIwDQYJKoZIhvcNAQEFBQAwEzERMA8GA1UEAxMIY291bnRyeTEwHhcNMTAw
+                    MzA5MTc1MjAyWhcNMTAwNjA3MTc1MjAyWjATMREwDwYDVQQDEwhjb3VudHJ5MTCBnzANBgkqhkiG
+                    9w0BAQEFAAOBjQAwgYkCgYEAnb2gcchwxvJBclcsfCBWJnYefLJYQnDGCQ3RUtYZc26JznnLXclu
+                    h1XfLJlWgYk/pFKz7B9KfJztal47c6mBfisnxjhdcLqcbXOuRIm7E8TZPzdbHEd60WHPDv20jr+r
+                    /WkOQs12tKQMbgDX2wtBBcJODLYCDiYa1oQsnyhdOGkCAwEAATANBgkqhkiG9w0BAQUFAAOBgQBk
+                    3luVRc0EqEE1zZeYvRPi5a2yOZfI9H+/rXI1qNLwmICnuJX++ukUbqJHm/FV1iSPM9O9oqzifJ/K
+                    eKL5EcUugJ76Tu5XO8za2FoJvYr+jIZDsEkCg+OSzcp/eljiWAIh2enZcQ/ON6QxWXeSNJPH0xOq
+                    KAoZgbUK0Zld3Dsheg==</ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+    </ds:Signature>
+    <saml2p:Extensions>
+        <stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
+        <stork:spSector>EDU001</stork:spSector>
+        <stork:spInstitution>OXF001</stork:spInstitution>
+        <stork:spApplication>APP001</stork:spApplication>
+        <stork:spCountry>EN</stork:spCountry>
+        <storkp:eIDSectorShare>true</storkp:eIDSectorShare>
+        <storkp:eIDCrossSectorShare>true</storkp:eIDCrossSectorShare>
+        <storkp:eIDCrossBorderShare>true</storkp:eIDCrossBorderShare>
+        <storkp:RequestedAttributes>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/isAgeOver"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="true">
+                <stork:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">16</stork:AttributeValue>
+                <stork:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema"
+                                      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:type="xs:string">18</stork:AttributeValue>
+            </stork:RequestedAttribute>
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="false" />
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/eIdentifier"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="true" />
+        </storkp:RequestedAttributes>
+    </saml2p:Extensions>
 </saml2p:AuthnRequest>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml
index 8766f9a8b..cca0dbc27 100644
--- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDelete.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <saml2p:AuthnRequest xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:stork" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
-	AssertionConsumerServiceURL="http://localhost:8080/SP/ReturnPage"
-	Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://locahost:8080/PEPS/ServiceProvider"
-	ForceAuthn="true" ID="_0c64ff85-1323-4618-847b-12d1983b86e4" IsPassive="false"
-	IssueInstant="2010-04-07T16:45:03.593Z" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-	ProviderName="PT-SP" Version="2.0">
-	<saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
-	<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-		<ds:SignatureValue>
-			S6nY97RSCUJXq3HZ5obSLCI341LvtAA3vHjR1FWxrIMDPACQMqlNWBYNnRP1RiZiJV6x0RieH+SR
-			Vkiy03jYyhr0XkwAE5Wd6Huf+zIbeTXjZkdQj7JpAXoB+ky4G/+L0deamvsP3eO7ZJ4grady4gmC
-			Xt8p8tK3EoMocZse2hw=
-		</ds:SignatureValue>
-		<ds:KeyInfo>
-			<ds:X509Data>
-				<ds:X509Certificate>MIIBkTCB+wIESpT8bTANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVzdG9yazAeFw0wOTA4MjYw
-					OTEyMTNaFw0wOTExMjQwOTEyMTNaMBAxDjAMBgNVBAMTBXN0b3JrMIGfMA0GCSqGSIb3DQEBAQUA
-					A4GNADCBiQKBgQDK/QL8NuMd41I1lObObeRA6DaM8bjeYqIz5mg5WnnZv4jlcK7Gq89Lk6htXRFl
-					lAXpDYhI3zolMIMHEMZ3zQQPc7lgTV6Bbz9uD2YTJ9Kx55e8Y6Y49DO+TiiejGJxTzTFUcuBJHaK
-					ipuvLVd1a8N3RAnaGSUOozhrTqxba82mEwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFJgeS18nhUl
-					r7WnvSn9FlkI94U//Hk3iZLc3/cScTu7D7Y/J0eUq4TF8PsSzWX5khGuqrTkswNgfEtl2IpACQ2w
-					kB8+RxeRNdddQlGHlO4ZqnpvxXBwSouiy2yUeAo0y++vMFm6DO4sxfk8eTtimPDo5SzBtjtGtbqS
-					3cyl/wz8</ds:X509Certificate>
-			</ds:X509Data>
-		</ds:KeyInfo>
-	</ds:Signature>
-	<saml2p:Extensions>
-		<stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
-		<storkp:eIDSectorShare>false</storkp:eIDSectorShare>
-		<storkp:eIDCrossSectorShare>false</storkp:eIDCrossSectorShare>
-		<storkp:eIDCrossBorderShare>false</storkp:eIDCrossBorderShare>
-		<storkp:RequestedAttributes>
-			<stork:RequestedAttribute
-				Name="http://www.stork.gov.eu/1.0/nationalityCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true" />
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true" />
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/givenName"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true" />
-		</storkp:RequestedAttributes>
-	</saml2p:Extensions>
+                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
+                     xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:stork" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
+                     AssertionConsumerServiceURL="http://localhost:8080/SP/ReturnPage"
+                     Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://locahost:8080/PEPS/ServiceProvider"
+                     ForceAuthn="true" ID="_0c64ff85-1323-4618-847b-12d1983b86e4" IsPassive="false"
+                     IssueInstant="2010-04-07T16:45:03.593Z" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+                     ProviderName="PT-SP" Version="2.0">
+    <saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
+    <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:SignatureValue>
+            S6nY97RSCUJXq3HZ5obSLCI341LvtAA3vHjR1FWxrIMDPACQMqlNWBYNnRP1RiZiJV6x0RieH+SR
+            Vkiy03jYyhr0XkwAE5Wd6Huf+zIbeTXjZkdQj7JpAXoB+ky4G/+L0deamvsP3eO7ZJ4grady4gmC
+            Xt8p8tK3EoMocZse2hw=
+        </ds:SignatureValue>
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>MIIBkTCB+wIESpT8bTANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVzdG9yazAeFw0wOTA4MjYw
+                    OTEyMTNaFw0wOTExMjQwOTEyMTNaMBAxDjAMBgNVBAMTBXN0b3JrMIGfMA0GCSqGSIb3DQEBAQUA
+                    A4GNADCBiQKBgQDK/QL8NuMd41I1lObObeRA6DaM8bjeYqIz5mg5WnnZv4jlcK7Gq89Lk6htXRFl
+                    lAXpDYhI3zolMIMHEMZ3zQQPc7lgTV6Bbz9uD2YTJ9Kx55e8Y6Y49DO+TiiejGJxTzTFUcuBJHaK
+                    ipuvLVd1a8N3RAnaGSUOozhrTqxba82mEwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFJgeS18nhUl
+                    r7WnvSn9FlkI94U//Hk3iZLc3/cScTu7D7Y/J0eUq4TF8PsSzWX5khGuqrTkswNgfEtl2IpACQ2w
+                    kB8+RxeRNdddQlGHlO4ZqnpvxXBwSouiy2yUeAo0y++vMFm6DO4sxfk8eTtimPDo5SzBtjtGtbqS
+                    3cyl/wz8</ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+    </ds:Signature>
+    <saml2p:Extensions>
+        <stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
+        <storkp:eIDSectorShare>false</storkp:eIDSectorShare>
+        <storkp:eIDCrossSectorShare>false</storkp:eIDCrossSectorShare>
+        <storkp:eIDCrossBorderShare>false</storkp:eIDCrossBorderShare>
+        <storkp:RequestedAttributes>
+            <stork:RequestedAttribute
+                Name="http://www.stork.gov.eu/1.0/nationalityCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                isRequired="true" />
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="true" />
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/givenName"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="true" />
+        </storkp:RequestedAttributes>
+    </saml2p:Extensions>
 </saml2p:AuthnRequest>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDeleteEncoded.xml b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDeleteEncoded.xml
index 1b1e1646c..db606145c 100644
--- a/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDeleteEncoded.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/data/eu/stork/STORKSAMLEngine/AuthnRequestTagDeleteEncoded.xml
@@ -1,47 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <saml2p:AuthnRequest xmlns:saml2p="urn:oasis:names:tc:SAML:2.0:protocol"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
-	xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:stork" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
-	AssertionConsumerServiceURL="http://localhost:8080/SP/ReturnPage"
-	Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://localhost:8080/PEPS/ServiceProvider"
-	ForceAuthn="true" ID="_0c64ff85-1323-4618-847b-12d1983b86e4" IsPassive="false"
-	IssueInstant="2010-04-07T16:45:03.593Z" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
-	ProviderName="PT-SP" Version="2.0">
-	<saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
-	<ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-		<ds:SignatureValue>
-			S6nY97RSCUJXq3HZ5obSLCI341LvtAA3vHjR1FWxrIMDPACQMqlNWBYNnRP1RiZiJV6x0RieH+SR
-			Vkiy03jYyhr0XkwAE5Wd6Huf+zIbeTXjZkdQj7JpAXoB+ky4G/+L0deamvsP3eO7ZJ4grady4gmC
-			Xt8p8tK3EoMocZse2hw=
-		</ds:SignatureValue>
-		<ds:KeyInfo>
-			<ds:X509Data>
-				<ds:X509Certificate>MIIBkTCB+wIESpT8bTANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVzdG9yazAeFw0wOTA4MjYw
-					OTEyMTNaFw0wOTExMjQwOTEyMTNaMBAxDjAMBgNVBAMTBXN0b3JrMIGfMA0GCSqGSIb3DQEBAQUA
-					A4GNADCBiQKBgQDK/QL8NuMd41I1lObObeRA6DaM8bjeYqIz5mg5WnnZv4jlcK7Gq89Lk6htXRFl
-					lAXpDYhI3zolMIMHEMZ3zQQPc7lgTV6Bbz9uD2YTJ9Kx55e8Y6Y49DO+TiiejGJxTzTFUcuBJHaK
-					ipuvLVd1a8N3RAnaGSUOozhrTqxba82mEwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFJgeS18nhUl
-					r7WnvSn9FlkI94U//Hk3iZLc3/cScTu7D7Y/J0eUq4TF8PsSzWX5khGuqrTkswNgfEtl2IpACQ2w
-					kB8+RxeRNdddQlGHlO4ZqnpvxXBwSouiy2yUeAo0y++vMFm6DO4sxfk8eTtimPDo5SzBtjtGtbqS
-					3cyl/wz8</ds:X509Certificate>
-			</ds:X509Data>
-		</ds:KeyInfo>
-	</ds:Signature>
-	<saml2p:Extensions>
-		<stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
-		<storkp:eIDSectorShare>false</storkp:eIDSectorShare>
-		<storkp:eIDCrossSectorShare>false</storkp:eIDCrossSectorShare>
-		<storkp:eIDCrossBorderShare>false</storkp:eIDCrossBorderShare>
-		<storkp:RequestedAttributes>
-			<stork:RequestedAttribute
-				Name="http://www.stork.gov.eu/1.0/nationalityCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true" />
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true" />
-			<stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/givenName"
-				NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
-				isRequired="true" />
-		</storkp:RequestedAttributes>
-	</saml2p:Extensions>
+                     xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:saml2="urn:oasis:names:tc:SAML:2.0:assertion"
+                     xmlns:stork="urn:eu:stork:names:tc:STORK:1.0:stork" xmlns:storkp="urn:eu:stork:names:tc:STORK:1.0:protocol"
+                     AssertionConsumerServiceURL="http://localhost:8080/SP/ReturnPage"
+                     Consent="urn:oasis:names:tc:SAML:2.0:consent:unspecified" Destination="http://localhost:8080/PEPS/ServiceProvider"
+                     ForceAuthn="true" ID="_0c64ff85-1323-4618-847b-12d1983b86e4" IsPassive="false"
+                     IssueInstant="2010-04-07T16:45:03.593Z" ProtocolBinding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST"
+                     ProviderName="PT-SP" Version="2.0">
+    <saml2:Issuer Format="urn:oasis:names:tc:SAML:2.0:nameid-format:entity">http://S-PEPS.gov.xx</saml2:Issuer>
+    <ds:Signature xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:SignatureValue>
+            S6nY97RSCUJXq3HZ5obSLCI341LvtAA3vHjR1FWxrIMDPACQMqlNWBYNnRP1RiZiJV6x0RieH+SR
+            Vkiy03jYyhr0XkwAE5Wd6Huf+zIbeTXjZkdQj7JpAXoB+ky4G/+L0deamvsP3eO7ZJ4grady4gmC
+            Xt8p8tK3EoMocZse2hw=
+        </ds:SignatureValue>
+        <ds:KeyInfo>
+            <ds:X509Data>
+                <ds:X509Certificate>MIIBkTCB+wIESpT8bTANBgkqhkiG9w0BAQUFADAQMQ4wDAYDVQQDEwVzdG9yazAeFw0wOTA4MjYw
+                    OTEyMTNaFw0wOTExMjQwOTEyMTNaMBAxDjAMBgNVBAMTBXN0b3JrMIGfMA0GCSqGSIb3DQEBAQUA
+                    A4GNADCBiQKBgQDK/QL8NuMd41I1lObObeRA6DaM8bjeYqIz5mg5WnnZv4jlcK7Gq89Lk6htXRFl
+                    lAXpDYhI3zolMIMHEMZ3zQQPc7lgTV6Bbz9uD2YTJ9Kx55e8Y6Y49DO+TiiejGJxTzTFUcuBJHaK
+                    ipuvLVd1a8N3RAnaGSUOozhrTqxba82mEwIDAQABMA0GCSqGSIb3DQEBBQUAA4GBAFJgeS18nhUl
+                    r7WnvSn9FlkI94U//Hk3iZLc3/cScTu7D7Y/J0eUq4TF8PsSzWX5khGuqrTkswNgfEtl2IpACQ2w
+                    kB8+RxeRNdddQlGHlO4ZqnpvxXBwSouiy2yUeAo0y++vMFm6DO4sxfk8eTtimPDo5SzBtjtGtbqS
+                    3cyl/wz8</ds:X509Certificate>
+            </ds:X509Data>
+        </ds:KeyInfo>
+    </ds:Signature>
+    <saml2p:Extensions>
+        <stork:QualityAuthenticationAssuranceLevel>3</stork:QualityAuthenticationAssuranceLevel>
+        <storkp:eIDSectorShare>false</storkp:eIDSectorShare>
+        <storkp:eIDCrossSectorShare>false</storkp:eIDCrossSectorShare>
+        <storkp:eIDCrossBorderShare>false</storkp:eIDCrossBorderShare>
+        <storkp:RequestedAttributes>
+            <stork:RequestedAttribute
+                Name="http://www.stork.gov.eu/1.0/nationalityCode" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                isRequired="true" />
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/dateOfBirth"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="true" />
+            <stork:RequestedAttribute Name="http://www.stork.gov.eu/1.0/givenName"
+                                      NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
+                                      isRequired="true" />
+        </storkp:RequestedAttributes>
+    </saml2p:Extensions>
 </saml2p:AuthnRequest>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/logback-test.xml b/id/server/stork2-saml-engine/src/test/resources/logback-test.xml
index 99d7d353a..84d48c00e 100644
--- a/id/server/stork2-saml-engine/src/test/resources/logback-test.xml
+++ b/id/server/stork2-saml-engine/src/test/resources/logback-test.xml
@@ -2,20 +2,20 @@
 <!-- Basic configuration used until the IdP can load the real configuration -->
 <configuration>
 
-	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
-		<layout class="ch.qos.logback.classic.PatternLayout">
-			<Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
-			</Pattern>
-		</layout>
-	</appender>
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <layout class="ch.qos.logback.classic.PatternLayout">
+            <Pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n
+            </Pattern>
+        </layout>
+    </appender>
 
-	<logger name="eu.stork">
-		<level value="DEBUG" />
-	</logger>
+    <logger name="eu.stork">
+        <level value="DEBUG" />
+    </logger>
 
-	<root>
-		<appender-ref ref="STDOUT" />
-		<level value="INFO" />
-	</root>
+    <root>
+        <appender-ref ref="STDOUT" />
+        <level value="INFO" />
+    </root>
 
 </configuration>
\ No newline at end of file
diff --git a/id/server/stork2-saml-engine/src/test/resources/p11Conf.cfg b/id/server/stork2-saml-engine/src/test/resources/p11Conf.cfg
index bd9f357ce..84f7050d1 100644
--- a/id/server/stork2-saml-engine/src/test/resources/p11Conf.cfg
+++ b/id/server/stork2-saml-engine/src/test/resources/p11Conf.cfg
@@ -1,21 +1,15 @@
-//ATTRIBUTE			VALUE
-//name				name suffix of this provider instance
-//library			pathname of PKCS#11 implementation
-//slotListIndex		slot index
-
-//PREFIX			DESCRIPTION
-//CKO_ 				Object class
-//CKA_ 				Attribute
-//CKK_ 				Key type
-
-//attributes(operation, keytype, keyalgorithm) = {
-//  name1 = value1
-//  [...]
-//}
-
-name=nameProvider
-library=library.dll
-slotListIndex=0
+name=OpenDNSSEC
+library = /usr/lib/softhsm/libsofthsm.so
+slot = 0
+attributes(generate, *, *) = {
+	CKA_TOKEN = true
+}
+attributes(generate, CKO_CERTIFICATE, *) = {
+   CKA_PRIVATE = false
+}
+attributes(generate, CKO_PUBLIC_KEY, *) = {
+   CKA_PRIVATE = false
+}
 attributes(*,CKO_PUBLIC_KEY,CKK_RSA)={
 	CKA_VERIFY=true
 }