Merge STORK2 code into development branch

200 files changed, 36717 insertions, 3508 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
index a33c4fdf4..5e4aee81b 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/AuthenticationServer.java
@@ -1781,6 +1781,7 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 		// add sign request
 		PersonalAttribute newAttribute = new PersonalAttribute();
 		newAttribute.setName("signedDoc");
+		newAttribute.setIsRequired(true);
 		List<String> value = new ArrayList<String>();
 
 		Logger.debug("PEPS supports XMLSignatures:"+cpeps.isXMLSignatureSupported());
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
index 192f139eb..1e6cf6910 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
@@ -45,7 +45,7 @@ import at.gv.egovernment.moa.id.storage.AssertionStorage;
 import at.gv.egovernment.moa.logging.Logger;
 import eu.stork.peps.auth.commons.*;
 import eu.stork.peps.auth.engine.STORKSAMLEngine;
-import eu.stork.peps.complex.attributes.AttributeStatusType;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.AttributeStatusType;
 import eu.stork.peps.exceptions.STORKSAMLEngineException;
 
 import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java
index de7d5d6dd..2c5728798 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java
@@ -41,7 +41,7 @@ import eu.stork.peps.auth.commons.PEPSUtil;
 import eu.stork.peps.auth.commons.PersonalAttribute;
 import eu.stork.peps.auth.commons.STORKAuthnResponse;
 import eu.stork.peps.auth.engine.STORKSAMLEngine;
-import eu.stork.peps.complex.attributes.AttributeStatusType;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.AttributeStatusType;
 import eu.stork.peps.exceptions.STORKSAMLEngineException;
 import org.apache.velocity.Template;
 import org.apache.velocity.VelocityContext;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/CorporateBodyMandateContainer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/CorporateBodyMandateContainer.java
index 3e16db7d2..acbf1678a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/CorporateBodyMandateContainer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/CorporateBodyMandateContainer.java
@@ -90,6 +90,7 @@ public class CorporateBodyMandateContainer extends MandateContainer {
     }
 
     public void setCorpMandatorIdentificationValue(String corpMandatorIdentificationValue) {
+        Logger.debug("Setting corpMandatorIdentificationValue to AT/" + corpMandatorIdentificationValue);
         this.corpMandatorIdentificationValue = "AT/" + corpMandatorIdentificationValue;
     }
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java
index 499265319..3ab4ec4a1 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java
@@ -31,8 +31,7 @@ import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 import eu.stork.peps.auth.commons.PersonalAttribute;
 import eu.stork.peps.auth.commons.PersonalAttributeList;
-import eu.stork.peps.auth.commons.STORKStatusCode;
-
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.AttributeStatusType;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.DateFormat;
@@ -138,7 +137,6 @@ public class MOAAttributeProvider {
 		if (authData.getDateOfBirth() != null) {
 			DateFormat fmt = new SimpleDateFormat("yyyyMMdd");
     		return  fmt.format(authData.getDateOfBirth());
-    		
 		}
    		else
    			return null;
@@ -147,14 +145,14 @@ public class MOAAttributeProvider {
     
     private void populateAttributeWithMethod(Method method, Object object, PersonalAttributeList attributeList, String storkAttribute, Boolean isRequired) {
         try {
-            Object attributeValue = method.invoke(object, new Class[]{});
+            Object attributeValue = method.invoke(object, new Class[]{});        // (Object[])
             
             PersonalAttribute newAttribute = new PersonalAttribute();
             newAttribute.setName(storkAttribute);
             newAttribute.setIsRequired(isRequired);
             
             if (attributeValue != null) {
-            	newAttribute.setStatus(STORKStatusCode.STATUS_AVAILABLE.name());            	
+            	newAttribute.setStatus(AttributeStatusType.AVAILABLE.value());
             	Logger.info("Got attribute value: " + attributeValue);
             
             	if (attributeValue instanceof String)            
@@ -167,7 +165,7 @@ public class MOAAttributeProvider {
             		
             		} else {
             			Logger.info("Attribute " + storkAttribute + " is not available.");
-                    	newAttribute.setStatus(STORKStatusCode.STATUS_NOT_AVAILABLE.name());
+                    	newAttribute.setStatus(AttributeStatusType.NOT_AVAILABLE.value());
             			
             		}
             			            	
@@ -179,7 +177,7 @@ public class MOAAttributeProvider {
             	
             } else {
             	Logger.info("Attribute " + storkAttribute + " is not available.");
-            	newAttribute.setStatus(STORKStatusCode.STATUS_NOT_AVAILABLE.name());
+            	newAttribute.setStatus(AttributeStatusType.NOT_AVAILABLE.value());
             }
             
         } catch (InvocationTargetException e) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateContainer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateContainer.java
index e6c58b503..9207cc2dc 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateContainer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateContainer.java
@@ -54,6 +54,8 @@ public abstract class MandateContainer {
 
 
     public MandateContainer(String mandate) throws XPathExpressionException, MOAIDException {
+        Logger.debug("Received mandate content for processing: " + mandate);
+
         xPath = XPathFactory.newInstance().newXPath();
         HashMap<String, String> prefMap = new HashMap<String, String>() {{
             put(S2Constants.MANDATE_PREFIX, S2Constants.MANDATE_NS);
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
index baa91a854..ed8480ccb 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
@@ -33,13 +33,16 @@ import at.gv.egovernment.moa.id.data.IAuthData;
 import at.gv.egovernment.moa.id.data.SLOInformationInterface;
 import at.gv.egovernment.moa.id.moduls.IAction;
 import at.gv.egovernment.moa.id.moduls.IRequest;
+import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Constants;
 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.STORKAttrQueryResponse;
-import eu.stork.peps.complex.attributes.*;
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.*;
+import org.apache.commons.codec.binary.Base64;
+import org.apache.commons.codec.binary.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
@@ -65,12 +68,21 @@ public class MandateRetrievalRequest implements IAction {
     private IAuthData authData;
     private MOASTORKRequest moaStorkRequest;
     private IdentityLink representingIdentityLink;
+    private Integer QAALevel;
+    private byte[] originalContent;
 
     public SLOInformationInterface processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, IAuthData authData) throws MOAIDException {
         Logger.debug("Entering AttributeRequest for MandateProvider");
         httpResp.reset();
         this.representingIdentityLink = authData.getIdentityLink();
+        this.QAALevel = translateQAALevel(authData.getQAALevel());
 
+        // preparing original content and removing sensitive data from it
+        this.originalContent = authData.getMISMandate().getMandate(); // TODO ERROR
+        //Logger.debug("Original content " + StringUtils.newStringUtf8(authData.getMISMandate().getMandate()));
+        String originalMandate = StringUtils.newStringUtf8(authData.getMISMandate().getMandate()).replaceAll("<pd:Value>.*?==</pd:Value><pd:Type>urn:publicid:gv.at:baseid</pd:Type>","<pd:Value></pd:Value><pd:Type></pd:Type>");;
+        Logger.debug("Removing personal identification value and type from original mandate ");
+        originalContent = StringUtils.getBytesUtf8(originalMandate);
 
         OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(req.getOAURL());
         if (oaParam == null)
@@ -206,6 +218,18 @@ public class MandateRetrievalRequest implements IAction {
         return null;
     }
 
+    private Integer translateQAALevel(String qaaLevel) throws MOAIDException {
+        if (qaaLevel.equals(PVPConstants.STORK_QAA_1_1))
+            return 1;
+        if (qaaLevel.equals(PVPConstants.STORK_QAA_1_2))
+            return 2;
+        if (qaaLevel.equals(PVPConstants.STORK_QAA_1_3))
+            return 3;
+        if (qaaLevel.equals(PVPConstants.STORK_QAA_1_4))
+            return 4;
+        Logger.error("Wrong QAA Number format");
+        throw new MOAIDException("stork.16", new Object[]{});
+    }
 
     private String geteLPIdentifier(MandateContainer mandateContainer, PersonalAttribute currentAttribute) throws MOAIDException {
         RepresentationPersonType represented = getRepresented(mandateContainer, currentAttribute);
@@ -213,7 +237,7 @@ public class MandateRetrievalRequest implements IAction {
             return represented.getELPIdentifier();
         } else if (currentAttribute.isRequired()) {
             Logger.error("Cannot provide eLPIdentifier for natural person.");
-            throw new MOAIDException("stork.19", new Object[]{currentAttribute.getName()});
+            throw new MOAIDException("stork.19", new Object[]{currentAttribute.getName()});    // TODO
         }
         return "";
     }
@@ -249,14 +273,35 @@ public class MandateRetrievalRequest implements IAction {
 
 
     private String mapPowersType(MandateContainer mandateContainer) {
+        // using if for java 6 compatibility if necessary
         if (mandateContainer.getAnnotation().equals("ELGABilateral")) {
             return "6"; // Health Powers
         } else if (mandateContainer.getAnnotation().equals("ERsB")) {
             return "0"; // General Powers
         } else if (mandateContainer.getAnnotation().equals("GeneralvollmachtBilateral")) {
             return "0"; // General Powers
+        } else if (mandateContainer.getAnnotation().equals("ERsBMitPostvollmacht")) {
+            return "0"; // General Powers
+        } else if (mandateContainer.getAnnotation().equals("ZVR")) {
+            return "0"; // General Powers
+        } else if (mandateContainer.getAnnotation().equals("ZVRMitPostvollmacht")) {
+            return "0"; // General Powers
+        } else if (mandateContainer.getAnnotation().equals("EVB")) {
+            return "0"; // General Powers
+        } else if (mandateContainer.getAnnotation().equals("Einzelvertretungsbefugnis")) {
+            return "0"; // General Powers
+        }  else if (mandateContainer.getAnnotation().equals("Prokura")) {
+            return "0"; // General Powers
+        }  else if (mandateContainer.getAnnotation().equals("Notar")) {
+            return "0"; // General Powers
+        } else if (mandateContainer.getAnnotation().equals("Organwalter")) {
+            return "0"; // General Powers
+        } else if (mandateContainer.getAnnotation().equals("Rechtsanwalt")) {
+            return "0"; // General Powers
+        } else if (mandateContainer.getAnnotation().equals("Ziviltechniker")) {
+            return "0"; // General Powers
         }
-        return "";
+        return "9";
     }
 
     private MandateType getMandateType(MandateContainer mandateContainer, PersonalAttribute sourceAttribute) throws MOAIDException {
@@ -264,10 +309,9 @@ public class MandateRetrievalRequest implements IAction {
         RepresentationPersonType representative = getRepresentative(mandateContainer, sourceAttribute);
         RepresentationPersonType represented = getRepresented(mandateContainer, sourceAttribute);
         MandateContentType mandateContent = getMandateContent(mandateContainer, sourceAttribute);
-
-        mandateType.setRepresenting(representative);
+        mandateType.setRepresentative(representative);
         mandateType.setRepresented(represented);
-        mandateType.setMandateContent(mandateContent);
+        mandateType.getMandateContent().add(mandateContent);
         Logger.debug("Complex attribute extracted: " + sourceAttribute.getName());
         return mandateType;
     }
@@ -275,7 +319,8 @@ public class MandateRetrievalRequest implements IAction {
     private String getLegalName(MandateContainer mandateContainer, PersonalAttribute sourceAttribute) throws MOAIDException {
         RepresentationPersonType represented = getRepresented(mandateContainer, sourceAttribute);
         if (mandateContainer instanceof CorporateBodyMandateContainer) {
-            return represented.getName();
+            represented.getLegalName();
+            //return represented.getName();
         } else if (sourceAttribute.isRequired()) {
             Logger.error("Cannot provide legalName for natural person.");
             throw new MOAIDException("stork.19", new Object[]{sourceAttribute.getName()});
@@ -487,10 +532,10 @@ public class MandateRetrievalRequest implements IAction {
         if (mandateContainer instanceof CorporateBodyMandateContainer) {
             CorporateBodyMandateContainer corporateBodyMandateContainer = (CorporateBodyMandateContainer) mandateContainer;
             represented.setELPIdentifier(corporateBodyMandateContainer.getCorpMandatorIdentificationValue());
-            represented.setName(corporateBodyMandateContainer.getCorpMandatorFullName());
-            represented.setAddress("");
-            represented.setCanonicalAddress(new CanonicalAddressType());
-            represented.setType(getCompanyType(corporateBodyMandateContainer.corpMandatorFullName, corporateBodyMandateContainer.corpMandatorIdentificationType, sourceAttribute));
+            represented.setLegalName(corporateBodyMandateContainer.getCorpMandatorFullName());
+            represented.setTextRegisteredAddress(null);
+            represented.setCanonicalRegisteredAddress(new CanonicalAddressType());
+            represented.setLegalForm(getCompanyType(corporateBodyMandateContainer.corpMandatorFullName, corporateBodyMandateContainer.corpMandatorIdentificationType, sourceAttribute));
         } else if (mandateContainer instanceof PhyPersonMandateContainer) {
             PhyPersonMandateContainer phyPersonMandateContainer = (PhyPersonMandateContainer) mandateContainer;
             represented.setEIdentifier(getRepresentedStorkeIdentifier(mandateContainer));
@@ -510,18 +555,22 @@ public class MandateRetrievalRequest implements IAction {
         try {
             XMLGregorianCalendar validFrom = DatatypeFactory.newInstance().newXMLGregorianCalendar(mandateContainer.getMandateValidFrom());
             XMLGregorianCalendar validTo = DatatypeFactory.newInstance().newXMLGregorianCalendar(mandateContainer.getMandateValidTo());
-            mandateContent.setValidFrom(validFrom);
-            mandateContent.setValidTo(validTo);
+            TimeRestrictionType timeRestriction = new TimeRestrictionType();
+            timeRestriction.setValidFrom(validFrom);
+            timeRestriction.setValidTo(validTo);
+            mandateContent.setTimeRestriction(timeRestriction);
         } catch (DatatypeConfigurationException dte) {
             Logger.error("Error converting date from mandate: " + mandateContainer.getMandateValidFrom() + ", " + mandateContainer.getMandateValidTo());
             throw new MOAIDException("stork.20", new Object[]{});
         }
-
-        mandateContent.setTransactionLimit(BigInteger.valueOf(0)); // TODO
-        mandateContent.setTransactionLimitCurrency("");// TODO
-        mandateContent.setIsJoint("0");
-        mandateContent.setIschained(false);
-        mandateContent.setTypePower(mapPowersType(mandateContainer));
+        mandateContent.setAQAA(this.QAALevel);
+        mandateContent.setOriginalMandate(originalContent);
+        mandateContent.setOriginalMandateType("application/xml");
+        TransactionLimitRestrictionType transactionLimit = new TransactionLimitRestrictionType();
+        mandateContent.setTransactionLimit(transactionLimit);
+        mandateContent.setIsJoint("");
+        mandateContent.setIsChained(false);
+        mandateContent.setTypeOfPower(mapPowersType(mandateContainer));     // TODO check
         Logger.debug("Complex attribute extracted: " + sourceAttribute.getName());
         return mandateContent;
     }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java
index 761460971..bd1576020 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/EHvdAttributeProviderPlugin.java
@@ -52,8 +52,9 @@ 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.IsHealthCareProfessionalType;
-import eu.stork.peps.complex.attributes.ObjectFactory;
+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.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
@@ -67,7 +68,7 @@ public class EHvdAttributeProviderPlugin extends AttributeProvider {
 	 * Instantiates a new e hvd attribute provider plugin.
 	 *
 	 * @param url the service url
-	 * @param attributes 
+	 * @param supportedAttributes
 	 */
 	public EHvdAttributeProviderPlugin(String url, String supportedAttributes) {
 		super(supportedAttributes);
@@ -183,7 +184,7 @@ public class EHvdAttributeProviderPlugin extends AttributeProvider {
 
 			if (collection.get("IsHealthcareProfessional").equals("false") || !collection.get("Type").equals("Medical doctor")) {
 				// the citizen is no HCP
-				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, new ArrayList<String>(), "NotAvailable");
+				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, new ArrayList<String>(), AttributeStatusType.NOT_AVAILABLE.value());
 			} else {
 				// go on and parse the data
 				IsHealthCareProfessionalType result = new IsHealthCareProfessionalType();
@@ -193,7 +194,7 @@ public class EHvdAttributeProviderPlugin extends AttributeProvider {
 					result.setTypeOfHCP("physician");
 
 				result.setNameOfOrganisation(collection.get("NameOfOrganisation"));
-				result.setTypeOfOrganisation("Unknown");
+				//result.setTypeOfOrganisation("Unknown"); // TODO used in previous version, check what to do with this
 
 				result.setAQAA(4);
 
@@ -206,7 +207,7 @@ public class EHvdAttributeProviderPlugin extends AttributeProvider {
 				ArrayList<String> value = new ArrayList<String>();
 				value.add(stringWriter.toString());
 
-				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, value, "Available");
+				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, value, AttributeStatusType.AVAILABLE.value());
 			}
 
 			// pack and return the result
@@ -216,7 +217,7 @@ public class EHvdAttributeProviderPlugin extends AttributeProvider {
 			// 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, "Available"));
+			result.add(new PersonalAttribute("eIdentifier", false, value, AttributeStatusType.AVAILABLE.value()));
 
 			return result;
 		} catch (Exception e) {
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
index 2000ef928..a16603beb 100644
--- 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
@@ -52,9 +52,11 @@ 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.IsHealthCareProfessionalDeprecatedType;
-import eu.stork.peps.complex.attributes.IsHealthCareProfessionalType;
-import eu.stork.peps.complex.attributes.ObjectFactory;
+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
@@ -68,7 +70,7 @@ public class EHvdAttribute_deprecatedProviderPlugin extends AttributeProvider {
 	 * Instantiates a new e hvd attribute provider plugin.
 	 *
 	 * @param url the service url
-	 * @param attributes 
+	 * @param supportedAttributes
 	 */
 	public EHvdAttribute_deprecatedProviderPlugin(String url, String supportedAttributes) {
 		super(supportedAttributes);
@@ -184,7 +186,7 @@ public class EHvdAttribute_deprecatedProviderPlugin extends AttributeProvider {
 
 			if (collection.get("IsHealthcareProfessional").equals("false")) {
 				// the citizen is no HCP
-				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, new ArrayList<String>(), "NotAvailable");
+				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, new ArrayList<String>(), AttributeStatusType.NOT_AVAILABLE.value());
 			} else {
 				// go on and parse the data
                 IsHealthCareProfessionalDeprecatedType result = new IsHealthCareProfessionalDeprecatedType();
@@ -202,16 +204,16 @@ public class EHvdAttribute_deprecatedProviderPlugin extends AttributeProvider {
 
 				result.setAQAA(4);
 
-				final Marshaller m = JAXBContext.newInstance(IsHealthCareProfessionalType.class).createMarshaller();
+				final Marshaller m = JAXBContext.newInstance(IsHealthCareProfessionalDeprecatedType.class).createMarshaller();
 			    m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
 			    
 			    StringWriter stringWriter = new StringWriter();
-			    m.marshal(new ObjectFactory().createIsHealthCareProfessional(result), stringWriter);		    
+			    m.marshal(new ObjectFactory().createIsHealthCareProfessionalDeprecated(result), stringWriter);		    
 				
 				ArrayList<String> value = new ArrayList<String>();
 				value.add(stringWriter.toString());
 
-				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, value, "Available");
+				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, value, AttributeStatusType.AVAILABLE.value());
 			}
 
 			// pack and return the result
@@ -221,7 +223,7 @@ public class EHvdAttribute_deprecatedProviderPlugin extends AttributeProvider {
 			// 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, "Available"));
+			result.add(new PersonalAttribute("eIdentifier", false, value, AttributeStatusType.AVAILABLE.value()));
 
 			return result;
 		} catch (Exception e) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java
index 124b91e8b..501e33a75 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/attributeproviders/SignedDocAttributeRequestProvider.java
@@ -46,6 +46,7 @@ import javax.xml.ws.Service;
 import javax.xml.ws.soap.SOAPBinding;
 import javax.xml.ws.BindingProvider;
 
+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.AttributeStatusType;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang.NotImplementedException;
@@ -296,7 +297,7 @@ public class SignedDocAttributeRequestProvider extends AttributeProvider {
 
 			Logger.debug("Assembling signedDoc attribute");
 			PersonalAttribute signedDocAttribute = new PersonalAttribute("signedDoc", false, values,
-					"Available");
+                    AttributeStatusType.AVAILABLE.value());
 
 			// pack and return the result
 			PersonalAttributeList result = new PersonalAttributeList();
diff --git a/id/server/stork2-commons/pom.xml b/id/server/stork2-commons/pom.xml
index 555d6cec7..43a02ae5d 100644
--- a/id/server/stork2-commons/pom.xml
+++ b/id/server/stork2-commons/pom.xml
@@ -65,6 +65,7 @@
 		<dependency>
   		<groupId>org.opensaml</groupId>
   		<artifactId>opensaml</artifactId>
+			<version>${opensaml.version}</version>
 			<exclusions>
 				<exclusion>
 				    <groupId>org.slf4j</groupId>
@@ -129,8 +130,9 @@
 					<artifactId>maven-compiler-plugin</artifactId>
 					<version>3.1</version>
 					<configuration>
-						<source>1.6</source>
-						<target>1.6</target>
+						<source>1.7</source>
+						<target>1.7</target>
+                        <encoding>UTF-8</encoding>
 					</configuration>
 				</plugin>
 				<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
index ae811dda7..acc79a8c9 100644
--- a/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties
+++ b/id/server/stork2-commons/src/main/config/embedded/pepsUtil.properties
@@ -33,6 +33,7 @@ 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
 
@@ -249,21 +250,24 @@ spepsSAMLResponse.code=200010
 spepsSAMLResponse.message=error.gen.speps.saml
 
 
-invalid.apepsRedirectUrl.code=001001
+invalid.apepsRedirectUrl.code=204001
 invalid.apepsRedirectUrl.message=invalid.apeps.redirectUrl
 
-apepsSAMLRequest.code=001002
+apepsSAMLRequest.code=204002
 apepsSAMLRequest.message=invalid.apeps.saml.request
 
-apepsSAMLResponse.code=001003
+apepsSAMLResponse.code=204003
 apepsSAMLResponse.message=invalid.apeps.saml.response
 
-invalid.apepsCallbackUrl.code=001004
+invalid.apepsCallbackUrl.code=204004
 invalid.apepsCallbackUrl.message=invalid.apeps.callback.url
 
-colleagueAttributeRequest.invalidSAML.code=001005
+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/Linker.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/auth/commons/Linker.java
index 6e7c891da..94882de77 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
@@ -145,7 +145,10 @@ public final class Linker implements Serializable {
 

 		//Assertion storage

 		this.assertions.put(source, attrResponse);

-

+        // previously: getTotalPersonalAttributeList() in both cases

+		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());

 	}

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 5da9ba494..f2493db4e 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
@@ -325,8 +325,13 @@ public enum PEPSErrors {
   /**
    * Represents the 'colleagueAttributeRequest.invalidSAML' constant error identifier.
    */
-  COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML");
-  
+  COLLEAGUE_ATTR_REQ_INVALID_SAML("colleagueAttributeRequest.invalidSAML"),
+
+  /**
+   * Represents the 'invalid.attr.country.code' constant error identifier.
+   */
+  INVALID_COUNTRY_CODE("invalid.attr.country.code");
+
   /**
    * Represents the constant's value.
    */
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 15c2ae552..dd534499d 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
@@ -407,10 +407,17 @@ public enum PEPSParameters {
    * 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.
    */
@@ -598,7 +605,12 @@ public enum PEPSParameters {
   /**
    * Represents the 'complexAttrListOpt' parameter constant.
    */
-  COMPLEX_ATTR_LIST_OPT("complexAttrListOpt");
+  COMPLEX_ATTR_LIST_OPT("complexAttrListOpt"),
+  /**
+   * Represents the 'idPDerivedAttrList' parameter constant.
+   */
+
+  IDP_DERIVED_ATTR_LIST("idPDerivedAttrList");
 
   /**
    * Represents the constant's value.
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..991682c9b 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
@@ -54,13 +54,13 @@ public final class PersonalAttributeList extends
   /**
    * Hash with the latest fetched attribute name alias.
    */
-  private final Map<String, Integer> latestAttrAlias =
+  private final transient Map<String, Integer> latestAttrAlias =
     new HashMap<String, Integer>();
   
   /**
    * Hash with mapping number of alias or the attribute name.
    */
-  private final Map<String, Integer> attrAliasNumber =
+  private final transient Map<String, Integer> attrAliasNumber =
     new HashMap<String, Integer>();
   
   /**
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
index 434de60f8..c7a7dfa23 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/.svn/entries
@@ -26,14 +26,14 @@ emrepisja
 
 aa842e49-f825-43fc-93ba-11ee9fd5a035
 
-IsHCPType.java
+AcTitleType.java
 file
 
 
 
-
-2014-03-05T09:36:07.898515Z
-c7794f438dce3f5e4e27e605a642a22a
+delete
+2014-03-05T09:36:07.894515Z
+df18729d7dbd509aeeac2f17ef036e19
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -58,16 +58,16 @@ emrepisja
 
 
 
-3801
+2388
 
-IsAcademicStaffType.java
+AttributeStatusType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-43d67ea6cedb4601555d0394db95417a
+4e30a60177a9ab03aececf580482fad1
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -92,16 +92,16 @@ emrepisja
 
 
 
-3818
+1734
 
-HabilitationType.java
+CanonicalAddressType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-6e9cc940cbe5298156c5e7b524936f11
+63bc0e23343775a0c252a03a5a3b09d1
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -126,16 +126,16 @@ emrepisja
 
 
 
-2314
+6847
 
-AttributeStatusType.java
+Habilitation.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-4e30a60177a9ab03aececf580482fad1
+248b26e8c89ddc3366c528cf3852d27b
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -160,16 +160,16 @@ emrepisja
 
 
 
-1734
+2298
 
-IsAdminStaffType.java
+HabilitationType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-5a49a39f1d260a3c306216069751260f
+6e9cc940cbe5298156c5e7b524936f11
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -194,16 +194,16 @@ emrepisja
 
 
 
-2341
+2314
 
-MandateType.java
+HasAccountInBankType.java
 file
 
 
 
-
-2014-03-05T09:36:07.898515Z
-2fbb38548efd320e4df27959a9842731
+delete
+2014-03-05T09:36:07.894515Z
+f71b4c28dd5c9580fb87c3573435837b
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -228,16 +228,16 @@ emrepisja
 
 
 
-3581
+2339
 
-HasAccountInBankType.java
+HasDegreeType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.894515Z
-f71b4c28dd5c9580fb87c3573435837b
+3a54a31f40c97b44d31f1a70e0767daa
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -262,16 +262,16 @@ emrepisja
 
 
 
-2339
+4432
 
-IsHealthCareProfessionalType.java
+IsAcademicStaffType.java
 file
 
 
 
-
-2014-03-05T09:36:07.894515Z
-2a4106ac8c87cc056b853b7f9ffb6fbc
+delete
+2014-03-05T09:36:07.898515Z
+43d67ea6cedb4601555d0394db95417a
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -296,16 +296,16 @@ emrepisja
 
 
 
-3834
+3818
 
-package-info.java
+IsAdminStaffType.java
 file
 
 
 
-
-2014-03-05T09:36:07.894515Z
-5a2f7df8040e53c9e0dc7beacc8f3457
+delete
+2014-03-05T09:36:07.898515Z
+5a49a39f1d260a3c306216069751260f
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -330,16 +330,16 @@ emrepisja
 
 
 
-549
+2341
 
-IsStudentType.java
+IsCourseCoordinatorType.java
 file
 
 
 
-
-2014-03-05T09:36:07.894515Z
-a576b2ef395482c49cb968e91e33ec89
+delete
+2014-03-05T09:36:07.898515Z
+9927ea145575d05bd2984bee0e3550be
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -364,16 +364,16 @@ emrepisja
 
 
 
-3714
+2423
 
-AcTitleType.java
+IsHCPType.java
 file
 
 
 
-
-2014-03-05T09:36:07.894515Z
-df18729d7dbd509aeeac2f17ef036e19
+delete
+2014-03-05T09:36:07.898515Z
+c7794f438dce3f5e4e27e605a642a22a
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -398,16 +398,16 @@ emrepisja
 
 
 
-2388
+3801
 
-RequestedAttributeType.java
+IsHealthCareProfessionalType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.894515Z
-c6ada26a7ff439713e9a4588d1b62b0a
+2a4106ac8c87cc056b853b7f9ffb6fbc
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -432,16 +432,16 @@ emrepisja
 
 
 
-6089
+3834
 
-HasDegreeType.java
+IsStudentType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.894515Z
-3a54a31f40c97b44d31f1a70e0767daa
+a576b2ef395482c49cb968e91e33ec89
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -466,16 +466,16 @@ emrepisja
 
 
 
-4432
+3714
 
-RepresentationPersonType.java
+IsTeacherOfType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-84b6c9432085cf590c3ed06e58b4307f
+1575bd6840471d713bd61c5d337d3900
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -500,16 +500,16 @@ emrepisja
 
 
 
-7205
+3668
 
-ObjectFactory.java
+MandateContentType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-bc36df4b11e93ab03119dfb25626bfb1
+debc98ce374d669b7621dea674120dfc
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -534,16 +534,16 @@ emrepisja
 
 
 
-18679
+6205
 
-IsTeacherOfType.java
+MandateType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-1575bd6840471d713bd61c5d337d3900
+2fbb38548efd320e4df27959a9842731
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -568,16 +568,16 @@ emrepisja
 
 
 
-3668
+3581
 
-CanonicalAddressType.java
+ObjectFactory.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-63bc0e23343775a0c252a03a5a3b09d1
+bc36df4b11e93ab03119dfb25626bfb1
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -602,16 +602,16 @@ emrepisja
 
 
 
-6847
+18679
 
-IsCourseCoordinatorType.java
+RepresentationPersonType.java
 file
 
 
 
-
+delete
 2014-03-05T09:36:07.898515Z
-9927ea145575d05bd2984bee0e3550be
+84b6c9432085cf590c3ed06e58b4307f
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -636,16 +636,16 @@ emrepisja
 
 
 
-2423
+7205
 
-MandateContentType.java
+RequestedAttributeType.java
 file
 
 
 
-
-2014-03-05T09:36:07.898515Z
-debc98ce374d669b7621dea674120dfc
+delete
+2014-03-05T09:36:07.894515Z
+c6ada26a7ff439713e9a4588d1b62b0a
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -670,16 +670,16 @@ emrepisja
 
 
 
-6205
+6089
 
-Habilitation.java
+package-info.java
 file
 
 
 
-
-2014-03-05T09:36:07.898515Z
-248b26e8c89ddc3366c528cf3852d27b
+delete
+2014-03-05T09:36:07.894515Z
+5a2f7df8040e53c9e0dc7beacc8f3457
 2014-03-04T14:10:03.192908Z
 721
 emrepisja
@@ -704,5 +704,5 @@ emrepisja
 
 
 
-2298
+549
 
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHCPType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHCPType.java
deleted file mode 100644
index 17e315d2d..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/IsHCPType.java
+++ /dev/null
@@ -1,145 +0,0 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlElement;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for isHCPType complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="isHCPType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="nameOfOrganisation" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="HCPType" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}HCPType"/>

- *         &lt;element name="specialisation" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}specialisationType"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "isHCPType", propOrder = {

-    "nameOfOrganisation",

-    "hcpType",

-    "specialisation",

-    "aqaa"

-})

-public class IsHCPType {

-

-    @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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * 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/MandateContentType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/MandateContentType.java
deleted file mode 100644
index 84ce2727b..000000000
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/MandateContentType.java
+++ /dev/null
@@ -1,233 +0,0 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import java.math.BigInteger;

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlElement;

-import javax.xml.bind.annotation.XmlSchemaType;

-import javax.xml.bind.annotation.XmlType;

-import javax.xml.datatype.XMLGregorianCalendar;

-

-

-/**

- * <p>Java class for mandateContentType complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="mandateContentType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="validFrom" type="{http://www.w3.org/2001/XMLSchema}date"/>

- *         &lt;element name="validTo" type="{http://www.w3.org/2001/XMLSchema}date"/>

- *         &lt;element name="transactionLimit" type="{http://www.w3.org/2001/XMLSchema}integer"/>

- *         &lt;element name="transactionLimitCurrency" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}currencyType"/>

- *         &lt;element name="isJoint" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="ischained" type="{http://www.w3.org/2001/XMLSchema}boolean"/>

- *         &lt;element name="typePower" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "mandateContentType", propOrder = {

-    "validFrom",

-    "validTo",

-    "transactionLimit",

-    "transactionLimitCurrency",

-    "isJoint",

-    "ischained",

-    "typePower"

-})

-public class MandateContentType {

-

-    @XmlElement(required = true)

-    @XmlSchemaType(name = "date")

-    protected XMLGregorianCalendar validFrom;

-    @XmlElement(required = true)

-    @XmlSchemaType(name = "date")

-    protected XMLGregorianCalendar validTo;

-    @XmlElement(required = true)

-    protected BigInteger transactionLimit;

-    @XmlElement(required = true)

-    protected String transactionLimitCurrency;

-    @XmlElement(required = true)

-    protected String isJoint;

-    protected boolean ischained;

-    @XmlElement(required = true)

-    protected String typePower;

-

-    /**

-     * 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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * Gets the value of the transactionLimit property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link BigInteger }

-     *     

-     */

-    public BigInteger getTransactionLimit() {

-        return transactionLimit;

-    }

-

-    /**

-     * Sets the value of the transactionLimit property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link BigInteger }

-     *     

-     */

-    public void setTransactionLimit(BigInteger value) {

-        this.transactionLimit = value;

-    }

-

-    /**

-     * Gets the value of the transactionLimitCurrency property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getTransactionLimitCurrency() {

-        return transactionLimitCurrency;

-    }

-

-    /**

-     * Sets the value of the transactionLimitCurrency property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setTransactionLimitCurrency(String value) {

-        this.transactionLimitCurrency = value;

-    }

-

-    /**

-     * Gets the value of the isJoint property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getIsJoint() {

-        return isJoint;

-    }

-

-    /**

-     * Sets the value of the isJoint property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setIsJoint(String value) {

-        this.isJoint = 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;

-    }

-

-    /**

-     * 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;

-    }

-

-}

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
new file mode 100644
index 000000000..21a15820b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AdditionalInformationType.java
@@ -0,0 +1,99 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AdditionalInformationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="SpecificInformation" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="OtherSources" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AdditionalInformationType", propOrder = {
+    "specificInformation",
+    "otherSources"
+})
+public class AdditionalInformationType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..044801564
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AddressType.java
@@ -0,0 +1,281 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * Address
+ * 
+ * <p>Java class for AddressType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AddressType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Line" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" maxOccurs="unbounded"/>
+ *         &lt;element name="City" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="StateOrRegion" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="PostalCode" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="Country">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..d30d97334
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileDataType.java
@@ -0,0 +1,125 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachedFileDataType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Description" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="Mime" type="{urn:crue:academic:xsd:language:diplomasupplement}MimeType"/>
+ *         &lt;element name="Data" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..3e49c0053
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedFileURLType.java
@@ -0,0 +1,127 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachedFileURLType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Description" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="Mime" type="{urn:crue:academic:xsd:language:diplomasupplement}MimeType"/>
+ *         &lt;element name="URL" type="{urn:crue:academic:xsd:language:diplomasupplement}URLType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..4e66627a4
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageDataType.java
@@ -0,0 +1,125 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachedImageDataType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Description" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="Mime" type="{urn:crue:academic:xsd:language:diplomasupplement}ImageMimeType"/>
+ *         &lt;element name="Data" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..76dffaa4a
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedImageURLType.java
@@ -0,0 +1,127 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachedImageURLType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Description" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="Mime" type="{urn:crue:academic:xsd:language:diplomasupplement}ImageMimeType"/>
+ *         &lt;element name="URL" type="{urn:crue:academic:xsd:language:diplomasupplement}URLType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..ba693c9a0
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachedType.java
@@ -0,0 +1,190 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachedType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;element name="FileData" type="{urn:crue:academic:xsd:language:diplomasupplement}AttachedFileDataType"/>
+ *         &lt;element name="FileURI" type="{urn:crue:academic:xsd:language:diplomasupplement}AttachedFileURLType"/>
+ *         &lt;element name="ImageData" type="{urn:crue:academic:xsd:language:diplomasupplement}AttachedImageDataType"/>
+ *         &lt;element name="ImageURI" type="{urn:crue:academic:xsd:language:diplomasupplement}AttachedImageURLType"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..a646bd390
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/AttachmentsType.java
@@ -0,0 +1,78 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachmentsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Attached" type="{urn:crue:academic:xsd:language:diplomasupplement}AttachedType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AttachmentsType", propOrder = {
+    "attached"
+})
+public class AttachmentsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..2d053514b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CertificationOfTheSupplementType.java
@@ -0,0 +1,128 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CertificationOfTheSupplementType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CertificationDate" type="{urn:crue:academic:xsd:language:diplomasupplement}DateType"/>
+ *         &lt;element name="OfficialsCertifying" type="{urn:crue:academic:xsd:language:diplomasupplement}OfficialsCertifyingType"/>
+ *         &lt;element name="OfficialStamp" type="{urn:crue:academic:xsd:language:diplomasupplement}OfficialStampType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..2ad8c81ec
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ContactInformationType.java
@@ -0,0 +1,172 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ContactInformationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Address" type="{urn:crue:academic:xsd:language:diplomasupplement}AddressType"/>
+ *         &lt;element name="PhoneNumber" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Email" type="{urn:crue:academic:xsd:language:diplomasupplement}EmailAddressType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="WebSite" type="{urn:crue:academic:xsd:language:diplomasupplement}URLType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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 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
new file mode 100644
index 000000000..5ace3fcb6
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CountryType.java
@@ -0,0 +1,1420 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="AD"/>
+ *     &lt;enumeration value="AE"/>
+ *     &lt;enumeration value="AF"/>
+ *     &lt;enumeration value="AG"/>
+ *     &lt;enumeration value="AL"/>
+ *     &lt;enumeration value="AM"/>
+ *     &lt;enumeration value="AO"/>
+ *     &lt;enumeration value="AR"/>
+ *     &lt;enumeration value="AT"/>
+ *     &lt;enumeration value="AU"/>
+ *     &lt;enumeration value="AZ"/>
+ *     &lt;enumeration value="BA"/>
+ *     &lt;enumeration value="BB"/>
+ *     &lt;enumeration value="BD"/>
+ *     &lt;enumeration value="BE"/>
+ *     &lt;enumeration value="BF"/>
+ *     &lt;enumeration value="BG"/>
+ *     &lt;enumeration value="BH"/>
+ *     &lt;enumeration value="BI"/>
+ *     &lt;enumeration value="BJ"/>
+ *     &lt;enumeration value="BN"/>
+ *     &lt;enumeration value="BO"/>
+ *     &lt;enumeration value="BR"/>
+ *     &lt;enumeration value="BS"/>
+ *     &lt;enumeration value="BT"/>
+ *     &lt;enumeration value="BW"/>
+ *     &lt;enumeration value="BY"/>
+ *     &lt;enumeration value="BZ"/>
+ *     &lt;enumeration value="CA"/>
+ *     &lt;enumeration value="CD"/>
+ *     &lt;enumeration value="CF"/>
+ *     &lt;enumeration value="CG"/>
+ *     &lt;enumeration value="CH"/>
+ *     &lt;enumeration value="CI"/>
+ *     &lt;enumeration value="CL"/>
+ *     &lt;enumeration value="CM"/>
+ *     &lt;enumeration value="CN"/>
+ *     &lt;enumeration value="CO"/>
+ *     &lt;enumeration value="CR"/>
+ *     &lt;enumeration value="CU"/>
+ *     &lt;enumeration value="CV"/>
+ *     &lt;enumeration value="CY"/>
+ *     &lt;enumeration value="CZ"/>
+ *     &lt;enumeration value="DE"/>
+ *     &lt;enumeration value="DJ"/>
+ *     &lt;enumeration value="DK"/>
+ *     &lt;enumeration value="DM"/>
+ *     &lt;enumeration value="DO"/>
+ *     &lt;enumeration value="DZ"/>
+ *     &lt;enumeration value="EC"/>
+ *     &lt;enumeration value="EE"/>
+ *     &lt;enumeration value="EG"/>
+ *     &lt;enumeration value="ER"/>
+ *     &lt;enumeration value="ES"/>
+ *     &lt;enumeration value="ET"/>
+ *     &lt;enumeration value="FI"/>
+ *     &lt;enumeration value="FJ"/>
+ *     &lt;enumeration value="FM"/>
+ *     &lt;enumeration value="FR"/>
+ *     &lt;enumeration value="GA"/>
+ *     &lt;enumeration value="GB"/>
+ *     &lt;enumeration value="GD"/>
+ *     &lt;enumeration value="GE"/>
+ *     &lt;enumeration value="GH"/>
+ *     &lt;enumeration value="GL"/>
+ *     &lt;enumeration value="GM"/>
+ *     &lt;enumeration value="GN"/>
+ *     &lt;enumeration value="GQ"/>
+ *     &lt;enumeration value="GR"/>
+ *     &lt;enumeration value="GT"/>
+ *     &lt;enumeration value="GW"/>
+ *     &lt;enumeration value="GY"/>
+ *     &lt;enumeration value="HN"/>
+ *     &lt;enumeration value="HR"/>
+ *     &lt;enumeration value="HT"/>
+ *     &lt;enumeration value="HU"/>
+ *     &lt;enumeration value="ID"/>
+ *     &lt;enumeration value="IE"/>
+ *     &lt;enumeration value="IL"/>
+ *     &lt;enumeration value="IN"/>
+ *     &lt;enumeration value="IQ"/>
+ *     &lt;enumeration value="IR"/>
+ *     &lt;enumeration value="IS"/>
+ *     &lt;enumeration value="IT"/>
+ *     &lt;enumeration value="JM"/>
+ *     &lt;enumeration value="JO"/>
+ *     &lt;enumeration value="JP"/>
+ *     &lt;enumeration value="KE"/>
+ *     &lt;enumeration value="KG"/>
+ *     &lt;enumeration value="KH"/>
+ *     &lt;enumeration value="KI"/>
+ *     &lt;enumeration value="KM"/>
+ *     &lt;enumeration value="KN"/>
+ *     &lt;enumeration value="KP"/>
+ *     &lt;enumeration value="KR"/>
+ *     &lt;enumeration value="KW"/>
+ *     &lt;enumeration value="KZ"/>
+ *     &lt;enumeration value="LA"/>
+ *     &lt;enumeration value="LB"/>
+ *     &lt;enumeration value="LC"/>
+ *     &lt;enumeration value="LI"/>
+ *     &lt;enumeration value="LK"/>
+ *     &lt;enumeration value="LR"/>
+ *     &lt;enumeration value="LS"/>
+ *     &lt;enumeration value="LT"/>
+ *     &lt;enumeration value="LU"/>
+ *     &lt;enumeration value="LV"/>
+ *     &lt;enumeration value="LY"/>
+ *     &lt;enumeration value="MA"/>
+ *     &lt;enumeration value="MC"/>
+ *     &lt;enumeration value="MD"/>
+ *     &lt;enumeration value="ME"/>
+ *     &lt;enumeration value="MG"/>
+ *     &lt;enumeration value="MH"/>
+ *     &lt;enumeration value="MK"/>
+ *     &lt;enumeration value="ML"/>
+ *     &lt;enumeration value="MM"/>
+ *     &lt;enumeration value="MN"/>
+ *     &lt;enumeration value="MR"/>
+ *     &lt;enumeration value="MT"/>
+ *     &lt;enumeration value="MU"/>
+ *     &lt;enumeration value="MV"/>
+ *     &lt;enumeration value="MW"/>
+ *     &lt;enumeration value="MX"/>
+ *     &lt;enumeration value="MY"/>
+ *     &lt;enumeration value="MZ"/>
+ *     &lt;enumeration value="NA"/>
+ *     &lt;enumeration value="NE"/>
+ *     &lt;enumeration value="NG"/>
+ *     &lt;enumeration value="NI"/>
+ *     &lt;enumeration value="NL"/>
+ *     &lt;enumeration value="NO"/>
+ *     &lt;enumeration value="NP"/>
+ *     &lt;enumeration value="NR"/>
+ *     &lt;enumeration value="NU"/>
+ *     &lt;enumeration value="NZ"/>
+ *     &lt;enumeration value="OM"/>
+ *     &lt;enumeration value="PA"/>
+ *     &lt;enumeration value="PE"/>
+ *     &lt;enumeration value="PG"/>
+ *     &lt;enumeration value="PH"/>
+ *     &lt;enumeration value="PK"/>
+ *     &lt;enumeration value="PL"/>
+ *     &lt;enumeration value="PR"/>
+ *     &lt;enumeration value="PS"/>
+ *     &lt;enumeration value="PT"/>
+ *     &lt;enumeration value="PW"/>
+ *     &lt;enumeration value="PY"/>
+ *     &lt;enumeration value="QA"/>
+ *     &lt;enumeration value="RO"/>
+ *     &lt;enumeration value="RS"/>
+ *     &lt;enumeration value="RU"/>
+ *     &lt;enumeration value="RW"/>
+ *     &lt;enumeration value="SA"/>
+ *     &lt;enumeration value="SB"/>
+ *     &lt;enumeration value="SC"/>
+ *     &lt;enumeration value="SD"/>
+ *     &lt;enumeration value="SE"/>
+ *     &lt;enumeration value="SG"/>
+ *     &lt;enumeration value="SI"/>
+ *     &lt;enumeration value="SK"/>
+ *     &lt;enumeration value="SL"/>
+ *     &lt;enumeration value="SM"/>
+ *     &lt;enumeration value="SN"/>
+ *     &lt;enumeration value="SO"/>
+ *     &lt;enumeration value="SR"/>
+ *     &lt;enumeration value="ST"/>
+ *     &lt;enumeration value="SV"/>
+ *     &lt;enumeration value="SY"/>
+ *     &lt;enumeration value="SZ"/>
+ *     &lt;enumeration value="TD"/>
+ *     &lt;enumeration value="TG"/>
+ *     &lt;enumeration value="TH"/>
+ *     &lt;enumeration value="TJ"/>
+ *     &lt;enumeration value="TL"/>
+ *     &lt;enumeration value="TM"/>
+ *     &lt;enumeration value="TN"/>
+ *     &lt;enumeration value="TO"/>
+ *     &lt;enumeration value="TR"/>
+ *     &lt;enumeration value="TT"/>
+ *     &lt;enumeration value="TV"/>
+ *     &lt;enumeration value="TZ"/>
+ *     &lt;enumeration value="UA"/>
+ *     &lt;enumeration value="UG"/>
+ *     &lt;enumeration value="US"/>
+ *     &lt;enumeration value="UY"/>
+ *     &lt;enumeration value="UZ"/>
+ *     &lt;enumeration value="VA"/>
+ *     &lt;enumeration value="VC"/>
+ *     &lt;enumeration value="VE"/>
+ *     &lt;enumeration value="VN"/>
+ *     &lt;enumeration value="VU"/>
+ *     &lt;enumeration value="WS"/>
+ *     &lt;enumeration value="YE"/>
+ *     &lt;enumeration value="ZA"/>
+ *     &lt;enumeration value="ZM"/>
+ *     &lt;enumeration value="ZW"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "CountryType")
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..35041350c
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseStructureDiagramType.java
@@ -0,0 +1,99 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseStructureDiagramType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CoursesGroups" type="{urn:crue:academic:xsd:language:diplomasupplement}CoursesGroupsType"/>
+ *         &lt;element name="CoursesUnits" type="{urn:crue:academic:xsd:language:diplomasupplement}CoursesUnitsType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CourseStructureDiagramType", propOrder = {
+    "coursesGroups",
+    "coursesUnits"
+})
+public class CourseStructureDiagramType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..4542085b6
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguageOfInstructionType.java
@@ -0,0 +1,98 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitLanguageOfInstructionType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;urn:crue:academic:xsd:language:diplomasupplement>PlainTextType">
+ *       &lt;attribute name="language" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguageType" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = {
+    "value"
+})
+public class CourseUnitLanguageOfInstructionType {
+
+    @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;
+    }
+
+    /**
+     * 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/CourseUnitLanguagesOfInstructionType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java
new file mode 100644
index 000000000..bfc905a75
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitLanguagesOfInstructionType.java
@@ -0,0 +1,78 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitLanguagesOfInstructionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Language" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseUnitLanguageOfInstructionType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = {
+    "language"
+})
+public class CourseUnitLanguagesOfInstructionType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..344d49990
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitStudentPerformanceType.java
@@ -0,0 +1,99 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitStudentPerformanceType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="LocalGrade" type="{urn:crue:academic:xsd:language:diplomasupplement}LocalGradeType"/>
+ *         &lt;element name="ECTSGrade" type="{urn:crue:academic:xsd:language:diplomasupplement}ECTSGradingScaleType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CourseUnitStudentPerformanceType", propOrder = {
+    "localGrade",
+    "ectsGrade"
+})
+public class CourseUnitStudentPerformanceType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..fe0d62b0b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitType.java
@@ -0,0 +1,1131 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * Course unit
+ * 
+ * <p>Java class for CourseUnitType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Code" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="ScientificArea" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Title" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="Theme" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Type">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="YearOfStudy" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="Level" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="ECTSCredits" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" minOccurs="0"/>
+ *         &lt;element name="LocalCredits" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" minOccurs="0"/>
+ *         &lt;element name="Hours" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" minOccurs="0"/>
+ *         &lt;element name="LanguagesOfInstruction" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseUnitLanguagesOfInstructionType" minOccurs="0"/>
+ *         &lt;element name="ModeOfDelivery" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="WorkPlacements" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseUnitWorkPlacementsType" minOccurs="0"/>
+ *         &lt;element name="StudentPerformance" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseUnitStudentPerformanceType" minOccurs="0"/>
+ *         &lt;element name="NameOfLecturers" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="LearningOutcomes" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="PrerequisitesAndCorequisites" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="RecomendedOptionalProgrammeComponents" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="CourseContents" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="RecomendedOrRequiredReading" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="PlanedLearningActivitiesAndTeachingMethod" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="AssesmentMethodsAndCriteria" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="Observations" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="groupID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="institutionAdministeringStudiesID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="isRequiredByTheProgramme" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@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"
+})
+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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..bb2dd2e50
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitTypeType.java
@@ -0,0 +1,68 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="Compulsory"/>
+ *     &lt;enumeration value="Optional"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "CourseUnitTypeType")
+@XmlEnum
+public enum CourseUnitTypeType {
+
+
+    /**
+     * Compulsory
+     * 
+     */
+    @XmlEnumValue("Compulsory")
+    COMPULSORY("Compulsory"),
+
+    /**
+     * Optional
+     * 
+     */
+    @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/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
new file mode 100644
index 000000000..eb930ec76
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementType.java
@@ -0,0 +1,157 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+
+/**
+ * Course unit work placement
+ * 
+ * <p>Java class for CourseUnitWorkPlacementType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitWorkPlacementType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CollaboratingInstitution" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="DateFrom" type="{urn:crue:academic:xsd:language:diplomasupplement}DateType" minOccurs="0"/>
+ *         &lt;element name="DateTo" type="{urn:crue:academic:xsd:language:diplomasupplement}DateType" minOccurs="0"/>
+ *         &lt;element name="TrainingHours" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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 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;
+    }
+
+}
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
new file mode 100644
index 000000000..f8d62f1e9
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CourseUnitWorkPlacementsType.java
@@ -0,0 +1,78 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitWorkPlacementsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="WorkPlacement" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseUnitWorkPlacementType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CourseUnitWorkPlacementsType", propOrder = {
+    "workPlacement"
+})
+public class CourseUnitWorkPlacementsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..8d9c69b53
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="MobilityProgramme" type="{urn:crue:academic:xsd:language:diplomasupplement}MobilityProgrammeType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CoursesAttendedInOtherInstitutionInMobilityProgramsType", propOrder = {
+    "mobilityProgramme"
+})
+public class CoursesAttendedInOtherInstitutionInMobilityProgramsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..364fa3f85
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupType.java
@@ -0,0 +1,190 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Courses group
+ * 
+ * <p>Java class for CoursesGroupType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CoursesGroupType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="HeaderInformation" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="CoursesGroup" type="{urn:crue:academic:xsd:language:diplomasupplement}CoursesGroupType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="FooterInformation" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="groupID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..820581335
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesGroupsType.java
@@ -0,0 +1,162 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CoursesGroupsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="HeaderInformation" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="CoursesGroup" type="{urn:crue:academic:xsd:language:diplomasupplement}CoursesGroupType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="FooterInformation" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..a2258cab0
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/CoursesUnitsType.java
@@ -0,0 +1,78 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CoursesUnitsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CourseUnit" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseUnitType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CoursesUnitsType", propOrder = {
+    "courseUnit"
+})
+public class CoursesUnitsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..b08a4fb72
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/DiplomaSupplementType.java
@@ -0,0 +1,411 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
+
+
+/**
+ * Diploma Supplement
+ * 
+ * <p>Java class for DiplomaSupplementType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="DiplomaSupplementType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="InformationIdentifyingTheHolderOfTheQualification" type="{urn:crue:academic:xsd:language:diplomasupplement}InformationIdentifyingTheHolderOfTheQualificationType"/>
+ *         &lt;element name="InformationIdentifyingTheQualification" type="{urn:crue:academic:xsd:language:diplomasupplement}InformationIdentifyingTheQualificationType"/>
+ *         &lt;element name="InformationOnTheLevelOfTheQualification" type="{urn:crue:academic:xsd:language:diplomasupplement}InformationOnTheLevelOfTheQualificationType"/>
+ *         &lt;element name="InformationOnTheContentsAndResultsGained" type="{urn:crue:academic:xsd:language:diplomasupplement}InformationOnTheContentsAndResultsGainedType"/>
+ *         &lt;element name="InformationOnTheFunctionOfTheQualification" type="{urn:crue:academic:xsd:language:diplomasupplement}InformationOnTheFunctionOfTheQualificationType"/>
+ *         &lt;element name="AdditionalInformation" type="{urn:crue:academic:xsd:language:diplomasupplement}AdditionalInformationType"/>
+ *         &lt;element name="CertificationOfTheSupplement" type="{urn:crue:academic:xsd:language:diplomasupplement}CertificationOfTheSupplementType"/>
+ *         &lt;element name="InformationOnTheNationalHigherEducationSystem" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType"/>
+ *         &lt;element name="Attachments" type="{urn:crue:academic:xsd:language:diplomasupplement}AttachmentsType" minOccurs="0"/>
+ *         &lt;element name="ExtensionContent" type="{urn:crue:academic:xsd:language:diplomasupplement}ExtensionContentType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="language" use="required" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguageType" />
+ *       &lt;attribute name="isTheOriginalLanguage" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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 isTheOriginalLanguage property.
+     * 
+     */
+    public boolean isIsTheOriginalLanguage() {
+        return isTheOriginalLanguage;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..94be08fb8
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ECTSGradingScaleType.java
@@ -0,0 +1,90 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="A"/>
+ *     &lt;enumeration value="B"/>
+ *     &lt;enumeration value="C"/>
+ *     &lt;enumeration value="D"/>
+ *     &lt;enumeration value="E"/>
+ *     &lt;enumeration value="FX"/>
+ *     &lt;enumeration value="F"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ECTSGradingScaleType")
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..05dbdedfe
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/EHEAFrameworkType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="FirstCycle"/>
+ *     &lt;enumeration value="SecondCycle"/>
+ *     &lt;enumeration value="ThirdCycle"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "EHEAFrameworkType")
+@XmlEnum
+public enum EHEAFrameworkType {
+
+
+    /**
+     * First Cycle
+     * 
+     */
+    @XmlEnumValue("FirstCycle")
+    FIRST_CYCLE("FirstCycle"),
+
+    /**
+     * Second Cycle
+     * 
+     */
+    @XmlEnumValue("SecondCycle")
+    SECOND_CYCLE("SecondCycle"),
+
+    /**
+     * Third Cycle
+     * 
+     */
+    @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/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
new file mode 100644
index 000000000..5eb351cf7
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ExtensionContentType.java
@@ -0,0 +1,111 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ExtensionContentType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence maxOccurs="unbounded" minOccurs="0">
+ *         &lt;any processContents='lax'/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ExtensionContentType", propOrder = {
+    "content"
+})
+public class ExtensionContentType {
+
+    @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;
+    }
+
+    /**
+     * 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/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
new file mode 100644
index 000000000..804dfc3e9
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/FamilyNameType.java
@@ -0,0 +1,78 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="FamilyNameType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Surname" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "FamilyNameType", propOrder = {
+    "surname"
+})
+public class FamilyNameType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..92c9dee87
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GenderType.java
@@ -0,0 +1,68 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="Female"/>
+ *     &lt;enumeration value="Male"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "GenderType")
+@XmlEnum
+public enum GenderType {
+
+
+    /**
+     * Female
+     * 
+     */
+    @XmlEnumValue("Female")
+    FEMALE("Female"),
+
+    /**
+     * Male
+     * 
+     */
+    @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/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
new file mode 100644
index 000000000..ac27d7149
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GivenNameType.java
@@ -0,0 +1,78 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="GivenNameType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "GivenNameType", propOrder = {
+    "name"
+})
+public class GivenNameType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..ab896f7f4
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/GradingSchemeAndGradeDistributionGuidanceType.java
@@ -0,0 +1,99 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="GradingSchemeAndGradeDistributionGuidanceType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="GradingScheme" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType"/>
+ *         &lt;element name="GradeDistributionGuidance" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = {
+    "gradingScheme",
+    "gradeDistributionGuidance"
+})
+public class GradingSchemeAndGradeDistributionGuidanceType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..22383f975
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ImageMimeType.java
@@ -0,0 +1,92 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="image/gif"/>
+ *     &lt;enumeration value="image/jpeg"/>
+ *     &lt;enumeration value="image/pjpeg"/>
+ *     &lt;enumeration value="image/png"/>
+ *     &lt;enumeration value="image/tiff"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ImageMimeType")
+@XmlEnum(MimeType.class)
+public enum ImageMimeType {
+
+
+    /**
+     * 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/pjpeg")
+    IMAGE_PJPEG(MimeType.IMAGE_PJPEG),
+
+    /**
+     * 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;
+
+    ImageMimeType(MimeType v) {
+        value = v;
+    }
+
+    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());
+    }
+
+}
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
new file mode 100644
index 000000000..7f5076886
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheHolderOfTheQualificationType.java
@@ -0,0 +1,420 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InformationIdentifyingTheHolderOfTheQualificationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="FamilyName" type="{urn:crue:academic:xsd:language:diplomasupplement}FamilyNameType"/>
+ *         &lt;element name="GivenName" type="{urn:crue:academic:xsd:language:diplomasupplement}GivenNameType"/>
+ *         &lt;element name="DateOfBirth" type="{urn:crue:academic:xsd:language:diplomasupplement}DateType"/>
+ *         &lt;element name="StudentIdentificationNumber" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="CountryOfBirth" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="PlaceOfBirth" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Gender" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..3820c55a3
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationIdentifyingTheQualificationType.java
@@ -0,0 +1,211 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InformationIdentifyingTheQualificationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Qualification" type="{urn:crue:academic:xsd:language:diplomasupplement}QualificationType"/>
+ *         &lt;element name="TitleConferred" type="{urn:crue:academic:xsd:language:diplomasupplement}TitleConferredType" minOccurs="0"/>
+ *         &lt;element name="MainFieldsOfStudy" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType"/>
+ *         &lt;element name="NameAndStatusOfAwardingInstitution" type="{urn:crue:academic:xsd:language:diplomasupplement}NameAndStatusOfAwardingInstitutionType"/>
+ *         &lt;element name="NameAndStatusOfInstitutionAdministeringStudies" type="{urn:crue:academic:xsd:language:diplomasupplement}NameAndStatusOfInstitutionAdministeringStudiesType"/>
+ *         &lt;element name="LanguagesOfInstructionAndExamination" type="{urn:crue:academic:xsd:language:diplomasupplement}LanguagesOfInstructionAndExaminationType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..68869c7ba
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheContentsAndResultsGainedType.java
@@ -0,0 +1,245 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InformationOnTheContentsAndResultsGainedType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ModeOfStudy">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="ProgrammeRequirements" type="{urn:crue:academic:xsd:language:diplomasupplement}ProgrammeRequirementsType"/>
+ *         &lt;element name="ProgrammeDetails" type="{urn:crue:academic:xsd:language:diplomasupplement}ProgrammeDetailsType"/>
+ *         &lt;element name="GradingSchemeAndGradeDistributionGuidance" type="{urn:crue:academic:xsd:language:diplomasupplement}GradingSchemeAndGradeDistributionGuidanceType"/>
+ *         &lt;element name="OverallClassificationOfTheQualification" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..e16bb9b22
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheFunctionOfTheQualificationType.java
@@ -0,0 +1,161 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InformationOnTheFunctionOfTheQualificationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="AccessToFurtherStudy" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType"/>
+ *         &lt;element name="ProfessionalStatus" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..796130137
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InformationOnTheLevelOfTheQualificationType.java
@@ -0,0 +1,391 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Information on the level of the qualification
+ * 
+ * <p>Java class for InformationOnTheLevelOfTheQualificationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InformationOnTheLevelOfTheQualificationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Level">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="OfficialLengthOfProgramme">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="AccessRequirements" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..c19db9312
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/InstitutionType.java
@@ -0,0 +1,454 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InstitutionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="Status" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="Country">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="AdditionalInformation" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="ContactInformation" type="{urn:crue:academic:xsd:language:diplomasupplement}ContactInformationType" minOccurs="0"/>
+ *         &lt;element name="AttachedImageRef" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *       &lt;attribute name="nationalID" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" />
+ *       &lt;attribute name="erasmusID" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@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
+})
+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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..7cbc99872
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguageType.java
@@ -0,0 +1,836 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="ab"/>
+ *     &lt;enumeration value="af"/>
+ *     &lt;enumeration value="an"/>
+ *     &lt;enumeration value="ar"/>
+ *     &lt;enumeration value="as"/>
+ *     &lt;enumeration value="az"/>
+ *     &lt;enumeration value="be"/>
+ *     &lt;enumeration value="bg"/>
+ *     &lt;enumeration value="bn"/>
+ *     &lt;enumeration value="bo"/>
+ *     &lt;enumeration value="br"/>
+ *     &lt;enumeration value="bs"/>
+ *     &lt;enumeration value="ca"/>
+ *     &lt;enumeration value="ce"/>
+ *     &lt;enumeration value="co"/>
+ *     &lt;enumeration value="cs"/>
+ *     &lt;enumeration value="cy"/>
+ *     &lt;enumeration value="da"/>
+ *     &lt;enumeration value="de"/>
+ *     &lt;enumeration value="el"/>
+ *     &lt;enumeration value="en"/>
+ *     &lt;enumeration value="es"/>
+ *     &lt;enumeration value="et"/>
+ *     &lt;enumeration value="eu"/>
+ *     &lt;enumeration value="fa"/>
+ *     &lt;enumeration value="fi"/>
+ *     &lt;enumeration value="fj"/>
+ *     &lt;enumeration value="fo"/>
+ *     &lt;enumeration value="fr"/>
+ *     &lt;enumeration value="fy"/>
+ *     &lt;enumeration value="ga"/>
+ *     &lt;enumeration value="gd"/>
+ *     &lt;enumeration value="gl"/>
+ *     &lt;enumeration value="gv"/>
+ *     &lt;enumeration value="grc"/>
+ *     &lt;enumeration value="gsw"/>
+ *     &lt;enumeration value="he"/>
+ *     &lt;enumeration value="hi"/>
+ *     &lt;enumeration value="hr"/>
+ *     &lt;enumeration value="ht"/>
+ *     &lt;enumeration value="hu"/>
+ *     &lt;enumeration value="hy"/>
+ *     &lt;enumeration value="id"/>
+ *     &lt;enumeration value="is"/>
+ *     &lt;enumeration value="it"/>
+ *     &lt;enumeration value="ja"/>
+ *     &lt;enumeration value="jv"/>
+ *     &lt;enumeration value="ka"/>
+ *     &lt;enumeration value="kg"/>
+ *     &lt;enumeration value="ko"/>
+ *     &lt;enumeration value="ku"/>
+ *     &lt;enumeration value="kw"/>
+ *     &lt;enumeration value="ky"/>
+ *     &lt;enumeration value="lb"/>
+ *     &lt;enumeration value="li"/>
+ *     &lt;enumeration value="ln"/>
+ *     &lt;enumeration value="lt"/>
+ *     &lt;enumeration value="lv"/>
+ *     &lt;enumeration value="mg"/>
+ *     &lt;enumeration value="mk"/>
+ *     &lt;enumeration value="mn"/>
+ *     &lt;enumeration value="mo"/>
+ *     &lt;enumeration value="ms"/>
+ *     &lt;enumeration value="mt"/>
+ *     &lt;enumeration value="my"/>
+ *     &lt;enumeration value="nb"/>
+ *     &lt;enumeration value="ne"/>
+ *     &lt;enumeration value="nl"/>
+ *     &lt;enumeration value="nn"/>
+ *     &lt;enumeration value="no"/>
+ *     &lt;enumeration value="pl"/>
+ *     &lt;enumeration value="pt"/>
+ *     &lt;enumeration value="rm"/>
+ *     &lt;enumeration value="ro"/>
+ *     &lt;enumeration value="ru"/>
+ *     &lt;enumeration value="sc"/>
+ *     &lt;enumeration value="se"/>
+ *     &lt;enumeration value="sk"/>
+ *     &lt;enumeration value="sl"/>
+ *     &lt;enumeration value="so"/>
+ *     &lt;enumeration value="sq"/>
+ *     &lt;enumeration value="sr"/>
+ *     &lt;enumeration value="sv"/>
+ *     &lt;enumeration value="sw"/>
+ *     &lt;enumeration value="tk"/>
+ *     &lt;enumeration value="tr"/>
+ *     &lt;enumeration value="ty"/>
+ *     &lt;enumeration value="uk"/>
+ *     &lt;enumeration value="ur"/>
+ *     &lt;enumeration value="uz"/>
+ *     &lt;enumeration value="vi"/>
+ *     &lt;enumeration value="yi"/>
+ *     &lt;enumeration value="zh"/>
+ *     &lt;enumeration value="cu"/>
+ *     &lt;enumeration value="eo"/>
+ *     &lt;enumeration value="la"/>
+ *     &lt;enumeration value="oc"/>
+ *     &lt;enumeration value="vo"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "LanguageType")
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..202da42b4
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LanguagesOfInstructionAndExaminationType.java
@@ -0,0 +1,169 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Language of instruction and examination
+ * 
+ * <p>Java class for LanguagesOfInstructionAndExaminationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="LanguagesOfInstructionAndExaminationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Language" maxOccurs="unbounded">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..96c7b66dd
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/LocalGradeType.java
@@ -0,0 +1,247 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="LocalGradeType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="AcademicYear" type="{urn:crue:academic:xsd:language:diplomasupplement}AcademicYearType"/>
+ *         &lt;element name="DateIssued" type="{urn:crue:academic:xsd:language:diplomasupplement}DateType" minOccurs="0"/>
+ *         &lt;element name="Grade" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="Source" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..a83d3bf21
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MimeType.java
@@ -0,0 +1,108 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="image/gif"/>
+ *     &lt;enumeration value="image/jpeg"/>
+ *     &lt;enumeration value="image/pjpeg"/>
+ *     &lt;enumeration value="image/png"/>
+ *     &lt;enumeration value="image/tiff"/>
+ *     &lt;enumeration value="text/html"/>
+ *     &lt;enumeration value="application/pdf"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "MimeType")
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..e54f9c61a
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCourseUnitType.java
@@ -0,0 +1,278 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * Mobility programme course unit
+ * 
+ * <p>Java class for MobilityProgrammeCourseUnitType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MobilityProgrammeCourseUnitType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Code" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Title">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="ECTSCredits" type="{urn:crue:academic:xsd:language:diplomasupplement}PositiveDecimalType" minOccurs="0"/>
+ *         &lt;element name="AdditionalInformation" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="isInTheLearningAgreement" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..557c6610c
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeCoursesUnitsType.java
@@ -0,0 +1,78 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MobilityProgrammeCoursesUnitsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CourseUnit" type="{urn:crue:academic:xsd:language:diplomasupplement}MobilityProgrammeCourseUnitType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MobilityProgrammeCoursesUnitsType", propOrder = {
+    "courseUnit"
+})
+public class MobilityProgrammeCoursesUnitsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..0c91a826c
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MobilityProgrammeType.java
@@ -0,0 +1,359 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MobilityProgrammeType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Type" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="FieldOfStudy" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Country">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="ReceivingInstitutionName" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="AcademicYear" type="{urn:crue:academic:xsd:language:diplomasupplement}AcademicYearType"/>
+ *         &lt;element name="DateFrom" type="{urn:crue:academic:xsd:language:diplomasupplement}DateType" minOccurs="0"/>
+ *         &lt;element name="DateTo" type="{urn:crue:academic:xsd:language:diplomasupplement}DateType" minOccurs="0"/>
+ *         &lt;element name="CoursesUnits" type="{urn:crue:academic:xsd:language:diplomasupplement}MobilityProgrammeCoursesUnitsType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+    /**
+     * 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 MobilityProgrammeType.Country }
+     *     
+     */
+    public MobilityProgrammeType.Country getCountry() {
+        return country;
+    }
+
+    /**
+     * 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 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;
+    }
+
+
+    /**
+     * <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/ModeOfDeliveryType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfDeliveryType.java
new file mode 100644
index 000000000..762ba0e99
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfDeliveryType.java
@@ -0,0 +1,68 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="FaceToFace"/>
+ *     &lt;enumeration value="DistanceLearning"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ModeOfDeliveryType")
+@XmlEnum
+public enum ModeOfDeliveryType {
+
+
+    /**
+     * Face-to-face
+     * 
+     */
+    @XmlEnumValue("FaceToFace")
+    FACE_TO_FACE("FaceToFace"),
+
+    /**
+     * Distance learning
+     * 
+     */
+    @XmlEnumValue("DistanceLearning")
+    DISTANCE_LEARNING("DistanceLearning");
+    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/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
new file mode 100644
index 000000000..c8f32a752
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ModeOfStudyType.java
@@ -0,0 +1,92 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="FullTime"/>
+ *     &lt;enumeration value="ParTime"/>
+ *     &lt;enumeration value="Distance"/>
+ *     &lt;enumeration value="eLearning"/>
+ *     &lt;enumeration value="Another"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ModeOfStudyType")
+@XmlEnum
+public enum ModeOfStudyType {
+
+
+    /**
+     * Full time
+     * 
+     */
+    @XmlEnumValue("FullTime")
+    FULL_TIME("FullTime"),
+
+    /**
+     * Par time
+     * 
+     */
+    @XmlEnumValue("ParTime")
+    PAR_TIME("ParTime"),
+
+    /**
+     * Distance
+     * 
+     */
+    @XmlEnumValue("Distance")
+    DISTANCE("Distance"),
+
+    /**
+     * eLearning
+     * 
+     */
+    @XmlEnumValue("eLearning")
+    E_LEARNING("eLearning"),
+
+    /**
+     * Another
+     * 
+     */
+    @XmlEnumValue("Another")
+    ANOTHER("Another");
+    private final String value;
+
+    ModeOfStudyType(String v) {
+        value = v;
+    }
+
+    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);
+    }
+
+}
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
new file mode 100644
index 000000000..f4bd8a5d1
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/MultilingualDiplomaSupplementType.java
@@ -0,0 +1,112 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
+
+
+/**
+ * Multilingual Diploma Supplement (DS)
+ * 
+ * <p>Java class for MultilingualDiplomaSupplementType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MultilingualDiplomaSupplementType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{urn:crue:academic:xsd:language:diplomasupplement}DiplomaSupplement" maxOccurs="unbounded" minOccurs="2"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..063244c03
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfAwardingInstitutionType.java
@@ -0,0 +1,140 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Name and status of awarding institution
+ * 
+ * <p>Java class for NameAndStatusOfAwardingInstitutionType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="NameAndStatusOfAwardingInstitutionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="AwardingInstitution" maxOccurs="unbounded">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+
+    /**
+     * <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;
+
+        /**
+         * 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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..3083da620
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/NameAndStatusOfInstitutionAdministeringStudiesType.java
@@ -0,0 +1,140 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * Name and status of institution administering studies
+ * 
+ * <p>Java class for NameAndStatusOfInstitutionAdministeringStudiesType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="NameAndStatusOfInstitutionAdministeringStudiesType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="InstitutionAdministeringStudies" maxOccurs="unbounded">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+
+    /**
+     * <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;
+
+        /**
+         * 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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..b6473551b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ObjectFactory.java
@@ -0,0 +1,656 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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.
+ * 
+ */
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..1d2cfd97e
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialCertifyingType.java
@@ -0,0 +1,155 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="OfficialCertifyingType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="FamilyName" type="{urn:crue:academic:xsd:language:diplomasupplement}FamilyNameType"/>
+ *         &lt;element name="GivenName" type="{urn:crue:academic:xsd:language:diplomasupplement}GivenNameType"/>
+ *         &lt;element name="Capacity" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="awardingInstitutionID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..af9007a1b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialStampType.java
@@ -0,0 +1,99 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="OfficialStampType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Description" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="awardingInstitutionID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "OfficialStampType", propOrder = {
+    "description"
+})
+public class OfficialStampType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..392e8d412
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/OfficialsCertifyingType.java
@@ -0,0 +1,78 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="OfficialsCertifyingType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="OfficialCertifying" type="{urn:crue:academic:xsd:language:diplomasupplement}OfficialCertifyingType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "OfficialsCertifyingType", propOrder = {
+    "officialCertifying"
+})
+public class OfficialsCertifyingType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..a6e27914c
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeDetailsType.java
@@ -0,0 +1,99 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ProgrammeDetailsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CourseStructureDiagram" type="{urn:crue:academic:xsd:language:diplomasupplement}CourseStructureDiagramType"/>
+ *         &lt;element name="CoursesAttendedInOtherInstitutionInMobilityPrograms" type="{urn:crue:academic:xsd:language:diplomasupplement}CoursesAttendedInOtherInstitutionInMobilityProgramsType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ProgrammeDetailsType", propOrder = {
+    "courseStructureDiagram",
+    "coursesAttendedInOtherInstitutionInMobilityPrograms"
+})
+public class ProgrammeDetailsType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..e0f358aca
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/ProgrammeRequirementsType.java
@@ -0,0 +1,99 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ProgrammeRequirementsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Requirements" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType"/>
+ *         &lt;element name="KeyLearningOutcomes" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ProgrammeRequirementsType", propOrder = {
+    "requirements",
+    "keyLearningOutcomes"
+})
+public class ProgrammeRequirementsType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..8700fcfca
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/QualificationType.java
@@ -0,0 +1,154 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="QualificationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="AdditionalInformation" type="{urn:crue:academic:xsd:language:diplomasupplement}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="localID" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" />
+ *       &lt;attribute name="nationalID" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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 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 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..18d44c09b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/RichTextTagType.java
@@ -0,0 +1,201 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementRefs;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlMixed;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="RichTextTagType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="Bold" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="BreakLine" type="{urn:crue:academic:xsd:language:diplomasupplement}EmptyType"/>
+ *         &lt;element name="Italic" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="Underline" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *         &lt;element name="AttachedRef">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/choice>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@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
+})
+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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..be97a835f
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/SourceGradeType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="Recognized"/>
+ *     &lt;enumeration value="MobilityProgramme"/>
+ *     &lt;enumeration value="Another"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "SourceGradeType")
+@XmlEnum
+public enum SourceGradeType {
+
+
+    /**
+     * Recognized
+     * 
+     */
+    @XmlEnumValue("Recognized")
+    RECOGNIZED("Recognized"),
+
+    /**
+     * Course unit attended in mobility programme
+     * 
+     */
+    @XmlEnumValue("MobilityProgramme")
+    MOBILITY_PROGRAMME("MobilityProgramme"),
+
+    /**
+     * Another
+     * 
+     */
+    @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/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
new file mode 100644
index 000000000..7d06458e0
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/TitleConferredType.java
@@ -0,0 +1,71 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TitleConferredType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:crue:academic:xsd:language:diplomasupplement}PlainTextType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TitleConferredType", propOrder = {
+    "name"
+})
+public class TitleConferredType {
+
+    @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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..427159cb8
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/crue/academic/xsd/language/diplomasupplement/package-info.java
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2014.04.12 at 12:22:50 PM GMT 
+//
+
+@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/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 3c214cb7b..7877f8cee 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,89 +1,89 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="acTitleType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="titleNormalised" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}titleNormalisedType"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "acTitleType", propOrder = {

-    "titleNormalised",

-    "aqaa"

-})

-public class AcTitleType {

-

-    @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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * Sets the value of the aqaa property.

-     * 

-     */

-    public void setAQAA(int value) {

-        this.aqaa = value;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="acTitleType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="titleNormalised" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}titleNormalisedType"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "acTitleType", propOrder = {
+    "titleNormalised",
+    "aqaa"
+})
+public class AcTitleType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 1a815e944..e2dd4e5e0 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,61 +1,61 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlEnum;

-import javax.xml.bind.annotation.XmlEnumValue;

-import javax.xml.bind.annotation.XmlType;

-

-

-/**

- * <p>Java class for AttributeStatusType.

- * 

- * <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">

- *     &lt;enumeration value="Available"/>

- *     &lt;enumeration value="NotAvailable"/>

- *     &lt;enumeration value="Withheld"/>

- *   &lt;/restriction>

- * &lt;/simpleType>

- * </pre>

- * 

- */

-@XmlType(name = "AttributeStatusType")

-@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);

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="Available"/>
+ *     &lt;enumeration value="NotAvailable"/>
+ *     &lt;enumeration value="Withheld"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "AttributeStatusType")
+@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);
+    }
+
+}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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 fa0289cfa..2c2117c14 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,264 +1,264 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlElement;

-import javax.xml.bind.annotation.XmlType;

-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;

-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;

-

-

-/**

- * <p>Java class for canonicalAddressType complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="canonicalAddressType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="countryCodeAddress" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}CountryCodeType"/>

- *         &lt;element name="state" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *         &lt;element name="municipalityCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *         &lt;element name="town" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="postalCode" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="streetName" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="streetNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *         &lt;element name="apartmentNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@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;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="canonicalAddressType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="countryCodeAddress" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}CountryCodeType"/>
+ *         &lt;element name="state" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="municipalityCode" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="town" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="postalCode" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="streetName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="streetNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="apartmentNumber" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..71f028cea
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/CurrentStudiesType.java
@@ -0,0 +1,198 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElement;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="currentStudiesType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;choice>
+ *           &lt;element ref="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}MultilingualGeneralDiploma"/>
+ *           &lt;element ref="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}GeneralDiploma"/>
+ *         &lt;/choice>
+ *         &lt;element name="yearOfStudy" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         &lt;element name="isEligibleForInternship" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *         &lt;any minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..584a2e771
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/DiplomaSupplementType.java
@@ -0,0 +1,207 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import eu.stork.peps.complex.attributes.crue.academic.xsd.language.diplomasupplement.MultilingualDiplomaSupplementType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="diplomaSupplementType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;choice>
+ *           &lt;element ref="{urn:crue:academic:xsd:language:diplomasupplement}MultilingualDiplomaSupplement"/>
+ *           &lt;element ref="{urn:crue:academic:xsd:language:diplomasupplement}DiplomaSupplement"/>
+ *           &lt;element ref="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}MultilingualGeneralDiploma"/>
+ *           &lt;element ref="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}GeneralDiploma"/>
+ *         &lt;/choice>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *         &lt;any minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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 3d99c9600..b0fc4d245 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,89 +1,89 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="habilitation">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="ability" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "habilitation", propOrder = {

-    "ability",

-    "aqaa"

-})

-public class Habilitation {

-

-    @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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * Sets the value of the aqaa property.

-     * 

-     */

-    public void setAQAA(int value) {

-        this.aqaa = value;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="habilitation">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ability" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "habilitation", propOrder = {
+    "ability",
+    "aqaa"
+})
+public class Habilitation {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 6a5cb7b00..92d600244 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,89 +1,89 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="habilitationType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="ability" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "habilitationType", propOrder = {

-    "ability",

-    "aqaa"

-})

-public class HabilitationType {

-

-    @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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * Sets the value of the aqaa property.

-     * 

-     */

-    public void setAQAA(int value) {

-        this.aqaa = value;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="habilitationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ability" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "habilitationType", propOrder = {
+    "ability",
+    "aqaa"
+})
+public class HabilitationType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 cc09f0486..6e4edc6e0 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,89 +1,89 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="hasAccountInBankType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="bankName" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "hasAccountInBankType", propOrder = {

-    "bankName",

-    "aqaa"

-})

-public class HasAccountInBankType {

-

-    @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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * Sets the value of the aqaa property.

-     * 

-     */

-    public void setAQAA(int value) {

-        this.aqaa = value;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="hasAccountInBankType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="bankName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "hasAccountInBankType", propOrder = {
+    "bankName",
+    "aqaa"
+})
+public class HasAccountInBankType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 ea466cb18..789a527e4 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,174 +1,174 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import java.math.BigInteger;

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="hasDegreeType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="study" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}studyType"/>

- *         &lt;element name="level" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}LevelType"/>

- *         &lt;element name="yearObtained" type="{http://www.w3.org/2001/XMLSchema}integer"/>

- *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@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;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="hasDegreeType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="study" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}studyType"/>
+ *         &lt;element name="level" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}LevelType"/>
+ *         &lt;element name="yearObtained" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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 02d9286d8..fe4422b94 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,145 +1,144 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="isAcademicStaffType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="occupation" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}occupationType"/>

- *         &lt;element name="knowledgearea" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "isAcademicStaffType", propOrder = {

-    "nameOfInstitution",

-    "occupation",

-    "knowledgearea",

-    "aqaa"

-})

-public class IsAcademicStaffType {

-

-    @XmlElement(required = true)

-    protected String nameOfInstitution;

-    @XmlElement(required = true)

-    protected String occupation;

-    @XmlElement(required = true)

-    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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * Sets the value of the aqaa property.

-     * 

-     */

-    public void setAQAA(int value) {

-        this.aqaa = value;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="isAcademicStaffType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="occupation" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}occupationType"/>
+ *         &lt;element name="knowledgeArea" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 0de16ee77..3cc073ed8 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,89 +1,89 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="isAdminStaffType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="adminStaff" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "isAdminStaffType", propOrder = {

-    "adminStaff",

-    "aqaa"

-})

-public class IsAdminStaffType {

-

-    @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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * Sets the value of the aqaa property.

-     * 

-     */

-    public void setAQAA(int value) {

-        this.aqaa = value;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="isAdminStaffType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="adminStaff" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "isAdminStaffType", propOrder = {
+    "adminStaff",
+    "aqaa"
+})
+public class IsAdminStaffType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 58caa2f22..d2151e30c 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,89 +1,89 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="isCourseCoordinatorType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="courseCoodinator" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "isCourseCoordinatorType", propOrder = {

-    "courseCoodinator",

-    "aqaa"

-})

-public class IsCourseCoordinatorType {

-

-    @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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * Sets the value of the aqaa property.

-     * 

-     */

-    public void setAQAA(int value) {

-        this.aqaa = value;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="isCourseCoordinatorType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="courseCoodinator" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "isCourseCoordinatorType", propOrder = {
+    "courseCoodinator",
+    "aqaa"
+})
+public class IsCourseCoordinatorType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 b9798537c..711b7d68d 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -2,11 +2,11 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.06.18 at 08:26:57 AM CEST 
+// Generated on: 2014.11.27 at 06:17:01 PM CET 
 //
 
 
-package eu.stork.peps.complex.attributes;
+package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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 1e3b4fa78..be11e4ee8 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -2,11 +2,11 @@
 // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
 // Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2014.06.18 at 08:26:57 AM CEST 
+// Generated on: 2014.11.27 at 06:17:01 PM CET 
 //
 
 
-package eu.stork.peps.complex.attributes;
+package eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion;
 
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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 6a7dc838a..e02ec9811 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,146 +1,143 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import java.math.BigInteger;

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="isStudentType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}study"/>

- *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="course" type="{http://www.w3.org/2001/XMLSchema}integer"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "isStudentType", propOrder = {

-    "study",

-    "nameOfInstitution",

-    "course",

-    "aqaa"

-})

-public class IsStudentType {

-

-    @XmlElement(required = true)

-    protected String study;

-    @XmlElement(required = true)

-    protected String nameOfInstitution;

-    @XmlElement(required = true)

-    protected BigInteger 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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * 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 BigInteger }

-     *     

-     */

-    public BigInteger getCourse() {

-        return course;

-    }

-

-    /**

-     * Sets the value of the course property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link BigInteger }

-     *     

-     */

-    public void setCourse(BigInteger value) {

-        this.course = 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;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="isStudentType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}study" minOccurs="0"/>
+ *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="course" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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 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 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;
+    }
+
+    /**
+     * 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/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 810f652c1..4a1262003 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,145 +1,145 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="isTeacherOfType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="course" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="role" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@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;

-

-    /**

-     * 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 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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * 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;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="isTeacherOfType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="nameOfInstitution" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="course" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="role" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}teacherRoleType"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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
new file mode 100644
index 000000000..b3386cdb5
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/MandateContentType.java
@@ -0,0 +1,309 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="mandateContentType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="typePower" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="typeOfPower" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="timeRestriction" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}TimeRestrictionType"/>
+ *         &lt;element name="isJoined" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="isJoint" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="isChained" type="{http://www.w3.org/2001/XMLSchema}boolean"/>
+ *         &lt;element name="originalMandateType" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="originalMandate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         &lt;element name="transactionLimit" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}TransactionLimitRestrictionType"/>
+ *         &lt;element name="AQAA" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}QualityAuthenticationAssuranceLevelType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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 timeRestriction property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link TimeRestrictionType }
+     *     
+     */
+    public TimeRestrictionType getTimeRestriction() {
+        return timeRestriction;
+    }
+
+    /**
+     * 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 isJoined property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIsJoined() {
+        return isJoined;
+    }
+
+    /**
+     * 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 isJoint property.
+     * 
+     * @return
+     *     possible object is
+     *     {@link String }
+     *     
+     */
+    public String getIsJoint() {
+        return isJoint;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 26597dc6b..5ac29e2df 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,125 +1,162 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="mandateType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element name="represented" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}representationPersonType"/>

- *         &lt;element name="representing" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}representationPersonType"/>

- *         &lt;element name="mandateContent" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}mandateContentType"/>

- *       &lt;/sequence>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "mandateType", propOrder = {

-    "represented",

-    "representing",

-    "mandateContent"

-})

-public class MandateType {

-

-    @XmlElement(required = true)

-    protected RepresentationPersonType represented;

-    @XmlElement(required = true)

-    protected RepresentationPersonType representing;

-    @XmlElement(required = true)

-    protected MandateContentType mandateContent;

-

-    /**

-     * 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;

-    }

-

-    /**

-     * 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;

-    }

-

-    /**

-     * Gets the value of the mandateContent property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link MandateContentType }

-     *     

-     */

-    public MandateContentType getMandateContent() {

-        return mandateContent;

-    }

-

-    /**

-     * Sets the value of the mandateContent property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link MandateContentType }

-     *     

-     */

-    public void setMandateContent(MandateContentType value) {

-        this.mandateContent = value;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="mandateType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="represented" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}representationPersonType"/>
+ *         &lt;element name="representing" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}representationPersonType"/>
+ *         &lt;element name="representative" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}representationPersonType"/>
+ *         &lt;element name="mandateContent" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}mandateContentType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 f80a4321c..f1ea05d65 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,443 +1,523 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.JAXBElement;

-import javax.xml.bind.annotation.XmlElementDecl;

-import javax.xml.bind.annotation.XmlRegistry;

-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.peps.complex.attributes 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 _HasDegree_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasDegree");

-    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 _IsStudent_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "isStudent");

-    private final static QName _AQAA_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AQAA");

-    private final static QName _HCPType_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "HCPType");

-    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 _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 _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 _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 _CitizenCountryCode_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "CitizenCountryCode");

-    private final static QName _AttributeValue_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "AttributeValue");

-    private final static QName _HasAccountInBank_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "hasAccountInBank");

-    private final static QName _CountryCodeAddress_QNAME = new QName("urn:eu:stork:names:tc:STORK:1.0:assertion", "countryCodeAddress");

-    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");

-    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");

-

-    /**

-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: eu.stork.peps.complex.attributes

-     * 

-     */

-    public ObjectFactory() {

-    }

-

-    /**

-     * 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 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 IsStudentType }

-     * 

-     */

-    public IsStudentType createIsStudentType() {

-        return new IsStudentType();

-    }

-

-    /**

-     * Create an instance of {@link HasDegreeType }

-     * 

-     */

-    public HasDegreeType createHasDegreeType() {

-        return new HasDegreeType();

-    }

-

-    /**

-     * Create an instance of {@link HabilitationType }

-     * 

-     */

-    public HabilitationType createHabilitationType() {

-        return new HabilitationType();

-    }

-

-    /**

-     * Create an instance of {@link MandateContentType }

-     * 

-     */

-    public MandateContentType createMandateContentType() {

-        return new MandateContentType();

-    }

-

-    /**

-     * Create an instance of {@link RepresentationPersonType }

-     * 

-     */

-    public RepresentationPersonType createRepresentationPersonType() {

-        return new RepresentationPersonType();

-    }

-

-    /**

-     * Create an instance of {@link Habilitation }

-     * 

-     */

-    public Habilitation createHabilitation() {

-        return new Habilitation();

-    }

-

-    /**

-     * 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 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 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 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 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 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 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 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 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 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 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 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 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 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 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);

-    }

-

-

-    /**

-     * 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<IsHealthCareProfessionalDeprecatedType> createIsHealthCareProfessional(IsHealthCareProfessionalDeprecatedType value) {

-        return new JAXBElement<IsHealthCareProfessionalDeprecatedType>(_IsHealthCareProfessional_QNAME, IsHealthCareProfessionalDeprecatedType.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);

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlElementDecl;
+import javax.xml.bind.annotation.XmlRegistry;
+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.
+ * 
+ */
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..776b36644
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/OriginalMandateType.java
@@ -0,0 +1,92 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="originalMandateType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       &lt;attribute name="mimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "originalMandateType", propOrder = {
+    "value"
+})
+public class OriginalMandateType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 b1d993f89..fd7aa460a 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,289 +1,289 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import javax.xml.bind.annotation.XmlAccessType;

-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>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="representationPersonType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;choice>

- *         &lt;sequence>

- *           &lt;element name="eIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *           &lt;element name="givenName" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *           &lt;element name="surname" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *           &lt;element name="dateOfBirth" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;/sequence>

- *         &lt;sequence>

- *           &lt;element name="eLPIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *           &lt;element name="name" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *           &lt;element name="address" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *           &lt;element name="canonicalAddress" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}canonicalAddressType"/>

- *           &lt;element name="type" type="{http://www.w3.org/2001/XMLSchema}string"/>

- *         &lt;/sequence>

- *       &lt;/choice>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@XmlType(name = "representationPersonType", propOrder = {

-    "eIdentifier",

-    "givenName",

-    "surname",

-    "dateOfBirth",

-    "elpIdentifier",

-    "name",

-    "address",

-    "canonicalAddress",

-    "type"

-})

-public class RepresentationPersonType {

-

-    protected String eIdentifier;

-    protected String givenName;

-    protected String surname;

-    protected String dateOfBirth;

-    @XmlElement(name = "eLPIdentifier")

-    protected String elpIdentifier;

-    protected String name;

-    protected String address;

-    protected CanonicalAddressType canonicalAddress;

-    protected String type;

-

-    /**

-     * 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 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 address property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link String }

-     *     

-     */

-    public String getAddress() {

-        return address;

-    }

-

-    /**

-     * Sets the value of the address property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link String }

-     *     

-     */

-    public void setAddress(String value) {

-        this.address = value;

-    }

-

-    /**

-     * Gets the value of the canonicalAddress property.

-     * 

-     * @return

-     *     possible object is

-     *     {@link CanonicalAddressType }

-     *     

-     */

-    public CanonicalAddressType getCanonicalAddress() {

-        return canonicalAddress;

-    }

-

-    /**

-     * Sets the value of the canonicalAddress property.

-     * 

-     * @param value

-     *     allowed object is

-     *     {@link CanonicalAddressType }

-     *     

-     */

-    public void setCanonicalAddress(CanonicalAddressType value) {

-        this.canonicalAddress = 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;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="representationPersonType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;sequence>
+ *           &lt;element name="eIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           &lt;element name="givenName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           &lt;element name="surname" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           &lt;element name="dateOfBirth" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/sequence>
+ *         &lt;sequence>
+ *           &lt;element name="eLPIdentifier" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           &lt;element name="legalName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           &lt;element name="textRegisteredAddress" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           &lt;element name="canonicalRegisteredAddress" type="{urn:eu:stork:names:tc:STORK:1.0:assertion}canonicalAddressType"/>
+ *           &lt;element name="legalForm" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;/sequence>
+ *       &lt;/choice>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
diff --git a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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 6a7c0b443..4800a2cfc 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,212 +1,212 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-

-package eu.stork.peps.complex.attributes;

-

-import java.util.ArrayList;

-import java.util.HashMap;

-import java.util.List;

-import java.util.Map;

-import javax.xml.bind.annotation.XmlAccessType;

-import javax.xml.bind.annotation.XmlAccessorType;

-import javax.xml.bind.annotation.XmlAnyAttribute;

-import javax.xml.bind.annotation.XmlAttribute;

-import javax.xml.bind.annotation.XmlElement;

-import javax.xml.bind.annotation.XmlSchemaType;

-import javax.xml.bind.annotation.XmlType;

-import javax.xml.namespace.QName;

-

-

-/**

- * <p>Java class for RequestedAttributeType complex type.

- * 

- * <p>The following schema fragment specifies the expected content contained within this class.

- * 

- * <pre>

- * &lt;complexType name="RequestedAttributeType">

- *   &lt;complexContent>

- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">

- *       &lt;sequence>

- *         &lt;element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}AttributeValue" maxOccurs="unbounded" minOccurs="0"/>

- *       &lt;/sequence>

- *       &lt;attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />

- *       &lt;attribute name="NameFormat" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />

- *       &lt;attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />

- *       &lt;attribute name="isRequired" type="{http://www.w3.org/2001/XMLSchema}boolean" />

- *       &lt;anyAttribute processContents='lax' namespace='##other'/>

- *     &lt;/restriction>

- *   &lt;/complexContent>

- * &lt;/complexType>

- * </pre>

- * 

- * 

- */

-@XmlAccessorType(XmlAccessType.FIELD)

-@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;

-    }

-

-}

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyAttribute;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.namespace.QName;
+
+
+/**
+ * <p>Java class for RequestedAttributeType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="RequestedAttributeType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{urn:eu:stork:names:tc:STORK:1.0:assertion}AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="NameFormat" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       &lt;attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="isRequired" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *       &lt;anyAttribute processContents='lax' namespace='##other'/>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..34cfb978a
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TimeRestrictionType.java
@@ -0,0 +1,101 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TimeRestrictionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="validFrom" type="{http://www.w3.org/2001/XMLSchema}date"/>
+ *         &lt;element name="validTo" type="{http://www.w3.org/2001/XMLSchema}date"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..b9db4ea0d
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_1_0/assertion/TransactionLimitRestrictionType.java
@@ -0,0 +1,98 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TransactionLimitRestrictionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="amount" type="{http://www.w3.org/2001/XMLSchema}decimal"/>
+ *         &lt;element name="currency" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TransactionLimitRestrictionType", propOrder = {
+    "amount",
+    "currency"
+})
+public class TransactionLimitRestrictionType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/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 47e225d22..e94518e03 100644
--- a/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/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
@@ -1,9 +1,9 @@
-//

-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 

-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 

-// Any modifications to this file will be lost upon recompilation of the source schema. 

-// Generated on: 2014.02.17 at 10:36:59 AM GMT 

-//

-

-@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;

+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2014.04.12 at 12:22:50 PM GMT 
+//
+
+@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
new file mode 100644
index 000000000..6b26bd000
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AdditionalInformationType.java
@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AdditionalInformationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="SpecificInformation" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="OtherSources" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AdditionalInformationType", propOrder = {
+    "specificInformation",
+    "otherSources"
+})
+public class AdditionalInformationType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..d7fae6b34
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AddressType.java
@@ -0,0 +1,188 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AddressType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Line" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" maxOccurs="unbounded"/>
+ *         &lt;element name="City" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="StateOrRegion" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="PostalCode" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Country" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CountryTextCodeType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..f905dcdd5
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileDataType.java
@@ -0,0 +1,123 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachedFileDataType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Description" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="Mime" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}MimeType"/>
+ *         &lt;element name="Data" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..7bd89fef8
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedFileURLType.java
@@ -0,0 +1,125 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachedFileURLType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Description" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="Mime" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}MimeType"/>
+ *         &lt;element name="URL" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}URLType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..cf964d7d0
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageDataType.java
@@ -0,0 +1,123 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachedImageDataType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Description" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="Mime" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ImageMimeType"/>
+ *         &lt;element name="Data" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..945b715fe
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedImageURLType.java
@@ -0,0 +1,125 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachedImageURLType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Description" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="Mime" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ImageMimeType"/>
+ *         &lt;element name="URL" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}URLType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..83cb26800
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachedType.java
@@ -0,0 +1,188 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachedType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;element name="FileData" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}AttachedFileDataType"/>
+ *         &lt;element name="FileURI" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}AttachedFileURLType"/>
+ *         &lt;element name="ImageData" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}AttachedImageDataType"/>
+ *         &lt;element name="ImageURI" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}AttachedImageURLType"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="attachedID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..a8612ae63
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/AttachmentsType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="AttachmentsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Attached" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}AttachedType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "AttachmentsType", propOrder = {
+    "attached"
+})
+public class AttachmentsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..c154e92c3
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CertificationOfTheSupplementType.java
@@ -0,0 +1,126 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CertificationOfTheSupplementType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CertificationDate" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}DateType" minOccurs="0"/>
+ *         &lt;element name="OfficialsCertifying" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}OfficialsCertifyingType" minOccurs="0"/>
+ *         &lt;element name="OfficialStamp" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}OfficialStampType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..3ed1697e7
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ContactInformationType.java
@@ -0,0 +1,170 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ContactInformationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Address" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}AddressType" minOccurs="0"/>
+ *         &lt;element name="PhoneNumber" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="Email" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}EmailAddressType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="WebSite" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}URLType" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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 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
new file mode 100644
index 000000000..bf4dd984b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryTextCodeType.java
@@ -0,0 +1,94 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CountryTextCodeType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+ *       &lt;attribute name="country" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CountryType" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CountryTextCodeType", propOrder = {
+    "value"
+})
+public class CountryTextCodeType {
+
+    @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;
+    }
+
+    /**
+     * 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/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
new file mode 100644
index 000000000..b2fe16735
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CountryType.java
@@ -0,0 +1,435 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="AD"/>
+ *     &lt;enumeration value="AE"/>
+ *     &lt;enumeration value="AF"/>
+ *     &lt;enumeration value="AG"/>
+ *     &lt;enumeration value="AL"/>
+ *     &lt;enumeration value="AM"/>
+ *     &lt;enumeration value="AO"/>
+ *     &lt;enumeration value="AR"/>
+ *     &lt;enumeration value="AT"/>
+ *     &lt;enumeration value="AU"/>
+ *     &lt;enumeration value="AZ"/>
+ *     &lt;enumeration value="BA"/>
+ *     &lt;enumeration value="BB"/>
+ *     &lt;enumeration value="BD"/>
+ *     &lt;enumeration value="BE"/>
+ *     &lt;enumeration value="BF"/>
+ *     &lt;enumeration value="BG"/>
+ *     &lt;enumeration value="BH"/>
+ *     &lt;enumeration value="BI"/>
+ *     &lt;enumeration value="BJ"/>
+ *     &lt;enumeration value="BN"/>
+ *     &lt;enumeration value="BO"/>
+ *     &lt;enumeration value="BR"/>
+ *     &lt;enumeration value="BS"/>
+ *     &lt;enumeration value="BT"/>
+ *     &lt;enumeration value="BW"/>
+ *     &lt;enumeration value="BY"/>
+ *     &lt;enumeration value="BZ"/>
+ *     &lt;enumeration value="CA"/>
+ *     &lt;enumeration value="CD"/>
+ *     &lt;enumeration value="CF"/>
+ *     &lt;enumeration value="CG"/>
+ *     &lt;enumeration value="CH"/>
+ *     &lt;enumeration value="CI"/>
+ *     &lt;enumeration value="CL"/>
+ *     &lt;enumeration value="CM"/>
+ *     &lt;enumeration value="CN"/>
+ *     &lt;enumeration value="CO"/>
+ *     &lt;enumeration value="CR"/>
+ *     &lt;enumeration value="CU"/>
+ *     &lt;enumeration value="CV"/>
+ *     &lt;enumeration value="CY"/>
+ *     &lt;enumeration value="CZ"/>
+ *     &lt;enumeration value="DE"/>
+ *     &lt;enumeration value="DJ"/>
+ *     &lt;enumeration value="DK"/>
+ *     &lt;enumeration value="DM"/>
+ *     &lt;enumeration value="DO"/>
+ *     &lt;enumeration value="DZ"/>
+ *     &lt;enumeration value="EC"/>
+ *     &lt;enumeration value="EE"/>
+ *     &lt;enumeration value="EG"/>
+ *     &lt;enumeration value="ER"/>
+ *     &lt;enumeration value="ES"/>
+ *     &lt;enumeration value="ET"/>
+ *     &lt;enumeration value="FI"/>
+ *     &lt;enumeration value="FJ"/>
+ *     &lt;enumeration value="FM"/>
+ *     &lt;enumeration value="FR"/>
+ *     &lt;enumeration value="GA"/>
+ *     &lt;enumeration value="GB"/>
+ *     &lt;enumeration value="GD"/>
+ *     &lt;enumeration value="GE"/>
+ *     &lt;enumeration value="GH"/>
+ *     &lt;enumeration value="GL"/>
+ *     &lt;enumeration value="GM"/>
+ *     &lt;enumeration value="GN"/>
+ *     &lt;enumeration value="GQ"/>
+ *     &lt;enumeration value="GR"/>
+ *     &lt;enumeration value="GT"/>
+ *     &lt;enumeration value="GW"/>
+ *     &lt;enumeration value="GY"/>
+ *     &lt;enumeration value="HN"/>
+ *     &lt;enumeration value="HR"/>
+ *     &lt;enumeration value="HT"/>
+ *     &lt;enumeration value="HU"/>
+ *     &lt;enumeration value="ID"/>
+ *     &lt;enumeration value="IE"/>
+ *     &lt;enumeration value="IL"/>
+ *     &lt;enumeration value="IN"/>
+ *     &lt;enumeration value="IQ"/>
+ *     &lt;enumeration value="IR"/>
+ *     &lt;enumeration value="IS"/>
+ *     &lt;enumeration value="IT"/>
+ *     &lt;enumeration value="JM"/>
+ *     &lt;enumeration value="JO"/>
+ *     &lt;enumeration value="JP"/>
+ *     &lt;enumeration value="KE"/>
+ *     &lt;enumeration value="KG"/>
+ *     &lt;enumeration value="KH"/>
+ *     &lt;enumeration value="KI"/>
+ *     &lt;enumeration value="KM"/>
+ *     &lt;enumeration value="KN"/>
+ *     &lt;enumeration value="KP"/>
+ *     &lt;enumeration value="KR"/>
+ *     &lt;enumeration value="KW"/>
+ *     &lt;enumeration value="KZ"/>
+ *     &lt;enumeration value="LA"/>
+ *     &lt;enumeration value="LB"/>
+ *     &lt;enumeration value="LC"/>
+ *     &lt;enumeration value="LI"/>
+ *     &lt;enumeration value="LK"/>
+ *     &lt;enumeration value="LR"/>
+ *     &lt;enumeration value="LS"/>
+ *     &lt;enumeration value="LT"/>
+ *     &lt;enumeration value="LU"/>
+ *     &lt;enumeration value="LV"/>
+ *     &lt;enumeration value="LY"/>
+ *     &lt;enumeration value="MA"/>
+ *     &lt;enumeration value="MC"/>
+ *     &lt;enumeration value="MD"/>
+ *     &lt;enumeration value="ME"/>
+ *     &lt;enumeration value="MG"/>
+ *     &lt;enumeration value="MH"/>
+ *     &lt;enumeration value="MK"/>
+ *     &lt;enumeration value="ML"/>
+ *     &lt;enumeration value="MM"/>
+ *     &lt;enumeration value="MN"/>
+ *     &lt;enumeration value="MR"/>
+ *     &lt;enumeration value="MT"/>
+ *     &lt;enumeration value="MU"/>
+ *     &lt;enumeration value="MV"/>
+ *     &lt;enumeration value="MW"/>
+ *     &lt;enumeration value="MX"/>
+ *     &lt;enumeration value="MY"/>
+ *     &lt;enumeration value="MZ"/>
+ *     &lt;enumeration value="NA"/>
+ *     &lt;enumeration value="NE"/>
+ *     &lt;enumeration value="NG"/>
+ *     &lt;enumeration value="NI"/>
+ *     &lt;enumeration value="NL"/>
+ *     &lt;enumeration value="NO"/>
+ *     &lt;enumeration value="NP"/>
+ *     &lt;enumeration value="NR"/>
+ *     &lt;enumeration value="NU"/>
+ *     &lt;enumeration value="NZ"/>
+ *     &lt;enumeration value="OM"/>
+ *     &lt;enumeration value="PA"/>
+ *     &lt;enumeration value="PE"/>
+ *     &lt;enumeration value="PG"/>
+ *     &lt;enumeration value="PH"/>
+ *     &lt;enumeration value="PK"/>
+ *     &lt;enumeration value="PL"/>
+ *     &lt;enumeration value="PR"/>
+ *     &lt;enumeration value="PS"/>
+ *     &lt;enumeration value="PT"/>
+ *     &lt;enumeration value="PW"/>
+ *     &lt;enumeration value="PY"/>
+ *     &lt;enumeration value="QA"/>
+ *     &lt;enumeration value="RO"/>
+ *     &lt;enumeration value="RS"/>
+ *     &lt;enumeration value="RU"/>
+ *     &lt;enumeration value="RW"/>
+ *     &lt;enumeration value="SA"/>
+ *     &lt;enumeration value="SB"/>
+ *     &lt;enumeration value="SC"/>
+ *     &lt;enumeration value="SD"/>
+ *     &lt;enumeration value="SE"/>
+ *     &lt;enumeration value="SG"/>
+ *     &lt;enumeration value="SI"/>
+ *     &lt;enumeration value="SK"/>
+ *     &lt;enumeration value="SL"/>
+ *     &lt;enumeration value="SM"/>
+ *     &lt;enumeration value="SN"/>
+ *     &lt;enumeration value="SO"/>
+ *     &lt;enumeration value="SR"/>
+ *     &lt;enumeration value="ST"/>
+ *     &lt;enumeration value="SV"/>
+ *     &lt;enumeration value="SY"/>
+ *     &lt;enumeration value="SZ"/>
+ *     &lt;enumeration value="TD"/>
+ *     &lt;enumeration value="TG"/>
+ *     &lt;enumeration value="TH"/>
+ *     &lt;enumeration value="TJ"/>
+ *     &lt;enumeration value="TL"/>
+ *     &lt;enumeration value="TM"/>
+ *     &lt;enumeration value="TN"/>
+ *     &lt;enumeration value="TO"/>
+ *     &lt;enumeration value="TR"/>
+ *     &lt;enumeration value="TT"/>
+ *     &lt;enumeration value="TV"/>
+ *     &lt;enumeration value="TZ"/>
+ *     &lt;enumeration value="UA"/>
+ *     &lt;enumeration value="UG"/>
+ *     &lt;enumeration value="US"/>
+ *     &lt;enumeration value="UY"/>
+ *     &lt;enumeration value="UZ"/>
+ *     &lt;enumeration value="VA"/>
+ *     &lt;enumeration value="VC"/>
+ *     &lt;enumeration value="VE"/>
+ *     &lt;enumeration value="VN"/>
+ *     &lt;enumeration value="VU"/>
+ *     &lt;enumeration value="WS"/>
+ *     &lt;enumeration value="YE"/>
+ *     &lt;enumeration value="ZA"/>
+ *     &lt;enumeration value="ZM"/>
+ *     &lt;enumeration value="ZW"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "CountryType")
+@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;
+
+    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/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
new file mode 100644
index 000000000..a73acb84a
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseStructureDiagramType.java
@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseStructureDiagramType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CoursesGroups" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CoursesGroupsType" minOccurs="0"/>
+ *         &lt;element name="CoursesUnits" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CoursesUnitsType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CourseStructureDiagramType", propOrder = {
+    "coursesGroups",
+    "coursesUnits"
+})
+public class CourseStructureDiagramType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..1c2461526
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguageOfInstructionType.java
@@ -0,0 +1,94 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitLanguageOfInstructionType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma>PlainTextType">
+ *       &lt;attribute name="language" use="required" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguageType" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CourseUnitLanguageOfInstructionType", propOrder = {
+    "value"
+})
+public class CourseUnitLanguageOfInstructionType {
+
+    @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;
+    }
+
+    /**
+     * 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/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
new file mode 100644
index 000000000..d09ce1d75
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitLanguagesOfInstructionType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitLanguagesOfInstructionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Language" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseUnitLanguageOfInstructionType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CourseUnitLanguagesOfInstructionType", propOrder = {
+    "language"
+})
+public class CourseUnitLanguagesOfInstructionType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..0b8116a7f
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitStudentPerformanceType.java
@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitStudentPerformanceType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="LocalGrade" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LocalGradeType"/>
+ *         &lt;element name="ECTSGrade" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ECTSGradingScaleType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CourseUnitStudentPerformanceType", propOrder = {
+    "localGrade",
+    "ectsGrade"
+})
+public class CourseUnitStudentPerformanceType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..f9725c6fc
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitType.java
@@ -0,0 +1,1181 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * <p>Java class for CourseUnitType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Code" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="ScientificArea" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Title" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="Theme" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Type" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="YearOfStudy" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="Level" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="ECTSCredits" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" minOccurs="0"/>
+ *         &lt;element name="LocalCredits" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" minOccurs="0"/>
+ *         &lt;element name="Hours" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" minOccurs="0"/>
+ *         &lt;element name="LanguagesOfInstruction" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseUnitLanguagesOfInstructionType" minOccurs="0"/>
+ *         &lt;element name="ModeOfDelivery" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="WorkPlacements" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseUnitWorkPlacementsType" minOccurs="0"/>
+ *         &lt;element name="StudentPerformance" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseUnitStudentPerformanceType" minOccurs="0"/>
+ *         &lt;element name="NameOfLecturers" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="LearningOutcomes" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="PrerequisitesAndCorequisites" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="PrerequisitesScholarshipLevel" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="PrerequisitesOtherTitles" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="RecomendedOptionalProgrammeComponents" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="CourseContents" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="RecomendedOrRequiredReading" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="PlanedLearningActivitiesAndTeachingMethod" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="AssesmentMethodsAndCriteria" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="Observations" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="groupID" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="institutionAdministeringStudiesID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAS" />
+ *       &lt;attribute name="isRequiredByTheProgramme" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@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"
+})
+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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..dae27bc84
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitTypeType.java
@@ -0,0 +1,58 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="Compulsory"/>
+ *     &lt;enumeration value="Optional"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "CourseUnitTypeType")
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..39eb67bc2
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementType.java
@@ -0,0 +1,155 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.datatype.XMLGregorianCalendar;
+
+
+/**
+ * <p>Java class for CourseUnitWorkPlacementType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitWorkPlacementType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CollaboratingInstitution" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="DateFrom" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}DateType" minOccurs="0"/>
+ *         &lt;element name="DateTo" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}DateType" minOccurs="0"/>
+ *         &lt;element name="TrainingHours" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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 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;
+    }
+
+}
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
new file mode 100644
index 000000000..9dfb3d6b7
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CourseUnitWorkPlacementsType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CourseUnitWorkPlacementsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="WorkPlacement" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseUnitWorkPlacementType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CourseUnitWorkPlacementsType", propOrder = {
+    "workPlacement"
+})
+public class CourseUnitWorkPlacementsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..01c42298c
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesAttendedInOtherInstitutionInMobilityProgramsType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="MobilityProgramme" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}MobilityProgrammeType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CoursesAttendedInOtherInstitutionInMobilityProgramsType", propOrder = {
+    "mobilityProgramme"
+})
+public class CoursesAttendedInOtherInstitutionInMobilityProgramsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..229b753ff
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupType.java
@@ -0,0 +1,188 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for CoursesGroupType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CoursesGroupType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="HeaderInformation" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="CoursesGroup" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CoursesGroupType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="FooterInformation" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="groupID" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..74b1bec06
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesGroupsType.java
@@ -0,0 +1,160 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CoursesGroupsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="HeaderInformation" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="CoursesGroup" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CoursesGroupType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element name="FooterInformation" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..d56b4bd10
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/CoursesUnitsType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CoursesUnitsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CourseUnit" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseUnitType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "CoursesUnitsType", propOrder = {
+    "courseUnit"
+})
+public class CoursesUnitsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..a012c27a9
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ECTSGradingScaleType.java
@@ -0,0 +1,55 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="A"/>
+ *     &lt;enumeration value="B"/>
+ *     &lt;enumeration value="C"/>
+ *     &lt;enumeration value="D"/>
+ *     &lt;enumeration value="E"/>
+ *     &lt;enumeration value="FX"/>
+ *     &lt;enumeration value="F"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ECTSGradingScaleType")
+@XmlEnum
+public enum ECTSGradingScaleType {
+
+    A,
+    B,
+    C,
+    D,
+    E,
+    FX,
+    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/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
new file mode 100644
index 000000000..2f8d46c73
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/EHEAFrameworkType.java
@@ -0,0 +1,61 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="FirstCycle"/>
+ *     &lt;enumeration value="SecondCycle"/>
+ *     &lt;enumeration value="ThirdCycle"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "EHEAFrameworkType")
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..85daac00d
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ExtensionContentType.java
@@ -0,0 +1,109 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ExtensionContentType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence maxOccurs="unbounded" minOccurs="0">
+ *         &lt;any processContents='lax'/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ExtensionContentType", propOrder = {
+    "content"
+})
+public class ExtensionContentType {
+
+    @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 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/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
new file mode 100644
index 000000000..a69798709
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/FamilyNameType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="FamilyNameType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Surname" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "FamilyNameType", propOrder = {
+    "surname"
+})
+public class FamilyNameType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..34a9a68b5
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GenderType.java
@@ -0,0 +1,58 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="Female"/>
+ *     &lt;enumeration value="Male"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "GenderType")
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..b59e1b6b1
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GeneralDiplomaType.java
@@ -0,0 +1,409 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
+
+
+/**
+ * <p>Java class for GeneralDiplomaType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="GeneralDiplomaType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="InformationIdentifyingTheHolderOfTheQualification" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InformationIdentifyingTheHolderOfTheQualificationType"/>
+ *         &lt;element name="InformationIdentifyingTheQualification" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InformationIdentifyingTheQualificationType"/>
+ *         &lt;element name="InformationOnTheLevelOfTheQualification" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InformationOnTheLevelOfTheQualificationType" minOccurs="0"/>
+ *         &lt;element name="InformationOnTheContentsAndResultsGained" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InformationOnTheContentsAndResultsGainedType" minOccurs="0"/>
+ *         &lt;element name="InformationOnTheFunctionOfTheQualification" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}InformationOnTheFunctionOfTheQualificationType" minOccurs="0"/>
+ *         &lt;element name="AdditionalInformation" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}AdditionalInformationType" minOccurs="0"/>
+ *         &lt;element name="CertificationOfTheSupplement" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CertificationOfTheSupplementType" minOccurs="0"/>
+ *         &lt;element name="InformationOnTheNationalHigherEducationSystem" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="Attachments" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}AttachmentsType" minOccurs="0"/>
+ *         &lt;element name="ExtensionContent" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ExtensionContentType" maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="language" use="required" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguageType" />
+ *       &lt;attribute name="isTheOriginalLanguage" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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 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 isTheOriginalLanguage property.
+     * 
+     */
+    public boolean isIsTheOriginalLanguage() {
+        return isTheOriginalLanguage;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..cc9b70e5b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GivenNameType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="GivenNameType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "GivenNameType", propOrder = {
+    "name"
+})
+public class GivenNameType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..9bb0de01d
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/GradingSchemeAndGradeDistributionGuidanceType.java
@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="GradingSchemeAndGradeDistributionGuidanceType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="GradingScheme" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType"/>
+ *         &lt;element name="GradeDistributionGuidance" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "GradingSchemeAndGradeDistributionGuidanceType", propOrder = {
+    "gradingScheme",
+    "gradeDistributionGuidance"
+})
+public class GradingSchemeAndGradeDistributionGuidanceType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..8429a3229
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ImageMimeType.java
@@ -0,0 +1,67 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="image/gif"/>
+ *     &lt;enumeration value="image/jpeg"/>
+ *     &lt;enumeration value="image/pjpeg"/>
+ *     &lt;enumeration value="image/png"/>
+ *     &lt;enumeration value="image/tiff"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ImageMimeType")
+@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;
+
+    ImageMimeType(MimeType v) {
+        value = v;
+    }
+
+    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());
+    }
+
+}
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
new file mode 100644
index 000000000..c9da2e078
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheHolderOfTheQualificationType.java
@@ -0,0 +1,327 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InformationIdentifyingTheHolderOfTheQualificationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="FamilyName" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}FamilyNameType"/>
+ *         &lt;element name="GivenName" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}GivenNameType"/>
+ *         &lt;element name="DateOfBirth" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}DateType" minOccurs="0"/>
+ *         &lt;element name="StudentIdentificationNumber" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="CountryOfBirth" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CountryTextCodeType" minOccurs="0"/>
+ *         &lt;element name="PlaceOfBirth" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Gender" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+    /**
+     * 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 CountryTextCodeType }
+     *     
+     */
+    public CountryTextCodeType getCountryOfBirth() {
+        return countryOfBirth;
+    }
+
+    /**
+     * 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 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: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;
+
+        /**
+         * 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 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/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
new file mode 100644
index 000000000..21040122c
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationIdentifyingTheQualificationType.java
@@ -0,0 +1,209 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InformationIdentifyingTheQualificationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Qualification" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}QualificationType"/>
+ *         &lt;element name="TitleConferred" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}TitleConferredType" minOccurs="0"/>
+ *         &lt;element name="MainFieldsOfStudy" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="NameAndStatusOfAwardingInstitution" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}NameAndStatusOfAwardingInstitutionType"/>
+ *         &lt;element name="NameAndStatusOfInstitutionAdministeringStudies" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}NameAndStatusOfInstitutionAdministeringStudiesType"/>
+ *         &lt;element name="LanguagesOfInstructionAndExamination" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}LanguagesOfInstructionAndExaminationType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..9255189f9
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheContentsAndResultsGainedType.java
@@ -0,0 +1,243 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InformationOnTheContentsAndResultsGainedType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="ModeOfStudy" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="ProgrammeRequirements" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ProgrammeRequirementsType" minOccurs="0"/>
+ *         &lt;element name="ProgrammeDetails" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ProgrammeDetailsType" minOccurs="0"/>
+ *         &lt;element name="GradingSchemeAndGradeDistributionGuidance" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}GradingSchemeAndGradeDistributionGuidanceType" minOccurs="0"/>
+ *         &lt;element name="OverallClassificationOfTheQualification" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..903eb2a35
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheFunctionOfTheQualificationType.java
@@ -0,0 +1,159 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InformationOnTheFunctionOfTheQualificationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="AccessToFurtherStudy" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="ProfessionalStatus" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..2119f23bb
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InformationOnTheLevelOfTheQualificationType.java
@@ -0,0 +1,389 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for InformationOnTheLevelOfTheQualificationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InformationOnTheLevelOfTheQualificationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Level">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="OfficialLengthOfProgramme">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="AccessRequirements" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..daab6ad3a
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/InstitutionType.java
@@ -0,0 +1,361 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="InstitutionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="Status" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Country" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CountryTextCodeType" minOccurs="0"/>
+ *         &lt;element name="AdditionalInformation" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *         &lt;element name="ContactInformation" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}ContactInformationType" minOccurs="0"/>
+ *         &lt;element name="AttachedImageRef" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *       &lt;attribute name="nationalID" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" />
+ *       &lt;attribute name="erasmusID" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@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
+})
+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;
+    }
+
+    /**
+     * 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 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 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: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;
+
+        /**
+         * 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/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
new file mode 100644
index 000000000..2ddf61e53
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguageType.java
@@ -0,0 +1,346 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="ab"/>
+ *     &lt;enumeration value="af"/>
+ *     &lt;enumeration value="an"/>
+ *     &lt;enumeration value="ar"/>
+ *     &lt;enumeration value="as"/>
+ *     &lt;enumeration value="az"/>
+ *     &lt;enumeration value="be"/>
+ *     &lt;enumeration value="bg"/>
+ *     &lt;enumeration value="bn"/>
+ *     &lt;enumeration value="bo"/>
+ *     &lt;enumeration value="br"/>
+ *     &lt;enumeration value="bs"/>
+ *     &lt;enumeration value="ca"/>
+ *     &lt;enumeration value="ce"/>
+ *     &lt;enumeration value="co"/>
+ *     &lt;enumeration value="cs"/>
+ *     &lt;enumeration value="cy"/>
+ *     &lt;enumeration value="da"/>
+ *     &lt;enumeration value="de"/>
+ *     &lt;enumeration value="el"/>
+ *     &lt;enumeration value="en"/>
+ *     &lt;enumeration value="es"/>
+ *     &lt;enumeration value="et"/>
+ *     &lt;enumeration value="eu"/>
+ *     &lt;enumeration value="fa"/>
+ *     &lt;enumeration value="fi"/>
+ *     &lt;enumeration value="fj"/>
+ *     &lt;enumeration value="fo"/>
+ *     &lt;enumeration value="fr"/>
+ *     &lt;enumeration value="fy"/>
+ *     &lt;enumeration value="ga"/>
+ *     &lt;enumeration value="gd"/>
+ *     &lt;enumeration value="gl"/>
+ *     &lt;enumeration value="gv"/>
+ *     &lt;enumeration value="grc"/>
+ *     &lt;enumeration value="gsw"/>
+ *     &lt;enumeration value="he"/>
+ *     &lt;enumeration value="hi"/>
+ *     &lt;enumeration value="hr"/>
+ *     &lt;enumeration value="ht"/>
+ *     &lt;enumeration value="hu"/>
+ *     &lt;enumeration value="hy"/>
+ *     &lt;enumeration value="id"/>
+ *     &lt;enumeration value="is"/>
+ *     &lt;enumeration value="it"/>
+ *     &lt;enumeration value="ja"/>
+ *     &lt;enumeration value="jv"/>
+ *     &lt;enumeration value="ka"/>
+ *     &lt;enumeration value="kg"/>
+ *     &lt;enumeration value="ko"/>
+ *     &lt;enumeration value="ku"/>
+ *     &lt;enumeration value="kw"/>
+ *     &lt;enumeration value="ky"/>
+ *     &lt;enumeration value="lb"/>
+ *     &lt;enumeration value="li"/>
+ *     &lt;enumeration value="ln"/>
+ *     &lt;enumeration value="lt"/>
+ *     &lt;enumeration value="lv"/>
+ *     &lt;enumeration value="mg"/>
+ *     &lt;enumeration value="mk"/>
+ *     &lt;enumeration value="mn"/>
+ *     &lt;enumeration value="mo"/>
+ *     &lt;enumeration value="ms"/>
+ *     &lt;enumeration value="mt"/>
+ *     &lt;enumeration value="my"/>
+ *     &lt;enumeration value="nb"/>
+ *     &lt;enumeration value="ne"/>
+ *     &lt;enumeration value="nl"/>
+ *     &lt;enumeration value="nn"/>
+ *     &lt;enumeration value="no"/>
+ *     &lt;enumeration value="pl"/>
+ *     &lt;enumeration value="pt"/>
+ *     &lt;enumeration value="rm"/>
+ *     &lt;enumeration value="ro"/>
+ *     &lt;enumeration value="ru"/>
+ *     &lt;enumeration value="sc"/>
+ *     &lt;enumeration value="se"/>
+ *     &lt;enumeration value="sk"/>
+ *     &lt;enumeration value="sl"/>
+ *     &lt;enumeration value="so"/>
+ *     &lt;enumeration value="sq"/>
+ *     &lt;enumeration value="sr"/>
+ *     &lt;enumeration value="sv"/>
+ *     &lt;enumeration value="sw"/>
+ *     &lt;enumeration value="tk"/>
+ *     &lt;enumeration value="tr"/>
+ *     &lt;enumeration value="ty"/>
+ *     &lt;enumeration value="uk"/>
+ *     &lt;enumeration value="ur"/>
+ *     &lt;enumeration value="uz"/>
+ *     &lt;enumeration value="vi"/>
+ *     &lt;enumeration value="yi"/>
+ *     &lt;enumeration value="zh"/>
+ *     &lt;enumeration value="cu"/>
+ *     &lt;enumeration value="eo"/>
+ *     &lt;enumeration value="la"/>
+ *     &lt;enumeration value="oc"/>
+ *     &lt;enumeration value="vo"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "LanguageType")
+@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;
+
+    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/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
new file mode 100644
index 000000000..575d3b867
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LanguagesOfInstructionAndExaminationType.java
@@ -0,0 +1,227 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for LanguagesOfInstructionAndExaminationType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="LanguagesOfInstructionAndExaminationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Language" maxOccurs="unbounded">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..de3b86c98
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/LocalGradeType.java
@@ -0,0 +1,243 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="LocalGradeType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="AcademicYear" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}AcademicYearType" minOccurs="0"/>
+ *         &lt;element name="DateIssued" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}DateType" minOccurs="0"/>
+ *         &lt;element name="Grade" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="Source" minOccurs="0">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..45a3bc403
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MimeType.java
@@ -0,0 +1,73 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="image/gif"/>
+ *     &lt;enumeration value="image/jpeg"/>
+ *     &lt;enumeration value="image/pjpeg"/>
+ *     &lt;enumeration value="image/png"/>
+ *     &lt;enumeration value="image/tiff"/>
+ *     &lt;enumeration value="text/html"/>
+ *     &lt;enumeration value="application/pdf"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "MimeType")
+@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;
+
+    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/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
new file mode 100644
index 000000000..d254e5f4d
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCourseUnitType.java
@@ -0,0 +1,274 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import javax.xml.bind.annotation.XmlValue;
+
+
+/**
+ * <p>Java class for MobilityProgrammeCourseUnitType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MobilityProgrammeCourseUnitType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Code" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Title">
+ *           &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>
+ *         &lt;/element>
+ *         &lt;element name="ECTSCredits" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PositiveDecimalType" minOccurs="0"/>
+ *         &lt;element name="AdditionalInformation" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="isInTheLearningAgreement" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..1cc243487
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeCoursesUnitsType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MobilityProgrammeCoursesUnitsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CourseUnit" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}MobilityProgrammeCourseUnitType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "MobilityProgrammeCoursesUnitsType", propOrder = {
+    "courseUnit"
+})
+public class MobilityProgrammeCoursesUnitsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..5ef23530a
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MobilityProgrammeType.java
@@ -0,0 +1,266 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MobilityProgrammeType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Type" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="FieldOfStudy" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *         &lt;element name="Country" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CountryTextCodeType"/>
+ *         &lt;element name="ReceivingInstitutionName" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="AcademicYear" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}AcademicYearType" minOccurs="0"/>
+ *         &lt;element name="DateFrom" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}DateType" minOccurs="0"/>
+ *         &lt;element name="DateTo" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}DateType" minOccurs="0"/>
+ *         &lt;element name="CoursesUnits" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}MobilityProgrammeCoursesUnitsType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..bfff6cbda
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfDeliveryType.java
@@ -0,0 +1,61 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="FaceToFace"/>
+ *     &lt;enumeration value="DistanceLearning"/>
+ *     &lt;enumeration value="Other"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ModeOfDeliveryType")
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..4d9e43d8d
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ModeOfStudyType.java
@@ -0,0 +1,67 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="FullTime"/>
+ *     &lt;enumeration value="ParTime"/>
+ *     &lt;enumeration value="Distance"/>
+ *     &lt;enumeration value="eLearning"/>
+ *     &lt;enumeration value="Another"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "ModeOfStudyType")
+@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;
+
+    ModeOfStudyType(String v) {
+        value = v;
+    }
+
+    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);
+    }
+
+}
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
new file mode 100644
index 000000000..7a3479a1f
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/MultilingualGeneralDiplomaType.java
@@ -0,0 +1,110 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+import eu.stork.peps.complex.attributes.org.w3._2000._09.xmldsig.SignatureType;
+
+
+/**
+ * <p>Java class for MultilingualGeneralDiplomaType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="MultilingualGeneralDiplomaType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}GeneralDiploma" maxOccurs="unbounded"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..8662aef80
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfAwardingInstitutionType.java
@@ -0,0 +1,142 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for NameAndStatusOfAwardingInstitutionType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="NameAndStatusOfAwardingInstitutionType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="AwardingInstitution" maxOccurs="unbounded">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+
+    /**
+     * <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;
+
+        /**
+         * 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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..2ab19b491
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/NameAndStatusOfInstitutionAdministeringStudiesType.java
@@ -0,0 +1,142 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for NameAndStatusOfInstitutionAdministeringStudiesType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="NameAndStatusOfInstitutionAdministeringStudiesType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="InstitutionAdministeringStudies" maxOccurs="unbounded">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+
+    /**
+     * <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;
+
+        /**
+         * 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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..699ca76c7
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ObjectFactory.java
@@ -0,0 +1,632 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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.
+ * 
+ */
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..6564cad3a
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialCertifyingType.java
@@ -0,0 +1,157 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="OfficialCertifyingType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="FamilyName" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}FamilyNameType"/>
+ *         &lt;element name="GivenName" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}GivenNameType"/>
+ *         &lt;element name="Capacity" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="awardingInstitutionID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAW" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..61966f341
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialStampType.java
@@ -0,0 +1,101 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="OfficialStampType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Description" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="awardingInstitutionID" type="{http://www.w3.org/2001/XMLSchema}string" default="DEF-IAW" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "OfficialStampType", propOrder = {
+    "description"
+})
+public class OfficialStampType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+        }
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..dbb17d0bc
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/OfficialsCertifyingType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="OfficialsCertifyingType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="OfficialCertifying" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}OfficialCertifyingType" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "OfficialsCertifyingType", propOrder = {
+    "officialCertifying"
+})
+public class OfficialsCertifyingType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..c5255c9ee
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeDetailsType.java
@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ProgrammeDetailsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="CourseStructureDiagram" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CourseStructureDiagramType"/>
+ *         &lt;element name="CoursesAttendedInOtherInstitutionInMobilityPrograms" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}CoursesAttendedInOtherInstitutionInMobilityProgramsType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ProgrammeDetailsType", propOrder = {
+    "courseStructureDiagram",
+    "coursesAttendedInOtherInstitutionInMobilityPrograms"
+})
+public class ProgrammeDetailsType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..fac1755c3
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/ProgrammeRequirementsType.java
@@ -0,0 +1,97 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ProgrammeRequirementsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Requirements" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType"/>
+ *         &lt;element name="KeyLearningOutcomes" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "ProgrammeRequirementsType", propOrder = {
+    "requirements",
+    "keyLearningOutcomes"
+})
+public class ProgrammeRequirementsType {
+
+    @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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..209094e4f
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/QualificationType.java
@@ -0,0 +1,152 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="QualificationType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="AdditionalInformation" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}RichTextTagType" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="localID" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" />
+ *       &lt;attribute name="nationalID" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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 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 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..8d1906142
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/RichTextTagType.java
@@ -0,0 +1,197 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementRefs;
+import javax.xml.bind.annotation.XmlIDREF;
+import javax.xml.bind.annotation.XmlMixed;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="RichTextTagType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;element name="Bold" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="BreakLine" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}EmptyType"/>
+ *         &lt;element name="Italic" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="Underline" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *         &lt;element name="AttachedRef">
+ *           &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>
+ *         &lt;/element>
+ *       &lt;/choice>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@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
+})
+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;
+        }
+
+    }
+
+}
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
new file mode 100644
index 000000000..2fc0d4292
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/SourceGradeType.java
@@ -0,0 +1,61 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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>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">
+ *     &lt;enumeration value="Recognized"/>
+ *     &lt;enumeration value="MobilityProgramme"/>
+ *     &lt;enumeration value="Another"/>
+ *   &lt;/restriction>
+ * &lt;/simpleType>
+ * </pre>
+ * 
+ */
+@XmlType(name = "SourceGradeType")
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..2ca949caa
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/eu/stork/names/tc/stork/_2_0/academic/generaldiploma/TitleConferredType.java
@@ -0,0 +1,69 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TitleConferredType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Name" type="{urn:eu:stork:names:tc:STORK:2.0:academic:generaldiploma}PlainTextType"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TitleConferredType", propOrder = {
+    "name"
+})
+public class TitleConferredType {
+
+    @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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..7d2131e52
--- /dev/null
+++ 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
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2014.04.12 at 12:22:50 PM GMT 
+//
+
+@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
new file mode 100644
index 000000000..e2c2db71d
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/CanonicalizationMethodType.java
@@ -0,0 +1,109 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="CanonicalizationMethodType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;any maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..7f7c48206
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DSAKeyValueType.java
@@ -0,0 +1,227 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="DSAKeyValueType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;sequence minOccurs="0">
+ *           &lt;element name="P" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           &lt;element name="Q" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         &lt;/sequence>
+ *         &lt;element name="G" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         &lt;element name="Y" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         &lt;element name="J" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary" minOccurs="0"/>
+ *         &lt;sequence minOccurs="0">
+ *           &lt;element name="Seed" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *           &lt;element name="PgenCounter" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         &lt;/sequence>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..9d32757cb
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/DigestMethodType.java
@@ -0,0 +1,111 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlMixed;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="DigestMethodType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..638d398ae
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyInfoType.java
@@ -0,0 +1,142 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementRefs;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlMixed;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="KeyInfoType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded">
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyName"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyValue"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RetrievalMethod"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}X509Data"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}PGPData"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SPKIData"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}MgmtData"/>
+ *         &lt;any processContents='lax' namespace='##other'/>
+ *       &lt;/choice>
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..819c9d014
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/KeyValueType.java
@@ -0,0 +1,92 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlElementRefs;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="KeyValueType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DSAKeyValue"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}RSAKeyValue"/>
+ *         &lt;any processContents='lax' namespace='##other'/>
+ *       &lt;/choice>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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
new file mode 100644
index 000000000..8f55486fa
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ManifestType.java
@@ -0,0 +1,111 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ManifestType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..621d32125
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectFactory.java
@@ -0,0 +1,559 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.JAXBElement;
+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.
+ * 
+ */
+@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);
+    }
+
+}
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
new file mode 100644
index 000000000..0c4509139
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ObjectType.java
@@ -0,0 +1,171 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlMixed;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ObjectType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence maxOccurs="unbounded" minOccurs="0">
+ *         &lt;any processContents='lax'/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       &lt;attribute name="MimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
+ *       &lt;attribute name="Encoding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..8c0e1ceaa
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/PGPDataType.java
@@ -0,0 +1,105 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElementRef;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="PGPDataType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice>
+ *         &lt;sequence>
+ *           &lt;element name="PGPKeyID" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           &lt;element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary" minOccurs="0"/>
+ *           &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;/sequence>
+ *         &lt;sequence>
+ *           &lt;element name="PGPKeyPacket" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           &lt;any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *         &lt;/sequence>
+ *       &lt;/choice>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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
new file mode 100644
index 000000000..892944965
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RSAKeyValueType.java
@@ -0,0 +1,93 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="RSAKeyValueType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="Modulus" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *         &lt;element name="Exponent" type="{http://www.w3.org/2000/09/xmldsig#}CryptoBinary"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..117949e65
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/ReferenceType.java
@@ -0,0 +1,214 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="ReferenceType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestMethod"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}DigestValue"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *       &lt;attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       &lt;attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..a8da5c998
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/RetrievalMethodType.java
@@ -0,0 +1,127 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+
+
+/**
+ * <p>Java class for RetrievalMethodType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="RetrievalMethodType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transforms" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="URI" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       &lt;attribute name="Type" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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 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/SPKIDataType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java
new file mode 100644
index 000000000..a8154f49f
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SPKIDataType.java
@@ -0,0 +1,83 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SPKIDataType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence maxOccurs="unbounded">
+ *         &lt;element name="SPKISexp" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *         &lt;any processContents='lax' namespace='##other' minOccurs="0"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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
new file mode 100644
index 000000000..20c22bd5b
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureMethodType.java
@@ -0,0 +1,115 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementRef;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SignatureMethodType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="HMACOutputLength" type="{http://www.w3.org/2000/09/xmldsig#}HMACOutputLengthType" minOccurs="0"/>
+ *         &lt;any namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..163e314d3
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertiesType.java
@@ -0,0 +1,111 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SignaturePropertiesType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureProperty" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..1963a7399
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignaturePropertyType.java
@@ -0,0 +1,144 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlMixed;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SignaturePropertyType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded">
+ *         &lt;any processContents='lax' namespace='##other'/>
+ *       &lt;/choice>
+ *       &lt;attribute name="Target" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..3e7a1b97c
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureType.java
@@ -0,0 +1,195 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SignatureType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignedInfo"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureValue"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" minOccurs="0"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Object" maxOccurs="unbounded" minOccurs="0"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+    }
+
+}
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
new file mode 100644
index 000000000..6ae095c5a
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignatureValueType.java
@@ -0,0 +1,99 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+import javax.xml.bind.annotation.XmlType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SignatureValueType">
+ *   &lt;simpleContent>
+ *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>base64Binary">
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/extension>
+ *   &lt;/simpleContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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/SignedInfoType.java b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java
new file mode 100644
index 000000000..cc82093ef
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/SignedInfoType.java
@@ -0,0 +1,167 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlID;
+import javax.xml.bind.annotation.XmlSchemaType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="SignedInfoType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}CanonicalizationMethod"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}SignatureMethod"/>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Reference" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *       &lt;attribute name="Id" type="{http://www.w3.org/2001/XMLSchema}ID" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..a56f59f0e
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformType.java
@@ -0,0 +1,116 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElementRef;
+import javax.xml.bind.annotation.XmlMixed;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TransformType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;choice maxOccurs="unbounded" minOccurs="0">
+ *         &lt;any processContents='lax' namespace='##other'/>
+ *         &lt;element name="XPath" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *       &lt;/choice>
+ *       &lt;attribute name="Algorithm" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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
new file mode 100644
index 000000000..e326030fd
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/TransformsType.java
@@ -0,0 +1,76 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="TransformsType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Transform" maxOccurs="unbounded"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlType(name = "TransformsType", propOrder = {
+    "transform"
+})
+public class TransformsType {
+
+    @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;
+    }
+
+}
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
new file mode 100644
index 000000000..2fac2e33a
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509DataType.java
@@ -0,0 +1,100 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import java.util.List;
+import javax.xml.bind.JAXBElement;
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAnyElement;
+import javax.xml.bind.annotation.XmlElementRef;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="X509DataType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence maxOccurs="unbounded">
+ *         &lt;choice>
+ *           &lt;element name="X509IssuerSerial" type="{http://www.w3.org/2000/09/xmldsig#}X509IssuerSerialType"/>
+ *           &lt;element name="X509SKI" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           &lt;element name="X509SubjectName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *           &lt;element name="X509Certificate" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           &lt;element name="X509CRL" type="{http://www.w3.org/2001/XMLSchema}base64Binary"/>
+ *           &lt;any processContents='lax' namespace='##other'/>
+ *         &lt;/choice>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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
new file mode 100644
index 000000000..48c70e6d0
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/X509IssuerSerialType.java
@@ -0,0 +1,98 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// 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;
+import javax.xml.bind.annotation.XmlAccessType;
+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>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="X509IssuerSerialType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;element name="X509IssuerName" type="{http://www.w3.org/2001/XMLSchema}string"/>
+ *         &lt;element name="X509SerialNumber" type="{http://www.w3.org/2001/XMLSchema}integer"/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+@XmlAccessorType(XmlAccessType.FIELD)
+@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;
+
+    /**
+     * 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;
+    }
+
+    /**
+     * 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;
+    }
+
+}
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
new file mode 100644
index 000000000..9d0e537e4
--- /dev/null
+++ b/id/server/stork2-commons/src/main/java/eu/stork/peps/complex/attributes/org/w3/_2000/_09/xmldsig/package-info.java
@@ -0,0 +1,9 @@
+//
+// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, v2.2.4-2 
+// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
+// Any modifications to this file will be lost upon recompilation of the source schema. 
+// Generated on: 2014.04.12 at 12:22:50 PM GMT 
+//
+
+@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/.svn/entries b/id/server/stork2-commons/src/main/resources/.svn/entries
index 3cafa50cf..e8296f4cd 100644
--- a/id/server/stork2-commons/src/main/resources/.svn/entries
+++ b/id/server/stork2-commons/src/main/resources/.svn/entries
@@ -26,17 +26,17 @@ emrepisja
 
 aa842e49-f825-43fc-93ba-11ee9fd5a035
 
-log4j.xml
+StorkcomplexAttributes.xsd
 file
 
 
 
-
-2013-12-20T12:27:56.554475Z
-aa8c46e41a236b8c7049713b3eeecc49
-2013-07-25T08:54:09.995385Z
-7
-emsomavmi
+delete
+2014-03-05T09:36:07.834515Z
+312be97fd22ecb2f274bf9fdebd85b29
+2014-03-04T14:10:03.192908Z
+721
+emrepisja
 
 
 
@@ -58,19 +58,19 @@ emsomavmi
 
 
 
-660
+10938
 
-StorkcomplexAttributes.xsd
+log4j.xml
 file
 
 
 
 
-2014-03-05T09:36:07.834515Z
-312be97fd22ecb2f274bf9fdebd85b29
-2014-03-04T14:10:03.192908Z
-721
-emrepisja
+2013-12-20T12:27:56.554475Z
+aa8c46e41a236b8c7049713b3eeecc49
+2013-07-25T08:54:09.995385Z
+7
+emsomavmi
 
 
 
@@ -92,5 +92,5 @@ emrepisja
 
 
 
-10938
+660
 
diff --git a/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd b/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd
deleted file mode 100644
index ab9e89712..000000000
--- a/id/server/stork2-commons/src/main/resources/StorkcomplexAttributes.xsd
+++ /dev/null
@@ -1,338 +0,0 @@
-<?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">

-	<!--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="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="study" type="stork:studyType" />

-	<xs:element name="HCPType" type="stork:HCPType" />

-	<xs:element name="isHealthCareProfessional_deprecated" type="stork:isHealthCareProfessional_deprecatedType" />

-

-	<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:minLength value="2" />

-			<xs:maxLength value="5" />

-		</xs:restriction>

-	</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="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" />

-			<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="xs:string" />

-			<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="name" type="xs:string" />

-				<xs:element name="address" type="xs:string" />

-				<xs:element name="canonicalAddress" type="stork:canonicalAddressType" />

-				<xs:element name="type" type="xs:string" />

-			</xs:sequence>

-		</xs:choice>

-	</xs:complexType>

-

-	<xs:complexType name="mandateType">

-		<xs:sequence>

-			<xs:element name="represented" type="stork:representationPersonType" />

-			<xs:element name="representing" type="stork:representationPersonType" />

-			<xs:element name="mandateContent" type="stork:mandateContentType" />

-		</xs:sequence>

-	</xs:complexType>

-

-	<xs:complexType name="mandateContentType">

-		<xs:sequence>

-			<xs:element name="validFrom" type="xs:date" />

-			<xs:element name="validTo" type="xs:date" />

-			<xs:element name="transactionLimit" type="xs:integer" />

-			<xs:element name="transactionLimitCurrency" type="stork:currencyType" />

-			<xs:element name="isJoint" type="xs:string" />

-			<xs:element name="ischained" type="xs:boolean" />

-			<xs:element name="typePower" type="xs:string" />

-		</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" />

-			<xs:element name="nameOfInstitution" type="xs:string" />

-			<xs:element name="course" type="xs:integer" />

-			<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: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>

diff --git a/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd b/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
new file mode 100644
index 000000000..1dfd6b319
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/schema/StorkcomplexAttributes.xsd
@@ -0,0 +1,396 @@
+<?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:complexType name="languageQualificationType">
+   <xs:sequence>
+     <xs:element name="language" type="stork:languageType" />
+     <xs:element name="name" type="xs:string" />
+     <xs:element name="acronym" type="xs:string" minOccurs="0"/>
+     <xs:element name="cefrLevel" type="stork:cefrLevelType" minOccurs="0"/>
+     <xs:element name="international" type="xs:boolean" minOccurs="0"/>
+     <xs:element name="AQAA"
+                 type="stork:QualityAuthenticationAssuranceLevelType" />
+   </xs:sequence>
+	</xs:complexType>
+ 
+	<xs:complexType name="academicRecommendationType">
+   <xs:sequence>
+     <xs:element name="fullNameOfRecommender" type="xs:string" />
+     <xs:element name="institution" type="xs:string" />
+     <xs:element name="affiliation" type="xs:string" />
+     <xs:element name="knowledgeArea" type="xs:string" minOccurs="0" />
+     <xs:element name="contactEmail" type="xs:string" />
+     <xs:element name="contactPhone" type="xs:string" minOccurs="0" />
+     <xs:element name="comment" type="xs:string" minOccurs="0" />
+     <xs:element name="AQAA"
+                 type="stork:QualityAuthenticationAssuranceLevelType" />
+   </xs:sequence>
+	</xs:complexType>
+
+	<xs:simpleType name="languageType">
+		<xs:restriction base="xs:string">
+			<xs:minLength value="2" />
+			<xs:maxLength value="3" />
+		</xs:restriction>
+	</xs:simpleType>
+
+	<xs:simpleType name="cefrLevelType">
+		<xs:restriction base="xs:string">
+			<xs:enumeration value="A1" />
+			<xs:enumeration value="A2" />
+			<xs:enumeration value="B1" />
+			<xs:enumeration value="B2" />
+			<xs:enumeration value="C1" />
+			<xs:enumeration value="C2" />
+		</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>
diff --git a/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd b/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd
new file mode 100644
index 000000000..3728a7904
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/schema/crue-academic-language-diplomasupplement-schema-1_1.xsd
@@ -0,0 +1,3778 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<xs:schema xmlns:dsig="http://www.w3.org/2000/09/xmldsig#"
+           xmlns:aclan="urn:crue:academic:xsd:language:diplomasupplement"
+           attributeFormDefault="unqualified"
+           elementFormDefault="qualified"
+           targetNamespace="urn:crue:academic:xsd:language:diplomasupplement"
+           version="1.1"
+           xmlns:xs="http://www.w3.org/2001/XMLSchema">
+		
+    <xs:import schemaLocation="xmldsig-core-schema.xsd"
+               namespace="http://www.w3.org/2000/09/xmldsig#" />
+
+    <xs:simpleType name="AcademicYearType">
+        <xs:annotation>
+            <xs:documentation xml:lang="es">Academic year constraint YYYY-YY. (e.g. 2005-06, 2006-07, ...)</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:pattern value="(19|20)\d\d\-\d\d" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="CountryType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">ISO 3166-1-alpha-2</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="AD">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Andorra</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="AE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">United Arab Emirates</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="AF">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Afghanistan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="AG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Antigua and Barbuda</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="AL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Albania</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="AM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Armenia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="AO">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Angola</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="AR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Argentina</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="AT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Austria</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="AU">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Australia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="AZ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Azerbaijan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Bosnia and Herzegovina</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BB">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Barbados</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BD">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Bangladesh</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Belgium</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BF">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Burkina Faso</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Bulgaria</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BH">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Bahrain</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BI">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Burundi</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BJ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Benin</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BN">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Brunei Darussalam</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BO">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Bolivia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Brazil</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BS">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Bahamas</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Bhutan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BW">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Botswana</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BY">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Belarus</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="BZ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Belize</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Canada</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CD">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Congo, Democratic Republic of the</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CF">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Central African Republic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Congo, Republic of the</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CH">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Switzerland</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CI">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Cote d/Ivoire</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Chile</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Cameroon</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CN">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">China</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CO">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Colombia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Costa Rica</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CU">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Cuba</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CV">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Cape Verde</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CY">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Cyprus</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="CZ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Czech Republic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Germany</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DJ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Djibouti</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DK">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Denmark</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Dominica</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DO">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Dominican Republic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DZ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Algeria</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="EC">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Ecuador</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="EE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Estonia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="EG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Egypt</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ER">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Eritrea</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ES">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Spain</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ET">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Ethiopia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="FI">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Finland</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="FJ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Fiji</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="FM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Federated States of Micronesia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="FR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">France</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Gabon</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GB">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">United Kingdom</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GD">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Grenada</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Georgia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GH">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Ghana</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Greenland</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Gambia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GN">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Guinea</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GQ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Equatorial Guinea</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Greece</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Guatemala</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GW">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Guinea-Bissau</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="GY">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Guyana</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="HN">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Honduras</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="HR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Croatia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="HT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Haiti</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="HU">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Hungary</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ID">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Indonesia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="IE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Ireland</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="IL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Israel</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="IN">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">India</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="IQ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Iraq</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="IR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Iran</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="IS">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Iceland</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="IT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Italy</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="JM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Jamaica</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="JO">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Jordan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="JP">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Japan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="KE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Kenya</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="KG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Kyrgyzstan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="KH">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Cambodia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="KI">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Kiribati</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="KM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Comoros</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="KN">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Saint Kitts and Nevis</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="KP">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Korea, Democratic People/s Republic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="KR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Korea, Republic of</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="KW">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Kuwait</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="KZ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Kazakstan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Lao People/s Democratic Republic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LB">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Lebanon</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LC">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Saint Lucia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LI">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Liechtenstein</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LK">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Sri Lanka</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Liberia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LS">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Lesotho</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Lithuania</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LU">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Luxembourg</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LV">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Latvia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="LY">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Libyan Arab Jamahiriya</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Morocco</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MC">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Monaco</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MD">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Moldova, Republic of</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ME">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Montenegro</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Madagascar</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MH">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Marshall Islands</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MK">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Macedonia, the former Yugoslav Republic of</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ML">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mali</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Myanmar</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MN">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mongolia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mauritania</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Malta</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MU">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mauritius</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MV">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Maldives</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MW">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Malawi</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MX">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mexico</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MY">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Malaysia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MZ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mozambique</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Namibia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Niger</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Nigeria</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NI">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Nicaragua</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Netherlands</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NO">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Norway</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NP">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Nepal</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Nauru</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NU">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Niue</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="NZ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">New Zealand</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="OM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Oman</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Panama</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Peru</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Papua New Guinea</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PH">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Philippines</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PK">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Pakistan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Poland</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Puerto Rico</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PS">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Palestinian Territory, Occupied</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Portugal</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PW">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Palau</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="PY">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Paraguay</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="QA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Qatar</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="RO">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Romania</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="RS">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Serbia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="RU">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Russian Federation</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="RW">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Rwanda</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Saudi Arabia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SB">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Solomon Islands</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SC">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Seychelles</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SD">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Sudan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Sweden</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Singapore</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SI">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Slovenia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SK">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Slovakia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Sierra Leone</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">San Marino</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SN">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Senegal</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SO">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Somalia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Suriname</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ST">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Sao Tome and Principe</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SV">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">El Salvador</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SY">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Syrian Arab Republic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SZ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Swaziland</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TD">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Chad</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Togo</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TH">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Thailand</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TJ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Tajikistan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TL">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Timor-Leste</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Turkmenistan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TN">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Tunisia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TO">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Tonga</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TR">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Turkey</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TT">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Trindidad and Tobago</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TV">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Tuvalu</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="TZ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Tanzania, United republic of</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="UA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Ukraina</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="UG">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Uganda</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="US">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">United States</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="UY">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Uruguay</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="UZ">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Uzbekistan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="VA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Holy See (Vatican City State)</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="VC">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Saint Vincent and the Granadines</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="VE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Venezuela</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="VN">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Viet Nam</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="VU">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Vanuatu</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="WS">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Samoa</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="YE">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Yemen</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ZA">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">South Africa</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ZM">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Zambia</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ZW">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Zimbabwe</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="CourseUnitTypeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Type of course unit</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Compulsory">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Compulsory</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="Optional">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Optional</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="DateType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Date format yyyy-mm-dd. Ex.: 2013-05-04, ...</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:date" />
+    </xs:simpleType>
+    <xs:simpleType name="ECTSGradingScaleType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">ECTS grading scale</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="A">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Top 10%</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="B">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Next 25%</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="C">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Next 30%</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="D">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Next 25%</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="E">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Lowest 10%</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="FX">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Fail</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="F">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Fail</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="EmailAddressType">
+        <xs:annotation>
+            <xs:documentation xml:lang="es">E-Mail address constraint</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string" />
+    </xs:simpleType>
+    <xs:simpleType name="EHEAFrameworkType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">EHEA Framework (Bologna: Framework of Qualifications/European Qualifications Framework)</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="FirstCycle">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">First Cycle</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="SecondCycle">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Second Cycle</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ThirdCycle">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Third Cycle</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="EmptyType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Empty text constraint</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Empty text constraint</xs:documentation>
+            </xs:annotation>
+            <xs:maxLength value="0" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="GenderType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Gender</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Female">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Female</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="Male">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Male</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ImageMimeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">MIME: Type image</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="aclan:MimeType">
+            <xs:enumeration value="image/gif">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">GIF image</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="image/jpeg">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">JPEG JFIF image</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="image/pjpeg">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">JPEG JFIF image</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="image/png">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Portable Network Graphics</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="image/tiff">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Tag Image File Format</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ISCED1997Type">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">International Standard Classification of Education (ISCED) 1997</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 0: Pre-primary education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="1">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 1: Primary education or first stage of basic education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="2">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 2: Lower secondary education or second stage of basic education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="3">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 3: Upper secondary education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="4">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 4: Post-secondary non-tertiary education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="5A">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 5A: First stage of tertiary education: largely theoretically based programmes intended to provide qualifications for gaining entry into more advanced research programmes and professions with higher skills requirements</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="5B">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 5B: First stage of tertiary education: shorter, more practical/technical/occupationally specific prgrammes leading to professional qualifications</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="6">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 6: Second stage of tertiary education (leading to an advanced research qualification)</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ISCED2011Type">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">International Standard Classification of Education (ISCED) 2011</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 0: Early childhood Education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="1">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 1: Primary education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="2">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 2: Lower secondary education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="3">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 3: Upper secondary education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="4">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 4: Post-secondary non-tertiary education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="5">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 5: Short-cycle teriary education</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="6">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 6: Bachelor or equivalent</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="7">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 7: Master or equivalent</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="8">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level 8: Doctoral or equivalent</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="LanguageType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">ISO 639-1 languages</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="ab">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Abkhazian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="af">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Afrikaans</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="an">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Aragonese</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ar">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Arabic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="as">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Assamese</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="az">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Azerbaijani</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="be">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Belarusian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="bg">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Bulgarian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="bn">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Bengali</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="bo">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Tibetan</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="br">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Breton</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="bs">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Bosnian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ca">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Catalan / Valencian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ce">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Chechen</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="co">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Corsican</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="cs">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Czech</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="cy">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Welsh</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="da">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Danish</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="de">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">German</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="el">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Greek</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="en">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">English</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="es">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Spanish / Castilian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="et">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Estonian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="eu">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Basque</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="fa">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Persian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="fi">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Finnish</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="fj">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Fijian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="fo">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Faroese</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="fr">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">French</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="fy">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Western Frisian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ga">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Irish</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="gd">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Gaelic / Scottish Gaelic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="gl">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Galician</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="gv">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Manx</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="grc">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Ancient Greek</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="gsw">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Alemanic; Swiss German</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="he">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Hebrew</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="hi">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Hindi</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="hr">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Croatian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ht">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Haitian; Haitian Creole</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="hu">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Hungarian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="hy">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Armenian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="id">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Indonesian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="is">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Icelandic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="it">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Italian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ja">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Japanese</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="jv">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Javanese</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ka">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Georgian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="kg">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Kongo</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ko">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Korean</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ku">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Kurdish</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="kw">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Cornish</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ky">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Kirghiz</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="lb">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Luxembourgish; Letzeburgesch</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="li">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Limburgan; Limburger; Limburgish</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ln">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Lingala</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="lt">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Lithuanian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="lv">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Latvian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="mg">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Malagasy</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="mk">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Macedonian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="mn">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mongolian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="mo">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Moldavian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ms">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Malay</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="mt">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Maltese</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="my">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Burmese</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="nb">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Norwegian (Bokmål)</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ne">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Nepali</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="nl">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Dutch</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="nn">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Norwegian (Nynorsk)</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="no">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Norwegian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="pl">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Polish</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="pt">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Portuguese</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="rm">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Raeto-Romance</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ro">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Romanian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ru">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Russian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="sc">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Sardinian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="se">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Northern Sami</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="sk">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Slovak</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="sl">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Slovenian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="so">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Somali</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="sq">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Albanian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="sr">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Serbian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="sv">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Swedish</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="sw">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Swahili</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="tk">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Turkmen</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="tr">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Turkish</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ty">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Tahitian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="uk">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Ukrainian</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ur">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Urdu</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="uz">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Uzbek</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="vi">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Vietnamese</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="yi">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Yiddish</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="zh">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Chinese</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="cu">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Church Slavic</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="eo">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Esperanto</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="la">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Latin</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="oc">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Occitan (post 1500); Provençal</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="vo">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">VVolapük</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="MimeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">MIME types</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="image/gif">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">GIF image</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="image/jpeg">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">JPEG JFIF image</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="image/pjpeg">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">JPEG JFIF image</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="image/png">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Portable Network Graphics</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="image/tiff">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Tag Image File Format</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="text/html">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">HTML</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="application/pdf">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Portable Document Format</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ModeOfStudyType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Mode of study</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="FullTime">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Full time</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="ParTime">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Par time</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="Distance">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Distance</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="eLearning">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">eLearning</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="Another">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Another</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="ModeOfDeliveryType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Model of delivery</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="FaceToFace">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Face-to-face</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="DistanceLearning">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Distance learning</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="NFQType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">National Framework of Qualifications (NFQ) Level </xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string" />
+    </xs:simpleType>
+    <xs:simpleType name="PlainTextType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Plain text constraint</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Non empty text</xs:documentation>
+            </xs:annotation>
+            <xs:minLength value="1" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PercentType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Percent constraint</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:decimal">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Restriction between 0 and 100</xs:documentation>
+            </xs:annotation>
+            <xs:maxInclusive value="100" />
+            <xs:minInclusive value="0" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PositiveDecimalType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Positive decimal number</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:decimal">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Positive decimal numbers restriction</xs:documentation>
+            </xs:annotation>
+            <xs:minInclusive value="0" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="PositiveIntegerType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Positive integer number</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:int">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Positive integer numbers restriction</xs:documentation>
+            </xs:annotation>
+            <xs:minInclusive value="0" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="SourceGradeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Source of the course unit performance</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:string">
+            <xs:enumeration value="Recognized">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Recognized</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="MobilityProgramme">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course unit attended in mobility programme</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+            <xs:enumeration value="Another">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Another</xs:documentation>
+                </xs:annotation>
+            </xs:enumeration>
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:simpleType name="URLType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Uniform Resource Locator (URL)</xs:documentation>
+        </xs:annotation>
+        <xs:restriction base="xs:anyURI">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">http and https restriction</xs:documentation>
+            </xs:annotation>
+            <xs:pattern value="http://.*" />
+            <xs:pattern value="https://.*" />
+        </xs:restriction>
+    </xs:simpleType>
+    <xs:complexType name="AdditionalInformationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Additional information</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="SpecificInformation"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Specific information</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="OtherSources"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Other sources</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AddressType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Address</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Line"
+                        type="aclan:PlainTextType"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Name, street, PO box, ...</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="City"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">City</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="StateOrRegion"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">State or region</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="PostalCode"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Postal code</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Country">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Country</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="country"
+                                          type="aclan:CountryType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Country code ISO 3166-1-alpha-2</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AttachedFileDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Data file</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Description"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Description</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Mime"
+                        type="aclan:MimeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">MIME type code</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Data"
+                        type="xs:base64Binary">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Base64 binary data</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AttachedFileURLType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">URL reference to the file</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Description"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Description</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Mime"
+                        type="aclan:MimeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">MIME type code</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="URL"
+                        type="aclan:URLType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">URL</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AttachedImageDataType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Image data file</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Description"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Description</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Mime"
+                        type="aclan:ImageMimeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">MIME type image code</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Data"
+                        type="xs:base64Binary">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Base64 binary data</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AttachedImageURLType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">URL reference to the image file</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Description"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Description</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Mime"
+                        type="aclan:ImageMimeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">MIME type image code</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="URL"
+                        type="aclan:URLType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">URL</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="AttachedType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Attachment resource</xs:documentation>
+        </xs:annotation>
+        <xs:choice>
+            <xs:element name="FileData"
+                        type="aclan:AttachedFileDataType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Data file</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FileURI"
+                        type="aclan:AttachedFileURLType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">URL reference to the file</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ImageData"
+                        type="aclan:AttachedImageDataType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Image data file</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ImageURI"
+                        type="aclan:AttachedImageURLType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">URL reference to the image file</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:choice>
+        <xs:attribute name="attachedID"
+                      type="xs:ID"
+                      use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Attached identifier</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="AttachmentsType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Attachments resources</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Attached"
+                        type="aclan:AttachedType"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Attachment resource</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CertificationOfTheSupplementType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Certification of the Supplement</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="CertificationDate"
+                        type="aclan:DateType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Date was issued</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="OfficialsCertifying"
+                        type="aclan:OfficialsCertifyingType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Officials certifying</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="OfficialStamp"
+                        type="aclan:OfficialStampType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Official stamp or seal of the institution</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ContactInformationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Contact information</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Address"
+                        type="aclan:AddressType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Address</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="PhoneNumber"
+                        type="aclan:PlainTextType"
+                        minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Phone number</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Email"
+                        type="aclan:EmailAddressType"
+                        minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">E-Mail address</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="WebSite"
+                        type="aclan:URLType"
+                        minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Web site</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CoursesAttendedInOtherInstitutionInMobilityProgramsType">
+        <xs:sequence>
+            <xs:element name="MobilityProgramme"
+                        type="aclan:MobilityProgrammeType"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mobility programme</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CourseStructureDiagramType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Course structure diagram</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="CoursesGroups"
+                        type="aclan:CoursesGroupsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Courses groups</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CoursesUnits"
+                        type="aclan:CoursesUnitsType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course units</xs:documentation>
+                </xs:annotation>
+                <xs:key name="CourseUnitCodeUQ">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Unique: Course unit code</xs:documentation>
+                    </xs:annotation>
+                    <xs:selector xpath="aclan:CourseUnit/aclan:Code" />
+                    <xs:field xpath="." />
+                </xs:key>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CoursesUnitsType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Course units</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="CourseUnit"
+                        type="aclan:CourseUnitType"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course unit</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CourseUnitLanguagesOfInstructionType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Language of instruction</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Language"
+                        type="aclan:CourseUnitLanguageOfInstructionType"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Language of instruction</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CourseUnitStudentPerformanceType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Student performance</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="LocalGrade"
+                        type="aclan:LocalGradeType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Local grade</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ECTSGrade"
+                        type="aclan:ECTSGradingScaleType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">ECTS grade</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CourseUnitType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Course unit</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Code"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course unit code</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ScientificArea"
+                        type="aclan:PlainTextType"
+                        minOccurs="0" />
+            <xs:element name="Title"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course unit title</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Theme"
+                        type="aclan:PlainTextType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Theme (example: Academic project)</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Type">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Type of course unit</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="type"
+                                          type="aclan:CourseUnitTypeType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Type of course unit code</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="YearOfStudy"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Year of study</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="year"
+                                          type="aclan:PositiveDecimalType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Year of study</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="Level"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level of course unit</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="eheaFramework"
+                                          type="aclan:EHEAFrameworkType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">EHEA Framework code</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="ECTSCredits"
+                        type="aclan:PositiveDecimalType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Number of ECTS credits</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="LocalCredits"
+                        type="aclan:PositiveDecimalType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Number of local credits</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Hours"
+                        type="aclan:PositiveDecimalType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Number of hours</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="LanguagesOfInstruction"
+                        type="aclan:CourseUnitLanguagesOfInstructionType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Languages of instruction</xs:documentation>
+                </xs:annotation>
+                <xs:unique name="LanguagesOfInstructionUQ">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Unique: Language</xs:documentation>
+                    </xs:annotation>
+                    <xs:selector xpath="aclan:Language" />
+                    <xs:field xpath="@language" />
+                </xs:unique>
+            </xs:element>
+            <xs:element name="ModeOfDelivery"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mode of delivery</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="modeOfDelivery"
+                                          type="aclan:ModeOfDeliveryType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Mode of delivery oode</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="WorkPlacements"
+                        type="aclan:CourseUnitWorkPlacementsType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Work placements</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="StudentPerformance"
+                        type="aclan:CourseUnitStudentPerformanceType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Student performance</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NameOfLecturers"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Name of lecturer(s)</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="LearningOutcomes"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Learning outcomes of the course unit</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="PrerequisitesAndCorequisites"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Prerequisites and co-requisites</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="RecomendedOptionalProgrammeComponents"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Recomended optional programme components</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CourseContents"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course contents</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="RecomendedOrRequiredReading"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Recomended or required reading</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="PlanedLearningActivitiesAndTeachingMethod"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Planed learning activities and teaching method</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AssesmentMethodsAndCriteria"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Assesment methods and criteria</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Observations"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Observations</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="groupID"
+                      type="xs:string"
+                      use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Group identifier</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="institutionAdministeringStudiesID"
+                      type="xs:string"
+                      use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Institution administering studies identifier </xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="isRequiredByTheProgramme"
+                      type="xs:boolean"
+                      default="true">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Is required by the programme?</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="CourseUnitWorkPlacementsType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Course unit work placements</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="WorkPlacement"
+                        type="aclan:CourseUnitWorkPlacementType"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Work placement</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CourseUnitWorkPlacementType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Course unit work placement</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="CollaboratingInstitution"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Name of collaborating institution</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="DateFrom"
+                        type="aclan:DateType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Date from</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="DateTo"
+                        type="aclan:DateType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Date to</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="TrainingHours"
+                        type="aclan:PositiveDecimalType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Training Hours</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CourseUnitLanguageOfInstructionType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Language of instruction</xs:documentation>
+        </xs:annotation>
+        <xs:simpleContent>
+            <xs:extension base="aclan:PlainTextType">
+                <xs:attribute name="language"
+                              type="aclan:LanguageType"
+                              use="required">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Language code ISO 639-1 of the Supplement</xs:documentation>
+                    </xs:annotation>
+                </xs:attribute>
+            </xs:extension>
+        </xs:simpleContent>
+    </xs:complexType>
+    <xs:complexType name="DiplomaSupplementType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Diploma Supplement</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="InformationIdentifyingTheHolderOfTheQualification"
+                        type="aclan:InformationIdentifyingTheHolderOfTheQualificationType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Information identifying the holder of the qualification</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="InformationIdentifyingTheQualification"
+                        type="aclan:InformationIdentifyingTheQualificationType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Information identifying the qualification</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="InformationOnTheLevelOfTheQualification"
+                        type="aclan:InformationOnTheLevelOfTheQualificationType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Information on the level of the qualification</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="InformationOnTheContentsAndResultsGained"
+                        type="aclan:InformationOnTheContentsAndResultsGainedType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Information on the contents and results gained</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="InformationOnTheFunctionOfTheQualification"
+                        type="aclan:InformationOnTheFunctionOfTheQualificationType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Information on the function of the qualification</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AdditionalInformation"
+                        type="aclan:AdditionalInformationType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Additional informationType</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CertificationOfTheSupplement"
+                        type="aclan:CertificationOfTheSupplementType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Certification of the Supplement</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="InformationOnTheNationalHigherEducationSystem"
+                        type="aclan:RichTextTagType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Information on the national higher education system</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Attachments"
+                        type="aclan:AttachmentsType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Attachments resources</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ExtensionContent"
+                        type="aclan:ExtensionContentType"
+                        minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Extension content</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element ref="dsig:Signature"
+                        minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Digital signature</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="language"
+                      type="aclan:LanguageType"
+                      use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Language code ISO 639-1 of the Supplement</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="isTheOriginalLanguage"
+                      type="xs:boolean"
+                      use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Indicate if language is the original language</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="ExtensionContentType"
+                    mixed="true">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Extension content</xs:documentation>
+        </xs:annotation>
+        <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:annotation>
+            <xs:documentation xml:lang="en">Family name(s)</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Surname"
+                        type="aclan:PlainTextType"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Surname</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="GivenNameType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Given name(s)</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Name"
+                        type="aclan:PlainTextType"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Name</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="GradingSchemeAndGradeDistributionGuidanceType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Grading scheme and grade distribution guidance</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="GradingScheme"
+                        type="aclan:RichTextTagType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Grading scheme</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="GradeDistributionGuidance"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Grade distribution guidance</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CoursesGroupsType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Courses groups</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Name"
+                        type="aclan:PlainTextType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Groups set name</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="HeaderInformation"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Header information</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CoursesGroup"
+                        type="aclan:CoursesGroupType"
+                        minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Courses group</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FooterInformation"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Footer information</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="CoursesGroupType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Courses group</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Name"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Name of the group</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="HeaderInformation"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Header information</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CoursesGroup"
+                        type="aclan:CoursesGroupType"
+                        minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Courses group</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FooterInformation"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Footer information</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="groupID"
+                      type="xs:string"
+                      use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Group identifier</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="InformationIdentifyingTheHolderOfTheQualificationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Information identifying the holder of the qualification</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="FamilyName"
+                        type="aclan:FamilyNameType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Family name(s)</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="GivenName"
+                        type="aclan:GivenNameType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Given name(s)</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="DateOfBirth"
+                        type="aclan:DateType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Date of birth</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="StudentIdentificationNumber"
+                        type="aclan:PlainTextType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Student identification number or code</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CountryOfBirth"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Country of birth</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="country"
+                                          type="aclan:CountryType"
+                                          use="optional">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Country code ISO 3166-1-alpha-2</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="PlaceOfBirth"
+                        type="aclan:PlainTextType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Place of birth</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Gender"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Gender</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="gender"
+                                          type="aclan:GenderType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Gender code</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="InformationIdentifyingTheQualificationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Information identifying the qualification</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Qualification"
+                        type="aclan:QualificationType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="es">Qualification</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="TitleConferred"
+                        type="aclan:TitleConferredType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Title conferred</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="MainFieldsOfStudy"
+                        type="aclan:RichTextTagType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Main fields of study</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NameAndStatusOfAwardingInstitution"
+                        type="aclan:NameAndStatusOfAwardingInstitutionType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Name and status of awarding institution</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="NameAndStatusOfInstitutionAdministeringStudies"
+                        type="aclan:NameAndStatusOfInstitutionAdministeringStudiesType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Name and status of institution administering studies</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="LanguagesOfInstructionAndExamination"
+                        type="aclan:LanguagesOfInstructionAndExaminationType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Language of instruction and examination</xs:documentation>
+                </xs:annotation>
+                <xs:unique name="LanguageOfInstructionAndExaminationUQ">
+                    <xs:annotation>
+                        <xs:documentation xml:lang="en">Unique: Language of instruction and examinatio</xs:documentation>
+                    </xs:annotation>
+                    <xs:selector xpath="aclan:Language" />
+                    <xs:field xpath="@language" />
+                </xs:unique>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="InformationOnTheContentsAndResultsGainedType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Information on the contents and results gained</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="ModeOfStudy">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mode of study</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="aclan:RichTextTagType">
+                            <xs:attribute name="modeOfStudy"
+                                          type="aclan:ModeOfStudyType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Mode of study</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="ProgrammeRequirements"
+                        type="aclan:ProgrammeRequirementsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Programme requirements</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ProgrammeDetails"
+                        type="aclan:ProgrammeDetailsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Programme details</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="GradingSchemeAndGradeDistributionGuidance"
+                        type="aclan:GradingSchemeAndGradeDistributionGuidanceType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Grading scheme and grade distribution guidance</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="OverallClassificationOfTheQualification"
+                        type="aclan:RichTextTagType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Overall classification of the qualification</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="InformationOnTheFunctionOfTheQualificationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Information on the function of the qualification type</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="AccessToFurtherStudy"
+                        type="aclan:RichTextTagType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Access to further study</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ProfessionalStatus"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Professional status</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="aclan:RichTextTagType">
+                            <xs:attribute name="isRegulatedProfession"
+                                          type="xs:boolean"
+                                          use="optional">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Is regulated profession</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="InformationOnTheLevelOfTheQualificationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Information on the level of the qualification</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Level">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Level ff the qualification</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="aclan:RichTextTagType">
+                            <xs:attribute name="isced1997"
+                                          type="aclan:ISCED1997Type"
+                                          use="optional">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">ISCED 1997 code</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                            <xs:attribute name="isced2011"
+                                          type="aclan:ISCED2011Type"
+                                          use="optional">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">ISCED 2011 code</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                            <xs:attribute name="eheaFramework"
+                                          type="aclan:EHEAFrameworkType"
+                                          use="optional">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">EHEA Framework code</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                            <xs:attribute name="nfq"
+                                          type="aclan:NFQType"
+                                          use="optional">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">NFQ code</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="OfficialLengthOfProgramme">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Official length of programme</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="aclan:RichTextTagType">
+                            <xs:attribute name="ectsCredits"
+                                          type="aclan:PositiveDecimalType"
+                                          use="optional">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Number of ECTS credits</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                            <xs:attribute name="years"
+                                          type="aclan:PositiveDecimalType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Number of years</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                            <xs:attribute name="semesters"
+                                          type="aclan:PositiveIntegerType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Number of semesters</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="AccessRequirements"
+                        type="aclan:RichTextTagType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Access requirements</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="InstitutionType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Name and status of the institution</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Name"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Name of the institution</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Status"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Status of the institution</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Country">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Country of the institution</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="country"
+                                          type="aclan:CountryType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Country code ISO 3166-1-alpha-2</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="AdditionalInformation"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Additional Information about the institution</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="ContactInformation"
+                        type="aclan:ContactInformationType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Contact information</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AttachedImageRef"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Logo of the institution reference</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="attachedID"
+                                          type="xs:IDREF"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Attached identifier reference</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="nationalID"
+                      type="aclan:PlainTextType">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">National identification code or number of the institution</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="erasmusID"
+                      type="aclan:PlainTextType">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">ERASMUS code of the institution</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="LanguagesOfInstructionAndExaminationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Language of instruction and examination</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Language"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Language of instruction and examination</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="aclan:RichTextTagType">
+                            <xs:attribute name="language"
+                                          type="aclan:LanguageType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="es">Language code ISO 639-1</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                            <xs:attribute name="percent"
+                                          type="aclan:PercentType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="es">Percent</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="LocalGradeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Local grade</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="AcademicYear"
+                        type="aclan:AcademicYearType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Academic year</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="DateIssued"
+                        type="aclan:DateType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Date issued</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Grade"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Grade</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Source"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Source grade</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="source"
+                                          type="aclan:SourceGradeType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Source grade code</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="MobilityProgrammeCoursesUnitsType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Mobility programme courses units</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="CourseUnit"
+                        type="aclan:MobilityProgrammeCourseUnitType"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course unit</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="MobilityProgrammeCourseUnitType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Mobility programme course unit</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Code"
+                        type="aclan:PlainTextType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course unit code</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Title">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course unit title</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="language"
+                                          type="aclan:LanguageType">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Language code ISO 639-1</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="ECTSCredits"
+                        type="aclan:PositiveDecimalType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Number of ECTS credits</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AdditionalInformation"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Additional information</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="isInTheLearningAgreement"
+                      type="xs:boolean"
+                      default="true">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Is in the learning agreement?</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="MobilityProgrammeType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Mobility programme</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Type"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Mobility programme type (e.g. ERASMUS, ISEP, ...)</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="FieldOfStudy"
+                        type="aclan:PlainTextType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Field of study</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Country">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Country</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="country"
+                                          type="aclan:CountryType"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Country code ISO 3166-1-alpha-2</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+            <xs:element name="ReceivingInstitutionName"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Receiving institution</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AcademicYear"
+                        type="aclan:AcademicYearType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Academic year</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="DateFrom"
+                        type="aclan:DateType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Study period (Date from)</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="DateTo"
+                        type="aclan:DateType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Study period (Date to)</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CoursesUnits"
+                        type="aclan:MobilityProgrammeCoursesUnitsType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course units</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="MultilingualDiplomaSupplementType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Multilingual Diploma Supplement (DS)</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element ref="aclan:DiplomaSupplement"
+                        minOccurs="2"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Diploma Supplement</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element ref="dsig:Signature"
+                        minOccurs="0"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Digital signature</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="NameAndStatusOfAwardingInstitutionType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Name and status of awarding institution</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="AwardingInstitution"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Awarding institution</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="aclan:InstitutionType">
+                            <xs:attribute name="awardingInstitutionID"
+                                          type="xs:string"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Awarding institution identifier</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="NameAndStatusOfInstitutionAdministeringStudiesType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Name and status of institution administering studies</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="InstitutionAdministeringStudies"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Institution administering studies</xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:complexContent>
+                        <xs:extension base="aclan:InstitutionType">
+                            <xs:attribute name="institutionAdministeringStudiesID"
+                                          type="xs:string"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Institution administering studies identifier</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:complexContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="OfficialCertifyingType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Official certifying the DS</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="FamilyName"
+                        type="aclan:FamilyNameType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Family name(s)</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="GivenName"
+                        type="aclan:GivenNameType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Given name(s)</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Capacity"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Official capacity</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="awardingInstitutionID"
+                      type="xs:string"
+                      use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Identifier of awarding institution</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="OfficialsCertifyingType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Officials certifying</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="OfficialCertifying"
+                        type="aclan:OfficialCertifyingType"
+                        maxOccurs="unbounded">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Official certifying</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="OfficialStampType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Official stamp or seal of the institution</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Description"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Stamp description</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="awardingInstitutionID"
+                      type="xs:string"
+                      use="required">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Identifier of awarding institution</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="ProgrammeDetailsType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Programme details</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="CourseStructureDiagram"
+                        type="aclan:CourseStructureDiagramType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Course structure diagram</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="CoursesAttendedInOtherInstitutionInMobilityPrograms"
+                        type="aclan:CoursesAttendedInOtherInstitutionInMobilityProgramsType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Courses attended in other institution in mobility programs</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="ProgrammeRequirementsType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Programme requirements</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Requirements"
+                        type="aclan:RichTextTagType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Programme requirements</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="KeyLearningOutcomes"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Key learning outcomes of the programme</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:complexType name="QualificationType">
+        <xs:annotation>
+            <xs:documentation xml:lang="es">Qualification</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Name"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Name of the qualification</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AdditionalInformation"
+                        type="aclan:RichTextTagType"
+                        minOccurs="0">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Additional information about the qualification</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+        <xs:attribute name="localID"
+                      type="aclan:PlainTextType">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Local identification code or number of the qualification</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+        <xs:attribute name="nationalID"
+                      type="aclan:PlainTextType">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">National identification code or number of the qualification</xs:documentation>
+            </xs:annotation>
+        </xs:attribute>
+    </xs:complexType>
+    <xs:complexType name="RichTextTagType"
+                    mixed="true">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Rich text tag</xs:documentation>
+        </xs:annotation>
+        <xs:choice minOccurs="0"
+                   maxOccurs="unbounded">
+            <xs:element name="Bold"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Specifies bold text</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="BreakLine"
+                        type="aclan:EmptyType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Specifies break line</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Italic"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Specifies italic text</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="Underline"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Specifies underline text</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+            <xs:element name="AttachedRef">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Specifies reference to the attached resource </xs:documentation>
+                </xs:annotation>
+                <xs:complexType>
+                    <xs:simpleContent>
+                        <xs:extension base="aclan:PlainTextType">
+                            <xs:attribute name="attachedID"
+                                          type="xs:IDREF"
+                                          use="required">
+                                <xs:annotation>
+                                    <xs:documentation xml:lang="en">Attached identifier reference</xs:documentation>
+                                </xs:annotation>
+                            </xs:attribute>
+                        </xs:extension>
+                    </xs:simpleContent>
+                </xs:complexType>
+            </xs:element>
+        </xs:choice>
+    </xs:complexType>
+    <xs:complexType name="TitleConferredType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Title conferred</xs:documentation>
+        </xs:annotation>
+        <xs:sequence>
+            <xs:element name="Name"
+                        type="aclan:PlainTextType">
+                <xs:annotation>
+                    <xs:documentation xml:lang="en">Name of the title conferred</xs:documentation>
+                </xs:annotation>
+            </xs:element>
+        </xs:sequence>
+    </xs:complexType>
+    <xs:element name="DiplomaSupplement"
+                type="aclan:DiplomaSupplementType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Diploma Supplement</xs:documentation>
+        </xs:annotation>
+        <!--Primary Keys-->
+        <xs:key name="GroupIDPK">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Primary Key: Group identifier</xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath=".//aclan:CoursesGroup" />
+            <xs:field xpath="@groupID" />
+        </xs:key>
+        <xs:key name="AwardingInstitutionIDPK">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Primary Key: Awarding institution identifier</xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath=".//aclan:AwardingInstitution" />
+            <xs:field xpath="@awardingInstitutionID" />
+        </xs:key>
+        <xs:key name="InstitutionAdministeringStudiesIDPK">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Primary Key: Intitution administering studies identifier</xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath=".//aclan:InstitutionAdministeringStudies" />
+            <xs:field xpath="@institutionAdministeringStudiesID" />
+        </xs:key>
+        <!--Foreign Keys-->
+        <xs:keyref name="GroupFK"
+                   refer="aclan:GroupIDPK">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Foreign Key: Group identifier</xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath=".//aclan:CourseStructureDiagram/aclan:CoursesUnits/aclan:CourseUnit" />
+            <xs:field xpath="@groupID" />
+        </xs:keyref>
+        <xs:keyref name="AwardingInstitutionOfficialCertifyingFK"
+                   refer="aclan:AwardingInstitutionIDPK">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Foreign Key: Awarding institution (Official Stamp) identifier</xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath=".//aclan:OfficialCertifying" />
+            <xs:field xpath="@awardingInstitutionID" />
+        </xs:keyref>
+        <xs:keyref name="AwardingInstitutionOfficialStampFK"
+                   refer="aclan:AwardingInstitutionIDPK">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Foreign Key: Awarding institution (Official Stamp) identifier</xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath=".//aclan:OfficialStamp" />
+            <xs:field xpath="@awardingInstitutionID" />
+        </xs:keyref>
+        <xs:keyref name="InstitutionAdministeringStudiesFK"
+                   refer="aclan:InstitutionAdministeringStudiesIDPK">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Foreign Key: Institution administering studies identifier</xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath=".//aclan:ProgrammeDetails/aclan:CourseStructureDiagram/aclan:CoursesUnits/aclan:CourseUnit" />
+            <xs:field xpath="@institutionAdministeringStudiesID" />
+        </xs:keyref>
+    </xs:element>
+    <xs:element name="MultilingualDiplomaSupplement"
+                type="aclan:MultilingualDiplomaSupplementType">
+        <xs:annotation>
+            <xs:documentation xml:lang="en">Multilingual Diploma Supplement</xs:documentation>
+        </xs:annotation>
+        <!--Unique Keys-->
+        <xs:unique name="DiplomaSupplementLanguageUQ">
+            <xs:annotation>
+                <xs:documentation xml:lang="en">Unique: Diploma Supplement language</xs:documentation>
+            </xs:annotation>
+            <xs:selector xpath="aclan:DiplomaSupplement" />
+            <xs:field xpath="@language" />
+        </xs:unique>
+    </xs:element>
+</xs:schema>
diff --git a/id/server/stork2-commons/src/main/resources/schema/diploma.xsd b/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
new file mode 100644
index 000000000..bea3d03f1
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/schema/diploma.xsd
@@ -0,0 +1,1687 @@
+<?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">
+		
+	<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="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 -->
+  
+ <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="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="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="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="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="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="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>
+ 
+ 
+ <!-- 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>
+
+ 
+ <!--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="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: 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>
+
+
+<!-- TODO: añadir cambios CSI, IS-SKRA -->
\ No newline at end of file
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
new file mode 100644
index 000000000..e75c806e0
--- /dev/null
+++ b/id/server/stork2-commons/src/main/resources/schema/xmldsig-core-schema.xsd
@@ -0,0 +1,309 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!-- Schema for XML Signatures
+    http://www.w3.org/2000/09/xmldsig#
+    $Revision: 1.1 $ on $Date: 2002/02/08 20:32:26 $ by $Author: reagle $
+
+    Copyright 2001 The Internet Society and W3C (Massachusetts Institute
+    of Technology, Institut National de Recherche en Informatique et en
+    Automatique, Keio University). All Rights Reserved.
+    http://www.w3.org/Consortium/Legal/
+
+    This document is governed by the W3C Software License [1] as described
+    in the FAQ [2].
+
+    [1] http://www.w3.org/Consortium/Legal/copyright-software-19980720
+    [2] http://www.w3.org/Consortium/Legal/IPR-FAQ-20000620.html#DTD
+-->
+
+
+<schema xmlns="http://www.w3.org/2001/XMLSchema"
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+        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">
+        <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/ComplexAttributesMarshalling.java b/id/server/stork2-commons/src/test/java/eu/stork/peps/tests/ComplexAttributesMarshalling.java
index d411a2f42..fc6e65f70 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
@@ -1,22 +1,11 @@
 /*

- * This work is Open Source and licensed by the European Commission under the

- * conditions of the European Public License v1.1 

- *  

- * (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); 

- * 

- * any use of this file implies acceptance of the conditions of this license. 

- * Unless required by applicable law or agreed to in writing, software 

- * distributed under the License is distributed on an "AS IS" BASIS,  WITHOUT 

- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the 

- * License for the specific language governing permissions and limitations 

- * under the License.

- * 

- * ---

- * 

- * Test cases for marshalling complex attributes.

- * 

- * Implemented are two testcases for marshalling and unmarshalling.  These testcases are

- * for canonical residenc address and has bank account.

+ * This work is Open Source and licensed by the European Commission under the conditions of the European Public License

+ * v1.1 (http://www.osor.eu/eupl/european-union-public-licence-eupl-v.1.1); any use of this file implies acceptance of

+ * the conditions of this license. Unless required by applicable law or agreed to in writing, software distributed under

+ * the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or

+ * implied. See the License for the specific language governing permissions and limitations under the License. --- Test

+ * cases for marshalling complex attributes. Implemented are two testcases for marshalling and unmarshalling. These

+ * testcases are for canonical residenc address and has bank account.

  */

 

 package eu.stork.peps.tests;

@@ -24,6 +13,7 @@ package eu.stork.peps.tests;
 import java.io.File;

 import java.io.FileNotFoundException;

 import java.io.FileOutputStream;

+import java.io.StringWriter;

 

 import javax.xml.bind.JAXBContext;

 import javax.xml.bind.JAXBElement;

@@ -32,38 +22,55 @@ import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;

 import javax.xml.transform.stream.StreamSource;

 

+import org.joda.time.DateTime;

 import org.junit.Test;

 

-import eu.stork.peps.complex.attributes.CanonicalAddressType;

-import eu.stork.peps.complex.attributes.HasAccountInBankType;

-import eu.stork.peps.complex.attributes.ObjectFactory;

+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.CanonicalAddressType;

+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.HasAccountInBankType;

+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.MandateContentType;

+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.MandateType;

+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.ObjectFactory;

+import eu.stork.peps.complex.attributes.eu.stork.names.tc.stork._1_0.assertion.RepresentationPersonType;

 

 /**

- * @author Advania

- * 

- * Examples on how to use the jaxb marshaller.

- * 

- * The classes are created from the StorkcomplexAttributes.xsd schema located in resources.

- * 

+ * @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 $ 

  *

  */

 

 public class ComplexAttributesMarshalling {

 

+    MandateContentType       mtObject  = new MandateContentType();

+    RepresentationPersonType rpObject  = new RepresentationPersonType();

+    RepresentationPersonType rptObject = new RepresentationPersonType();

+

+    void initMandateValues() {

+        // Fill in the information ...

+        mtObject.setIsChained(false);

+        // mtObject.setIsJoined("IsJoined");

+        mtObject.setTypeOfPower("The Force");

+        mtObject.setIsChained(false);

+        // ... fill in info for the representative

+        rpObject.setTextRegisteredAddress("Address at some street");

+        rpObject.setDateOfBirth(DateTime.now().toString());

+        rpObject.setEIdentifier("123456");

+        rpObject.setGivenName("Name of some person");

+        rpObject.setLegalForm("Type of person");

+        // .... fill in the info for the represented

+        rptObject.setTextRegisteredAddress("Another Address at some street");

+        rptObject.setDateOfBirth(DateTime.now().toString());

+        rptObject.setEIdentifier("654321");

+        rptObject.setGivenName("Another Name of some person");

+        rptObject.setLegalForm("Yet another type of person");

+    }

+

 	/**

-	 * Test marshalling canonical address

-	 * <?xml version="1.0" encoding="UTF-8" standalone="yes"?>

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

 	 *  <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>

+     * <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() 

@@ -88,30 +95,133 @@ public class ComplexAttributesMarshalling {
 		    m.marshal(objf.createCanonicalResidenceAddress(object), new FileOutputStream("CanonicalAddressType.xml"));		    

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

 		}

-		catch (JAXBException e ) 

-		{

-			e.printStackTrace();

-			

-		} catch (FileNotFoundException e) {

+        catch ( Exception e ) {

 			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();

+            RepresentationPersonType representative = new RepresentationPersonType();

+            representative.setDateOfBirth("1990-01-01");

+            representative.setGivenName("Bilbo");

+            representative.setSurname("Baggins");

+            representative.setEIdentifier("IT/IT/12345678990");

+            mandate.setRepresentative(representative);

+

+            RepresentationPersonType represented = new RepresentationPersonType();

+            represented.setTextRegisteredAddress("Via....");

+            represented.setELPIdentifier("IT/1111111");

+            represented.setLegalName("Shire Corp.");

+            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();

+        }

+    }

+

+    @Test

+    public void testMandateContent() {

+        initMandateValues();

+        try {

+            final MandateType object = new MandateType();

+            // Make the object ....

+            object.getMandateContent().add(mtObject);

+            object.setRepresented(rpObject);

+            object.setRepresentative(rptObject);

+

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

+            // Create the marshaller

+            final Marshaller m = context.createMarshaller();

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

+            final ObjectFactory objf = new ObjectFactory();

+            // Various types of output

+            m.marshal(objf.createMandate(object), new FileOutputStream("MandateContentType.xml"));

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

+

+            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"?>

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

 	 *  <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>

+     * <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() 

@@ -140,12 +250,8 @@ public class ComplexAttributesMarshalling {
 	}

 

 	/**

-	 * 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 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()

@@ -162,22 +268,18 @@ public class ComplexAttributesMarshalling {
 			m.marshal(o.createHasAccountInBank(object), System.out);

 			

 		}

-		catch (JAXBException e ) 

-		{

+        catch (FileNotFoundException e) {

+            e.printStackTrace();

+

+        }catch ( Exception e ) {

 			e.printStackTrace();

 			

-		} catch (FileNotFoundException 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 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()

diff --git a/id/server/stork2-saml-engine/pom.xml b/id/server/stork2-saml-engine/pom.xml
index 21449b522..a13a036a0 100644
--- a/id/server/stork2-saml-engine/pom.xml
+++ b/id/server/stork2-saml-engine/pom.xml
@@ -60,7 +60,7 @@
 		<dependency>

 			<groupId>org.opensaml</groupId>

 			<artifactId>opensaml</artifactId>

-<!-- 			<version>${opensaml.version}</version> -->

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

 			<exclusions>

 				<exclusion>

 					<groupId>org.slf4j</groupId>

@@ -89,6 +89,12 @@
 			</exclusions>

 		</dependency>

 

+        <dependency>

+            <groupId>org.opensaml</groupId>

+            <artifactId>xmltooling</artifactId>

+            <version>1.4.3</version>

+        </dependency>

+

 		<dependency>

 			<groupId>org.slf4j</groupId>

 			<artifactId>slf4j-api</artifactId>

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 d415375e7..0984bb9ca 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
@@ -220,13 +220,17 @@ public class SignSW implements SAMLEngineSignI {
                 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;
+                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) {