merge

81 files changed, 5837 insertions, 2559 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 9ac9986c8..a8c4daad7 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
@@ -75,7 +75,6 @@ import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;
 import at.gv.egovernment.moa.id.auth.parser.InfoboxReadResponseParser;
 import at.gv.egovernment.moa.id.auth.parser.VerifyXMLSignatureResponseParser;
 import at.gv.egovernment.moa.id.auth.servlet.PEPSConnectorServlet;
-import at.gv.egovernment.moa.id.auth.stork.VelocityProvider;
 import at.gv.egovernment.moa.id.auth.validator.CreateXMLSignatureResponseValidator;
 import at.gv.egovernment.moa.id.auth.validator.IdentityLinkValidator;
 import at.gv.egovernment.moa.id.auth.validator.InfoboxValidator;
@@ -87,7 +86,6 @@ import at.gv.egovernment.moa.id.auth.validator.parep.ParepUtils;
 import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWConstants;
 import at.gv.egovernment.moa.id.client.SZRGWClient;
 import at.gv.egovernment.moa.id.client.SZRGWClientException;
-import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAStorkAttribute;
 import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
@@ -105,6 +103,7 @@ import at.gv.egovernment.moa.id.storage.DBExceptionStoreImpl;
 import at.gv.egovernment.moa.id.util.HTTPUtils;
 import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 import at.gv.egovernment.moa.id.util.Random;
+import at.gv.egovernment.moa.id.util.VelocityProvider;
 import at.gv.egovernment.moa.id.util.XMLUtil;
 import at.gv.egovernment.moa.id.util.client.mis.simple.MISMandate;
 import at.gv.egovernment.moa.logging.LogMsg;
@@ -125,7 +124,7 @@ import at.gv.util.xsd.srzgw.MISType;
 import at.gv.util.xsd.srzgw.MISType.Filters;
 import eu.stork.oasisdss.api.AdditionalProfiles;
 import eu.stork.oasisdss.api.ApiUtils;
-import eu.stork.oasisdss.api.ApiUtilsException;
+import eu.stork.oasisdss.api.exceptions.ApiUtilsException;
 import eu.stork.oasisdss.api.Profiles;
 import eu.stork.oasisdss.api.QualityLevels;
 import eu.stork.oasisdss.api.SignatureTypes;
@@ -139,6 +138,11 @@ import eu.stork.peps.auth.commons.STORKAuthnRequest;
 import eu.stork.peps.auth.engine.STORKSAMLEngine;
 import eu.stork.peps.exceptions.STORKSAMLEngineException;
 
+//import java.security.cert.CertificateFactory;
+//import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.CreateIdentityLinkResponse;
+//import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClient;
+//import at.gv.egovernment.moa.id.auth.validator.parep.client.szrgw.SZRGWClientException;
+
 /**
  * API for MOA ID Authentication Service.<br> {@link AuthenticationSession} is
  * stored in a session store and retrieved by giving the session ID.
@@ -149,148 +153,147 @@ import eu.stork.peps.exceptions.STORKSAMLEngineException;
  */
 public class AuthenticationServer implements MOAIDAuthConstants {
 
-	/** single instance */
-	private static AuthenticationServer instance;
-
-	/**
-	 * time out in milliseconds used by {@link cleanup} for session store
-	 */
-	private long sessionTimeOutCreated = 15 * 60  * 1000; // default 10 minutes
-	private long sessionTimeOutUpdated = 10 * 60  * 1000; // default 10 minutes
-	/**
-	 * time out in milliseconds used by {@link cleanup} for authentication data
-	 * store
-	 */
-	private long authDataTimeOut = 2 * 60  * 1000; // default 2 minutes
-
-	/**
-	 * Returns the single instance of <code>AuthenticationServer</code>.
-	 *
-	 * @return the single instance of <code>AuthenticationServer</code>
-	 */
-	public static AuthenticationServer getInstance() {
-		if (instance == null)
-			instance = new AuthenticationServer();
-		return instance;
-	}
-
-	/**
-	 * Constructor for AuthenticationServer.
-	 */
-	public AuthenticationServer() {
-		super();
-	}
-
-
-	/**
-	 * Processes the beginning of an authentication session.
-	 * <ul>
-	 * <li>Starts an authentication session</li>
-	 * <li>Creates an <code>&lt;InfoboxReadRequest&gt;</code></li>
-	 * <li>Creates an HTML form for querying the identity link from the security
-	 * layer implementation. <br>
-	 * Form parameters include
-	 * <ul>
-	 * <li>the <code>&lt;InfoboxReadRequest&gt;</code></li>
-	 * <li>the data URL where the security layer implementation sends it
-	 * response to</li>
-	 * </ul>
-	 * </ul>
-	 *
-	 * @param authURL
-	 *            URL of the servlet to be used as data URL
-	 * @param target
-	 *            "Gesch&auml;ftsbereich" of the online application requested
-	 * @param targetFriendlyName
-	 *            Friendly name of the target if the target is configured via
-	 *            configuration
-	 * @param oaURL
-	 *            online application URL requested
-	 * @param bkuURL
-	 *            URL of the "B&uuml;rgerkartenumgebung" to be used; may be
-	 *            <code>null</code>; in this case, the default location will be
-	 *            used
-	 * @param useMandate
-	 *            Indicates if mandate is used or not
-	 * @param templateURL
-	 *            URL providing an HTML template for the HTML form generated
-	 * @param templateMandteURL
-	 *            URL providing an HTML template for the HTML form generated
-	 *            (for signing in mandates mode)
-	 * @param req
-	 *            determines the protocol used
-	 * @param sourceID
-	 * @return HTML form
-	 * @throws AuthenticationException
-	 * @see GetIdentityLinkFormBuilder
-	 * @see InfoboxReadRequestBuilder
-	 */
-	public String startAuthentication(AuthenticationSession session, HttpServletRequest req) throws WrongParametersException,
-			AuthenticationException, ConfigurationException, BuildException {
-
-		if (session == null) {
-			throw new AuthenticationException("auth.18", new Object[] { });
-		}
-
-		//load OnlineApplication configuration
-	    OAAuthParameter oaParam =
-		          AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(session.getPublicOAURLPrefix());
-		        if (oaParam == null)
-		          throw new AuthenticationException("auth.00", new Object[] { session.getPublicOAURLPrefix() });
-
-		//load Template
-		String template = null;
-		if (session.getTemplateURL() != null) {
-			try {
-				
-				template = new String(FileUtils.readURL(session.getTemplateURL()));
-			} catch (IOException ex) {
-				throw new AuthenticationException("auth.03", new Object[] {
-						session.getTemplateURL(), ex.toString() }, ex);
-			}
-		}
-
-		String infoboxReadRequest = "";
-
-		String domainIdentifier = AuthConfigurationProvider.getInstance().getSSOTagetIdentifier().trim();
-		if (MiscUtil.isEmpty(domainIdentifier) && session.isSsoRequested()) {
-			//do not use SSO if no Target is set
-			Log.warn("NO SSO-Target found in configuration. Single Sign-On is deaktivated!");
-			session.setSsoRequested(false);
-			
-		}
-		
-		if (session.isSsoRequested()) {
-			//load identityLink with SSO Target
-			boolean isbuisness = false;
-						
-			if (domainIdentifier.startsWith(PREFIX_WPBK)) {
-				
-				isbuisness = true;
-				
-			} else {
-				isbuisness = false;
-				
-			}
-			
-			//build ReadInfobox request
-			infoboxReadRequest = new InfoboxReadRequestBuilder().build(
-					isbuisness, domainIdentifier);
-
-		} else {
-			//build ReadInfobox request
-			infoboxReadRequest = new InfoboxReadRequestBuilder().build(
-					oaParam.getBusinessService(), oaParam
-						.getIdentityLinkDomainIdentifier());
-		}
-
-
-		String dataURL = new DataURLBuilder().buildDataURL(
-				session.getAuthURL(), REQ_VERIFY_IDENTITY_LINK, session
-						.getSessionID());
-
-		//removed in MOAID 2.0
-		String pushInfobox = "";
+    /**
+     * single instance
+     */
+    private static AuthenticationServer instance;
+
+    /**
+     * time out in milliseconds used by {@link cleanup} for session store
+     */
+    private long sessionTimeOutCreated = 15 * 60 * 1000; // default 10 minutes
+    private long sessionTimeOutUpdated = 10 * 60 * 1000; // default 10 minutes
+    /**
+     * time out in milliseconds used by {@link cleanup} for authentication data
+     * store
+     */
+    private long authDataTimeOut = 2 * 60 * 1000; // default 2 minutes
+
+    /**
+     * Returns the single instance of <code>AuthenticationServer</code>.
+     *
+     * @return the single instance of <code>AuthenticationServer</code>
+     */
+    public static AuthenticationServer getInstance() {
+        if (instance == null)
+            instance = new AuthenticationServer();
+        return instance;
+    }
+
+    /**
+     * Constructor for AuthenticationServer.
+     */
+    public AuthenticationServer() {
+        super();
+    }
+
+
+    /**
+     * Processes the beginning of an authentication session.
+     * <ul>
+     * <li>Starts an authentication session</li>
+     * <li>Creates an <code>&lt;InfoboxReadRequest&gt;</code></li>
+     * <li>Creates an HTML form for querying the identity link from the security
+     * layer implementation. <br>
+     * Form parameters include
+     * <ul>
+     * <li>the <code>&lt;InfoboxReadRequest&gt;</code></li>
+     * <li>the data URL where the security layer implementation sends it
+     * response to</li>
+     * </ul>
+     * </ul>
+     *
+     * @param authURL            URL of the servlet to be used as data URL
+     * @param target             "Gesch&auml;ftsbereich" of the online application requested
+     * @param targetFriendlyName Friendly name of the target if the target is configured via
+     *                           configuration
+     * @param oaURL              online application URL requested
+     * @param bkuURL             URL of the "B&uuml;rgerkartenumgebung" to be used; may be
+     *                           <code>null</code>; in this case, the default location will be
+     *                           used
+     * @param useMandate         Indicates if mandate is used or not
+     * @param templateURL        URL providing an HTML template for the HTML form generated
+     * @param templateMandteURL  URL providing an HTML template for the HTML form generated
+     *                           (for signing in mandates mode)
+     * @param req                determines the protocol used
+     * @param sourceID
+     * @return HTML form
+     * @throws AuthenticationException
+     * @see GetIdentityLinkFormBuilder
+     * @see InfoboxReadRequestBuilder
+     */
+    public String startAuthentication(AuthenticationSession session, HttpServletRequest req) throws WrongParametersException,
+            AuthenticationException, ConfigurationException, BuildException {
+
+        if (session == null) {
+            throw new AuthenticationException("auth.18", new Object[]{});
+        }
+
+        //load OnlineApplication configuration
+        OAAuthParameter oaParam =
+                AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(session.getPublicOAURLPrefix());
+        if (oaParam == null)
+            throw new AuthenticationException("auth.00", new Object[]{session.getPublicOAURLPrefix()});
+
+        //load Template
+        String template = null;
+        if (session.getTemplateURL() != null) {
+            try {
+
+                template = new String(FileUtils.readURL(session.getTemplateURL()));
+            } catch (IOException ex) {
+                throw new AuthenticationException("auth.03", new Object[]{
+                        session.getTemplateURL(), ex.toString()}, ex);
+            }
+        }
+
+        String infoboxReadRequest = "";
+
+        String domainIdentifier = AuthConfigurationProvider.getInstance().getSSOTagetIdentifier().trim();
+        if (MiscUtil.isEmpty(domainIdentifier) && session.isSsoRequested()) {
+            //do not use SSO if no Target is set
+            Log.warn("NO SSO-Target found in configuration. Single Sign-On is deaktivated!");
+            session.setSsoRequested(false);
+
+        }
+
+        if (session.isSsoRequested()) {
+            //load identityLink with SSO Target
+            boolean isbuisness = false;
+
+            if (domainIdentifier.startsWith(PREFIX_WPBK)) {
+
+                isbuisness = true;
+
+            } else {
+                isbuisness = false;
+
+            }
+
+            //build ReadInfobox request
+            infoboxReadRequest = new InfoboxReadRequestBuilder().build(
+                    isbuisness, domainIdentifier);
+
+        } else {
+
+            if (oaParam.getStorkService())
+                // build stork request
+                infoboxReadRequest = new InfoboxReadRequestBuilder().buildStorkReadRequest(
+                        oaParam.getIdentityLinkDomainIdentifier());
+            else
+                //build ReadInfobox request
+                infoboxReadRequest = new InfoboxReadRequestBuilder().build(
+                        oaParam.getBusinessService(), oaParam
+                        .getIdentityLinkDomainIdentifier());
+        }
+
+
+        String dataURL = new DataURLBuilder().buildDataURL(
+                session.getAuthURL(), REQ_VERIFY_IDENTITY_LINK, session
+                .getSessionID());
+
+        //removed in MOAID 2.0
+        String pushInfobox = "";
 
 //		VerifyInfoboxParameters verifyInfoboxParameters = oaParam
 //				.getVerifyInfoboxParameters();
@@ -307,11 +310,11 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 //				.buildDataURL(session.getAuthURL(), REQ_START_AUTHENTICATION,
 //						session.getSessionID());
 
-		//get Applet Parameters
-    	String appletwidth = req.getParameter(PARAM_APPLET_WIDTH);
-    	String appletheigth = req.getParameter(PARAM_APPLET_HEIGTH);
-    	appletheigth = StringEscapeUtils.escapeHtml(appletheigth);
-    	appletwidth = StringEscapeUtils.escapeHtml(appletwidth);
+        //get Applet Parameters
+        String appletwidth = req.getParameter(PARAM_APPLET_WIDTH);
+        String appletheigth = req.getParameter(PARAM_APPLET_HEIGTH);
+        appletheigth = StringEscapeUtils.escapeHtml(appletheigth);
+        appletwidth = StringEscapeUtils.escapeHtml(appletwidth);
 
     	
     	//TODO: cleanup before MOA-ID 2.1 release 
@@ -319,1158 +322,1120 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 				session.getBkuURL(), infoboxReadRequest, dataURL, null,
 				null, pushInfobox, oaParam, appletheigth, appletwidth);
 
-		return htmlForm;
-	}
-
-	/**
-	 * Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the
-	 * security layer implementation.<br>
-	 * <ul>
-	 * <li>Validates given <code>&lt;InfoboxReadResponse&gt;</code></li>
-	 * <li>Parses identity link enclosed in
-	 * <code>&lt;InfoboxReadResponse&gt;</code></li>
-	 * <li>Verifies identity link by calling the MOA SP component</li>
-	 * <li>Checks certificate authority of identity link</li>
-	 * <li>Stores identity link in the session</li>
-	 * <li>Verifies all additional infoboxes returned from the BKU</li>
-	 * <li>Creates an authentication block to be signed by the user</li>
-	 * <li>Creates and returns a <code>&lt;CreateXMLSignatureRequest&gt;</code>
-	 * containg the authentication block, meant to be returned to the security
-	 * layer implementation</li>
-	 * </ul>
-	 *
-	 * @param sessionID
-	 *            ID of associated authentication session data
-	 * @param infoboxReadResponseParameters
-	 *            The parameters from the response returned from the BKU
-	 *            including the <code>&lt;InfoboxReadResponse&gt;</code>
-	 * @return String representation of the
-	 *         <code>&lt;CreateXMLSignatureRequest&gt;</code>
-	 * @throws BKUException
-	 */
-	public String verifyIdentityLink(AuthenticationSession session,
-			Map<String, String> infoboxReadResponseParameters) throws AuthenticationException,
-			BuildException, ParseException, ConfigurationException,
-			ValidateException, ServiceException, BKUException {
-
-		if (session == null)
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_VERIFY_IDENTITY_LINK, PARAM_SESSIONID });
-
-		String xmlInfoboxReadResponse = (String) infoboxReadResponseParameters
-				.get(PARAM_XMLRESPONSE);
-
-		if (isEmpty(xmlInfoboxReadResponse))
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_VERIFY_IDENTITY_LINK, PARAM_XMLRESPONSE });
-
-		AuthConfigurationProvider authConf = AuthConfigurationProvider
-				.getInstance();
-
-		// check if an identity link was found
-		// Errorcode 2911 von Trustdesk BKU (nicht spezifikationskonform
-		// (SL1.2))
-		// CharSequence se = "ErrorCode>2911".substring(0);
-		// boolean b = xmlInfoboxReadResponse.contains(se);
-		String se = "ErrorCode>2911";
-		int b = xmlInfoboxReadResponse.indexOf(se);
-		if (b != -1) { // no identity link found
-			Logger
-					.info("Es konnte keine Personenbindung auf der Karte gefunden werden. Versuche Anmeldung als auslaendische eID.");
-			return null;
-		}
-		// spezifikationsgemaess (SL1.2) Errorcode
-		se = "ErrorCode>4002";
-		// b = xmlInfoboxReadResponse.contains(se);
-		b = xmlInfoboxReadResponse.indexOf(se);
-		if (b != -1) { // Unbekannter Infoboxbezeichner
-			Logger
-					.info("Unbekannter Infoboxbezeichner. Versuche Anmeldung als auslaendische eID.");
-			return null;
-		}
-
-		// parses the <InfoboxReadResponse>
-		IdentityLink identityLink = new InfoboxReadResponseParser(
-				xmlInfoboxReadResponse).parseIdentityLink();
-		// validates the identity link
-		IdentityLinkValidator.getInstance().validate(identityLink);
-		// builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
-		Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder()
-				.build(identityLink, authConf
-						.getMoaSpIdentityLinkTrustProfileID());
-
-		// invokes the call
-		Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()
-				.verifyXMLSignature(domVerifyXMLSignatureRequest);
-		// parses the <VerifyXMLSignatureResponse>
-		VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser(
-				domVerifyXMLSignatureResponse).parseData();
-
-		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
-				.getOnlineApplicationParameter(session.getPublicOAURLPrefix());
-
-		// if OA is type is business service the manifest validation result has
-		// to be ignored
-		boolean ignoreManifestValidationResult = oaParam.getBusinessService() ? true
-				: false;
-
-		// validates the <VerifyXMLSignatureResponse>
-		VerifyXMLSignatureResponseValidator.getInstance().validate(
-				verifyXMLSignatureResponse,
-				authConf.getIdentityLinkX509SubjectNames(),
-				VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK,
-				ignoreManifestValidationResult);
-
-		session.setIdentityLink(identityLink);
-		// now validate the extended infoboxes
-
-		//Removed in MOA-ID 2.0
-		//verifyInfoboxes(session, infoboxReadResponseParameters, false);
-
-		return "found!";
-	}
-
-	/**
-	 * Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the
-	 * security layer implementation.<br>
-	 * <ul>
-	 * <li>Validates given <code>&lt;InfoboxReadResponse&gt;</code></li>
-	 * <li>Parses identity link enclosed in
-	 * <code>&lt;InfoboxReadResponse&gt;</code></li>
-	 * <li>Verifies identity link by calling the MOA SP component</li>
-	 * <li>Checks certificate authority of identity link</li>
-	 * <li>Stores identity link in the session</li>
-	 * <li>Verifies all additional infoboxes returned from the BKU</li>
-	 * <li>Creates an authentication block to be signed by the user</li>
-	 * <li>Creates and returns a <code>&lt;CreateXMLSignatureRequest&gt;</code>
-	 * containg the authentication block, meant to be returned to the security
-	 * layer implementation</li>
-	 * </ul>
-	 *
-	 * @param sessionID
-	 *            ID of associated authentication session data
-	 * @param infoboxReadResponseParameters
-	 *            The parameters from the response returned from the BKU
-	 *            including the <code>&lt;InfoboxReadResponse&gt;</code>
-	 * @return String representation of the
-	 *         <code>&lt;CreateXMLSignatureRequest&gt;</code>
-	 */
-	public String verifyCertificate(AuthenticationSession session,
-			X509Certificate certificate) throws AuthenticationException,
-			BuildException, ParseException, ConfigurationException,
-			ValidateException, ServiceException, MOAIDException{
-
-		if (session == null)
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_VERIFY_CERTIFICATE, PARAM_SESSIONID });
-
-		// check if person is a Organwalter
-		// if true - don't show bPK in AUTH Block
-		try {
-			for (ObjectID OWid : MOAIDAuthConstants.OW_LIST) {
-				if (certificate.getExtension(OWid) != null) {
-					session.setOW(true);
-				}
-
-			}
-
-		} catch (X509ExtensionInitException e) {
-			Logger.warn("Certificate extension is not readable.");
-			session.setOW(false);
-		}
-
-		AuthConfigurationProvider authConf = AuthConfigurationProvider
-				.getInstance();
-
-		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
-				.getOnlineApplicationParameter(session.getPublicOAURLPrefix());
-
-		String returnvalue = getCreateXMLSignatureRequestAuthBlockOrRedirect(session,
-				authConf, oaParam);
-
-		return returnvalue;
-	}
-
-	/**
-	 * Processes an <code>Mandate</code> sent by the MIS.<br>
-	 * <ul>
-	 * <li>Validates given <code>Mandate</code></li>
-	 * <li>Verifies Mandate by calling the MOA SP component</li>
-	 * <li>Creates an authentication block to be signed by the user</li>
-	 * <li>Creates and returns a <code>&lt;CreateXMLSignatureRequest&gt;</code>
-	 * containg the authentication block, meant to be returned to the security
-	 * layer implementation</li>
-	 * </ul>
-	 *
-	 * @param sessionID
-	 *            ID of associated authentication session data
-	 * @param infoboxReadResponseParameters
-	 *            The parameters from the response returned from the BKU
-	 *            including the <code>&lt;InfoboxReadResponse&gt;</code>
-	 * @return String representation of the
-	 *         <code>&lt;CreateXMLSignatureRequest&gt;</code>
-	 */
-	public void verifyMandate(AuthenticationSession session, MISMandate mandate)
-			throws AuthenticationException, BuildException, ParseException,
-			ConfigurationException, ValidateException, ServiceException {
-
-		if (session == null)
-			throw new AuthenticationException("auth.10", new Object[] {
-					GET_MIS_SESSIONID, PARAM_SESSIONID });
-
-		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
-				.getOnlineApplicationParameter(session.getPublicOAURLPrefix());
-
-		try {
-			// sets the extended SAML attributes for OID (Organwalter)
-			setExtendedSAMLAttributeForMandatesOID(session, mandate, oaParam
-					.getBusinessService());
-
-			validateExtendedSAMLAttributeForMandates(session, mandate, oaParam.getBusinessService());
-
-
-		} catch (SAXException e) {
-			throw new AuthenticationException("auth.16",
-					new Object[] { GET_MIS_SESSIONID }, e);
-		} catch (IOException e) {
-			throw new AuthenticationException("auth.16",
-					new Object[] { GET_MIS_SESSIONID }, e);
-		} catch (ParserConfigurationException e) {
-			throw new AuthenticationException("auth.16",
-					new Object[] { GET_MIS_SESSIONID }, e);
-		} catch (TransformerException e) {
-			throw new AuthenticationException("auth.16",
-					new Object[] { GET_MIS_SESSIONID }, e);
-		}
-
-	}
-
-	/**
-	 *
-	 * @param session
-	 * @param authConf
-	 * @param oaParam
-	 * @return
-	 * @throws ConfigurationException
-	 * @throws BuildException
-	 * @throws ValidateException
-	 */
-	public String getCreateXMLSignatureRequestAuthBlockOrRedirect(
-			AuthenticationSession session, AuthConfigurationProvider authConf,
-			OAAuthParameter oaParam) throws ConfigurationException,
-			BuildException, ValidateException {
-
-		// check for intermediate processing of the infoboxes
-		if (session.isValidatorInputPending())
-			return "Redirect to Input Processor";
-
-		if (authConf == null)
-			authConf = AuthConfigurationProvider.getInstance();
-		if (oaParam == null)
-			oaParam = AuthConfigurationProvider.getInstance()
-					.getOnlineApplicationParameter(
-							session.getPublicOAURLPrefix());
-
-		// builds the AUTH-block
-	String authBlock = buildAuthenticationBlock(session, oaParam);
-
-		// builds the <CreateXMLSignatureRequest>
-		List<String> transformsInfos = oaParam.getTransformsInfos();
-		if ((transformsInfos == null) || (transformsInfos.size() == 0)) {
-			// no OA specific transforms specified, use default ones
-			transformsInfos = authConf.getTransformsInfos();
-		}
-		String createXMLSignatureRequest = new CreateXMLSignatureRequestBuilder()
-				.build(authBlock, oaParam.getKeyBoxIdentifier(),
-						transformsInfos);
-		return createXMLSignatureRequest;
-	}
-
-	/**
-	 * Returns an CreateXMLSignatureRequest for signing the ERnP statement.<br>
-	 * <ul>
-	 * <li>Creates an CreateXMLSignatureRequest to be signed by the user</li>
-	 * </ul>
-	 *
-	 * @param sessionID
-	 *            ID of associated authentication session data
-	 * @param cert
-	 *            The certificate from the user
-	 * @return String representation of the
-	 *         <code>&lt;CreateXMLSignatureRequest&gt;</code>
-	 */
-	public String createXMLSignatureRequestForeignID(AuthenticationSession session,
-			X509Certificate cert) throws AuthenticationException,
-			BuildException, ParseException, ConfigurationException,
-			ValidateException, ServiceException {
-
-		if (session == null)
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_VERIFY_CERTIFICATE, PARAM_SESSIONID });
-
-		AuthConfigurationProvider authConf = AuthConfigurationProvider
-				.getInstance();
-
-		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
-				.getOnlineApplicationParameter(session.getPublicOAURLPrefix());
-
-		return getCreateXMLSignatureRequestForeigID(session, authConf, oaParam,
-				cert);
-	}
-
-	public String getCreateXMLSignatureRequestForeigID(
-			AuthenticationSession session, AuthConfigurationProvider authConf,
-			OAAuthParameter oaParam, X509Certificate cert)
-			throws ConfigurationException {
-
-		// check for intermediate processing of the infoboxes
-		if (session.isValidatorInputPending())
-			return "Redirect to Input Processor";
-
-		if (authConf == null)
-			authConf = AuthConfigurationProvider.getInstance();
-		if (oaParam == null)
-			oaParam = AuthConfigurationProvider.getInstance()
-					.getOnlineApplicationParameter(
-							session.getPublicOAURLPrefix());
-
-		Principal subject = cert.getSubjectDN();
-
-		String createXMLSignatureRequest = new CreateXMLSignatureRequestBuilder()
-				.buildForeignID(subject.toString(), oaParam, session);
-		return createXMLSignatureRequest;
-	}
-
-	/**
-	 * Processes an <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
-	 * security layer implementation.<br>
-	 * <ul>
-	 * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
-	 * <li>Parses response enclosed in
-	 * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
-	 * <li>Verifies signature by calling the MOA SP component</li>
-	 * <li>Returns the signer certificate</li>
-	 * </ul>
-	 *
-	 * @param sessionID
-	 *            ID of associated authentication session data
-	 * @param createXMLSignatureResponseParameters
-	 *            The parameters from the response returned from the BKU
-	 *            including the <code>&lt;CreateXMLSignatureResponse&gt;</code>
-	 * @throws BKUException
-	 */
-	public X509Certificate verifyXMLSignature(String sessionID,
-			Map<String, String> createXMLSignatureResponseParameters)
-			throws AuthenticationException, BuildException, ParseException,
-			ConfigurationException, ValidateException, ServiceException, BKUException {
-
-		if (isEmpty(sessionID))
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_GET_FOREIGN_ID, PARAM_SESSIONID });
-
-		String xmlCreateXMLSignatureResponse = (String) createXMLSignatureResponseParameters
-				.get(PARAM_XMLRESPONSE);
-
-		if (isEmpty(xmlCreateXMLSignatureResponse))
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_GET_FOREIGN_ID, PARAM_XMLRESPONSE });
-
-		AuthConfigurationProvider authConf = AuthConfigurationProvider
-				.getInstance();
-
-		// parses the <CreateXMLSignatureResponse>
-		CreateXMLSignatureResponseParser p = new CreateXMLSignatureResponseParser(
-				xmlCreateXMLSignatureResponse);
-		CreateXMLSignatureResponse createXMLSignatureResponse = p
-				.parseResponseDsig();
-
-		// builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
-		Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder()
-				.buildDsig(createXMLSignatureResponse, authConf
-						.getMoaSpAuthBlockTrustProfileID());
-
-		// invokes the call
-		Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()
-				.verifyXMLSignature(domVerifyXMLSignatureRequest);
-
-		// parses the <VerifyXMLSignatureResponse>
-		VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser(
-				domVerifyXMLSignatureResponse).parseData();
-
-		return verifyXMLSignatureResponse.getX509certificate();
-
-	}
-
-	/**
-	 * Processes an <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
-	 * security layer implementation.<br>
-	 * <ul>
-	 * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
-	 * <li>Parses response enclosed in
-	 * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
-	 * <li>Verifies signature by calling the MOA SP component</li>
-	 * <li>Returns the signer certificate</li>
-	 * </ul>
-	 *
-	 * @param sessionID
-	 *            ID of associated authentication session data
-	 * @param readInfoboxResponseParameters
-	 *            The parameters from the response returned from the BKU
-	 *            including the <code>&lt;ReadInfoboxResponse&gt;</code>
-	 * @throws BKUException
-	 */
-	public X509Certificate getCertificate(String sessionID,
-			Map<String, String> readInfoboxResponseParameters) throws AuthenticationException,
-			BuildException, ParseException, ConfigurationException,
-			ValidateException, ServiceException, BKUException {
-
-		if (isEmpty(sessionID))
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_VERIFY_CERTIFICATE, PARAM_SESSIONID });
-
-		String xmlReadInfoboxResponse = (String) readInfoboxResponseParameters
-				.get(PARAM_XMLRESPONSE);
-
-		if (isEmpty(xmlReadInfoboxResponse))
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_VERIFY_CERTIFICATE, PARAM_XMLRESPONSE });
-
-		// parses the <CreateXMLSignatureResponse>
-		InfoboxReadResponseParser p = new InfoboxReadResponseParser(
-				xmlReadInfoboxResponse);
-		X509Certificate cert = p.parseCertificate();
-
-		return cert;
-
-	}
-
-	/**
-	 * Builds an authentication block <code>&lt;saml:Assertion&gt;</code> from
-	 * given session data.
-	 *
-	 * @param session
-	 *            authentication session
-	 *
-	 * @return <code>&lt;saml:Assertion&gt;</code> as a String
-	 *
-	 * @throws BuildException
-	 *             If an error occurs on serializing an extended SAML attribute
-	 *             to be appended to the AUTH-Block.
-	 */
-	private String buildAuthenticationBlock(AuthenticationSession session,
-			OAAuthParameter oaParam) throws BuildException {
-
-		IdentityLink identityLink = session.getIdentityLink();
-		String issuer = identityLink.getName();
-		String gebDat = identityLink.getDateOfBirth();
-
-		String identificationValue = null;
-		String identificationType = null;
-
-		//set empty AuthBlock BPK in case of OW or SSO or bpk is not requested
-		if (session.isOW() || session.isSsoRequested() || oaParam.isRemovePBKFromAuthBlock()) {
-			identificationType = "";
-			identificationValue = "";
-
-		} else if (identityLink.getIdentificationType().equals(Constants.URN_PREFIX_BASEID)) {
-
-			if (oaParam.getBusinessService()) {
-
-				String bpkBase64 = new BPKBuilder().buildWBPK(identityLink
-							.getIdentificationValue(), oaParam.getIdentityLinkDomainIdentifier());
-				identificationValue = bpkBase64;
-
-			    if (oaParam.getIdentityLinkDomainIdentifier().startsWith(Constants.URN_PREFIX_WBPK + "+" ))
-			    	identificationType = oaParam.getIdentityLinkDomainIdentifier();
-			    else
-			    	identificationType = Constants.URN_PREFIX_WBPK + "+" + oaParam.getIdentityLinkDomainIdentifier();
-
-			} else {
-				String bpkBase64 = new BPKBuilder().buildBPK(identityLink
-							.getIdentificationValue(), session.getTarget());
-				identificationValue = bpkBase64;
-				identificationType = Constants.URN_PREFIX_CDID + "+" + session.getTarget();
-			}
-
-
-		} else {
-			identificationValue = identityLink.getIdentificationValue();
-			identificationType = identityLink.getIdentificationType();
-
-		}
-
-		String issueInstant = DateTimeUtils.buildDateTimeUTC(Calendar
-				.getInstance());
-		session.setIssueInstant(issueInstant);
-		String authURL = session.getAuthURL();
-		String target = session.getTarget();
-		String targetFriendlyName = session.getTargetFriendlyName();
-
-		// Bug #485
-		// (https://egovlabs.gv.at/tracker/index.php?func=detail&aid=485&group_id=6&atid=105)
-		// String oaURL = session.getPublicOAURLPrefix();
-
-		List<ExtendedSAMLAttribute> extendedSAMLAttributes = session.getExtendedSAMLAttributesAUTH();
-
-
-		if (session.isSsoRequested()) {
-			String oaURL = new String();
-			try {
-				oaURL = AuthConfigurationProvider.getInstance().getPublicURLPrefix();
-
-				if (MiscUtil.isNotEmpty(oaURL))
-					oaURL = oaURL.replaceAll("&", "&amp;");
-
-			} catch (ConfigurationException e) {
-			}
-			String authBlock = new AuthenticationBlockAssertionBuilder()
-				.buildAuthBlockSSO(issuer, issueInstant, authURL, target,
-						targetFriendlyName, identificationValue,
-						identificationType, oaURL, gebDat,
-						extendedSAMLAttributes, session, oaParam);
-			return authBlock;
-
-		} else {
-			String oaURL = session.getPublicOAURLPrefix().replaceAll("&", "&amp;");
-			String authBlock = new AuthenticationBlockAssertionBuilder()
-				.buildAuthBlock(issuer, issueInstant, authURL, target,
-						targetFriendlyName, identificationValue,
-						identificationType, oaURL, gebDat,
-						extendedSAMLAttributes, session, oaParam);
-			return authBlock;
-		}
-	}
-
-
-
-	/**
-	 * Verifies the infoboxes (except of the identity link infobox) returned by
-	 * the BKU by calling appropriate validator classes.
-	 *
-	 * @param session
-	 *            The actual authentication session.
-	 * @param mandate
-	 *            The Mandate from the MIS
-	 *
-	 * @throws AuthenticationException
-	 * @throws ConfigurationException
-	 * @throws TransformerException
-	 * @throws ParserConfigurationException
-	 * @throws IOException
-	 * @throws SAXException
-	 */
-	private void validateExtendedSAMLAttributeForMandates(
-			AuthenticationSession session, MISMandate mandate,
-			boolean business)
-			throws ValidateException, ConfigurationException, SAXException,
-			IOException, ParserConfigurationException, TransformerException {
-
-		ExtendedSAMLAttribute[] extendedSAMLAttributes = addExtendedSamlAttributes(
-				mandate, business, false);
-
-		int length = extendedSAMLAttributes.length;
-		for (int i = 0; i < length; i++) {
-			ExtendedSAMLAttribute samlAttribute = extendedSAMLAttributes[i];
-
-			verifySAMLAttribute(samlAttribute, i, "MISService",
-					"MISService");
-
-		}
-	}
-
-	/**
-	 * Verifies the infoboxes (except of the identity link infobox) returned by
-	 * the BKU by calling appropriate validator classes.
-	 *
-	 * @param session
-	 *            The actual authentication session.
-	 * @param mandate
-	 *            The Mandate from the MIS
-	 *
-	 * @throws AuthenticationException
-	 * @throws ConfigurationException
-	 * @throws TransformerException
-	 * @throws ParserConfigurationException
-	 * @throws IOException
-	 * @throws SAXException
-	 */
-	private void setExtendedSAMLAttributeForMandatesOID(
-			AuthenticationSession session, MISMandate mandate, boolean business)
-			throws ValidateException, ConfigurationException, SAXException,
-			IOException, ParserConfigurationException, TransformerException {
-
-		ExtendedSAMLAttribute[] extendedSamlAttributes = addExtendedSamlAttributesOID(
-				mandate, business);
-
-		AddAdditionalSAMLAttributes(session, extendedSamlAttributes,
-				"MISService", "MISService");
-
-	}
-
-	/**
-	 * Adds given SAML Attributes to the current session. They will be appended
-	 * to the final SAML Assertion or the AUTH block. If the attributes are
-	 * already in the list, they will be replaced.
-	 *
-	 * @param session
-	 *            The current session
-	 * @param extendedSAMLAttributes
-	 *            The SAML attributes to add
-	 * @param identifier
-	 *            The infobox identifier for debug purposes
-	 * @param friendlyNam
-	 *            The friendly name of the infobox for debug purposes
-	 */
-	private static void AddAdditionalSAMLAttributes(
-			AuthenticationSession session,
-			ExtendedSAMLAttribute[] extendedSAMLAttributes, String identifier,
-			String friendlyName) throws ValidateException {
-		if (extendedSAMLAttributes == null)
-			return;
-		List<ExtendedSAMLAttribute> oaAttributes = session.getExtendedSAMLAttributesOA();
-		if (oaAttributes == null)
-			oaAttributes = new Vector<ExtendedSAMLAttribute>();
-		List<ExtendedSAMLAttribute> authAttributes = session.getExtendedSAMLAttributesAUTH();
-		if (authAttributes == null)
-			authAttributes = new Vector<ExtendedSAMLAttribute>();
-		int length = extendedSAMLAttributes.length;
-		for (int i = 0; i < length; i++) {
-			ExtendedSAMLAttribute samlAttribute = extendedSAMLAttributes[i];
-
-			Object value = verifySAMLAttribute(samlAttribute, i, identifier,
-					friendlyName);
-
-			if ((value instanceof String) || (value instanceof Element)) {
-				switch (samlAttribute.getAddToAUTHBlock()) {
-				case ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY:
-					replaceExtendedSAMLAttribute(authAttributes, samlAttribute);
-					break;
-				case ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK:
-					replaceExtendedSAMLAttribute(authAttributes, samlAttribute);
-					replaceExtendedSAMLAttribute(oaAttributes, samlAttribute);
-					break;
-				case ExtendedSAMLAttribute.NOT_ADD_TO_AUTHBLOCK:
-					replaceExtendedSAMLAttribute(oaAttributes, samlAttribute);
-					break;
-				default:
-					Logger
-							.info("Invalid return value from method \"getAddToAUTHBlock()\" ("
-									+ samlAttribute.getAddToAUTHBlock()
-									+ ") in SAML attribute number "
-									+ (i + 1)
-									+ " for infobox " + identifier);
-					throw new ValidateException("validator.47", new Object[] {
-							friendlyName, String.valueOf((i + 1)) });
-				}
-			} else {
-				Logger
-						.info("The type of SAML-Attribute number "
-								+ (i + 1)
-								+ " returned from "
-								+ identifier
-								+ "-infobox validator is not valid. Must be either \"java.Lang.String\""
-								+ " or \"org.w3c.dom.Element\"");
-				throw new ValidateException("validator.46", new Object[] {
-						identifier, String.valueOf((i + 1)) });
-			}
-		}
-		session.setExtendedSAMLAttributesAUTH(authAttributes);
-		session.setExtendedSAMLAttributesOA(oaAttributes);
-	}
-
-	/**
-	 * Adds the AUTH block related SAML attributes to the validation result.
-	 * This is needed always before the AUTH block is to be signed, because the
-	 * name of the mandator has to be set
-	 *
-	 * @throws ParserConfigurationException
-	 * @throws IOException
-	 * @throws SAXException
-	 * @throws TransformerException
-	 */
-
-	protected static ExtendedSAMLAttribute[] addExtendedSamlAttributes(
-			MISMandate mandate, boolean business, boolean provideStammzahl)
-			throws SAXException, IOException, ParserConfigurationException,
-			TransformerException {
-		Vector<ExtendedSAMLAttribute> extendedSamlAttributes = new Vector<ExtendedSAMLAttribute>();
-
-		extendedSamlAttributes.clear();
-
-		// Name
-		Element domMandate = mandateToElement(mandate);
-		Element nameSpaceNode = domMandate.getOwnerDocument().createElement(
-				"NameSpaceNode");
-		nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX,
-				Constants.PD_NS_URI);
-		nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.MANDATE_POSTFIX,
-				SZRGWConstants.MANDATE_NS);
-
-		Element mandator = (Element) XPathAPI.selectSingleNode(domMandate,
-				"//md:Mandate/md:Mandator", nameSpaceNode);
-
-		// Mandate
-		extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
-				EXT_SAML_MANDATE_RAW, domMandate,
-				SZRGWConstants.MANDATE_NS,
-				ExtendedSAMLAttribute.NOT_ADD_TO_AUTHBLOCK));
-
-		// (w)bpk
-		String wbpk = ParepUtils.extractMandatorWbpk(mandator);
-		if (!ParepUtils.isEmpty(wbpk)) {
-			if (!ParepUtils.isPhysicalPerson(mandator)) {
-				String idType = ParepUtils
-						.extractMandatorIdentificationType(mandator);
-				if (!ParepUtils.isEmpty(idType)
-						&& idType.startsWith(Constants.URN_PREFIX_BASEID)) {
-					extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
-							EXT_SAML_MANDATE_CB_BASE_ID,
-							ParepUtils.getRegisterString(idType) + ": " + wbpk,
-							SZRGWConstants.MANDATE_NS,
-							ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY));
-				}
-			} else if (business) {
-				extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
-						EXT_SAML_MANDATE_WBPK, wbpk,
-						SZRGWConstants.MANDATE_NS,
-						ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY));
-			}
-		}
-
-		ExtendedSAMLAttribute[] ret = new ExtendedSAMLAttribute[extendedSamlAttributes
-				.size()];
-		extendedSamlAttributes.copyInto(ret);
-		Logger.debug("ExtendedSAML Attributes: " + ret.length);
-		return ret;
-
-	}
-
-	/**
-	 * Adds the AUTH block related SAML attributes to the validation result.
-	 * This is needed always before the AUTH block is to be signed, because the
-	 * name of the mandator has to be set
-	 *
-	 * @throws ParserConfigurationException
-	 * @throws IOException
-	 * @throws SAXException
-	 * @throws TransformerException
-	 */
-	private static ExtendedSAMLAttribute[] addExtendedSamlAttributesOID(
-			MISMandate mandate, boolean business) throws SAXException,
-			IOException, ParserConfigurationException, TransformerException {
-
-		Vector<ExtendedSAMLAttribute> extendedSamlAttributes = new Vector<ExtendedSAMLAttribute>();
-
-		extendedSamlAttributes.clear();
-
-		// RepresentationType
-		extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
-				EXT_SAML_MANDATE_REPRESENTATIONTYPE,
-				EXT_SAML_MANDATE_REPRESENTATIONTEXT,
-				SZRGWConstants.MANDATE_NS,
-				ExtendedSAMLAttribute.NOT_ADD_TO_AUTHBLOCK));
-
-		String oid = mandate.getProfRep();
-
-		if (oid != null) {
-			extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
-					EXT_SAML_MANDATE_OID, oid,
-					SZRGWConstants.MANDATE_NS,
-					ExtendedSAMLAttribute.NOT_ADD_TO_AUTHBLOCK));
-			String oidDescription = mandate.getTextualDescriptionOfOID();
-			extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
-					EXT_SAML_MANDATE_OIDTEXTUALDESCRIPTION,
-					oidDescription, SZRGWConstants.MANDATE_NS,
-					ExtendedSAMLAttribute.NOT_ADD_TO_AUTHBLOCK));
-
-		}
-
-		ExtendedSAMLAttribute[] ret = new ExtendedSAMLAttribute[extendedSamlAttributes
-				.size()];
-		extendedSamlAttributes.copyInto(ret);
-		Logger.debug("ExtendedSAML Attributes: " + ret.length);
-		return ret;
-
-	}
-
-	/**
-	 *
-	 * @param mandate
-	 * @return
-	 * @throws ParserConfigurationException
-	 * @throws IOException
-	 * @throws SAXException
-	 */
-	private static Element mandateToElement(MISMandate mandate)
-			throws SAXException, IOException, ParserConfigurationException {
-		ByteArrayInputStream bais = new ByteArrayInputStream(mandate
-				.getMandate());
-		Document doc = DOMUtils.parseDocumentSimple(bais);
-		return doc.getDocumentElement();
-	}
-
-	protected static void replaceExtendedSAMLAttribute(List<ExtendedSAMLAttribute> attributes,
-			ExtendedSAMLAttribute samlAttribute) {
-		if (null == attributes) {
-			attributes = new Vector<ExtendedSAMLAttribute>();
-		} else {
-			String id = samlAttribute.getName();
-			int length = attributes.size();
-			for (int i = 0; i < length; i++) {
-				ExtendedSAMLAttribute att = (ExtendedSAMLAttribute) attributes
-						.get(i);
-				if (id.equals(att.getName())) {
-					// replace attribute
-					attributes.set(i, samlAttribute);
-					return;
-				}
-			}
-			attributes.add(samlAttribute);
-		}
-	}
-
-	/**
-	 * Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
-	 * security layer implementation.<br>
-	 * <ul>
-	 * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
-	 * <li>Parses <code>&lt;CreateXMLSignatureResponse&gt;</code> for error
-	 * codes</li>
-	 * <li>Parses authentication block enclosed in
-	 * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
-	 * <li>Verifies authentication block by calling the MOA SP component</li>
-	 * <li>Creates authentication data</li>
-	 * <li>Creates a corresponding SAML artifact</li>
-	 * <li>Stores authentication data in the authentication data store indexed
-	 * by the SAML artifact</li>
-	 * <li>Deletes authentication session</li>
-	 * <li>Returns the SAML artifact, encoded BASE64</li>
-	 * </ul>
-	 *
-	 * @param sessionID
-	 *            session ID of the running authentication session
-	 * @param xmlCreateXMLSignatureReadResponse
-	 *            String representation of the
-	 *            <code>&lt;CreateXMLSignatureResponse&gt;</code>
-	 * @return SAML artifact needed for retrieving authentication data, encoded
-	 *         BASE64
-	 * @throws BKUException
-	 */
-	public String verifyAuthenticationBlock(AuthenticationSession session,
-			String xmlCreateXMLSignatureReadResponse)
-			throws AuthenticationException, BuildException, ParseException,
-			ConfigurationException, ServiceException, ValidateException, BKUException {
-
-		if (session == null)
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_VERIFY_AUTH_BLOCK, PARAM_SESSIONID });
-		if (isEmpty(xmlCreateXMLSignatureReadResponse))
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE });
-
-		AuthConfigurationProvider authConf = AuthConfigurationProvider
-				.getInstance();
-		// parses <CreateXMLSignatureResponse>
-		CreateXMLSignatureResponse csresp = new CreateXMLSignatureResponseParser(
-				xmlCreateXMLSignatureReadResponse).parseResponse();
-
-		try {
-			String serializedAssertion = DOMUtils.serializeNode(csresp
-					.getSamlAssertion());
-			session.setAuthBlock(serializedAssertion);
-		} catch (TransformerException e) {
-			throw new ParseException("parser.04", new Object[] {
-					REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE });
-		} catch (IOException e) {
-			throw new ParseException("parser.04", new Object[] {
-					REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE });
-		}
-		// validates <CreateXMLSignatureResponse>
-		if (session.isSsoRequested())
-			new CreateXMLSignatureResponseValidator().validateSSO(csresp, session);
-		else
-			new CreateXMLSignatureResponseValidator().validate(csresp, session);
-
-		// builds a <VerifyXMLSignatureRequest> for a MOA-SPSS call
-		List<String> vtids = authConf.getMoaSpAuthBlockVerifyTransformsInfoIDs();
-		String tpid = authConf.getMoaSpAuthBlockTrustProfileID();
-		Element domVsreq = new VerifyXMLSignatureRequestBuilder().build(csresp,
-				vtids, tpid);
-		// debug output
-
-		// invokes the call
-		Element domVsresp = new SignatureVerificationInvoker()
-				.verifyXMLSignature(domVsreq);
-		// debug output
-
-		// parses the <VerifyXMLSignatureResponse>
-		VerifyXMLSignatureResponse vsresp = new VerifyXMLSignatureResponseParser(
-				domVsresp).parseData();
-
-		if (Logger.isTraceEnabled()) {
-			if (domVsresp != null) {
-				try {
-					String xmlVerifyXMLSignatureResponse = DOMUtils
-							.serializeNode(domVsresp, true);
-					Logger.trace(new LogMsg(xmlCreateXMLSignatureReadResponse));
-					Logger.trace(new LogMsg(xmlVerifyXMLSignatureResponse));
-				} catch (Throwable t) {
-					t.printStackTrace();
-					Logger.info(new LogMsg(t.getStackTrace()));
-				}
-			}
-		}
-
-		// validates the <VerifyXMLSignatureResponse>
-		VerifyXMLSignatureResponseValidator.getInstance().validate(vsresp,
-				null, VerifyXMLSignatureResponseValidator.CHECK_AUTH_BLOCK,
-				false);
-
-		// Compare AuthBlock Data with information stored in session, especially
-		// date and time
-		CreateXMLSignatureResponseValidator.getInstance().validateSigningDateTime(csresp);
-
-		// compares the public keys from the identityLink with the AuthBlock
-		VerifyXMLSignatureResponseValidator.getInstance().validateCertificate(
-				vsresp, session.getIdentityLink());
-
-		// post processing of the infoboxes
-		Iterator iter = session.getInfoboxValidatorIterator();
-		boolean formpending = false;
-		if (iter != null) {
-			while (!formpending && iter.hasNext()) {
-				Vector infoboxValidatorVector = (Vector) iter.next();
-				String identifier = (String) infoboxValidatorVector.get(0);
-				String friendlyName = (String) infoboxValidatorVector.get(1);
-				InfoboxValidator infoboxvalidator = (InfoboxValidator) infoboxValidatorVector
-						.get(2);
-				InfoboxValidationResult infoboxValidationResult = null;
-				try {
-					infoboxValidationResult = infoboxvalidator.validate(csresp
-							.getSamlAssertion());
-				} catch (ValidateException e) {
-					Logger.error("Error validating " + identifier + " infobox:"
-							+ e.getMessage());
-					throw new ValidateException("validator.44",
-							new Object[] { friendlyName });
-				}
-				if (!infoboxValidationResult.isValid()) {
-					Logger.info("Validation of " + identifier
-							+ " infobox failed.");
-					throw new ValidateException("validator.40", new Object[] {
-							friendlyName,
-							infoboxValidationResult.getErrorMessage() });
-				}
-				String form = infoboxvalidator.getForm();
-				if (ParepUtils.isEmpty(form)) {
-					AddAdditionalSAMLAttributes(
-							session,
-							infoboxValidationResult.getExtendedSamlAttributes(),
-							identifier, friendlyName);
-				} else {
-					return "Redirect to Input Processor";
-				}
-			}
-		}
-
-		session.setXMLVerifySignatureResponse(vsresp);
-		session.setSignerCertificate(vsresp.getX509certificate());
-		vsresp.setX509certificate(null);
-		session.setForeigner(false);
-
-		if (session.getUseMandate()) {
-			// mandate mode
-			return null;
-
-		} else {
-
-			session.setAuthenticatedUsed(false);
-			session.setAuthenticated(true);
-			
-	    	//set QAA Level four in case of card authentifcation
-	    	session.setQAALevel(PVPConstants.STORK_QAA_1_4);
-			
-			
-			String oldsessionID = session.getSessionID();
-
-			//Session is implicte stored in changeSessionID!!!
-			String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session);
-
-			Logger.info("Changed MOASession " + oldsessionID + " to Session " + newMOASessionID);
-			Logger.info("Daten angelegt zu MOASession " + newMOASessionID);
-
-			return newMOASessionID;
-		}
-	}
-
-	/**
-	 * Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
-	 * security layer implementation.<br>
-	 * <ul>
-	 * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
-	 * <li>Parses <code>&lt;CreateXMLSignatureResponse&gt;</code> for error
-	 * codes</li>
-	 * <li>Parses authentication block enclosed in
-	 * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
-	 * <li>Verifies authentication block by calling the MOA SP component</li>
-	 * <li>Creates authentication data</li>
-	 * <li>Creates a corresponding SAML artifact</li>
-	 * <li>Stores authentication data in the authentication data store indexed
-	 * by the SAML artifact</li>
-	 * <li>Deletes authentication session</li>
-	 * <li>Returns the SAML artifact, encoded BASE64</li>
-	 * </ul>
-	 *
-	 * @param sessionID
-	 *            session ID of the running authentication session
-	 * @param xmlCreateXMLSignatureReadResponse
-	 *            String representation of the
-	 *            <code>&lt;CreateXMLSignatureResponse&gt;</code>
-	 * @return SAML artifact needed for retrieving authentication data, encoded
-	 *         BASE64
-	 */
-
-	protected Element createIdentificationBPK(Element mandatePerson,
-			String baseid, String target) throws BuildException {
-		Element identificationBpK = mandatePerson.getOwnerDocument()
-				.createElementNS(Constants.PD_NS_URI, "Identification");
-		Element valueBpK = mandatePerson.getOwnerDocument().createElementNS(
-				Constants.PD_NS_URI, "Value");
-
-		String bpkBase64 = new BPKBuilder().buildBPK(baseid, target);
-		valueBpK.appendChild(mandatePerson.getOwnerDocument().createTextNode(
-				bpkBase64));
-		Element typeBpK = mandatePerson.getOwnerDocument().createElementNS(
-				Constants.PD_NS_URI, "Type");
-		typeBpK.appendChild(mandatePerson.getOwnerDocument().createTextNode(
-				"urn:publicid:gv.at:cdid+bpk"));
-		identificationBpK.appendChild(valueBpK);
-		identificationBpK.appendChild(typeBpK);
-
-		return identificationBpK;
-
-	}
-
-	protected String getBaseId(Element mandatePerson)
-			throws TransformerException, IOException {
-		NodeList list = mandatePerson.getElementsByTagNameNS(
-				Constants.PD_NS_URI, "Identification");
-		for (int i = 0; i < list.getLength(); i++) {
-			Element identification = (Element) list.item(i);
-			Element type = (Element) identification.getElementsByTagNameNS(
-					Constants.PD_NS_URI, "Type").item(0);
-			if (type.getTextContent().compareToIgnoreCase(
-					"urn:publicid:gv.at:baseid") == 0) {
-				Element value = (Element) identification
-						.getElementsByTagNameNS(Constants.PD_NS_URI, "Value")
-						.item(0);
-				return value.getTextContent();
-			}
-		}
-		return null;
-
-	}
-
-	/**
-	 * Gets the foreign authentication data.<br>
-	 * <ul>
-	 * <li>Creates authentication data</li>
-	 * <li>Creates a corresponding SAML artifact</li>
-	 * <li>Stores authentication data in the authentication data store indexed
-	 * by the SAML artifact</li>
-	 * <li>Deletes authentication session</li>
-	 * <li>Returns the SAML artifact, encoded BASE64</li>
-	 * </ul>
-	 *
-	 * @param sessionID
-	 *            session ID of the running authentication session
-	 * @return SAML artifact needed for retrieving authentication data, encoded
-	 *         BASE64
-	 */
-	public String getForeignAuthenticationData(AuthenticationSession session)
-			throws AuthenticationException, BuildException, ParseException,
-			ConfigurationException, ServiceException, ValidateException {
-
-		if (session == null)
-			throw new AuthenticationException("auth.10", new Object[] {
-					REQ_VERIFY_AUTH_BLOCK, PARAM_SESSIONID });
-
-		// post processing of the infoboxes
-		Iterator iter = session.getInfoboxValidatorIterator();
-		boolean formpending = false;
-		if (iter != null) {
-			while (!formpending && iter.hasNext()) {
-				Vector infoboxValidatorVector = (Vector) iter.next();
-				String identifier = (String) infoboxValidatorVector.get(0);
-				String friendlyName = (String) infoboxValidatorVector.get(1);
-				InfoboxValidator infoboxvalidator = (InfoboxValidator) infoboxValidatorVector
-						.get(2);
-				InfoboxValidationResult infoboxValidationResult = null;
-				try {
-					infoboxValidationResult = infoboxvalidator.validate(session
-							.getIdentityLink().getSamlAssertion());
-				} catch (ValidateException e) {
-					Logger.error("Error validating " + identifier + " infobox:"
-							+ e.getMessage());
-					throw new ValidateException("validator.44",
-							new Object[] { friendlyName });
-				}
-				if (!infoboxValidationResult.isValid()) {
-					Logger.info("Validation of " + identifier
-							+ " infobox failed.");
-					throw new ValidateException("validator.40", new Object[] {
-							friendlyName,
-							infoboxValidationResult.getErrorMessage() });
-				}
-				String form = infoboxvalidator.getForm();
-				if (ParepUtils.isEmpty(form)) {
-					AddAdditionalSAMLAttributes(
-							session,
-							infoboxValidationResult.getExtendedSamlAttributes(),
-							identifier, friendlyName);
-				} else {
-					return "Redirect to Input Processor";
-				}
-			}
-		}
-
-		VerifyXMLSignatureResponse vsresp = new VerifyXMLSignatureResponse();
-		X509Certificate cert = session.getSignerCertificate();
-		vsresp.setX509certificate(cert);
-
-		session.setAuthenticatedUsed(false);
-		session.setAuthenticated(true);
-
-
-		session.setXMLVerifySignatureResponse(vsresp);
-		session.setSignerCertificate(vsresp.getX509certificate());
-		vsresp.setX509certificate(null);
-		session.setForeigner(true);
-
-		//TODO: regenerate MOASession ID!
-		return "new Session";
-	}
-
-	/**
-	 * Builds the AuthenticationData object together with the corresponding
-	 * <code>&lt;saml:Assertion&gt;</code>
-	 *
-	 * @param session
-	 *            authentication session
-	 * @param verifyXMLSigResp
-	 *            VerifyXMLSignatureResponse from MOA-SP
-	 * @param useUTC uses correct UTC time format
-	 * @param useUTC indicates that authenticated citizen is a foreigner
-	 * @param isForeigner indicates whether Austrian (false) or foreigner (true) authenticates
-	 * @return AuthenticationData object
-	 * @throws ConfigurationException
-	 *             while accessing configuration data
-	 * @throws BuildException
-	 *             while building the <code>&lt;saml:Assertion&gt;</code>
-	 */
-	public static AuthenticationData buildAuthenticationData(
-			AuthenticationSession session, OAAuthParameter oaParam, String target)
-			throws ConfigurationException, BuildException {
+        return htmlForm;
+    }
+
+    /**
+     * Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the
+     * security layer implementation.<br>
+     * <ul>
+     * <li>Validates given <code>&lt;InfoboxReadResponse&gt;</code></li>
+     * <li>Parses identity link enclosed in
+     * <code>&lt;InfoboxReadResponse&gt;</code></li>
+     * <li>Verifies identity link by calling the MOA SP component</li>
+     * <li>Checks certificate authority of identity link</li>
+     * <li>Stores identity link in the session</li>
+     * <li>Verifies all additional infoboxes returned from the BKU</li>
+     * <li>Creates an authentication block to be signed by the user</li>
+     * <li>Creates and returns a <code>&lt;CreateXMLSignatureRequest&gt;</code>
+     * containg the authentication block, meant to be returned to the security
+     * layer implementation</li>
+     * </ul>
+     *
+     * @param sessionID                     ID of associated authentication session data
+     * @param infoboxReadResponseParameters The parameters from the response returned from the BKU
+     *                                      including the <code>&lt;InfoboxReadResponse&gt;</code>
+     * @return String representation of the
+     * <code>&lt;CreateXMLSignatureRequest&gt;</code>
+     * @throws BKUException
+     */
+    public String verifyIdentityLink(AuthenticationSession session,
+                                     Map<String, String> infoboxReadResponseParameters) throws AuthenticationException,
+            BuildException, ParseException, ConfigurationException,
+            ValidateException, ServiceException, BKUException {
+
+        if (session == null)
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_VERIFY_IDENTITY_LINK, PARAM_SESSIONID});
+
+        String xmlInfoboxReadResponse = (String) infoboxReadResponseParameters
+                .get(PARAM_XMLRESPONSE);
+
+        if (isEmpty(xmlInfoboxReadResponse))
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_VERIFY_IDENTITY_LINK, PARAM_XMLRESPONSE});
+
+        AuthConfigurationProvider authConf = AuthConfigurationProvider
+                .getInstance();
+
+        // check if an identity link was found
+        // Errorcode 2911 von Trustdesk BKU (nicht spezifikationskonform
+        // (SL1.2))
+        // CharSequence se = "ErrorCode>2911".substring(0);
+        // boolean b = xmlInfoboxReadResponse.contains(se);
+        String se = "ErrorCode>2911";
+        int b = xmlInfoboxReadResponse.indexOf(se);
+        if (b != -1) { // no identity link found
+            Logger
+                    .info("Es konnte keine Personenbindung auf der Karte gefunden werden. Versuche Anmeldung als auslaendische eID.");
+            return null;
+        }
+        // spezifikationsgemaess (SL1.2) Errorcode
+        se = "ErrorCode>4002";
+        // b = xmlInfoboxReadResponse.contains(se);
+        b = xmlInfoboxReadResponse.indexOf(se);
+        if (b != -1) { // Unbekannter Infoboxbezeichner
+            Logger
+                    .info("Unbekannter Infoboxbezeichner. Versuche Anmeldung als auslaendische eID.");
+            return null;
+        }
+
+        // parses the <InfoboxReadResponse>
+        IdentityLink identityLink = new InfoboxReadResponseParser(
+                xmlInfoboxReadResponse).parseIdentityLink();
+        // validates the identity link
+        IdentityLinkValidator.getInstance().validate(identityLink);
+        // builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
+        Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder()
+                .build(identityLink, authConf
+                        .getMoaSpIdentityLinkTrustProfileID());
+
+        // invokes the call
+        Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()
+                .verifyXMLSignature(domVerifyXMLSignatureRequest);
+        // parses the <VerifyXMLSignatureResponse>
+        VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser(
+                domVerifyXMLSignatureResponse).parseData();
+
+        OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
+                .getOnlineApplicationParameter(session.getPublicOAURLPrefix());
+
+        // if OA is type is business service the manifest validation result has
+        // to be ignored
+        boolean ignoreManifestValidationResult = (oaParam.getBusinessService() || oaParam.getStorkService()) ? true
+                : false;
+
+        // validates the <VerifyXMLSignatureResponse>
+        VerifyXMLSignatureResponseValidator.getInstance().validate(
+                verifyXMLSignatureResponse,
+                authConf.getIdentityLinkX509SubjectNames(),
+                VerifyXMLSignatureResponseValidator.CHECK_IDENTITY_LINK,
+                ignoreManifestValidationResult);
+
+        session.setIdentityLink(identityLink);
+        // now validate the extended infoboxes
+
+        //Removed in MOA-ID 2.0
+        //verifyInfoboxes(session, infoboxReadResponseParameters, false);
+
+        return "found!";
+    }
+
+    /**
+     * Processes an <code>&lt;InfoboxReadResponse&gt;</code> sent by the
+     * security layer implementation.<br>
+     * <ul>
+     * <li>Validates given <code>&lt;InfoboxReadResponse&gt;</code></li>
+     * <li>Parses identity link enclosed in
+     * <code>&lt;InfoboxReadResponse&gt;</code></li>
+     * <li>Verifies identity link by calling the MOA SP component</li>
+     * <li>Checks certificate authority of identity link</li>
+     * <li>Stores identity link in the session</li>
+     * <li>Verifies all additional infoboxes returned from the BKU</li>
+     * <li>Creates an authentication block to be signed by the user</li>
+     * <li>Creates and returns a <code>&lt;CreateXMLSignatureRequest&gt;</code>
+     * containg the authentication block, meant to be returned to the security
+     * layer implementation</li>
+     * </ul>
+     *
+     * @param sessionID                     ID of associated authentication session data
+     * @param infoboxReadResponseParameters The parameters from the response returned from the BKU
+     *                                      including the <code>&lt;InfoboxReadResponse&gt;</code>
+     * @return String representation of the
+     * <code>&lt;CreateXMLSignatureRequest&gt;</code>
+     */
+    public String verifyCertificate(AuthenticationSession session,
+                                    X509Certificate certificate) throws AuthenticationException,
+            BuildException, ParseException, ConfigurationException,
+            ValidateException, ServiceException, MOAIDException {
+
+        if (session == null)
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_VERIFY_CERTIFICATE, PARAM_SESSIONID});
+
+        // check if person is a Organwalter
+        // if true - don't show bPK in AUTH Block
+        try {
+            for (ObjectID OWid : MOAIDAuthConstants.OW_LIST) {
+                if (certificate.getExtension(OWid) != null) {
+                    session.setOW(true);
+                }
+
+            }
+
+        } catch (X509ExtensionInitException e) {
+            Logger.warn("Certificate extension is not readable.");
+            session.setOW(false);
+        }
+
+        AuthConfigurationProvider authConf = AuthConfigurationProvider
+                .getInstance();
+
+        OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
+                .getOnlineApplicationParameter(session.getPublicOAURLPrefix());
+
+        String returnvalue = getCreateXMLSignatureRequestAuthBlockOrRedirect(session,
+                authConf, oaParam);
+
+        return returnvalue;
+    }
+
+    /**
+     * Processes an <code>Mandate</code> sent by the MIS.<br>
+     * <ul>
+     * <li>Validates given <code>Mandate</code></li>
+     * <li>Verifies Mandate by calling the MOA SP component</li>
+     * <li>Creates an authentication block to be signed by the user</li>
+     * <li>Creates and returns a <code>&lt;CreateXMLSignatureRequest&gt;</code>
+     * containg the authentication block, meant to be returned to the security
+     * layer implementation</li>
+     * </ul>
+     *
+     * @param sessionID                     ID of associated authentication session data
+     * @param infoboxReadResponseParameters The parameters from the response returned from the BKU
+     *                                      including the <code>&lt;InfoboxReadResponse&gt;</code>
+     * @return String representation of the
+     * <code>&lt;CreateXMLSignatureRequest&gt;</code>
+     */
+    public void verifyMandate(AuthenticationSession session, MISMandate mandate)
+            throws AuthenticationException, BuildException, ParseException,
+            ConfigurationException, ValidateException, ServiceException {
+
+        if (session == null)
+            throw new AuthenticationException("auth.10", new Object[]{
+                    GET_MIS_SESSIONID, PARAM_SESSIONID});
+
+        OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
+                .getOnlineApplicationParameter(session.getPublicOAURLPrefix());
+
+        try {
+            // sets the extended SAML attributes for OID (Organwalter)
+            setExtendedSAMLAttributeForMandatesOID(session, mandate, oaParam
+                    .getBusinessService());
+
+            validateExtendedSAMLAttributeForMandates(session, mandate, oaParam.getBusinessService());
+
+
+        } catch (SAXException e) {
+            throw new AuthenticationException("auth.16",
+                    new Object[]{GET_MIS_SESSIONID}, e);
+        } catch (IOException e) {
+            throw new AuthenticationException("auth.16",
+                    new Object[]{GET_MIS_SESSIONID}, e);
+        } catch (ParserConfigurationException e) {
+            throw new AuthenticationException("auth.16",
+                    new Object[]{GET_MIS_SESSIONID}, e);
+        } catch (TransformerException e) {
+            throw new AuthenticationException("auth.16",
+                    new Object[]{GET_MIS_SESSIONID}, e);
+        }
+
+    }
+
+    /**
+     * @param session
+     * @param authConf
+     * @param oaParam
+     * @return
+     * @throws ConfigurationException
+     * @throws BuildException
+     * @throws ValidateException
+     */
+    public String getCreateXMLSignatureRequestAuthBlockOrRedirect(
+            AuthenticationSession session, AuthConfigurationProvider authConf,
+            OAAuthParameter oaParam) throws ConfigurationException,
+            BuildException, ValidateException {
+
+        // check for intermediate processing of the infoboxes
+        if (session.isValidatorInputPending())
+            return "Redirect to Input Processor";
+
+        if (authConf == null)
+            authConf = AuthConfigurationProvider.getInstance();
+        if (oaParam == null)
+            oaParam = AuthConfigurationProvider.getInstance()
+                    .getOnlineApplicationParameter(
+                            session.getPublicOAURLPrefix());
+
+        // builds the AUTH-block
+        String authBlock = buildAuthenticationBlock(session, oaParam);
+
+        // builds the <CreateXMLSignatureRequest>
+        List<String> transformsInfos = oaParam.getTransformsInfos();
+        if ((transformsInfos == null) || (transformsInfos.size() == 0)) {
+            // no OA specific transforms specified, use default ones
+            transformsInfos = authConf.getTransformsInfos();
+        }
+        String createXMLSignatureRequest = new CreateXMLSignatureRequestBuilder()
+                .build(authBlock, oaParam.getKeyBoxIdentifier(),
+                        transformsInfos);
+        return createXMLSignatureRequest;
+    }
+
+    /**
+     * Returns an CreateXMLSignatureRequest for signing the ERnP statement.<br>
+     * <ul>
+     * <li>Creates an CreateXMLSignatureRequest to be signed by the user</li>
+     * </ul>
+     *
+     * @param sessionID ID of associated authentication session data
+     * @param cert      The certificate from the user
+     * @return String representation of the
+     * <code>&lt;CreateXMLSignatureRequest&gt;</code>
+     */
+    public String createXMLSignatureRequestForeignID(AuthenticationSession session,
+                                                     X509Certificate cert) throws AuthenticationException,
+            BuildException, ParseException, ConfigurationException,
+            ValidateException, ServiceException {
+
+        if (session == null)
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_VERIFY_CERTIFICATE, PARAM_SESSIONID});
+
+        AuthConfigurationProvider authConf = AuthConfigurationProvider
+                .getInstance();
+
+        OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
+                .getOnlineApplicationParameter(session.getPublicOAURLPrefix());
+
+        return getCreateXMLSignatureRequestForeigID(session, authConf, oaParam,
+                cert);
+    }
+
+    public String getCreateXMLSignatureRequestForeigID(
+            AuthenticationSession session, AuthConfigurationProvider authConf,
+            OAAuthParameter oaParam, X509Certificate cert)
+            throws ConfigurationException {
+
+        // check for intermediate processing of the infoboxes
+        if (session.isValidatorInputPending())
+            return "Redirect to Input Processor";
+
+        if (authConf == null)
+            authConf = AuthConfigurationProvider.getInstance();
+        if (oaParam == null)
+            oaParam = AuthConfigurationProvider.getInstance()
+                    .getOnlineApplicationParameter(
+                            session.getPublicOAURLPrefix());
+
+        Principal subject = cert.getSubjectDN();
+
+        String createXMLSignatureRequest = new CreateXMLSignatureRequestBuilder()
+                .buildForeignID(subject.toString(), oaParam, session);
+        return createXMLSignatureRequest;
+    }
+
+    /**
+     * Processes an <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
+     * security layer implementation.<br>
+     * <ul>
+     * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
+     * <li>Parses response enclosed in
+     * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
+     * <li>Verifies signature by calling the MOA SP component</li>
+     * <li>Returns the signer certificate</li>
+     * </ul>
+     *
+     * @param sessionID                            ID of associated authentication session data
+     * @param createXMLSignatureResponseParameters The parameters from the response returned from the BKU
+     *                                             including the <code>&lt;CreateXMLSignatureResponse&gt;</code>
+     * @throws BKUException
+     */
+    public X509Certificate verifyXMLSignature(String sessionID,
+                                              Map<String, String> createXMLSignatureResponseParameters)
+            throws AuthenticationException, BuildException, ParseException,
+            ConfigurationException, ValidateException, ServiceException, BKUException {
+
+        if (isEmpty(sessionID))
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_GET_FOREIGN_ID, PARAM_SESSIONID});
+
+        String xmlCreateXMLSignatureResponse = (String) createXMLSignatureResponseParameters
+                .get(PARAM_XMLRESPONSE);
+
+        if (isEmpty(xmlCreateXMLSignatureResponse))
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_GET_FOREIGN_ID, PARAM_XMLRESPONSE});
+
+        AuthConfigurationProvider authConf = AuthConfigurationProvider
+                .getInstance();
+
+        // parses the <CreateXMLSignatureResponse>
+        CreateXMLSignatureResponseParser p = new CreateXMLSignatureResponseParser(
+                xmlCreateXMLSignatureResponse);
+        CreateXMLSignatureResponse createXMLSignatureResponse = p
+                .parseResponseDsig();
+
+        // builds a <VerifyXMLSignatureRequest> for a call of MOA-SP
+        Element domVerifyXMLSignatureRequest = new VerifyXMLSignatureRequestBuilder()
+                .buildDsig(createXMLSignatureResponse, authConf
+                        .getMoaSpAuthBlockTrustProfileID());
+
+        // invokes the call
+        Element domVerifyXMLSignatureResponse = new SignatureVerificationInvoker()
+                .verifyXMLSignature(domVerifyXMLSignatureRequest);
+
+        // parses the <VerifyXMLSignatureResponse>
+        VerifyXMLSignatureResponse verifyXMLSignatureResponse = new VerifyXMLSignatureResponseParser(
+                domVerifyXMLSignatureResponse).parseData();
+
+        return verifyXMLSignatureResponse.getX509certificate();
+
+    }
+
+    /**
+     * Processes an <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
+     * security layer implementation.<br>
+     * <ul>
+     * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
+     * <li>Parses response enclosed in
+     * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
+     * <li>Verifies signature by calling the MOA SP component</li>
+     * <li>Returns the signer certificate</li>
+     * </ul>
+     *
+     * @param sessionID                     ID of associated authentication session data
+     * @param readInfoboxResponseParameters The parameters from the response returned from the BKU
+     *                                      including the <code>&lt;ReadInfoboxResponse&gt;</code>
+     * @throws BKUException
+     */
+    public X509Certificate getCertificate(String sessionID,
+                                          Map<String, String> readInfoboxResponseParameters) throws AuthenticationException,
+            BuildException, ParseException, ConfigurationException,
+            ValidateException, ServiceException, BKUException {
+
+        if (isEmpty(sessionID))
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_VERIFY_CERTIFICATE, PARAM_SESSIONID});
+
+        String xmlReadInfoboxResponse = (String) readInfoboxResponseParameters
+                .get(PARAM_XMLRESPONSE);
+
+        if (isEmpty(xmlReadInfoboxResponse))
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_VERIFY_CERTIFICATE, PARAM_XMLRESPONSE});
+
+        // parses the <CreateXMLSignatureResponse>
+        InfoboxReadResponseParser p = new InfoboxReadResponseParser(
+                xmlReadInfoboxResponse);
+        X509Certificate cert = p.parseCertificate();
+
+        return cert;
+
+    }
+
+    /**
+     * Builds an authentication block <code>&lt;saml:Assertion&gt;</code> from
+     * given session data.
+     *
+     * @param session authentication session
+     * @return <code>&lt;saml:Assertion&gt;</code> as a String
+     * @throws BuildException If an error occurs on serializing an extended SAML attribute
+     *                        to be appended to the AUTH-Block.
+     */
+    private String buildAuthenticationBlock(AuthenticationSession session,
+                                            OAAuthParameter oaParam) throws BuildException {
+
+        IdentityLink identityLink = session.getIdentityLink();
+        String issuer = identityLink.getName();
+        String gebDat = identityLink.getDateOfBirth();
+
+        String identificationValue = null;
+        String identificationType = null;
+
+        //set empty AuthBlock BPK in case of OW or SSO or bpk is not requested
+        if (session.isOW() || session.isSsoRequested() || oaParam.isRemovePBKFromAuthBlock()) {
+            identificationType = "";
+            identificationValue = "";
+
+        } else if (identityLink.getIdentificationType().equals(Constants.URN_PREFIX_BASEID)) {
+
+            if (oaParam.getBusinessService()) {
+
+                String bpkBase64 = new BPKBuilder().buildWBPK(identityLink
+                        .getIdentificationValue(), oaParam.getIdentityLinkDomainIdentifier());
+                identificationValue = bpkBase64;
+
+                if (oaParam.getIdentityLinkDomainIdentifier().startsWith(Constants.URN_PREFIX_WBPK + "+"))
+                    identificationType = oaParam.getIdentityLinkDomainIdentifier();
+                else
+                    identificationType = Constants.URN_PREFIX_WBPK + "+" + oaParam.getIdentityLinkDomainIdentifier();
+
+            } else {
+                String bpkBase64 = new BPKBuilder().buildBPK(identityLink
+                        .getIdentificationValue(), session.getTarget());
+                identificationValue = bpkBase64;
+                identificationType = Constants.URN_PREFIX_CDID + "+" + session.getTarget();
+            }
+
+
+        } else {
+            identificationValue = identityLink.getIdentificationValue();
+            identificationType = identityLink.getIdentificationType();
+
+        }
+
+        String issueInstant = DateTimeUtils.buildDateTimeUTC(Calendar
+                .getInstance());
+        session.setIssueInstant(issueInstant);
+        String authURL = session.getAuthURL();
+        String target = session.getTarget();
+        String targetFriendlyName = session.getTargetFriendlyName();
+
+        // Bug #485
+        // (https://egovlabs.gv.at/tracker/index.php?func=detail&aid=485&group_id=6&atid=105)
+        // String oaURL = session.getPublicOAURLPrefix();
+
+        List<ExtendedSAMLAttribute> extendedSAMLAttributes = session.getExtendedSAMLAttributesAUTH();
+
+
+        if (session.isSsoRequested()) {
+            String oaURL = new String();
+            try {
+                oaURL = AuthConfigurationProvider.getInstance().getPublicURLPrefix();
+
+                if (MiscUtil.isNotEmpty(oaURL))
+                    oaURL = oaURL.replaceAll("&", "&amp;");
+
+            } catch (ConfigurationException e) {
+            }
+            String authBlock = new AuthenticationBlockAssertionBuilder()
+                    .buildAuthBlockSSO(issuer, issueInstant, authURL, target,
+                            targetFriendlyName, identificationValue,
+                            identificationType, oaURL, gebDat,
+                            extendedSAMLAttributes, session, oaParam);
+            return authBlock;
+
+        } else {
+            String oaURL = session.getPublicOAURLPrefix().replaceAll("&", "&amp;");
+            String authBlock = new AuthenticationBlockAssertionBuilder()
+                    .buildAuthBlock(issuer, issueInstant, authURL, target,
+                            targetFriendlyName, identificationValue,
+                            identificationType, oaURL, gebDat,
+                            extendedSAMLAttributes, session, oaParam);
+            return authBlock;
+        }
+    }
+
+
+    /**
+     * Verifies the infoboxes (except of the identity link infobox) returned by
+     * the BKU by calling appropriate validator classes.
+     *
+     * @param session The actual authentication session.
+     * @param mandate The Mandate from the MIS
+     * @throws AuthenticationException
+     * @throws ConfigurationException
+     * @throws TransformerException
+     * @throws ParserConfigurationException
+     * @throws IOException
+     * @throws SAXException
+     */
+    private void validateExtendedSAMLAttributeForMandates(
+            AuthenticationSession session, MISMandate mandate,
+            boolean business)
+            throws ValidateException, ConfigurationException, SAXException,
+            IOException, ParserConfigurationException, TransformerException {
+
+        ExtendedSAMLAttribute[] extendedSAMLAttributes = addExtendedSamlAttributes(
+                mandate, business, false);
+
+        int length = extendedSAMLAttributes.length;
+        for (int i = 0; i < length; i++) {
+            ExtendedSAMLAttribute samlAttribute = extendedSAMLAttributes[i];
+
+            verifySAMLAttribute(samlAttribute, i, "MISService",
+                    "MISService");
+
+        }
+    }
+
+    /**
+     * Verifies the infoboxes (except of the identity link infobox) returned by
+     * the BKU by calling appropriate validator classes.
+     *
+     * @param session The actual authentication session.
+     * @param mandate The Mandate from the MIS
+     * @throws AuthenticationException
+     * @throws ConfigurationException
+     * @throws TransformerException
+     * @throws ParserConfigurationException
+     * @throws IOException
+     * @throws SAXException
+     */
+    private void setExtendedSAMLAttributeForMandatesOID(
+            AuthenticationSession session, MISMandate mandate, boolean business)
+            throws ValidateException, ConfigurationException, SAXException,
+            IOException, ParserConfigurationException, TransformerException {
+
+        ExtendedSAMLAttribute[] extendedSamlAttributes = addExtendedSamlAttributesOID(
+                mandate, business);
+
+        AddAdditionalSAMLAttributes(session, extendedSamlAttributes,
+                "MISService", "MISService");
+
+    }
+
+    /**
+     * Adds given SAML Attributes to the current session. They will be appended
+     * to the final SAML Assertion or the AUTH block. If the attributes are
+     * already in the list, they will be replaced.
+     *
+     * @param session                The current session
+     * @param extendedSAMLAttributes The SAML attributes to add
+     * @param identifier             The infobox identifier for debug purposes
+     * @param friendlyNam            The friendly name of the infobox for debug purposes
+     */
+    private static void AddAdditionalSAMLAttributes(
+            AuthenticationSession session,
+            ExtendedSAMLAttribute[] extendedSAMLAttributes, String identifier,
+            String friendlyName) throws ValidateException {
+        if (extendedSAMLAttributes == null)
+            return;
+        List<ExtendedSAMLAttribute> oaAttributes = session.getExtendedSAMLAttributesOA();
+        if (oaAttributes == null)
+            oaAttributes = new Vector<ExtendedSAMLAttribute>();
+        List<ExtendedSAMLAttribute> authAttributes = session.getExtendedSAMLAttributesAUTH();
+        if (authAttributes == null)
+            authAttributes = new Vector<ExtendedSAMLAttribute>();
+        int length = extendedSAMLAttributes.length;
+        for (int i = 0; i < length; i++) {
+            ExtendedSAMLAttribute samlAttribute = extendedSAMLAttributes[i];
+
+            Object value = verifySAMLAttribute(samlAttribute, i, identifier,
+                    friendlyName);
+
+            if ((value instanceof String) || (value instanceof Element)) {
+                switch (samlAttribute.getAddToAUTHBlock()) {
+                    case ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY:
+                        replaceExtendedSAMLAttribute(authAttributes, samlAttribute);
+                        break;
+                    case ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK:
+                        replaceExtendedSAMLAttribute(authAttributes, samlAttribute);
+                        replaceExtendedSAMLAttribute(oaAttributes, samlAttribute);
+                        break;
+                    case ExtendedSAMLAttribute.NOT_ADD_TO_AUTHBLOCK:
+                        replaceExtendedSAMLAttribute(oaAttributes, samlAttribute);
+                        break;
+                    default:
+                        Logger
+                                .info("Invalid return value from method \"getAddToAUTHBlock()\" ("
+                                        + samlAttribute.getAddToAUTHBlock()
+                                        + ") in SAML attribute number "
+                                        + (i + 1)
+                                        + " for infobox " + identifier);
+                        throw new ValidateException("validator.47", new Object[]{
+                                friendlyName, String.valueOf((i + 1))});
+                }
+            } else {
+                Logger
+                        .info("The type of SAML-Attribute number "
+                                + (i + 1)
+                                + " returned from "
+                                + identifier
+                                + "-infobox validator is not valid. Must be either \"java.Lang.String\""
+                                + " or \"org.w3c.dom.Element\"");
+                throw new ValidateException("validator.46", new Object[]{
+                        identifier, String.valueOf((i + 1))});
+            }
+        }
+        session.setExtendedSAMLAttributesAUTH(authAttributes);
+        session.setExtendedSAMLAttributesOA(oaAttributes);
+    }
+
+    /**
+     * Adds the AUTH block related SAML attributes to the validation result.
+     * This is needed always before the AUTH block is to be signed, because the
+     * name of the mandator has to be set
+     *
+     * @throws ParserConfigurationException
+     * @throws IOException
+     * @throws SAXException
+     * @throws TransformerException
+     */
+
+    protected static ExtendedSAMLAttribute[] addExtendedSamlAttributes(
+            MISMandate mandate, boolean business, boolean provideStammzahl)
+            throws SAXException, IOException, ParserConfigurationException,
+            TransformerException {
+        Vector<ExtendedSAMLAttribute> extendedSamlAttributes = new Vector<ExtendedSAMLAttribute>();
+
+        extendedSamlAttributes.clear();
+
+        // Name
+        Element domMandate = mandateToElement(mandate);
+        Element nameSpaceNode = domMandate.getOwnerDocument().createElement(
+                "NameSpaceNode");
+        nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.PD_POSTFIX,
+                Constants.PD_NS_URI);
+        nameSpaceNode.setAttribute("xmlns" + SZRGWConstants.MANDATE_POSTFIX,
+                SZRGWConstants.MANDATE_NS);
+
+        Element mandator = (Element) XPathAPI.selectSingleNode(domMandate,
+                "//md:Mandate/md:Mandator", nameSpaceNode);
+
+        // Mandate
+        extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
+                EXT_SAML_MANDATE_RAW, domMandate,
+                SZRGWConstants.MANDATE_NS,
+                ExtendedSAMLAttribute.NOT_ADD_TO_AUTHBLOCK));
+
+        // (w)bpk
+        String wbpk = ParepUtils.extractMandatorWbpk(mandator);
+        if (!ParepUtils.isEmpty(wbpk)) {
+            if (!ParepUtils.isPhysicalPerson(mandator)) {
+                String idType = ParepUtils
+                        .extractMandatorIdentificationType(mandator);
+                if (!ParepUtils.isEmpty(idType)
+                        && idType.startsWith(Constants.URN_PREFIX_BASEID)) {
+                    extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
+                            EXT_SAML_MANDATE_CB_BASE_ID,
+                            ParepUtils.getRegisterString(idType) + ": " + wbpk,
+                            SZRGWConstants.MANDATE_NS,
+                            ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY));
+                }
+            } else if (business) {
+                extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
+                        EXT_SAML_MANDATE_WBPK, wbpk,
+                        SZRGWConstants.MANDATE_NS,
+                        ExtendedSAMLAttribute.ADD_TO_AUTHBLOCK_ONLY));
+            }
+        }
+
+        ExtendedSAMLAttribute[] ret = new ExtendedSAMLAttribute[extendedSamlAttributes
+                .size()];
+        extendedSamlAttributes.copyInto(ret);
+        Logger.debug("ExtendedSAML Attributes: " + ret.length);
+        return ret;
+
+    }
+
+    /**
+     * Adds the AUTH block related SAML attributes to the validation result.
+     * This is needed always before the AUTH block is to be signed, because the
+     * name of the mandator has to be set
+     *
+     * @throws ParserConfigurationException
+     * @throws IOException
+     * @throws SAXException
+     * @throws TransformerException
+     */
+    private static ExtendedSAMLAttribute[] addExtendedSamlAttributesOID(
+            MISMandate mandate, boolean business) throws SAXException,
+            IOException, ParserConfigurationException, TransformerException {
+
+        Vector<ExtendedSAMLAttribute> extendedSamlAttributes = new Vector<ExtendedSAMLAttribute>();
+
+        extendedSamlAttributes.clear();
+
+        // RepresentationType
+        extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
+                EXT_SAML_MANDATE_REPRESENTATIONTYPE,
+                EXT_SAML_MANDATE_REPRESENTATIONTEXT,
+                SZRGWConstants.MANDATE_NS,
+                ExtendedSAMLAttribute.NOT_ADD_TO_AUTHBLOCK));
+
+        String oid = mandate.getProfRep();
+
+        if (oid != null) {
+            extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
+                    EXT_SAML_MANDATE_OID, oid,
+                    SZRGWConstants.MANDATE_NS,
+                    ExtendedSAMLAttribute.NOT_ADD_TO_AUTHBLOCK));
+            String oidDescription = mandate.getTextualDescriptionOfOID();
+            extendedSamlAttributes.add(new ExtendedSAMLAttributeImpl(
+                    EXT_SAML_MANDATE_OIDTEXTUALDESCRIPTION,
+                    oidDescription, SZRGWConstants.MANDATE_NS,
+                    ExtendedSAMLAttribute.NOT_ADD_TO_AUTHBLOCK));
+
+        }
+
+        ExtendedSAMLAttribute[] ret = new ExtendedSAMLAttribute[extendedSamlAttributes
+                .size()];
+        extendedSamlAttributes.copyInto(ret);
+        Logger.debug("ExtendedSAML Attributes: " + ret.length);
+        return ret;
+
+    }
+
+    /**
+     * @param mandate
+     * @return
+     * @throws ParserConfigurationException
+     * @throws IOException
+     * @throws SAXException
+     */
+    private static Element mandateToElement(MISMandate mandate)
+            throws SAXException, IOException, ParserConfigurationException {
+        ByteArrayInputStream bais = new ByteArrayInputStream(mandate
+                .getMandate());
+        Document doc = DOMUtils.parseDocumentSimple(bais);
+        return doc.getDocumentElement();
+    }
+
+    protected static void replaceExtendedSAMLAttribute(List<ExtendedSAMLAttribute> attributes,
+                                                       ExtendedSAMLAttribute samlAttribute) {
+        if (null == attributes) {
+            attributes = new Vector<ExtendedSAMLAttribute>();
+        } else {
+            String id = samlAttribute.getName();
+            int length = attributes.size();
+            for (int i = 0; i < length; i++) {
+                ExtendedSAMLAttribute att = (ExtendedSAMLAttribute) attributes
+                        .get(i);
+                if (id.equals(att.getName())) {
+                    // replace attribute
+                    attributes.set(i, samlAttribute);
+                    return;
+                }
+            }
+            attributes.add(samlAttribute);
+        }
+    }
+
+    /**
+     * Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
+     * security layer implementation.<br>
+     * <ul>
+     * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
+     * <li>Parses <code>&lt;CreateXMLSignatureResponse&gt;</code> for error
+     * codes</li>
+     * <li>Parses authentication block enclosed in
+     * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
+     * <li>Verifies authentication block by calling the MOA SP component</li>
+     * <li>Creates authentication data</li>
+     * <li>Creates a corresponding SAML artifact</li>
+     * <li>Stores authentication data in the authentication data store indexed
+     * by the SAML artifact</li>
+     * <li>Deletes authentication session</li>
+     * <li>Returns the SAML artifact, encoded BASE64</li>
+     * </ul>
+     *
+     * @param sessionID                         session ID of the running authentication session
+     * @param xmlCreateXMLSignatureReadResponse String representation of the
+     *                                          <code>&lt;CreateXMLSignatureResponse&gt;</code>
+     * @return SAML artifact needed for retrieving authentication data, encoded
+     * BASE64
+     * @throws BKUException
+     */
+    public String verifyAuthenticationBlock(AuthenticationSession session,
+                                            String xmlCreateXMLSignatureReadResponse)
+            throws AuthenticationException, BuildException, ParseException,
+            ConfigurationException, ServiceException, ValidateException, BKUException {
+
+        if (session == null)
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_VERIFY_AUTH_BLOCK, PARAM_SESSIONID});
+        if (isEmpty(xmlCreateXMLSignatureReadResponse))
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE});
+
+        AuthConfigurationProvider authConf = AuthConfigurationProvider
+                .getInstance();
+        // parses <CreateXMLSignatureResponse>
+        CreateXMLSignatureResponse csresp = new CreateXMLSignatureResponseParser(
+                xmlCreateXMLSignatureReadResponse).parseResponse();
+
+        try {
+            String serializedAssertion = DOMUtils.serializeNode(csresp
+                    .getSamlAssertion());
+            session.setAuthBlock(serializedAssertion);
+        } catch (TransformerException e) {
+            throw new ParseException("parser.04", new Object[]{
+                    REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE});
+        } catch (IOException e) {
+            throw new ParseException("parser.04", new Object[]{
+                    REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE});
+        }
+        // validates <CreateXMLSignatureResponse>
+        if (session.isSsoRequested())
+            new CreateXMLSignatureResponseValidator().validateSSO(csresp, session);
+        else
+            new CreateXMLSignatureResponseValidator().validate(csresp, session);
+
+        // builds a <VerifyXMLSignatureRequest> for a MOA-SPSS call
+        List<String> vtids = authConf.getMoaSpAuthBlockVerifyTransformsInfoIDs();
+        String tpid = authConf.getMoaSpAuthBlockTrustProfileID();
+        Element domVsreq = new VerifyXMLSignatureRequestBuilder().build(csresp,
+                vtids, tpid);
+        // debug output
+
+        // invokes the call
+        Element domVsresp = new SignatureVerificationInvoker()
+                .verifyXMLSignature(domVsreq);
+        // debug output
+
+        // parses the <VerifyXMLSignatureResponse>
+        VerifyXMLSignatureResponse vsresp = new VerifyXMLSignatureResponseParser(
+                domVsresp).parseData();
+
+        if (Logger.isTraceEnabled()) {
+            if (domVsresp != null) {
+                try {
+                    String xmlVerifyXMLSignatureResponse = DOMUtils
+                            .serializeNode(domVsresp, true);
+                    Logger.trace(new LogMsg(xmlCreateXMLSignatureReadResponse));
+                    Logger.trace(new LogMsg(xmlVerifyXMLSignatureResponse));
+                } catch (Throwable t) {
+                    t.printStackTrace();
+                    Logger.info(new LogMsg(t.getStackTrace()));
+                }
+            }
+        }
+
+        // validates the <VerifyXMLSignatureResponse>
+        VerifyXMLSignatureResponseValidator.getInstance().validate(vsresp,
+                null, VerifyXMLSignatureResponseValidator.CHECK_AUTH_BLOCK,
+                false);
+
+        // Compare AuthBlock Data with information stored in session, especially
+        // date and time
+        CreateXMLSignatureResponseValidator.getInstance().validateSigningDateTime(csresp);
+
+        // compares the public keys from the identityLink with the AuthBlock
+        VerifyXMLSignatureResponseValidator.getInstance().validateCertificate(
+                vsresp, session.getIdentityLink());
+
+        // post processing of the infoboxes
+        Iterator iter = session.getInfoboxValidatorIterator();
+        boolean formpending = false;
+        if (iter != null) {
+            while (!formpending && iter.hasNext()) {
+                Vector infoboxValidatorVector = (Vector) iter.next();
+                String identifier = (String) infoboxValidatorVector.get(0);
+                String friendlyName = (String) infoboxValidatorVector.get(1);
+                InfoboxValidator infoboxvalidator = (InfoboxValidator) infoboxValidatorVector
+                        .get(2);
+                InfoboxValidationResult infoboxValidationResult = null;
+                try {
+                    infoboxValidationResult = infoboxvalidator.validate(csresp
+                            .getSamlAssertion());
+                } catch (ValidateException e) {
+                    Logger.error("Error validating " + identifier + " infobox:"
+                            + e.getMessage());
+                    throw new ValidateException("validator.44",
+                            new Object[]{friendlyName});
+                }
+                if (!infoboxValidationResult.isValid()) {
+                    Logger.info("Validation of " + identifier
+                            + " infobox failed.");
+                    throw new ValidateException("validator.40", new Object[]{
+                            friendlyName,
+                            infoboxValidationResult.getErrorMessage()});
+                }
+                String form = infoboxvalidator.getForm();
+                if (ParepUtils.isEmpty(form)) {
+                    AddAdditionalSAMLAttributes(
+                            session,
+                            infoboxValidationResult.getExtendedSamlAttributes(),
+                            identifier, friendlyName);
+                } else {
+                    return "Redirect to Input Processor";
+                }
+            }
+        }
+
+        session.setXMLVerifySignatureResponse(vsresp);
+        session.setSignerCertificate(vsresp.getX509certificate());
+        vsresp.setX509certificate(null);
+        session.setForeigner(false);
+
+        if (session.getUseMandate()) {
+            // mandate mode
+            return null;
+
+        } else {
+
+            session.setAuthenticatedUsed(false);
+            session.setAuthenticated(true);
+
+            //set QAA Level four in case of card authentifcation
+            session.setQAALevel(PVPConstants.STORK_QAA_1_4);
+
+
+            String oldsessionID = session.getSessionID();
+
+            //Session is implicte stored in changeSessionID!!!
+            String newMOASessionID = AuthenticationSessionStoreage.changeSessionID(session);
+
+            Logger.info("Changed MOASession " + oldsessionID + " to Session " + newMOASessionID);
+            Logger.info("Daten angelegt zu MOASession " + newMOASessionID);
+
+            return newMOASessionID;
+        }
+    }
+
+    /**
+     * Processes a <code>&lt;CreateXMLSignatureResponse&gt;</code> sent by the
+     * security layer implementation.<br>
+     * <ul>
+     * <li>Validates given <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
+     * <li>Parses <code>&lt;CreateXMLSignatureResponse&gt;</code> for error
+     * codes</li>
+     * <li>Parses authentication block enclosed in
+     * <code>&lt;CreateXMLSignatureResponse&gt;</code></li>
+     * <li>Verifies authentication block by calling the MOA SP component</li>
+     * <li>Creates authentication data</li>
+     * <li>Creates a corresponding SAML artifact</li>
+     * <li>Stores authentication data in the authentication data store indexed
+     * by the SAML artifact</li>
+     * <li>Deletes authentication session</li>
+     * <li>Returns the SAML artifact, encoded BASE64</li>
+     * </ul>
+     *
+     * @param sessionID                         session ID of the running authentication session
+     * @param xmlCreateXMLSignatureReadResponse String representation of the
+     *                                          <code>&lt;CreateXMLSignatureResponse&gt;</code>
+     * @return SAML artifact needed for retrieving authentication data, encoded
+     * BASE64
+     */
+
+    protected Element createIdentificationBPK(Element mandatePerson,
+                                              String baseid, String target) throws BuildException {
+        Element identificationBpK = mandatePerson.getOwnerDocument()
+                .createElementNS(Constants.PD_NS_URI, "Identification");
+        Element valueBpK = mandatePerson.getOwnerDocument().createElementNS(
+                Constants.PD_NS_URI, "Value");
+
+        String bpkBase64 = new BPKBuilder().buildBPK(baseid, target);
+        valueBpK.appendChild(mandatePerson.getOwnerDocument().createTextNode(
+                bpkBase64));
+        Element typeBpK = mandatePerson.getOwnerDocument().createElementNS(
+                Constants.PD_NS_URI, "Type");
+        typeBpK.appendChild(mandatePerson.getOwnerDocument().createTextNode(
+                "urn:publicid:gv.at:cdid+bpk"));
+        identificationBpK.appendChild(valueBpK);
+        identificationBpK.appendChild(typeBpK);
+
+        return identificationBpK;
+
+    }
+
+    protected String getBaseId(Element mandatePerson)
+            throws TransformerException, IOException {
+        NodeList list = mandatePerson.getElementsByTagNameNS(
+                Constants.PD_NS_URI, "Identification");
+        for (int i = 0; i < list.getLength(); i++) {
+            Element identification = (Element) list.item(i);
+            Element type = (Element) identification.getElementsByTagNameNS(
+                    Constants.PD_NS_URI, "Type").item(0);
+            if (type.getTextContent().compareToIgnoreCase(
+                    "urn:publicid:gv.at:baseid") == 0) {
+                Element value = (Element) identification
+                        .getElementsByTagNameNS(Constants.PD_NS_URI, "Value")
+                        .item(0);
+                return value.getTextContent();
+            }
+        }
+        return null;
+
+    }
+
+    /**
+     * Gets the foreign authentication data.<br>
+     * <ul>
+     * <li>Creates authentication data</li>
+     * <li>Creates a corresponding SAML artifact</li>
+     * <li>Stores authentication data in the authentication data store indexed
+     * by the SAML artifact</li>
+     * <li>Deletes authentication session</li>
+     * <li>Returns the SAML artifact, encoded BASE64</li>
+     * </ul>
+     *
+     * @param sessionID session ID of the running authentication session
+     * @return SAML artifact needed for retrieving authentication data, encoded
+     * BASE64
+     */
+    public String getForeignAuthenticationData(AuthenticationSession session)
+            throws AuthenticationException, BuildException, ParseException,
+            ConfigurationException, ServiceException, ValidateException {
+
+        if (session == null)
+            throw new AuthenticationException("auth.10", new Object[]{
+                    REQ_VERIFY_AUTH_BLOCK, PARAM_SESSIONID});
+
+        // post processing of the infoboxes
+        Iterator iter = session.getInfoboxValidatorIterator();
+        boolean formpending = false;
+        if (iter != null) {
+            while (!formpending && iter.hasNext()) {
+                Vector infoboxValidatorVector = (Vector) iter.next();
+                String identifier = (String) infoboxValidatorVector.get(0);
+                String friendlyName = (String) infoboxValidatorVector.get(1);
+                InfoboxValidator infoboxvalidator = (InfoboxValidator) infoboxValidatorVector
+                        .get(2);
+                InfoboxValidationResult infoboxValidationResult = null;
+                try {
+                    infoboxValidationResult = infoboxvalidator.validate(session
+                            .getIdentityLink().getSamlAssertion());
+                } catch (ValidateException e) {
+                    Logger.error("Error validating " + identifier + " infobox:"
+                            + e.getMessage());
+                    throw new ValidateException("validator.44",
+                            new Object[]{friendlyName});
+                }
+                if (!infoboxValidationResult.isValid()) {
+                    Logger.info("Validation of " + identifier
+                            + " infobox failed.");
+                    throw new ValidateException("validator.40", new Object[]{
+                            friendlyName,
+                            infoboxValidationResult.getErrorMessage()});
+                }
+                String form = infoboxvalidator.getForm();
+                if (ParepUtils.isEmpty(form)) {
+                    AddAdditionalSAMLAttributes(
+                            session,
+                            infoboxValidationResult.getExtendedSamlAttributes(),
+                            identifier, friendlyName);
+                } else {
+                    return "Redirect to Input Processor";
+                }
+            }
+        }
+
+        VerifyXMLSignatureResponse vsresp = new VerifyXMLSignatureResponse();
+        X509Certificate cert = session.getSignerCertificate();
+        vsresp.setX509certificate(cert);
+
+        session.setAuthenticatedUsed(false);
+        session.setAuthenticated(true);
+
+
+        session.setXMLVerifySignatureResponse(vsresp);
+        session.setSignerCertificate(vsresp.getX509certificate());
+        vsresp.setX509certificate(null);
+        session.setForeigner(true);
+
+        //TODO: regenerate MOASession ID!
+        return "new Session";
+    }
+
+    /**
+     * Builds the AuthenticationData object together with the corresponding
+     * <code>&lt;saml:Assertion&gt;</code>
+     *
+     * @param session          authentication session
+     * @param verifyXMLSigResp VerifyXMLSignatureResponse from MOA-SP
+     * @param useUTC           uses correct UTC time format
+     * @param useUTC           indicates that authenticated citizen is a foreigner
+     * @param isForeigner      indicates whether Austrian (false) or foreigner (true) authenticates
+     * @return AuthenticationData object
+     * @throws ConfigurationException while accessing configuration data
+     * @throws BuildException         while building the <code>&lt;saml:Assertion&gt;</code>
+     */
+    public static AuthenticationData buildAuthenticationData(
+            AuthenticationSession session, OAAuthParameter oaParam, String target)
+            throws ConfigurationException, BuildException {
 
 		IdentityLink identityLink = session.getIdentityLink();
 		AuthenticationData authData = new AuthenticationData();
@@ -1503,276 +1468,202 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 
 		try {
 
-			if (session.getUseMandate() && session.isOW()) {
-				MISMandate mandate = session.getMISMandate();
+			MISMandate mandate = session.getMISMandate();
+			
+			if (session.getUseMandate() && session.isOW() 
+					&& mandate != null && MiscUtil.isNotEmpty(mandate.getOWbPK())) {				
 				authData.setBPK(mandate.getOWbPK());
 				authData.setBPKType(Constants.URN_PREFIX_CDID + "+" + "OW");
 				authData.setIdentityLink(identityLink);
-
 				Logger.trace("Authenticated User is OW: " + mandate.getOWbPK());
 
-			} else {
-
-				if (businessService) {
-					//since we have foreigner, wbPK is not calculated in BKU
-					if(identityLink.getIdentificationType().equals(Constants.URN_PREFIX_BASEID)) {
-
-					 	String registerAndOrdNr = oaParam.getIdentityLinkDomainIdentifier();
-
-						if (registerAndOrdNr.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) {
-							// If domainIdentifier starts with prefix
-							// "urn:publicid:gv.at:wbpk+"; remove this prefix
-							registerAndOrdNr = registerAndOrdNr
-									.substring(AuthenticationSession.REGISTERANDORDNR_PREFIX_.length());
-							Logger.debug("Register and ordernumber prefix stripped off; resulting register string: "
-									+ registerAndOrdNr);
-						}
-
-						String wbpkBase64 = new BPKBuilder().buildWBPK(identityLink.getIdentificationValue(), registerAndOrdNr);
-						authData.setBPK(wbpkBase64);
-						authData.setBPKType( Constants.URN_PREFIX_WBPK + "+" + registerAndOrdNr);
-
-					} else {
-						authData.setBPK(identityLink.getIdentificationValue());
-						authData.setBPKType(identityLink.getIdentificationType());
-
-					}
-
-					Logger.trace("Authenticate user with wbPK " + authData.getBPK());
-
-					Element idlassertion = session.getIdentityLink().getSamlAssertion();
-					//set bpk/wpbk;
-					Node prIdentification = XPathUtils.selectSingleNode(idlassertion, IdentityLinkAssertionParser.PERSON_IDENT_VALUE_XPATH);
-					prIdentification.getFirstChild().setNodeValue(authData.getBPK());
-					//set bkp/wpbk type
-					Node prIdentificationType = XPathUtils.selectSingleNode(idlassertion, IdentityLinkAssertionParser.PERSON_IDENT_TYPE_XPATH);
-					prIdentificationType.getFirstChild().setNodeValue(authData.getBPKType());
-
-					IdentityLinkAssertionParser idlparser = new IdentityLinkAssertionParser(idlassertion);
-					IdentityLink idl = idlparser.parseIdentityLink();
-					authData.setIdentityLink(idl);
-
-				} else {
-
-					if(identityLink.getIdentificationType().equals(Constants.URN_PREFIX_BASEID)) {
-						// only compute bPK if online application is a public service and we have the Stammzahl
-						String bpkBase64 = new BPKBuilder().buildBPK(identityLink.getIdentificationValue(), target);
-						authData.setBPK(bpkBase64);
-						authData.setBPKType(Constants.URN_PREFIX_CDID + "+" + oaParam.getTarget());
-					}
-
-					Logger.trace("Authenticate user with bPK " + authData.getBPK());
-
-					authData.setIdentityLink(identityLink);
-				}
-			}
-
-			return authData;
-
-		} catch (Throwable ex) {
-			throw new BuildException("builder.00", new Object[] {
-					"AuthenticationData", ex.toString() }, ex);
-		}
-	}
-
-	/**
-	 * Retrieves a session from the session store.
-	 *
-	 * @param id
-	 *            session ID
-	 * @return <code>AuthenticationSession</code> stored with given session ID,
-	 *         <code>null</code> if session ID unknown
-	 */
-	public static AuthenticationSession getSession(String id)
-			throws AuthenticationException {
-
-		AuthenticationSession session;
-		try {
-			session = AuthenticationSessionStoreage.getSession(id);
-
-			if (session == null)
-				throw new AuthenticationException("auth.02", new Object[] { id });
-			return session;
-
-		} catch (MOADatabaseException e) {
-			throw new AuthenticationException("parser.04", new Object[] { id });
-		}
-	}
-
-	/**
-	 * Cleans up expired session and authentication data stores.
-	 */
-	public void cleanup() {
-		long now = new Date().getTime();
-
-		//clean AuthenticationSessionStore
-
-		AuthenticationSessionStoreage.clean(now, sessionTimeOutCreated, sessionTimeOutUpdated);
+            } else {
 
-		//clean AssertionStore
-		AssertionStorage assertionstore = AssertionStorage.getInstance();
-		assertionstore.clean(now, authDataTimeOut);
+                if (businessService) {
+                    //since we have foreigner, wbPK is not calculated in BKU
+                    if (identityLink.getIdentificationType().equals(Constants.URN_PREFIX_BASEID)) {
 
-		//clean ExeptionStore
-		DBExceptionStoreImpl exstore = DBExceptionStoreImpl.getStore();
-		exstore.clean(now, authDataTimeOut);
-
-	}
-
-	/**
-	 * Sets the sessionTimeOut.
-	 *
-	 * @param seconds
-	 *            Time out of the session in seconds
-	 */
-	public void setSecondsSessionTimeOutCreated(long seconds) {
-		sessionTimeOutCreated = seconds * 1000;
-	}
-
-	public void setSecondsSessionTimeOutUpdated(long seconds) {
-		sessionTimeOutUpdated = seconds * 1000;
-	}
-
-	/**
-	 * Sets the authDataTimeOut.
-	 *
-	 * @param seconds
-	 *            Time out for signing AuthData in seconds
-	 */
-	public void setSecondsAuthDataTimeOut(long seconds) {
-		authDataTimeOut = seconds * 1000;
-	}
-
-	/**
-	 * Checks a parameter.
-	 *
-	 * @param param
-	 *            parameter
-	 * @return true if the parameter is null or empty
-	 */
-	private boolean isEmpty(String param) {
-		return param == null || param.length() == 0;
-	}
-
-	/**
-	 * Checks the correctness of SAML attributes and returns its value.
-	 *
-	 * @param param
-	 *            samlAttribute
-	 * @param i
-	 *            the number of the verified attribute for messages
-	 * @param identifier
-	 *            the infobox identifier for messages
-	 * @param friendlyname
-	 *            the friendly name of the infobox for messages
-	 * @return the SAML attribute value (Element or String)
-	 */
-	protected static Object verifySAMLAttribute(
-			ExtendedSAMLAttribute samlAttribute, int i, String identifier,
-			String friendlyName) throws ValidateException {
-		String name = samlAttribute.getName();
-
-		if (name == null) {
-			Logger.info("The name of SAML-Attribute number " + (i + 1)
-					+ " returned from " + identifier
-					+ "-infobox validator is null.");
-			throw new ValidateException("validator.45", new Object[] {
-					friendlyName, "Name", String.valueOf((i + 1)), "null" });
-		}
-		if (name == "") {
-			Logger.info("The name of SAML-Attribute number " + (i + 1)
-					+ " returned from " + identifier
-					+ "-infobox validator is empty.");
-			throw new ValidateException("validator.45", new Object[] {
-					friendlyName, "Name", String.valueOf((i + 1)), "leer" });
-		}
-		if (samlAttribute.getNameSpace() == null) {
-			Logger.info("The namespace of SAML-Attribute number " + (i + 1)
-					+ " returned from " + identifier
-					+ "-infobox validator is null.");
-			throw new ValidateException("validator.45",
-					new Object[] { friendlyName, "Namespace",
-							String.valueOf((i + 1)), "null" });
-		}
-		Object value = samlAttribute.getValue();
-		if (value == null) {
-			Logger.info("The value of SAML-Attribute number " + (i + 1)
-					+ " returned from " + identifier
-					+ "-infobox validator is null.");
-			throw new ValidateException("validator.45", new Object[] {
-					friendlyName, "Wert", String.valueOf((i + 1)), "null" });
-		}
-
-		return value;
-	}
-
-	/**
-	   * Does the request to the SZR-GW
-	 * @param oaFriendlyName 
-	 * @param signature XMLDSIG signature
-	   * @return Identity link assertion
-	 * @throws SZRGWClientException 
-	   */
-
-	     public CreateIdentityLinkResponse getIdentityLink(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, String gender, String citizenSignature, String represented, String representative, String mandateContent, String organizationAddress, String organizationType, String targetType, String targetValue, String oaFriendlyName, String filters) throws SZRGWClientException {
-
-			try {
-		    	AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
-		    	ConnectionParameter connectionParameters = authConf.getForeignIDConnectionParameter();
-
-		    	SZRGWClient client = new SZRGWClient(connectionParameters);
-		    	 
-		    	
-		    	CreateIdentityLinkRequest request = new CreateIdentityLinkRequest();
-		    	request.setSignature(citizenSignature.getBytes());
-	    	
-		    	PEPSData data = new PEPSData();
-		    	data.setDateOfBirth(PEPSDateOfBirth);
-		    	data.setFamilyname(PEPSFamilyname);
-		    	data.setFirstname(PEPSFirstname);
-		    	data.setIdentifier(PEPSIdentifier);
-
-		    	data.setRepresentative(representative);
-		    	data.setRepresented(represented);
-		    	data.setMandateContent(mandateContent);
-		    	
-		    	data.setLegalPersonCanonicalRegisteredAddress(organizationAddress);
-		    	data.setLegalPersonTranslatableType(organizationType);
-
-		    	if(null != mandateContent) {
-			    	MISType mis = new MISType();
-			    	
-			    	Target targetObject = new Target();
-			    	targetObject.setType(targetType);
-			    	targetObject.setValue(targetValue);
-			    	mis.setTarget(targetObject);
-			    	
-			    	mis.setOAFriendlyName(oaFriendlyName);
-			    	
-			    	Filters filterObject = new Filters();
-			    	MandateIdentifiers mandateIds = new MandateIdentifiers();
-			        for(String current : filters.split(","))
-			        	mandateIds.getMandateIdentifier().add(current.trim());
-			    	filterObject.setMandateIdentifiers(mandateIds);
-			    	mis.setFilters(filterObject);
-			    	
-			    	request.setMIS(mis);
-		    	}
-		    	
-		    	Logger.info("Starte Kommunikation mit dem Stammzahlenregister Gateway(" + connectionParameters.getUrl() + ")...");
-				CreateIdentityLinkResponse response = client.sentCreateIDLRequest(request , connectionParameters.getUrl());
-				return response;
-		    	
-		    }
-		    catch (ConfigurationException e) {
-		    	Logger.warn(e);
-		    	Logger.warn(MOAIDMessageProvider.getInstance().getMessage("config.12", null ));
-			}
-		    
-		    return null;
-		
-	  }
+                        String registerAndOrdNr = oaParam.getIdentityLinkDomainIdentifier();
 
+                        if (registerAndOrdNr.startsWith(AuthenticationSession.REGISTERANDORDNR_PREFIX_)) {
+                            // If domainIdentifier starts with prefix
+                            // "urn:publicid:gv.at:wbpk+"; remove this prefix
+                            registerAndOrdNr = registerAndOrdNr
+                                    .substring(AuthenticationSession.REGISTERANDORDNR_PREFIX_.length());
+                            Logger.debug("Register and ordernumber prefix stripped off; resulting register string: "
+                                    + registerAndOrdNr);
+                        }
+
+                        String wbpkBase64 = new BPKBuilder().buildWBPK(identityLink.getIdentificationValue(), registerAndOrdNr);
+                        authData.setBPK(wbpkBase64);
+                        authData.setBPKType(Constants.URN_PREFIX_WBPK + "+" + registerAndOrdNr);
+
+                    } else {
+                        authData.setBPK(identityLink.getIdentificationValue());
+                        authData.setBPKType(identityLink.getIdentificationType());
+
+                    }
+
+                    Logger.trace("Authenticate user with wbPK " + authData.getBPK());
+
+                    Element idlassertion = session.getIdentityLink().getSamlAssertion();
+                    //set bpk/wpbk;
+                    Node prIdentification = XPathUtils.selectSingleNode(idlassertion, IdentityLinkAssertionParser.PERSON_IDENT_VALUE_XPATH);
+                    prIdentification.getFirstChild().setNodeValue(authData.getBPK());
+                    //set bkp/wpbk type
+                    Node prIdentificationType = XPathUtils.selectSingleNode(idlassertion, IdentityLinkAssertionParser.PERSON_IDENT_TYPE_XPATH);
+                    prIdentificationType.getFirstChild().setNodeValue(authData.getBPKType());
+
+                    IdentityLinkAssertionParser idlparser = new IdentityLinkAssertionParser(idlassertion);
+                    IdentityLink idl = idlparser.parseIdentityLink();
+                    authData.setIdentityLink(idl);
+
+                } else {
+
+                    if (identityLink.getIdentificationType().equals(Constants.URN_PREFIX_BASEID)) {
+                        // only compute bPK if online application is a public service and we have the Stammzahl
+                        String bpkBase64 = new BPKBuilder().buildBPK(identityLink.getIdentificationValue(), target);
+                        authData.setBPK(bpkBase64);
+                        authData.setBPKType(Constants.URN_PREFIX_CDID + "+" + oaParam.getTarget());
+                    }
+
+                    Logger.trace("Authenticate user with bPK " + authData.getBPK());
+
+                    authData.setIdentityLink(identityLink);
+                }
+            }
+
+            return authData;
+
+        } catch (Throwable ex) {
+            throw new BuildException("builder.00", new Object[]{
+                    "AuthenticationData", ex.toString()}, ex);
+        }
+    }
+
+    /**
+     * Retrieves a session from the session store.
+     *
+     * @param id session ID
+     * @return <code>AuthenticationSession</code> stored with given session ID,
+     * <code>null</code> if session ID unknown
+     */
+    public static AuthenticationSession getSession(String id)
+            throws AuthenticationException {
+
+        AuthenticationSession session;
+        try {
+            session = AuthenticationSessionStoreage.getSession(id);
+
+            if (session == null)
+                throw new AuthenticationException("auth.02", new Object[]{id});
+            return session;
+
+        } catch (MOADatabaseException e) {
+            throw new AuthenticationException("parser.04", new Object[]{id});
+        }
+    }
+
+    /**
+     * Cleans up expired session and authentication data stores.
+     */
+    public void cleanup() {
+        long now = new Date().getTime();
+
+        //clean AuthenticationSessionStore
+
+        AuthenticationSessionStoreage.clean(now, sessionTimeOutCreated, sessionTimeOutUpdated);
+
+        //clean AssertionStore
+        AssertionStorage assertionstore = AssertionStorage.getInstance();
+        assertionstore.clean(now, authDataTimeOut);
+
+        //clean ExeptionStore
+        DBExceptionStoreImpl exstore = DBExceptionStoreImpl.getStore();
+        exstore.clean(now, authDataTimeOut);
+
+    }
+
+    /**
+     * Sets the sessionTimeOut.
+     *
+     * @param seconds Time out of the session in seconds
+     */
+    public void setSecondsSessionTimeOutCreated(long seconds) {
+        sessionTimeOutCreated = seconds * 1000;
+    }
+
+    public void setSecondsSessionTimeOutUpdated(long seconds) {
+        sessionTimeOutUpdated = seconds * 1000;
+    }
+
+    /**
+     * Sets the authDataTimeOut.
+     *
+     * @param seconds Time out for signing AuthData in seconds
+     */
+    public void setSecondsAuthDataTimeOut(long seconds) {
+        authDataTimeOut = seconds * 1000;
+    }
+
+    /**
+     * Checks a parameter.
+     *
+     * @param param parameter
+     * @return true if the parameter is null or empty
+     */
+    private boolean isEmpty(String param) {
+        return param == null || param.length() == 0;
+    }
+
+    /**
+     * Checks the correctness of SAML attributes and returns its value.
+     *
+     * @param param        samlAttribute
+     * @param i            the number of the verified attribute for messages
+     * @param identifier   the infobox identifier for messages
+     * @param friendlyname the friendly name of the infobox for messages
+     * @return the SAML attribute value (Element or String)
+     */
+    protected static Object verifySAMLAttribute(
+            ExtendedSAMLAttribute samlAttribute, int i, String identifier,
+            String friendlyName) throws ValidateException {
+        String name = samlAttribute.getName();
+
+        if (name == null) {
+            Logger.info("The name of SAML-Attribute number " + (i + 1)
+                    + " returned from " + identifier
+                    + "-infobox validator is null.");
+            throw new ValidateException("validator.45", new Object[]{
+                    friendlyName, "Name", String.valueOf((i + 1)), "null"});
+        }
+        if (name == "") {
+            Logger.info("The name of SAML-Attribute number " + (i + 1)
+                    + " returned from " + identifier
+                    + "-infobox validator is empty.");
+            throw new ValidateException("validator.45", new Object[]{
+                    friendlyName, "Name", String.valueOf((i + 1)), "leer"});
+        }
+        if (samlAttribute.getNameSpace() == null) {
+            Logger.info("The namespace of SAML-Attribute number " + (i + 1)
+                    + " returned from " + identifier
+                    + "-infobox validator is null.");
+            throw new ValidateException("validator.45",
+                    new Object[]{friendlyName, "Namespace",
+                            String.valueOf((i + 1)), "null"});
+        }
+        Object value = samlAttribute.getValue();
+        if (value == null) {
+            Logger.info("The value of SAML-Attribute number " + (i + 1)
+                    + " returned from " + identifier
+                    + "-infobox validator is null.");
+            throw new ValidateException("validator.45", new Object[]{
+                    friendlyName, "Wert", String.valueOf((i + 1)), "null"});
+        }
+        
+        return value;
+    }
+	
 	/**
 	 * Does the request to the SZR-GW.
 	 *
@@ -1782,9 +1673,9 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 * @throws ConfigurationException the configuration exception
 	 */
 	public CreateIdentityLinkResponse getIdentityLink(Element signature) throws SZRGWClientException, ConfigurationException {
-		return getIdentityLink(null, null, null, null, XMLHelper.nodeToString(signature));
+		return getIdentityLink(null, null, null, null, XMLHelper.nodeToString(signature), null);
 	}
-
+    
 	/**
 	 * Does the request to the SZR-GW.
 	 *
@@ -1797,28 +1688,8 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 * @throws SZRGWClientException the sZRGW client exception
 	 * @throws ConfigurationException the configuration exception
 	 */
-	public CreateIdentityLinkResponse getIdentityLink(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, String signature) throws SZRGWClientException {
-		return getIdentityLink(PEPSIdentifier, PEPSFirstname, PEPSFamilyname, PEPSDateOfBirth, null, signature, null, null, null, null, null, null, null);
-	}
-
-	/**
-	 * Gets the identity link.
-	 *
-	 * @param citizenSignature the citizen signature
-	 * @param representative the representative
-	 * @param represented the represented
-	 * @param mandate the mandate
-	 * @param organizationAddress the organization address
-	 * @param organizationType the organization type
-	 * @return the identity link
-	 * @throws SZRGWClientException 
-	 */
-	public CreateIdentityLinkResponse getIdentityLink(String citizenSignature,
-			String representative, String represented, String mandateContent,
-			String organizationAddress, String organizationType, String targetType, String targetValue, String oaFriendlyName, String filters) throws SZRGWClientException {
-		return getIdentityLink(null, null, null, null, null,
-				citizenSignature, represented, representative, mandateContent, organizationAddress,
-				organizationType, targetType, targetValue, oaFriendlyName, filters);
+	public CreateIdentityLinkResponse getIdentityLink(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, String signature, String PEPSFiscalNumber) throws SZRGWClientException {
+		return getIdentityLink(PEPSIdentifier, PEPSFirstname, PEPSFamilyname, PEPSDateOfBirth, null, signature, null, null, null, null, null, null, null, PEPSFiscalNumber);
 	}
 	
  	/**
@@ -1838,251 +1709,331 @@ public class AuthenticationServer implements MOAIDAuthConstants {
 	 public CreateIdentityLinkResponse getIdentityLink(String eIdentifier,
  			String givenName, String lastName, String dateOfBirth, String gender,
  			String citizenSignature, String representative, String represented,
- 			String mandate, String targetType, String targetValue, String oaFriendlyName, String filters) throws SZRGWClientException {
+ 			String mandate, String targetType, String targetValue, String oaFriendlyName, List<String> filters, String PEPSFiscalNumber) throws SZRGWClientException {
  		return getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, gender,
  				citizenSignature, representative, represented, mandate, null,
- 				null, targetType, targetValue, oaFriendlyName, filters);
+ 				null, targetType, targetValue, oaFriendlyName, filters, PEPSFiscalNumber);
  	}
+	
+		/**
+		 * Gets the identity link.
+		 *
+		 * @param citizenSignature the citizen signature
+		 * @param representative the representative
+		 * @param represented the represented
+		 * @param mandate the mandate
+		 * @param organizationAddress the organization address
+		 * @param organizationType the organization type
+		 * @return the identity link
+		 * @throws SZRGWClientException 
+		 */
+		public CreateIdentityLinkResponse getIdentityLink(String citizenSignature,
+				String representative, String represented, String mandateContent,
+				String organizationAddress, String organizationType, String targetType, String targetValue, String oaFriendlyName, List<String> filters, String PEPSFiscalNumber) throws SZRGWClientException {
+			return getIdentityLink(null, null, null, null, null,
+					citizenSignature, represented, representative, mandateContent, organizationAddress,
+					organizationType, targetType, targetValue, oaFriendlyName, filters, PEPSFiscalNumber);
+		}	 
+	 
+    public CreateIdentityLinkResponse getIdentityLink(String PEPSIdentifier, String PEPSFirstname, String PEPSFamilyname, String PEPSDateOfBirth, String gender, String citizenSignature, String represented, String representative, String mandateContent, String organizationAddress, String organizationType, String targetType, String targetValue, String oaFriendlyName, List<String> filters, String PEPSFiscalNumber) throws SZRGWClientException {
 
-	/**
-	 * Starts a MOA-ID authentication process using STORK
-	 * @param req HttpServletRequest
-	 * @param resp HttpServletResponse
-	 * @param ccc Citizen country code
-	 * @param oaURL URL of the online application
-	 * @param target Target parameter
-	 * @param targetFriendlyName Friendly Name of Target
-	 * @param authURL Authentication URL
-	 * @param sourceID SourceID parameter
-	 * @throws MOAIDException
-	 * @throws AuthenticationException
-	 * @throws WrongParametersException
-	 * @throws ConfigurationException
-	 */
-	public static void startSTORKAuthentication(
-			HttpServletRequest req,
-			HttpServletResponse resp,
-			AuthenticationSession moasession) throws MOAIDException, AuthenticationException, WrongParametersException, ConfigurationException {
-
-		if (moasession == null) {
-			throw new AuthenticationException("auth.18", new Object[] { });
-		}
-
-		//read configuration paramters of OA
-		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
-		if (oaParam == null)
-				throw new AuthenticationException("auth.00", new Object[] { moasession.getPublicOAURLPrefix() });
-
-		//Start of STORK Processing
-		STORKConfig storkConfig = AuthConfigurationProvider.getInstance().getStorkConfig();
-
-		CPEPS cpeps = storkConfig.getCPEPS(moasession.getCcc());
-
-		Logger.debug("Preparing to assemble STORK AuthnRequest witt the following values:");
-    	String destination = cpeps.getPepsURL().toExternalForm();
-    	Logger.debug("C-PEPS URL: " + destination);
-
-    	String issuerValue = AuthConfigurationProvider.getInstance().getPublicURLPrefix();
-    	String providerName= oaParam.getFriendlyName();
-    	Logger.debug("Issuer value: " + issuerValue);
-    	
-    	String acsURL = issuerValue + PEPSConnectorServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN;
-    	Logger.debug("MOA Assertion Consumer URL (PEPSConnctor): " + acsURL);
-
-    	// prepare collection of required attributes
-    	// - attributes for online application
-    	List<OAStorkAttribute> attributesFromConfig = oaParam.getRequestedAttributes();
-
-    	// - prepare attribute list
-    	PersonalAttributeList attributeList = new PersonalAttributeList();
-
-    	// - fill container
-    	for(OAStorkAttribute current : attributesFromConfig) {
-	    	PersonalAttribute newAttribute = new PersonalAttribute();
-	    	newAttribute.setName(current.getName());
-
-	    	boolean globallyMandatory = false;
-	    	for(StorkAttribute currentGlobalAttribute : storkConfig.getStorkAttributes())
-	    		if(current.getName().equals(currentGlobalAttribute.getName())) {
-	    			globallyMandatory = currentGlobalAttribute.isMandatory();
-	    			break;
-	    		}
-
-	    	newAttribute.setIsRequired(current.isMandatory() || globallyMandatory);
-	    	attributeList.add(newAttribute);
-    	}
-
-    	// add sign request
-    	PersonalAttribute newAttribute = new PersonalAttribute();
-    	newAttribute.setName("signedDoc");
-    	List<String> value = new ArrayList<String>();
-    	value.add(generateDssSignRequest(CreateXMLSignatureRequestBuilder.buildForeignIDTextToBeSigned("wie im  Signaturzertifikat (as in my signature certificate)", oaParam, moasession),
-    			"application/xhtml+xml",
-    			moasession.getCcc()));
-    	newAttribute.setValue(value);
-    	attributeList.add(newAttribute);
-
-
-		if (Logger.isDebugEnabled()) {
-			Logger.debug("The following attributes are requested for this OA:");
-			for (OAStorkAttribute logReqAttr : attributesFromConfig)
-				Logger.debug("OA specific requested attribute: " + logReqAttr.getName() + ", isRequired: " + logReqAttr.isMandatory());
-		}
-
-		//TODO: check Target in case of SSO!!
-    	String spSector = StringUtils.isEmpty(moasession.getTarget()) ? "Business" : moasession.getTarget();
-    	String spInstitution = StringUtils.isEmpty(oaParam.getFriendlyName()) ? "UNKNOWN" : oaParam.getFriendlyName();
-    	String spApplication = spInstitution;
-    	String spCountry = "AT";
-
-    	//generate AuthnRquest
-    	STORKAuthnRequest authnRequest = new STORKAuthnRequest();
-    	authnRequest.setDestination(destination);
-    	authnRequest.setAssertionConsumerServiceURL(acsURL);
-    	authnRequest.setProviderName(providerName);
-    	authnRequest.setIssuer(issuerValue);
-    	authnRequest.setQaa(oaParam.getQaaLevel());
-    	authnRequest.setSpInstitution(spInstitution);
-    	authnRequest.setCountry(spCountry);
-    	authnRequest.setSpApplication(spApplication);
-    	authnRequest.setSpSector(spSector);
-    	authnRequest.setPersonalAttributeList(attributeList);
-
-    	authnRequest.setEIDCrossBorderShare(true);
-    	authnRequest.setEIDCrossSectorShare(true);
-    	authnRequest.setEIDSectorShare(true);
-
-    	authnRequest.setCitizenCountryCode(moasession.getCcc());
-
-
-    	Logger.debug("STORK AuthnRequest succesfully assembled.");
-
-    	STORKSAMLEngine samlEngine = STORKSAMLEngine.getInstance("outgoing");
-    	try {
-    		authnRequest = samlEngine.generateSTORKAuthnRequest(authnRequest);
-    	} catch (STORKSAMLEngineException e) {
-			Logger.error("Could not sign STORK SAML AuthnRequest.", e);
-			throw new MOAIDException("stork.00", null);
-		}
-
-		Logger.info("STORK AuthnRequest successfully signed!");
-		
-    	//validate AuthnRequest
-		try {
-			samlEngine.validateSTORKAuthnRequest(authnRequest.getTokenSaml());
-		} catch (STORKSAMLEngineException e) {
-			Logger.error("STORK SAML AuthnRequest not valid.", e);
-			throw new MOAIDException("stork.01", null);
-		}	
-		
-		Logger.debug("STORK AuthnRequest successfully internally validated.");
-		
-		//send
-		moasession.setStorkAuthnRequest(authnRequest);
-		HttpSession httpSession = req.getSession();
-		httpSession.setAttribute("MOA-Session-ID", moasession.getSessionID());
-
-
-		Logger.info("Preparing to send STORK AuthnRequest.");
-		Logger.info("prepared STORKAuthnRequest: ");
-		Logger.info(new String(authnRequest.getTokenSaml()));
-
-		try {
-			Logger.trace("Initialize VelocityEngine...");
-
-			VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine();
-			Template template = velocityEngine.getTemplate("/resources/templates/saml2-post-binding-moa.vm");
-			VelocityContext context = new VelocityContext();
-			context.put("SAMLRequest", PEPSUtil.encodeSAMLToken(authnRequest.getTokenSaml()));
-			context.put("action", destination);
-
-			StringWriter writer = new StringWriter();
-			template.merge(context, writer);
-
-			resp.getOutputStream().write(writer.toString().getBytes());
-		} catch (Exception e) {
-			Logger.error("Error sending STORK SAML AuthnRequest.", e);
-			httpSession.invalidate();
-			throw new MOAIDException("stork.02", new Object[] { destination });
-		}
-
-		Logger.info("STORK AuthnRequest successfully successfully prepared for client with target location: " + authnRequest.getDestination());
-	}
-
-	private static String generateDssSignRequest(String text, String  mimeType, String citizenCountry) {
-		IdentifierGenerator idGenerator;
-		try {
-			idGenerator = new SecureRandomIdentifierGenerator();
-			
-			DocumentType doc = new DocumentType();
-			doc.setBase64XML(text.getBytes());
-			doc.setID(idGenerator.generateIdentifier());
-			
-			SignRequest request = new SignRequest();
-			request.setInputDocuments(ApiUtils.createInputDocuments(doc));
-			
-			String id = idGenerator.generateIdentifier();
-			request.setRequestID(id);
-			request.setDocUI(id);
-			
-			request.setProfile(Profiles.XADES_BES.toString());
-			request.setNumberOfSigners(BigInteger.ONE);
-			request.setTargetCountry(citizenCountry);
-
-			// no, no todo. PEPS will alter this value anyhow.
-			request.setReturnURL("http://invalid_return");
-			
-			AnyType required = new AnyType();
-			required.getAny().add(ApiUtils.createSignatureType(SignatureTypes.XMLSIG_RFC3275.toString()));
-			required.getAny().add(ApiUtils.createAdditionalProfile(AdditionalProfiles.XADES.toString()));
-			required.getAny().add(ApiUtils.createQualityRequirements(QualityLevels.QUALITYLEVEL_QUALIFIEDSIG));
-			required.getAny().add(ApiUtils.createIncludeObject(doc));
-			request.setOptionalInputs(required);
-			
-			return IOUtils.toString(ApiUtils.marshalToInputStream(request));
-		} catch (NoSuchAlgorithmException e) {
-			Logger.error("Cannot generate id", e);
-			throw new RuntimeException(e);
-		} catch (ApiUtilsException e) {
-			Logger.error("Could not create SignRequest", e);
-			throw new RuntimeException(e);
-		} catch (DOMException e) {
-			Logger.error("Could not create SignRequest", e);
-			throw new RuntimeException(e);
-		} catch (IOException e) {
-			Logger.error("Could not create SignRequest", e);
-			throw new RuntimeException(e);
-		}
-	}
-
-	/**
-	 * Extracts an X509 Certificate out of an XML signagture element
-	 * @param signedXML XML signature element
-	 * @return X509Certificate
-	 * @throws CertificateException
-	 */
-	public static X509Certificate getCertificateFromXML(Element signedXML) throws CertificateException {
-
-		NodeList nList = signedXML.getElementsByTagNameNS(Constants.DSIG_NS_URI, "X509Certificate");
-
-		String base64CertString = XMLUtil.getFirstTextValueFromNodeList(nList);
-
-		if (StringUtils.isEmpty(base64CertString)) {
-			String msg = "XML does not contain a X509Certificate element.";
-			Logger.error(msg);
-			throw new CertificateException(msg);
-		}
-
-		InputStream is = new ByteArrayInputStream(Base64.decode(base64CertString));
-
-		X509Certificate cert;
 		try {
-			cert = new X509Certificate(is);
-			return cert;
+	    	AuthConfigurationProvider authConf = AuthConfigurationProvider.getInstance();
+	    	ConnectionParameter connectionParameters = authConf.getForeignIDConnectionParameter();
 
-		} catch (Throwable e) {
-			throw new CertificateException(e);
+	    	SZRGWClient client = new SZRGWClient(connectionParameters);
+	    	 	    	
+	    	CreateIdentityLinkRequest request = new CreateIdentityLinkRequest();
+	    	request.setSignature(citizenSignature.getBytes());
+	
+            PEPSData data = new PEPSData();
+            data.setDateOfBirth(PEPSDateOfBirth);
+            data.setFamilyname(PEPSFamilyname);
+            data.setFirstname(PEPSFirstname);
+            data.setIdentifier(PEPSIdentifier);
+
+            data.setRepresentative(representative);
+            data.setRepresented(represented);
+            data.setMandateContent(mandateContent);
+
+            data.setLegalPersonCanonicalRegisteredAddress(organizationAddress);
+            data.setLegalPersonTranslatableType(organizationType);
+
+            if (null != mandateContent) {
+                MISType mis = new MISType();
+
+                Target targetObject = new Target();
+                targetObject.setType(targetType);
+                targetObject.setValue(targetValue);
+                mis.setTarget(targetObject);
+
+                mis.setOAFriendlyName(oaFriendlyName);
+
+                Filters filterObject = new Filters();
+                MandateIdentifiers mandateIds = new MandateIdentifiers();
+		        for(String current : filters)
+		        	mandateIds.getMandateIdentifier().add(current.trim());
+		    	filterObject.setMandateIdentifiers(mandateIds);
+		    	mis.setFilters(filterObject);
+
+                request.setMIS(mis);
+            }
+
+            Logger.info("Starte Kommunikation mit dem Stammzahlenregister Gateway(" + connectionParameters.getUrl() + ")...");
+            CreateIdentityLinkResponse response = client.sentCreateIDLRequest(request, connectionParameters.getUrl());
+            return response;
+            
+	    }
+	    catch (ConfigurationException e) {
+	    	Logger.warn(e);
+	    	Logger.warn(MOAIDMessageProvider.getInstance().getMessage("config.12", null ));
 		}
-	}
+	    
+	    return null;
+	
+  }
+
+    /**
+     * Starts a MOA-ID authentication process using STORK
+     *
+     * @param req                HttpServletRequest
+     * @param resp               HttpServletResponse
+     * @param ccc                Citizen country code
+     * @param oaURL              URL of the online application
+     * @param target             Target parameter
+     * @param targetFriendlyName Friendly Name of Target
+     * @param authURL            Authentication URL
+     * @param sourceID           SourceID parameter
+     * @throws MOAIDException
+     * @throws AuthenticationException
+     * @throws WrongParametersException
+     * @throws ConfigurationException
+     */
+    public static void startSTORKAuthentication(
+            HttpServletRequest req,
+            HttpServletResponse resp,
+            AuthenticationSession moasession) throws MOAIDException, AuthenticationException, WrongParametersException, ConfigurationException {
+
+        if (moasession == null) {
+            throw new AuthenticationException("auth.18", new Object[]{});
+        }
+
+        //read configuration paramters of OA
+        OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
+        if (oaParam == null)
+            throw new AuthenticationException("auth.00", new Object[]{moasession.getPublicOAURLPrefix()});
+
+        //Start of STORK Processing
+        STORKConfig storkConfig = AuthConfigurationProvider.getInstance().getStorkConfig();
+
+        CPEPS cpeps = storkConfig.getCPEPS(moasession.getCcc());
+
+        Logger.debug("Preparing to assemble STORK AuthnRequest with the following values:");
+        String destination = cpeps.getPepsURL().toExternalForm();
+        Logger.debug("C-PEPS URL: " + destination);
+
+        String acsURL = HTTPUtils.getBaseURL(req) + PEPSConnectorServlet.PEPSCONNECTOR_SERVLET_URL_PATTERN;
+        Logger.debug("MOA Assertion Consumer URL (PEPSConnctor): " + acsURL);
+
+        String providerName = oaParam.getFriendlyName();
+        String issuerValue = HTTPUtils.getBaseURL(req);
+        Logger.debug("Issuer value: " + issuerValue);
+
+        // prepare collection of required attributes
+        // - attributes for online application
+        List<OAStorkAttribute> attributesFromConfig = oaParam.getRequestedAttributes();
+
+        // - prepare attribute list
+        PersonalAttributeList attributeList = new PersonalAttributeList();
+
+        // - fill container
+        for (OAStorkAttribute current : attributesFromConfig) {
+            PersonalAttribute newAttribute = new PersonalAttribute();
+            newAttribute.setName(current.getName());
+
+            boolean globallyMandatory = false;
+            for (StorkAttribute currentGlobalAttribute : storkConfig.getStorkAttributes())
+                if (current.getName().equals(currentGlobalAttribute.getName())) {
+                    globallyMandatory = currentGlobalAttribute.isMandatory();
+                    break;
+                }
+
+            newAttribute.setIsRequired(current.isMandatory() || globallyMandatory);
+            attributeList.add(newAttribute);
+        }
+
+        // add sign request
+        PersonalAttribute newAttribute = new PersonalAttribute();
+        newAttribute.setName("signedDoc");
+        List<String> value = new ArrayList<String>();
+        value.add(generateDssSignRequest(CreateXMLSignatureRequestBuilder.buildForeignIDTextToBeSigned("wie im  Signaturzertifikat (as in my signature certificate)", oaParam, moasession),
+                "application/xhtml+xml",
+                moasession.getCcc()));
+        newAttribute.setValue(value);
+        attributeList.add(newAttribute);
+
+
+        if (Logger.isDebugEnabled()) {
+            Logger.debug("The following attributes are requested for this OA:");
+            for (OAStorkAttribute logReqAttr : attributesFromConfig)
+                Logger.debug("OA specific requested attribute: " + logReqAttr.getName() + ", isRequired: " + logReqAttr.isMandatory());
+        }
+
+        //TODO: check Target in case of SSO!!
+        String spSector = StringUtils.isEmpty(moasession.getTarget()) ? "Business" : moasession.getTarget();
+        String spInstitution = StringUtils.isEmpty(oaParam.getFriendlyName()) ? "UNKNOWN" : oaParam.getFriendlyName();
+        String spApplication = spInstitution;
+        String spCountry = "AT";
+
+        //generate AuthnRquest
+        STORKAuthnRequest authnRequest = new STORKAuthnRequest();
+        authnRequest.setDestination(destination);
+        authnRequest.setAssertionConsumerServiceURL(acsURL);
+        authnRequest.setProviderName(providerName);
+        authnRequest.setIssuer(issuerValue);
+        authnRequest.setQaa(oaParam.getQaaLevel());
+        authnRequest.setSpInstitution(spInstitution);
+        authnRequest.setCountry(spCountry);
+        authnRequest.setSpApplication(spApplication);
+        authnRequest.setSpSector(spSector);
+        authnRequest.setPersonalAttributeList(attributeList);
+
+        authnRequest.setEIDCrossBorderShare(true);
+        authnRequest.setEIDCrossSectorShare(true);
+        authnRequest.setEIDSectorShare(true);
+
+        authnRequest.setCitizenCountryCode(moasession.getCcc());
+
+
+        Logger.debug("STORK AuthnRequest succesfully assembled.");
+
+        STORKSAMLEngine samlEngine = STORKSAMLEngine.getInstance("outgoing");
+        try {
+            authnRequest = samlEngine.generateSTORKAuthnRequest(authnRequest);
+        } catch (STORKSAMLEngineException e) {
+            Logger.error("Could not sign STORK SAML AuthnRequest.", e);
+            throw new MOAIDException("stork.00", null);
+        }
+
+        Logger.info("STORK AuthnRequest successfully signed!");
+
+        //validate AuthnRequest
+        try {
+            samlEngine.validateSTORKAuthnRequest(authnRequest.getTokenSaml());
+        } catch (STORKSAMLEngineException e) {
+            Logger.error("STORK SAML AuthnRequest not valid.", e);
+            throw new MOAIDException("stork.01", null);
+        }
+
+        Logger.debug("STORK AuthnRequest successfully internally validated.");
+
+        //send
+        moasession.setStorkAuthnRequest(authnRequest);
+        HttpSession httpSession = req.getSession();
+        httpSession.setAttribute("MOA-Session-ID", moasession.getSessionID());
+
+
+        Logger.info("Preparing to send STORK AuthnRequest.");
+        Logger.info("prepared STORKAuthnRequest: ");
+        Logger.info(new String(authnRequest.getTokenSaml()));
+
+        try {
+            Logger.trace("Initialize VelocityEngine...");
+
+            VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine();
+            Template template = velocityEngine.getTemplate("/resources/templates/saml2-post-binding-moa.vm");
+            VelocityContext context = new VelocityContext();
+            context.put("SAMLRequest", PEPSUtil.encodeSAMLToken(authnRequest.getTokenSaml()));
+            context.put("action", destination);
+
+            StringWriter writer = new StringWriter();
+            template.merge(context, writer);
+
+            resp.getOutputStream().write(writer.toString().getBytes());
+        } catch (Exception e) {
+            Logger.error("Error sending STORK SAML AuthnRequest.", e);
+            httpSession.invalidate();
+            throw new MOAIDException("stork.02", new Object[]{destination});
+        }
+
+        Logger.info("STORK AuthnRequest successfully successfully prepared for client with target location: " + authnRequest.getDestination());
+    }
+
+    private static String generateDssSignRequest(String text, String mimeType, String citizenCountry) {
+        IdentifierGenerator idGenerator;
+        try {
+            idGenerator = new SecureRandomIdentifierGenerator();
+
+            DocumentType doc = new DocumentType();
+            doc.setBase64XML(text.getBytes());
+            doc.setID(idGenerator.generateIdentifier());
+
+            SignRequest request = new SignRequest();
+            request.setInputDocuments(ApiUtils.createInputDocuments(doc));
+
+            String id = idGenerator.generateIdentifier();
+            request.setRequestID(id);
+            request.setDocUI(id);
+
+            request.setProfile(Profiles.XADES_BES.toString());
+            request.setNumberOfSigners(BigInteger.ONE);
+            request.setTargetCountry(citizenCountry);
+
+            // no, no todo. PEPS will alter this value anyhow.
+            request.setReturnURL("http://invalid_return");
+
+            AnyType required = new AnyType();
+            required.getAny().add(ApiUtils.createSignatureType(SignatureTypes.XMLSIG_RFC3275.toString()));
+            required.getAny().add(ApiUtils.createAdditionalProfile(AdditionalProfiles.XADES.toString()));
+            required.getAny().add(ApiUtils.createQualityRequirements(QualityLevels.QUALITYLEVEL_QUALIFIEDSIG));
+            required.getAny().add(ApiUtils.createIncludeObject(doc));
+            request.setOptionalInputs(required);
+
+            return IOUtils.toString(ApiUtils.marshalToInputStream(request));
+        } catch (NoSuchAlgorithmException e) {
+            Logger.error("Cannot generate id", e);
+            throw new RuntimeException(e);
+        } catch (ApiUtilsException e) {
+            Logger.error("Could not create SignRequest", e);
+            throw new RuntimeException(e);
+        } catch (DOMException e) {
+            Logger.error("Could not create SignRequest", e);
+            throw new RuntimeException(e);
+        } catch (IOException e) {
+            Logger.error("Could not create SignRequest", e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    /**
+     * Extracts an X509 Certificate out of an XML signagture element
+     *
+     * @param signedXML XML signature element
+     * @return X509Certificate
+     * @throws CertificateException
+     */
+    public static X509Certificate getCertificateFromXML(Element signedXML) throws CertificateException {
+
+        NodeList nList = signedXML.getElementsByTagNameNS(Constants.DSIG_NS_URI, "X509Certificate");
+
+        String base64CertString = XMLUtil.getFirstTextValueFromNodeList(nList);
+
+        if (StringUtils.isEmpty(base64CertString)) {
+            String msg = "XML does not contain a X509Certificate element.";
+            Logger.error(msg);
+            throw new CertificateException(msg);
+        }
+
+        InputStream is = new ByteArrayInputStream(Base64.decode(base64CertString));
+
+        X509Certificate cert;
+        try {
+            cert = new X509Certificate(is);
+            return cert;
+
+        } catch (Throwable e) {
+            throw new CertificateException(e);
+        }
+    }
 
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
index bd87737ed..866c5a923 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/BPKBuilder.java
@@ -2,19 +2,19 @@
  * Copyright 2014 Federal Chancellery Austria
  * MOA-ID has been developed in a cooperation between BRZ, the Federal
  * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- * 
+ *
  * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
  * the European Commission - subsequent versions of the EUPL (the "Licence");
  * You may not use this work except in compliance with the Licence.
  * You may obtain a copy of the Licence at:
  * http://www.osor.eu/eupl/
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the Licence is distributed on an "AS IS" basis,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
- * 
+ *
  * This product combines work with different licenses. See the "NOTICE" text
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
@@ -46,91 +46,148 @@
 
 package at.gv.egovernment.moa.id.auth.builder;
 
-import java.security.MessageDigest;
-
 import at.gv.egovernment.moa.id.auth.exception.BuildException;
+import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.Constants;
 
+import java.security.MessageDigest;
+
 /**
  * Builder for the bPK, as defined in
  * <code>&quot;Ableitung f&uml;r die bereichsspezifische Personenkennzeichnung&quot;</code>
  * version <code>1.0.1</code> from <code>&quot;reference.e-government.gv.at&quot;</code>.
- *  
+ *
  * @author Paul Schamberger
  * @version $Id$
  */
 public class BPKBuilder {
 
-  /**
-   * Builds the bPK from the given parameters. 
-   * @param identificationValue Base64 encoded "Stammzahl" 
-   * @param target "Bereich lt. Verordnung des BKA"
-   * @return bPK in a BASE64 encoding
-   * @throws BuildException if an error occurs on building the bPK
-   */
-  public String buildBPK(String identificationValue, String target) 
-    throws BuildException {
-    
-    if ((identificationValue == null || 
-         identificationValue.length() == 0 ||
-    		 target == null || 
-         target.length() == 0)) 
-    {
-      throw new BuildException("builder.00", 
-      		                     new Object[] {"BPK", "Unvollständige Parameterangaben: identificationValue=" + 
-                                             identificationValue + ",target=" + target});
+    /**
+     * Builds the bPK from the given parameters.
+     *
+     * @param identificationValue Base64 encoded "Stammzahl"
+     * @param target              "Bereich lt. Verordnung des BKA"
+     * @return bPK in a BASE64 encoding
+     * @throws BuildException if an error occurs on building the bPK
+     */
+    public String buildBPK(String identificationValue, String target)
+            throws BuildException {
+
+        if ((identificationValue == null ||
+                identificationValue.length() == 0 ||
+                target == null ||
+                target.length() == 0)) {
+            throw new BuildException("builder.00",
+                    new Object[]{"BPK", "Unvollständige Parameterangaben: identificationValue=" +
+                            identificationValue + ",target=" + target});
+        }
+        String basisbegriff;
+        if (target.startsWith(Constants.URN_PREFIX_CDID + "+"))
+            basisbegriff = identificationValue + "+" + target;
+        else
+            basisbegriff = identificationValue + "+" + Constants.URN_PREFIX_CDID + "+" + target;
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            byte[] hash = md.digest(basisbegriff.getBytes("ISO-8859-1"));
+            String hashBase64 = Base64Utils.encode(hash);
+            return hashBase64;
+        } catch (Exception ex) {
+            throw new BuildException("builder.00", new Object[]{"bPK", ex.toString()}, ex);
+        }
     }
-    String basisbegriff;
-	if (target.startsWith(Constants.URN_PREFIX_CDID + "+"))
-		basisbegriff = identificationValue + "+" + target;
-	else
-		basisbegriff = identificationValue + "+" + Constants.URN_PREFIX_CDID + "+" + target;
-	
-    try {
-      MessageDigest md = MessageDigest.getInstance("SHA-1");
-      byte[] hash = md.digest(basisbegriff.getBytes("ISO-8859-1"));
-      String hashBase64 = Base64Utils.encode(hash);
-      return hashBase64;
-    } catch (Exception ex) {
-      throw new BuildException("builder.00", new Object[] {"bPK", ex.toString()}, ex);
+
+    /**
+     * Builds the wbPK from the given parameters.
+     *
+     * @param identificationValue Base64 encoded "Stammzahl"
+     * @param registerAndOrdNr    type of register + "+" + number in register.
+     * @return wbPK in a BASE64 encoding
+     * @throws BuildException if an error occurs on building the wbPK
+     */
+    public String buildWBPK(String identificationValue, String registerAndOrdNr)
+            throws BuildException {
+
+        if ((identificationValue == null ||
+                identificationValue.length() == 0 ||
+                registerAndOrdNr == null ||
+                registerAndOrdNr.length() == 0)) {
+            throw new BuildException("builder.00",
+                    new Object[]{"wbPK", "Unvollständige Parameterangaben: identificationValue=" +
+                            identificationValue + ",Register+Registernummer=" + registerAndOrdNr});
+        }
+
+        String basisbegriff;
+        if (registerAndOrdNr.startsWith(Constants.URN_PREFIX_WBPK + "+"))
+            basisbegriff = identificationValue + "+" + registerAndOrdNr;
+        else
+            basisbegriff = identificationValue + "+" + Constants.URN_PREFIX_WBPK + "+" + registerAndOrdNr;
+
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            byte[] hash = md.digest(basisbegriff.getBytes("ISO-8859-1"));
+            String hashBase64 = Base64Utils.encode(hash);
+            return hashBase64;
+        } catch (Exception ex) {
+            throw new BuildException("builder.00", new Object[]{"wbPK", ex.toString()}, ex);
+        }
     }
-  }
-
-  /**
-   * Builds the wbPK from the given parameters. 
-   * @param identificationValue Base64 encoded "Stammzahl" 
-   * @param registerAndOrdNr type of register + "+" + number in register.
-   * @return wbPK in a BASE64 encoding
-   * @throws BuildException if an error occurs on building the wbPK
-   */
-  public String buildWBPK(String identificationValue, String registerAndOrdNr) 
-    throws BuildException {
-    
-    if ((identificationValue == null || 
-         identificationValue.length() == 0 ||
-         registerAndOrdNr == null || 
-         registerAndOrdNr.length() == 0)) 
-    {
-      throw new BuildException("builder.00", 
-          new Object[] {"wbPK", "Unvollständige Parameterangaben: identificationValue=" + 
-                        identificationValue + ",Register+Registernummer=" + registerAndOrdNr});
+
+    /**
+     * Builds the storkeid from the given parameters.
+     *
+     * @param identificationValue Base64 encoded "Stammzahl"
+     * @param destinationCountry  destination country code (2 chars)
+     * @return storkid in a BASE64 encoding
+     * @throws BuildException if an error occurs on building the wbPK
+     */
+    public String buildStorkbPK(String identificationValue, String destinationCountry)
+            throws BuildException {
+        return buildStorkbPK(identificationValue, "AT", destinationCountry);
     }
-     
-    String basisbegriff;
-    if (registerAndOrdNr.startsWith(Constants.URN_PREFIX_WBPK + "+" ))
-    	basisbegriff = identificationValue + "+" + registerAndOrdNr;
-    else
-    	basisbegriff = identificationValue + "+" + Constants.URN_PREFIX_WBPK + "+" + registerAndOrdNr;
-    
-    try {
-      MessageDigest md = MessageDigest.getInstance("SHA-1");
-      byte[] hash = md.digest(basisbegriff.getBytes("ISO-8859-1"));
-      String hashBase64 = Base64Utils.encode(hash);
-      return hashBase64;
-    } catch (Exception ex) {
-      throw new BuildException("builder.00", new Object[] {"wbPK", ex.toString()}, ex);
+
+
+    /**
+     * Builds the storkeid from the given parameters.
+     *
+     * @param identificationValue Base64 encoded "Stammzahl"
+     * @param sourceCountry       source country code (2 chars)
+     * @param destinationCountry  destination country code (2 chars)
+     * @return storkid in a BASE64 encoding
+     * @throws BuildException if an error occurs on building the wbPK
+     */
+    public String buildStorkbPK(String identificationValue, String sourceCountry, String destinationCountry)
+            throws BuildException {
+
+        if ((identificationValue == null ||
+                identificationValue.length() == 0 ||
+                destinationCountry == null ||
+                destinationCountry.length() == 0 ||
+                sourceCountry == null ||
+                sourceCountry.length() == 0)) {
+            throw new BuildException("builder.00",
+                    new Object[]{"storkid", "Unvollständige Parameterangaben: identificationValue=" +
+                            identificationValue + ", Zielland=" + destinationCountry + ", Ursprungsland=" + sourceCountry});
+        }
+        Logger.info("Building STORK identification from: " + sourceCountry+"/"+destinationCountry+"/" + "[identValue]");
+        String eIdentifier = sourceCountry+"/"+destinationCountry+"/"+identificationValue;
+
+        /* Commented - it is already done by BKU, we need only to add Stork values
+        String basisbegriff = identificationValue + "+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry;
+        Logger.info("Building STORK identification from: [identValue]+" + Constants.URN_PREFIX_STORK + "+" + sourceCountry + "+" + destinationCountry);
+        try {
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
+            byte[] hash = md.digest(basisbegriff.getBytes("ISO-8859-1"));
+            String hashBase64 = Base64Utils.encode(hash);
+            Logger.info("STORK identification defined as: " + hashBase64);
+            return hashBase64;
+        } catch (Exception ex) {
+            throw new BuildException("builder.00", new Object[]{"storkid", ex.toString()}, ex);
+        }
+        */
+        return eIdentifier;
     }
-  }
+
 
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java
index e7e1e5cbd..f4b5cb4c9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/CreateXMLSignatureRequestBuilderForeign.java
@@ -144,7 +144,7 @@ public class CreateXMLSignatureRequestBuilderForeign extends Builder {
         else if (ch == '<')

           out.write("&lt;");

         else if (ch == '>')

-          out.write("&gt;");

+          out.write("&gt;"); 

         else if (ch == 'ä')

           out.write("&auml;");

         else if (ch == 'ö')

@@ -164,7 +164,7 @@ public class CreateXMLSignatureRequestBuilderForeign extends Builder {
       }

     }

     catch (IOException ex) {

-      throw new BuildException("builder.00", new Object[] {"GetIdentityLinkForm", ex.toString()});

+      throw new BuildException("builder.00", new Object[] {"CreateXMLSignatureRequest", ex.toString()});

     }

     return out.toString();

   }

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
index c09cde787..ab93f509c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/GetIdentityLinkFormBuilder.java
@@ -212,28 +212,29 @@ public class GetIdentityLinkFormBuilder extends Builder {
     StringWriter out = new StringWriter();
     try {
       for (int ch = in.read(); ch >= 0; ch = in.read()) {
-        if (ch == '"')
+        if (ch == '"') {
           out.write("&quot;");
-        else if (ch == '<')
+        } else if (ch == '<') {
           out.write("&lt;");
-        else if (ch == '>')
+        } else if (ch == '>') {
           out.write("&gt;");
-        else if (ch == 'ä')
+    	} else if (ch == 'ä') {
           out.write("&auml;");
-        else if (ch == 'ö')
+  		} else if (ch == 'ö') {
           out.write("&ouml;");
-        else if (ch == 'ü')
+		} else if (ch == 'ü') {
           out.write("&uuml;");
-        else if (ch == 'Ä')
+		} else if (ch == 'Ä') {
           out.write("&Auml;");
-        else if (ch == 'Ö')
+		} else if (ch == 'Ö') {
           out.write("&Ouml;");
-        else if (ch == 'Ü')
+		} else if (ch == 'Ü') {
           out.write("&Uuml;");
-        else if (ch == 'ß')
+		} else if (ch == 'ß') {
           out.write("&szlig;");
-        else
+		} else  {
           out.write(ch);
+		}
       }
     }
     catch (IOException ex) {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
index 828fc78ab..81ef5e408 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/InfoboxReadRequestBuilder.java
@@ -2,19 +2,19 @@
  * Copyright 2014 Federal Chancellery Austria
  * MOA-ID has been developed in a cooperation between BRZ, the Federal
  * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- * 
+ *
  * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
  * the European Commission - subsequent versions of the EUPL (the "Licence");
  * You may not use this work except in compliance with the Licence.
  * You may obtain a copy of the Licence at:
  * http://www.osor.eu/eupl/
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the Licence is distributed on an "AS IS" basis,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
- * 
+ *
  * This product combines work with different licenses. See the "NOTICE" text
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
@@ -46,87 +46,150 @@
 
 package at.gv.egovernment.moa.id.auth.builder;
 
+import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Constants;
 
 /**
  * Builder for the <code>&lt;InfoboxReadRequest&gt;</code> structure
  * used for requesting the identity link from the security layer implementation.
- * 
+ *
  * @author Paul Ivancsics
  * @version $Id$
  */
 public class InfoboxReadRequestBuilder implements Constants {
 
 
-  /**
-   * Constructor for InfoboxReadRequestBuilder.
-   */
-  public InfoboxReadRequestBuilder() {
-  }
-   
-  
-  /**
-   * Builds an <code>&lt;InfoboxReadRequest&gt;</code>.
-   * 
-   * @param slVersion12           specifies whether the Security Layer version is
-   *                              version 1.2 or not
-   * @param businessService       specifies whether the online application is a
-   *                              business service or not
-   * @param identityLinkDomainIdentifier  the identification number of the business 
-   *                              company; maybe <code>null</code> if the OA
-   *                              is a public service; must not be <code>null</code>
-   *                              if the OA is a business service
-   * 
-   * @return <code>&lt;InfoboxReadRequest&gt;</code> as String
-   */
-  public String build(boolean businessService, String identityLinkDomainIdentifier) {
-    
-    String slPrefix;
-    String slNsDeclaration;
-    
+    /**
+     * Constructor for InfoboxReadRequestBuilder.
+     */
+    public InfoboxReadRequestBuilder() {
+    }
+
+
+    /**
+     * Builds an <code>&lt;InfoboxReadRequest&gt;</code>.
+     *
+     * @param slVersion12                  specifies whether the Security Layer version is
+     *                                     version 1.2 or not
+     * @param businessService              specifies whether the online application is a
+     *                                     business service or not
+     * @param identityLinkDomainIdentifier the identification number of the business
+     *                                     company; maybe <code>null</code> if the OA
+     *                                     is a public service; must not be <code>null</code>
+     *                                     if the OA is a business service
+     * @return <code>&lt;InfoboxReadRequest&gt;</code> as String
+     */
+    public String build(boolean businessService, String identityLinkDomainIdentifier) {
+        Logger.info("Building InfoBoxReadRequest");
+        String slPrefix;
+        String slNsDeclaration;
+
 //    if (slVersion12) {
-      slPrefix = SL12_PREFIX;
-      slNsDeclaration = SL12_NS_URI;
+        slPrefix = SL12_PREFIX;
+        slNsDeclaration = SL12_NS_URI;
 //    } else {
 //      slPrefix = SL10_PREFIX;
 //      slNsDeclaration = SL10_NS_URI;
 //    }
-        
-    StringBuffer sb = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
-    sb.append("<");
-    sb.append(slPrefix);
-    sb.append(":InfoboxReadRequest xmlns:");
-    sb.append(slPrefix);
-    sb.append("=\"");
-    sb.append(slNsDeclaration);
-    sb.append("\">");
-    sb.append("<");
-    sb.append(slPrefix);
-    sb.append(":InfoboxIdentifier>IdentityLink</");
-    sb.append(slPrefix);
-    sb.append(":InfoboxIdentifier>");
-    sb.append("<");
-    sb.append(slPrefix);
-    sb.append(":BinaryFileParameters ContentIsXMLEntity=\"true\"/>");
-    if (businessService) {
-      sb.append("<");
-      sb.append(slPrefix);
-      sb.append(":BoxSpecificParameters>");
-      sb.append("<");
-      sb.append(slPrefix);
-      sb.append(":IdentityLinkDomainIdentifier>");
-      sb.append(identityLinkDomainIdentifier);
-      sb.append("</sl:IdentityLinkDomainIdentifier>");
-      sb.append("</");
-      sb.append(slPrefix);
-      sb.append(":BoxSpecificParameters>");
+
+        StringBuffer sb = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
+        sb.append("<");
+        sb.append(slPrefix);
+        sb.append(":InfoboxReadRequest xmlns:");
+        sb.append(slPrefix);
+        sb.append("=\"");
+        sb.append(slNsDeclaration);
+        sb.append("\">");
+        sb.append("<");
+        sb.append(slPrefix);
+        sb.append(":InfoboxIdentifier>IdentityLink</");
+        sb.append(slPrefix);
+        sb.append(":InfoboxIdentifier>");
+        sb.append("<");
+        sb.append(slPrefix);
+        sb.append(":BinaryFileParameters ContentIsXMLEntity=\"true\"/>");
+        if (businessService) {
+            sb.append("<");
+            sb.append(slPrefix);
+            sb.append(":BoxSpecificParameters>");
+            sb.append("<");
+            sb.append(slPrefix);
+            sb.append(":IdentityLinkDomainIdentifier>");
+            sb.append(identityLinkDomainIdentifier);
+            sb.append("</sl:IdentityLinkDomainIdentifier>");
+            sb.append("</");
+            sb.append(slPrefix);
+            sb.append(":BoxSpecificParameters>");
+        }
+        sb.append("</");
+        sb.append(slPrefix);
+        sb.append(":InfoboxReadRequest>");
+
+        return sb.toString();
+
+    }
+
+
+    /**
+     * Builds an <code>&lt;InfoboxReadRequest&gt;</code>.
+     *
+     * @param slVersion12                  specifies whether the Security Layer version is
+     *                                     version 1.2 or not
+     * @param businessService              specifies whether the online application is a
+     *                                     business service or not
+     * @param identityLinkDomainIdentifier the identification number of the business
+     *                                     company; maybe <code>null</code> if the OA
+     *                                     is a public service; must not be <code>null</code>
+     *                                     if the OA is a business service
+     * @return <code>&lt;InfoboxReadRequest&gt;</code> as String
+     *
+     */
+    public String buildStorkReadRequest(String identityLinkDomainIdentifier) {
+        Logger.info("Building Stork InfoBoxReadRequest for " + identityLinkDomainIdentifier);
+
+        String slPrefix;
+        String slNsDeclaration;
+
+        slPrefix = SL12_PREFIX;
+        slNsDeclaration = SL12_NS_URI;
+
+        StringBuffer sb = new StringBuffer("<?xml version=\"1.0\" encoding=\"UTF-8\" ?>");
+        sb.append("<");
+        sb.append(slPrefix);
+        sb.append(":InfoboxReadRequest xmlns:");
+        sb.append(slPrefix);
+        sb.append("=\"");
+        sb.append(slNsDeclaration);
+        sb.append("\">");
+        sb.append("<");
+        sb.append(slPrefix);
+        sb.append(":InfoboxIdentifier>IdentityLink</");
+        sb.append(slPrefix);
+        sb.append(":InfoboxIdentifier>");
+        sb.append("<");
+        sb.append(slPrefix);
+        sb.append(":BinaryFileParameters ContentIsXMLEntity=\"true\"/>");
+
+        // append box parameters - necessary for stork?
+        sb.append("<");
+        sb.append(slPrefix);
+        sb.append(":BoxSpecificParameters>");
+        sb.append("<");
+        sb.append(slPrefix);
+        sb.append(":IdentityLinkDomainIdentifier>");
+        sb.append(identityLinkDomainIdentifier);
+        sb.append("</sl:IdentityLinkDomainIdentifier>");
+        sb.append("</");
+        sb.append(slPrefix);
+        sb.append(":BoxSpecificParameters>");
+        // end appending box parameters
+
+        sb.append("</");
+        sb.append(slPrefix);
+        sb.append(":InfoboxReadRequest>");
+
+        return sb.toString();
+
     }
-    sb.append("</");
-    sb.append(slPrefix);
-    sb.append(":InfoboxReadRequest>");
-    
-    return sb.toString();
-       
-  }
 
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/RedirectFormBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/RedirectFormBuilder.java
index e2a736330..2a5c8d418 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/RedirectFormBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/RedirectFormBuilder.java
@@ -31,7 +31,8 @@ import at.gv.egovernment.moa.logging.Logger;
 
 public class RedirectFormBuilder {
 	
-	private static String URL = "#URL#";	
+	private static String URL = "#URL#";
+	private static String TARGET = "#TARGET#";
 	private static String template;
 
 	private static String getTemplate() {
@@ -53,9 +54,10 @@ public class RedirectFormBuilder {
 		return template;
 	}
 
-	public static String buildLoginForm(String url) {
+	public static String buildLoginForm(String url, String redirectTarget) {
 		String value = getTemplate();
 		value = value.replace(URL, url);
+		value = value.replace(TARGET, redirectTarget);
 		
 		return value;
 	}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
index 896feed9e..2a6bde1e8 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/data/AuthenticationSession.java
@@ -220,6 +220,8 @@ public class AuthenticationSession implements Serializable {
 	 */
 	private STORKAuthnRequest storkAuthnRequest;
 	
+	private String storkAuthnResponse;
+	
 	// private AuthenticationData authData;
 	
 	// protocol selection
@@ -1022,6 +1024,21 @@ public class AuthenticationSession implements Serializable {
 		QAALevel = qAALevel;
 	}
 
+	/**
+	 * @return the storkAuthnResponse
+	 */
+	public String getStorkAuthnResponse() {
+		return storkAuthnResponse;
+	}
+
+	/**
+	 * @param storkAuthnResponse the storkAuthnResponse to set
+	 */
+	public void setStorkAuthnResponse(String storkAuthnResponse) {
+		this.storkAuthnResponse = storkAuthnResponse;
+	}
+
+	
 	
 	
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java
index d6d22fe4a..479775dd5 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/invoke/SignatureVerificationInvoker.java
@@ -110,9 +110,11 @@ public class SignatureVerificationInvoker {
       authConnParam = authConfigProvider.getMoaSpConnectionParameter();
       //If the ConnectionParameter do NOT exist, we try to get the api to work....
       if (authConnParam != null) {
+        Logger.debug("Connecting using auth url: " + authConnParam.getUrl() + ", service " + serviceName.getNamespaceURI() + " : " + serviceName.getLocalPart() + " : "+ serviceName.getPrefix());
         endPoint = authConnParam.getUrl();
         call.setTargetEndpointAddress(endPoint);
         responses = (Vector) call.invoke(serviceName, params);
+        Logger.debug("Got responses: " + responses.size()); // TODO handle axis 302 response when incorrect service url is used
         response = (SOAPBodyElement) responses.get(0);
         return response.getAsDOM();
       }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
index f4212cc78..5ad937b2a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetForeignIDServlet.java
@@ -67,6 +67,7 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.data.CreateXMLSignatureResponse;

 import at.gv.egovernment.moa.id.auth.data.IdentityLink;

 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;

+import at.gv.egovernment.moa.id.auth.exception.ParseException;

 import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;

 import at.gv.egovernment.moa.id.auth.parser.CreateXMLSignatureResponseParser;

 import at.gv.egovernment.moa.id.auth.parser.IdentityLinkAssertionParser;

@@ -169,13 +170,29 @@ public class GetForeignIDServlet extends AuthServlet {
 

 	    	session = AuthenticationServer.getSession(sessionID);

 	    	

-	    	

+			//change MOASessionID

+		    sessionID = AuthenticationSessionStoreage.changeSessionID(session);

 	    	

 	    	Logger.debug(xmlCreateXMLSignatureResponse);

 	    	

 	    	CreateXMLSignatureResponse csresp =

 	    	      new CreateXMLSignatureResponseParser(xmlCreateXMLSignatureResponse).parseResponseDsig();

 

+			try {

+				String serializedAssertion = DOMUtils.serializeNode(csresp

+						.getSamlAssertion());

+				session.setAuthBlock(serializedAssertion);

+				

+			} catch (TransformerException e) {

+				throw new ParseException("parser.04", new Object[] {

+						REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE });

+				

+			} catch (IOException e) {

+				throw new ParseException("parser.04", new Object[] {

+						REQ_VERIFY_AUTH_BLOCK, PARAM_XMLRESPONSE });

+				

+			}

+	    	

 	    	Element signature = csresp.getDsigSignature();

 	    	

 	    	try {

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
index 8bf437cca..5733cee85 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/GetMISSessionIDServlet.java
@@ -174,6 +174,9 @@ public class GetMISSessionIDServlet extends AuthServlet {
 			
 			session = AuthenticationServer.getSession(sessionID);
 
+			//change MOASessionID
+		    sessionID = AuthenticationSessionStoreage.changeSessionID(session);
+			
 			String misSessionID = session.getMISSessionID();
 
 			AuthConfigurationProvider authConf = AuthConfigurationProvider
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java
index f3495966a..800393b30 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/LogOutServlet.java
@@ -54,12 +54,14 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import at.gv.egovernment.moa.id.auth.MOAIDAuthInitializer;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.moduls.AuthenticationManager;
 import at.gv.egovernment.moa.id.moduls.RequestStorage;
 import at.gv.egovernment.moa.id.moduls.SSOManager;
 import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
 import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 public class LogOutServlet extends AuthServlet {
 
@@ -80,6 +82,11 @@ public class LogOutServlet extends AuthServlet {
 		//get SSO token from request
 		String ssoid = ssomanager.getSSOSessionID(req);
 		
+		if (MiscUtil.isEmpty(redirectUrl))
+			//set default redirect Target
+			Logger.debug("Set default RedirectURL back to MOA-ID-Auth");
+			redirectUrl = AuthConfigurationProvider.getInstance().getPublicURLPrefix();
+		
 		if (ssomanager.isValidSSOSession(ssoid, req)) {
 	
 			//TODO: Single LogOut Implementation
@@ -88,8 +95,7 @@ public class LogOutServlet extends AuthServlet {
 			AuthenticationManager authmanager = AuthenticationManager.getInstance();
 			String moasessionid = AuthenticationSessionStoreage.getMOASessionID(ssoid);
 	
-			RequestStorage.removePendingRequest(RequestStorage.getPendingRequest(req.getSession()), 
-					AuthenticationSessionStoreage.getPendingRequestID(moasessionid));
+			RequestStorage.removePendingRequest(AuthenticationSessionStoreage.getPendingRequestID(moasessionid));
 			
 			authmanager.logout(req, resp, moasessionid);
 			Logger.info("User with SSO Id " + ssoid + " is logged out and get redirect to "+ redirectUrl);
@@ -105,7 +111,7 @@ public class LogOutServlet extends AuthServlet {
 	}
 		
 	//Redirect to Application
-    resp.setStatus(301);
+    resp.setStatus(302);
     resp.addHeader("Location", redirectUrl);
   }
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
index b356c6f35..328a441cd 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
@@ -26,10 +26,8 @@ import iaik.x509.X509Certificate;
 import java.io.IOException;

 import java.io.InputStream;

 import java.io.StringWriter;

-import java.net.URL;

 import java.util.ArrayList;

-import java.util.List;

-

+import javax.activation.DataSource;

 import javax.servlet.ServletException;

 import javax.servlet.http.HttpServlet;

 import javax.servlet.http.HttpServletRequest;

@@ -40,6 +38,7 @@ import javax.xml.bind.JAXBElement;
 import javax.xml.transform.stream.StreamSource;

 

 import org.apache.commons.io.IOUtils;

+import org.apache.commons.lang.StringEscapeUtils;

 import org.apache.velocity.Template;

 import org.apache.velocity.VelocityContext;

 import org.apache.velocity.app.VelocityEngine;

@@ -51,9 +50,10 @@ import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.data.IdentityLink;

 import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;

 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;

+import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;

 import at.gv.egovernment.moa.id.auth.stork.STORKException;

 import at.gv.egovernment.moa.id.auth.stork.STORKResponseProcessor;

-import at.gv.egovernment.moa.id.auth.stork.VelocityProvider;

+import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;

 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;

 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;

 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;

@@ -61,13 +61,17 @@ import at.gv.egovernment.moa.id.moduls.ModulUtils;
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;

 import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;

 import at.gv.egovernment.moa.id.util.HTTPUtils;

+import at.gv.egovernment.moa.id.util.ParamValidatorUtils;

+import at.gv.egovernment.moa.id.util.VelocityProvider;

 import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.util.StringUtils;

 import at.gv.util.xsd.xmldsig.SignatureType;

 import at.gv.util.xsd.xmldsig.X509DataType;

 import eu.stork.oasisdss.api.ApiUtils;

-import eu.stork.oasisdss.profile.DocumentWithSignature;

+import eu.stork.oasisdss.api.LightweightSourceResolver;

+import eu.stork.oasisdss.api.exceptions.ApiUtilsException;

 import eu.stork.oasisdss.profile.SignResponse;

+import eu.stork.peps.auth.commons.IPersonalAttributeList;

 import eu.stork.peps.auth.commons.PEPSUtil;

 import eu.stork.peps.auth.commons.PersonalAttribute;

 import eu.stork.peps.auth.commons.STORKAuthnRequest;

@@ -111,17 +115,28 @@ public class PEPSConnectorServlet extends AuthServlet {
 			super.checkIfHTTPisAllowed(request.getRequestURL().toString());

 			

 			Logger.debug("Trying to find MOA Session-ID");			

-			HttpSession httpSession = request.getSession();

-			String moaSessionID = (String) httpSession.getAttribute("MOA-Session-ID");

+		    String moaSessionID = request.getParameter(PARAM_SESSIONID);

+	           

+		    // escape parameter strings

+		    moaSessionID= StringEscapeUtils.escapeHtml(moaSessionID);

 			

 			if (StringUtils.isEmpty(moaSessionID)) {

 				//No authentication session has been started before

 				Logger.error("MOA-SessionID was not found, no previous AuthnRequest had been started");

 				throw new AuthenticationException("auth.02", new Object[] { moaSessionID });

 			}

-			

+

+	         if (!ParamValidatorUtils.isValidSessionID(moaSessionID))

+	             throw new WrongParametersException("VerifyAuthenticationBlock", PARAM_SESSIONID, "auth.12");

+

 			pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(moaSessionID);

 			

+			//load MOASession from database

+			AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID);

+			

+			//change MOASessionID

+			moaSessionID = AuthenticationSessionStoreage.changeSessionID(moaSession);

+			

 			Logger.info("Found MOA sessionID: " + moaSessionID);

 			

 			Logger.debug("Beginning to extract SAMLResponse out of HTTP Request");

@@ -162,10 +177,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 			}

 			

 			Logger.info("Got SAML response with authentication success message.");

-			

-			//check if authentication request was created before

-			AuthenticationSession moaSession = AuthenticationServer.getSession(moaSessionID);

-			

+						

 			Logger.debug("MOA session is still valid");

 			

 			STORKAuthnRequest storkAuthnRequest = moaSession.getStorkAuthnRequest();

@@ -179,7 +191,15 @@ public class PEPSConnectorServlet extends AuthServlet {
 

 			////////////// incorporate gender from parameters if not in stork response

 			

-			PersonalAttribute gender = authnResponse.getPersonalAttributeList().get("gender");

+			IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList();

+			

+			// but first, check if we have a representation case

+			if(STORKResponseProcessor.hasAttribute("mandateContent", attributeList) || STORKResponseProcessor.hasAttribute("representative", attributeList) || STORKResponseProcessor.hasAttribute("represented", attributeList)) {

+				// in a representation case...

+				moaSession.setUseMandate("true");

+				

+				// and check if we have the gender value

+			PersonalAttribute gender = attributeList.get("gender");

 			if(null == gender) {

 				String gendervalue = (String) request.getParameter("gender");

 				if(null != gendervalue) {

@@ -192,6 +212,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 					authnResponse.getPersonalAttributeList().add(gender);

 				}

 			}

+			}

 			

 			//////////////////////////////////////////////////////////////////////////

 			

@@ -202,17 +223,15 @@ public class PEPSConnectorServlet extends AuthServlet {
 				String signatureInfo = authnResponse.getPersonalAttributeList().get("signedDoc").getValue().get(0);

 				SignResponse dssSignResponse = (SignResponse) ApiUtils.unmarshal(new StreamSource(new java.io.StringReader(signatureInfo)));

 				

-				List<DocumentWithSignature> doclocations = ApiUtils.findNamedElement(dssSignResponse.getOptionalOutputs(), DocumentWithSignature.class.getSimpleName(), DocumentWithSignature.class);

-				// TODO handle multiple docs?

-				Logger.debug("trying first doclocation");

-				String docUrl = doclocations.get(0).getDocument().getDocumentURL();

-				Logger.debug("trying first doclocation successful");

-				

 				// fetch signed doc

-				URL url = new URL(docUrl);

-				InputStream incomming = url.openStream();

-				citizenSignature = IOUtils.toString(incomming);

-				incomming.close();

+				DataSource ds = LightweightSourceResolver.getDataSource(dssSignResponse);

+				if(ds == null){

+					throw new ApiUtilsException("No datasource found in response");

+				}				

+				

+				InputStream incoming  = ds.getInputStream();

+				citizenSignature = IOUtils.toString(incoming);

+				incoming.close();

 				

 				JAXBContext ctx = JAXBContext.newInstance(SignatureType.class.getPackage().getName());

 				SignatureType root = ((JAXBElement<SignatureType>) ctx.createUnmarshaller().unmarshal(IOUtils.toInputStream(citizenSignature))).getValue();

@@ -298,7 +317,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 						response.getOutputStream().write(writer.toString().getBytes());

 					} catch (Exception e1) {

 						Logger.error("Error sending gender retrival form.", e1);

-						httpSession.invalidate();

+//						httpSession.invalidate();

 						throw new MOAIDException("stork.10", null);

 					}

 					

@@ -320,6 +339,9 @@ public class PEPSConnectorServlet extends AuthServlet {
 			Logger.debug("Adding addtional STORK attributes to MOA session");

 			moaSession.setStorkAttributes(authnResponse.getPersonalAttributeList());

 			

+			Logger.debug("Add full STORK AuthnResponse to MOA session");

+			moaSession.setStorkAuthnResponse(request.getParameter("SAMLResponse"));

+			

 			//We don't have BKUURL, setting from null to "Not applicable"

 			moaSession.setBkuURL("Not applicable (STORK Authentication)");

 

@@ -331,6 +353,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 			

 			//TODO: found better solution, but QAA Level in response could be not supported yet

 			try {

+

 				moasession.setQAALevel(authnResponse.getAssertions().get(0).

 						getAuthnStatements().get(0).getAuthnContext().

 						getAuthnContextClassRef().getAuthnContextClassRef());

@@ -365,6 +388,10 @@ public class PEPSConnectorServlet extends AuthServlet {
 			handleError(null, e, request, response, pendingRequestID);

 		}

 		

+	    finally {

+	    	ConfigurationDBUtils.closeSession();

+	    }

+		

 	}

 

 }

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java
index 7c51e7d6b..671151bbe 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/RedirectServlet.java
@@ -30,6 +30,9 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import at.gv.egovernment.moa.id.auth.builder.RedirectFormBuilder;
+import at.gv.egovernment.moa.id.commons.db.ConfigurationDBRead;
+import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
+import at.gv.egovernment.moa.id.commons.db.dao.config.OnlineApplication;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.MiscUtil;
 import at.gv.egovernment.moa.util.URLEncoder;
@@ -45,12 +48,45 @@ public class RedirectServlet extends AuthServlet{
 	
 	protected void doGet(HttpServletRequest req, HttpServletResponse resp)
 			throws ServletException, IOException {
-		Logger.info("Receive " + RedirectServlet.class + " Request");
+		Logger.debug("Receive " + RedirectServlet.class + " Request");
 		
 		String url = req.getParameter(REDIRCT_PARAM_URL);
 		String target = req.getParameter(PARAM_TARGET);
 		String artifact = req.getParameter(PARAM_SAMLARTIFACT);
 		
+		if (MiscUtil.isEmpty(artifact)) {
+			resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Parameters not valid");
+			return;
+		}
+		
+		Logger.debug("Check URL against online-applications");
+		OnlineApplication oa = null;
+		String redirectTarget = "_parent";
+		try {
+			oa = ConfigurationDBRead.getActiveOnlineApplication(url);			
+			if (oa == null) {		
+				resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Parameters not valid");
+				return;
+				
+			} else {
+				try {
+					redirectTarget = oa.getAuthComponentOA().getTemplates().getBKUSelectionCustomization().getAppletRedirectTarget();
+					
+				} catch (Exception e) {
+					Logger.debug("Use default redirectTarget.");
+				}
+				
+			}
+			
+		} catch (Throwable e) {
+			resp.sendError(HttpServletResponse.SC_FORBIDDEN, "Request not allowed.");
+			return;
+						
+		} finally {
+			ConfigurationDBUtils.closeSession();
+			
+		}
+					
 		Logger.info("Redirect to " + url);
 		
 		if (MiscUtil.isNotEmpty(target)) {
@@ -65,12 +101,15 @@ public class RedirectServlet extends AuthServlet{
 				URLEncoder.encode(artifact, "UTF-8"));
 		url = resp.encodeRedirectURL(url);
 		
-		String redirect_form = RedirectFormBuilder.buildLoginForm(url);
+		String redirect_form = RedirectFormBuilder.buildLoginForm(url, redirectTarget);
 		
 		resp.setContentType("text/html;charset=UTF-8");
 		PrintWriter out = new PrintWriter(resp.getOutputStream()); 
 		out.write(redirect_form);
 		out.flush();
+		
+
 	}
+	
 
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
index 4f722c8b3..2b46c8ff2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyAuthenticationBlockServlet.java
@@ -50,6 +50,7 @@ import iaik.pki.PKIException;
 
 import java.io.IOException;
 import java.security.GeneralSecurityException;
+import java.util.List;
 import java.util.Map;
 
 import javax.net.ssl.SSLSocketFactory;
@@ -174,9 +175,8 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 
 		// escape parameter strings
 		sessionID = StringEscapeUtils.escapeHtml(sessionID);
-
 		pendingRequestID = AuthenticationSessionStoreage.getPendingRequestID(sessionID);
-		
+	   		
 		String redirectURL = null;
 		try {
          // check parameter
@@ -187,6 +187,9 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 
 			AuthenticationSession session = AuthenticationServer.getSession(sessionID);
 
+			//change MOASessionID
+		    sessionID = AuthenticationSessionStoreage.changeSessionID(session);
+			
 			String samlArtifactBase64 = AuthenticationServer.getInstance().verifyAuthenticationBlock(session, createXMLSignatureResponse);
 			
 
@@ -220,17 +223,17 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 					
 			        String oaURL = session.getOAURLRequested();
 			        OAAuthParameter oaParam = authConf.getOnlineApplicationParameter(oaURL);
-			        String profiles = oaParam.getMandateProfiles();
+			        List<String> profiles = oaParam.getMandateProfiles();
 
 			        if (profiles == null) {
 			      	  Logger.error("No Mandate/Profile for OA configured.");
 			      	  throw new AuthenticationException("auth.16", new Object[] { GET_MIS_SESSIONID});
 			        }
 			        
-			        String profilesArray[] = profiles.split(",");  	 		 
-			        for(int i = 0; i < profilesArray.length; i++) {
-			      	  profilesArray[i] = profilesArray[i].trim();
-			        }
+//			        String profilesArray[] = profiles.split(",");  	 		 
+//			        for(int i = 0; i < profilesArray.length; i++) {
+//			      	  profilesArray[i] = profilesArray[i].trim();
+//			        }
 			        
 			        String oaFriendlyName = oaParam.getFriendlyName();
 			        String mandateReferenceValue = session.getMandateReferenceValue();
@@ -249,7 +252,7 @@ public class VerifyAuthenticationBlockServlet extends AuthServlet {
 			        	targetType = AuthenticationSession.TARGET_PREFIX_ + oaParam.getTarget();
 			        }
 			        
-			        MISSessionId misSessionID = MISSimpleClient.sendSessionIdRequest(connectionParameters.getUrl(), idl, cert, oaFriendlyName, redirectURL, mandateReferenceValue, profilesArray, targetType, sslFactory);
+			        MISSessionId misSessionID = MISSimpleClient.sendSessionIdRequest(connectionParameters.getUrl(), idl, cert, oaFriendlyName, redirectURL, mandateReferenceValue, profiles, targetType, sslFactory);
 			        
 			        if (misSessionID == null) {
 			      	  Logger.error("Fehler bei Anfrage an Vollmachten Service. MIS Session ID ist null.");
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
index 80b1547c9..fddd0d6b9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyCertificateServlet.java
@@ -157,6 +157,8 @@ public class VerifyCertificateServlet extends AuthServlet {
 	       

 	    	session = AuthenticationServer.getSession(sessionID);

 	    	

+	        //change MOASessionID

+	        sessionID = AuthenticationSessionStoreage.changeSessionID(session);

 	    	

     		X509Certificate cert = AuthenticationServer.getInstance().getCertificate(sessionID, parameters);

     		if (cert == null) {

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
index 7c2a032a1..10a41c487 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/VerifyIdentityLinkServlet.java
@@ -66,6 +66,7 @@ import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
 import at.gv.egovernment.moa.id.auth.exception.ParseException;
 import at.gv.egovernment.moa.id.auth.exception.WrongParametersException;
 import at.gv.egovernment.moa.id.commons.db.ConfigurationDBUtils;
+import at.gv.egovernment.moa.id.commons.db.MOASessionDBUtils;
 import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
 import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
@@ -147,8 +148,7 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
       throw new IOException(e.getMessage());
     }
     String sessionID = req.getParameter(PARAM_SESSIONID);
-       
-
+           
     // escape parameter strings
 	sessionID = StringEscapeUtils.escapeHtml(sessionID);
     
@@ -167,6 +167,9 @@ public class VerifyIdentityLinkServlet extends AuthServlet {
        
        
        AuthenticationSession session = AuthenticationServer.getSession(sessionID);
+       
+       //change MOASessionID
+       sessionID = AuthenticationSessionStoreage.changeSessionID(session);
     	  
     	String createXMLSignatureRequestOrRedirect = AuthenticationServer.getInstance().verifyIdentityLink(session, parameters);
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
index 57843d0f3..c3b45f165 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
@@ -86,7 +86,7 @@ public class STORKResponseProcessor {
 	 * @param attributeList the attribute list

 	 * @return true, if successful

 	 */

-	private static boolean hasAttribute(String attributeName, IPersonalAttributeList attributeList) {

+	public static boolean hasAttribute(String attributeName, IPersonalAttributeList attributeList) {

 		try {

 			getAttributeValue(attributeName, attributeList);

 			return true;

@@ -125,7 +125,7 @@ public class STORKResponseProcessor {
 	 * @return Identity Link

 	 * @throws STORKException the sTORK exception

 	 */

-	public static IdentityLink connectToSZRGateway(IPersonalAttributeList attributeList, String oaFriendlyName, String targetType, String targetValue, String filters) throws STORKException {

+	public static IdentityLink connectToSZRGateway(IPersonalAttributeList attributeList, String oaFriendlyName, String targetType, String targetValue, List<String> filters) throws STORKException {

 		Logger.trace("Calling SZR Gateway with the following attributes:");

 

 		CreateIdentityLinkResponse identityLinkResponse = null;

@@ -133,12 +133,42 @@ public class STORKResponseProcessor {
 		try {

 			Logger.trace("Starting call...");

 

-			

 			// if there is no signedDoc attribute, we cannot go on

 			String citizenSignature = getAttributeValue("signedDoc", attributeList);

+			String fiscalNumber = getAttributeValue("fiscalNumber", attributeList);

 			

 			// if we have a signedDoc we test for a representation case

-			if(hasAttribute("mandateContent", attributeList) || hasAttribute("representative", attributeList) || hasAttribute("represented", attributeList)) {

+			// - according to stork samlengine and commons

+			if(hasAttribute("mandate", attributeList)) {

+				// we have a representation case

+				String mandate = getAttributeValue("mandate", attributeList);

+				

+				if(!hasAttribute("dateOfBirth", attributeList)) {

+					// if we get here, we have a natural person representing a legal person

+					String organizationAddress = getAttributeValue("canonicalRegisteredAddress", attributeList);

+					String organizationType = getAttributeValue("translateableType", attributeList);

+					

+					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(citizenSignature, null, null, mandate, organizationAddress, organizationType, targetType, targetValue, oaFriendlyName, filters, fiscalNumber);

+				} else {

+					// if we get here, we have a natural person representing another natural person

+					String eIdentifier = getAttributeValue("eIdentifier", attributeList);

+					String givenName = getAttributeValue("givenName", attributeList);

+					String lastName = getAttributeValue("surname", attributeList);

+					String dateOfBirth = getAttributeValue("dateOfBirth", attributeList);

+					

+					// gender attribute is mandatory here because of some legal stuff

+					String gender = getAttributeValue("gender", attributeList);

+					

+					if (!StringUtils.isEmpty(dateOfBirth))

+						dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

+

+					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(eIdentifier, 

+							givenName, lastName, dateOfBirth, gender, citizenSignature, null,

+							null, mandate, targetType, targetValue, oaFriendlyName, filters, fiscalNumber);

+				}

+			}

+			// - according to stork spec

+			else if(hasAttribute("mandateContent", attributeList) || hasAttribute("representative", attributeList) || hasAttribute("represented", attributeList)) {

 				// we have a representation case

 				String representative = getAttributeValue("representative", attributeList);

 				String represented = getAttributeValue("represented", attributeList);

@@ -148,15 +178,15 @@ public class STORKResponseProcessor {
 					// if we get here, we have a natural person representing a legal person

 					String organizationAddress = getAttributeValue("canonicalRegisteredAddress", attributeList);

 					String organizationType = getAttributeValue("translateableType", attributeList);

-					

-					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(citizenSignature, representative, represented, mandate, organizationAddress, organizationType, targetType, targetValue, oaFriendlyName, filters);

+									

+					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(citizenSignature, representative, represented, mandate, organizationAddress, organizationType, targetType, targetValue, oaFriendlyName, filters, fiscalNumber);

 				} else {

 					// if we get here, we have a natural person representing another natural person

 					String eIdentifier = getAttributeValue("eIdentifier", attributeList);

 					String givenName = getAttributeValue("givenName", attributeList);

 					String lastName = getAttributeValue("surname", attributeList);

 					String dateOfBirth = getAttributeValue("dateOfBirth", attributeList);

-					

+			

 					// gender attribute is mandatory here because of some legal stuff

 					String gender = getAttributeValue("gender", attributeList);

 					

@@ -165,7 +195,7 @@ public class STORKResponseProcessor {
 

 					identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(eIdentifier, 

 							givenName, lastName, dateOfBirth, gender, citizenSignature, representative,

-							represented, mandate, targetType, targetValue, oaFriendlyName, filters);

+							represented, mandate, targetType, targetValue, oaFriendlyName, filters, fiscalNumber);

 				}

 			} else {

 				// we do not have a representation case

@@ -175,7 +205,7 @@ public class STORKResponseProcessor {
 				String dateOfBirth = getAttributeValue("dateOfBirth", attributeList);

 				if (!StringUtils.isEmpty(dateOfBirth))

 					dateOfBirth = DateTimeUtils.formatPEPSDateToMOADate(dateOfBirth);

-				identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, citizenSignature);

+				identityLinkResponse = AuthenticationServer.getInstance().getIdentityLink(eIdentifier, givenName, lastName, dateOfBirth, citizenSignature, fiscalNumber);

 			}

 	    	

 	    	if (null != identityLinkResponse.getErrorResponse()){

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
index 0d39a4bc5..038e92f1c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/validator/VerifyXMLSignatureResponseValidator.java
@@ -60,6 +60,8 @@ import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
 import at.gv.egovernment.moa.id.auth.data.IdentityLink;
 import at.gv.egovernment.moa.id.auth.data.VerifyXMLSignatureResponse;
 import at.gv.egovernment.moa.id.auth.exception.ValidateException;
+import at.gv.egovernment.moa.id.config.ConfigurationException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
 import at.gv.egovernment.moa.logging.Logger;
 
@@ -101,12 +103,13 @@ public class VerifyXMLSignatureResponseValidator {
    *                                       manifest has to be ignored (identityLink validation if
    *                                       the OA is a business service) or not
    * @throws ValidateException on any validation error
+ * @throws ConfigurationException 
    */
   public void validate(VerifyXMLSignatureResponse verifyXMLSignatureResponse,
                        List<String> identityLinkSignersSubjectDNNames, 
                        String whatToCheck,
                        boolean ignoreManifestValidationResult)
-    throws ValidateException {
+    throws ValidateException, ConfigurationException {
 
     if (verifyXMLSignatureResponse.getSignatureCheckCode() != 0)
       throw new ValidateException("validator.06", null);
@@ -123,13 +126,20 @@ public class VerifyXMLSignatureResponseValidator {
 				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.24", null);
 			if (verifyXMLSignatureResponse.getCertificateCheckCode() == 5) 
 				checkFailedReason = MOAIDMessageProvider.getInstance().getMessage("validator.25", null);
-    
-      if (whatToCheck.equals(CHECK_IDENTITY_LINK)) 
-        throw new ValidateException("validator.07", new Object[] { checkFailedReason } );
-      else
-        throw new ValidateException("validator.19", new Object[] { checkFailedReason } );
+
+    // TEST CARDS
+    //  if (whatToCheck.equals(CHECK_IDENTITY_LINK))
+    //    throw new ValidateException("validator.07", new Object[] { checkFailedReason } );
+    //  else
+    //    throw new ValidateException("validator.19", new Object[] { checkFailedReason } );
     }
     
+    //check QC 
+    if (AuthConfigurationProvider.getInstance().isCertifiacteQCActive() &&
+    		!whatToCheck.equals(CHECK_IDENTITY_LINK) &&
+    		!verifyXMLSignatureResponse.isQualifiedCertificate())
+        throw new ValidateException("validator.71", null);
+    
     if (ignoreManifestValidationResult) {
       Logger.debug("OA type is business service, thus ignoring DSIG manifest validation result");
     } else {
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
index 7e21c6667..2d0a0e367 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/OAParameter.java
@@ -55,7 +55,12 @@ public class OAParameter {
 			this.businessService = true;
 		else
 			this.businessService = false;
-		
+
+        if (this.oaType.equals("storkService"))
+            this.storkService = true;
+        else
+            this.storkService = false;
+
 		this.publicURLPrefix = oa.getPublicURLPrefix();
 		
 		this.friendlyName = oa.getFriendlyName();
@@ -81,8 +86,15 @@ public class OAParameter {
 	 * if value of {@link #oaType} is "businessService"
 	 */
 	private boolean businessService;
-	
-	/**
+
+    /**
+     * specifies whether the online application is a stork application or not (<code>true</code>
+     * if value of {@link #oaType} is "storkService"
+     */
+    private boolean storkService;
+
+
+    /**
 	 * public URL prefix of the online application
 	 */
 	private String publicURLPrefix;
@@ -139,5 +151,7 @@ public class OAParameter {
 	public OAOAUTH20 getoAuth20Config() {
 		return oAuth20Config;
 	}
+
+    public boolean getStorkService() { return storkService; }
 	
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java
index 1674715d1..b02c0946c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigLoader.java
@@ -42,21 +42,29 @@ public class AuthConfigLoader implements Runnable {
 						
 				Logger.info("check for new config.");
 				MOAIDConfiguration moaidconfig = ConfigurationDBRead.getMOAIDConfiguration();
-				Date dbdate = moaidconfig.getTimestampItem();
-				Date pvprefresh = moaidconfig.getPvp2RefreshItem();
-
-				Date date = AuthConfigurationProvider.getTimeStamp();
-			
-				if (dbdate != null && dbdate.after(date)) {
-					AuthConfigurationProvider instance = AuthConfigurationProvider.getInstance();
-					instance.reloadDataBaseConfig();
-				}
 				
-				Date pvpdate = MOAMetadataProvider.getTimeStamp();
-				if (pvprefresh != null && pvpdate != null && pvprefresh.after(pvpdate)) {
-					MOAMetadataProvider.reInitialize();
+				if (moaidconfig != null) {									
+					Date dbdate = moaidconfig.getTimestampItem();
+					Date pvprefresh = moaidconfig.getPvp2RefreshItem();
+	
+					Date date = AuthConfigurationProvider.getTimeStamp();
+				
+					if (dbdate != null && dbdate.after(date)) {
+						AuthConfigurationProvider instance = AuthConfigurationProvider.getInstance();
+						instance.reloadDataBaseConfig();
+					}
+					
+					Date pvpdate = MOAMetadataProvider.getTimeStamp();
+					if (pvprefresh != null && pvpdate != null && pvprefresh.after(pvpdate)) {
+						MOAMetadataProvider.reInitialize();
+					}
+					
+				} else {
+					Logger.warn("MOA-ID Configuration is actually not found. Reuse old configuration.");
+					
 				}
 				
+				
 			} catch (Throwable e) {
 				Logger.warn("MOA-ID Configuration is actually not loadable. Reuse old configuration.", e);
 				
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
index f9a038d9f..8b5c8d796 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/AuthConfigurationProvider.java
@@ -998,6 +998,16 @@ public class AuthConfigurationProvider extends ConfigurationProvider {
 	  return publicURLPreFix;
   }
   
+  public boolean isPVP2AssertionEncryptionActive() {
+	  String prop = props.getProperty("protocols.pvp2.assertion.encryption.active", "true");
+	  return Boolean.valueOf(prop);
+  }
+  
+  public boolean isCertifiacteQCActive() {
+	  String prop = props.getProperty("configuration.validation.certificate.QC.ignore", "false");
+	  return !Boolean.valueOf(prop);	  
+  }
+  
   /**
    * Retruns the STORK Configuration
    * @return STORK Configuration
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
index 8e7ca0779..d16e85084 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
@@ -51,11 +51,13 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.AuthComponentOA;
 import at.gv.egovernment.moa.id.commons.db.dao.config.BKUSelectionCustomizationType;
 import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
 import at.gv.egovernment.moa.id.commons.db.dao.config.Mandates;
+import at.gv.egovernment.moa.id.commons.db.dao.config.MandatesProfileNameItem;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAPVP2;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASAML1;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASSO;
@@ -221,13 +223,32 @@ public List<String> getTransformsInfos() {
 /**
  * @return the mandateProfiles
  */
-public String getMandateProfiles() {
+public List<String> getMandateProfiles() {
 	
 	Mandates mandates = oa_auth.getMandates();
 	
-	if (mandates != null)
-		return mandates.getProfiles();
-	else
+	List<String> list = new ArrayList<String>();
+	
+	if (mandates != null) {
+		String oldProfilList = mandates.getProfiles();		
+		
+		List<MandatesProfileNameItem> profileList = mandates.getProfileNameItems();
+		for (MandatesProfileNameItem el : profileList) {
+			list.add(el.getItem());
+			
+		}
+
+		//only for RC1 
+		if (MiscUtil.isNotEmpty(oldProfilList)) {
+	        String profilesArray[] = oldProfilList.split(",");  	 		 
+	        for(int i = 0; i < profilesArray.length; i++) {
+	      	  list.add(profilesArray[i].trim());
+	        }
+		}
+		
+		return list;
+		
+	} else
 		return null;
 }
 
@@ -348,6 +369,13 @@ public List<OAStorkAttribute> getRequestedAttributes() {
 	return oa_auth.getOASTORK().getOAAttributes();
 }
 
+public boolean isRequireConsentForStorkAttributes() {
+	return oa_auth.getOASTORK().isRequireConsent();
+}
+
+public List<AttributeProviderPlugin> getStorkAPs() {
+	return oa_auth.getOASTORK().getAttributeProviders();
+}
 
 public byte[] getBKUSelectionTemplate() {
 	
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
index 7ecd7dde8..e6e77911a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/legacy/BuildFromLegacyConfig.java
@@ -28,6 +28,9 @@ import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
+import java.net.URI;
+import java.net.URL;
+import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
@@ -55,6 +58,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.MOAIDConfiguration;
 import at.gv.egovernment.moa.id.commons.db.dao.config.MOAKeyBoxSelector;
 import at.gv.egovernment.moa.id.commons.db.dao.config.MOASP;
 import at.gv.egovernment.moa.id.commons.db.dao.config.Mandates;
+import at.gv.egovernment.moa.id.commons.db.dao.config.MandatesProfileNameItem;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAPVP2;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASAML1;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASSO;
@@ -83,6 +87,7 @@ import at.gv.egovernment.moa.id.data.IssuerAndSerial;
 import at.gv.egovernment.moa.logging.Logger;
 import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.DOMUtils;
+import at.gv.egovernment.moa.util.FileUtils;
 import at.gv.egovernment.moa.util.MiscUtil;
 
 public class BuildFromLegacyConfig {
@@ -237,7 +242,10 @@ public class BuildFromLegacyConfig {
 	    		for (int i=0; i<transformsInfos.length; i++) {
 
 	    			TransformsInfoType transforminfotype = new TransformsInfoType();
-	    			transforminfotype.setFilename(transformsInfoFileNames[i]);
+	    			
+	    			String fileURL = FileUtils.makeAbsoluteURL(transformsInfoFileNames[i], rootConfigFileDir);	    			    			
+	    			Path fileName_ = new File(new URI(fileURL)).toPath().getFileName();
+	    			transforminfotype.setFilename(fileName_.toString());
 	    		
 	    			transforminfotype.setTransformation(Base64Utils.encode(transformsInfos[i].getBytes("UTF-8")).getBytes("UTF-8"));
 	    			auth_transformInfos.add(transforminfotype); 
@@ -392,22 +400,32 @@ public class BuildFromLegacyConfig {
 	        	templates.setTemplate(template_list);
 	        	
 	        	
-	        	//set TransformsInfo
+	        	//TransformsInfo not supported by MOAID 2.0
 	        	String[] transforminfos = oa.getTransformsInfos();
-	        	ArrayList<TransformsInfoType> oa_transforminfos = new ArrayList<TransformsInfoType>();
-	        	for (String e1 : transforminfos) {
-	        		TransformsInfoType transforminfo = new TransformsInfoType();
-	        		transforminfo.setFilename(e1);
-	        		oa_transforminfos.add(transforminfo);
+	        	for (String e1 : transforminfos) {	        		
+	        		if (MiscUtil.isNotEmpty(e1)) {
+	        			Logger.warn("OA specific transformation for OA " + oa.getPublicURLPrefix()
+	        					+ " are not supported. USE AdditionalAuthBlock text!");
+	        		}
 	        	}
-	        	oa_auth.setTransformsInfo(oa_transforminfos);
 	        	
 	        	//VerifyInfoBoxes not supported by MOAID 2.0
 	        	
 	        	//set Mandates
 	        	Mandates oa_mandates = new Mandates();
 	        	oa_auth.setMandates(oa_mandates);
-	        	oa_mandates.setProfiles(oa.getMandateProfiles());
+	        	List<MandatesProfileNameItem> profileList = new ArrayList<MandatesProfileNameItem>();
+	        	
+	        	String oldProfiles = oa.getMandateProfiles();
+	        	if (MiscUtil.isNotEmpty(oldProfiles)) {
+		        	String[] oldprofileList = oldProfiles.split(",");
+		        	for (int i=0; i<oldprofileList.length; i++) {
+		        		MandatesProfileNameItem item = new MandatesProfileNameItem();
+		        		item.setItem(oldprofileList[i].trim());
+		        		profileList.add(item);
+		        	}
+					oa_mandates.setProfileNameItems(profileList );
+	        	}
 	        	
 	        	//STORK
 	        	//TODO: OA specific STORK config is deactivated in MOA 1.5.2
@@ -447,7 +465,16 @@ public class BuildFromLegacyConfig {
 	    	ChainingModes moa_chainingModes = new ChainingModes();
 	    	moaIDConfig.setChainingModes(moa_chainingModes);
 	    	
-	    	ChainingModeType type = ChainingModeType.fromValue(builder.getDefaultChainingMode());
+	    	
+	    	
+	    	String defaultmode = builder.getDefaultChainingMode();
+	    	ChainingModeType type;
+	    	if (defaultmode.equals(iaik.pki.pathvalidation.ChainingModes.CHAIN_MODE))
+	    		type = ChainingModeType.CHAINING;
+	    	else
+	    		type = ChainingModeType.PKIX;
+	    	
+	    	
 	    	moa_chainingModes.setSystemDefaultMode(type);
 	    	
 	    	Map<IssuerAndSerial, String> chainingModes = builder.buildChainingModes();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
index ff481b825..4dec2c32e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/stork/STORKConfig.java
@@ -25,6 +25,7 @@
  */

 package at.gv.egovernment.moa.id.config.stork;

 

+import java.io.IOException;

 import java.net.MalformedURLException;

 import java.net.URL;

 import java.util.ArrayList;

@@ -33,10 +34,15 @@ import java.util.List;
 import java.util.Map;

 import java.util.Properties;

 

+import at.gv.egovernment.moa.id.commons.db.dao.config.SAMLSigningParameter;

 import at.gv.egovernment.moa.id.commons.db.dao.config.STORK;

 import at.gv.egovernment.moa.id.commons.db.dao.config.StorkAttribute;

 import at.gv.egovernment.moa.logging.Logger;

 import at.gv.egovernment.moa.util.StringUtils;

+import org.opensaml.ws.message.encoder.MessageEncodingException;

+import org.xml.sax.SAXException;

+

+import javax.xml.parsers.ParserConfigurationException;

 

 /**

  * Encapsulates several STORK configuration parameters according MOA configuration

@@ -59,8 +65,15 @@ public class STORKConfig {
 		this.props = props;

 

 		//create CPEPS map

-		List<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS> cpeps = stork.getCPEPS();

-		

+		//List<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS> cpeps = stork.getCPEPS();

+        List<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS> cpeps = new ArrayList<at.gv.egovernment.moa.id.commons.db.dao.config.CPEPS>();   // TODO Change this

+

+        try {

+            cpeps = stork.getCPEPS();

+        }   catch (NullPointerException ex) {

+            Logger.error("CPEPS not configured!");

+        }

+

 		cpepsMap = new HashMap<String, CPEPS>();

 

 		if (cpeps != null) {

@@ -76,8 +89,20 @@ public class STORKConfig {
 							+ cpep.getCountryCode() + " has an invalid URL and is ignored.");

 				}

 			}

+            /*catch (ParserConfigurationException e) {

+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");

+			} catch (SAXException e) {

+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");

+			} catch (IOException e) {

+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");

+			} catch (MessageEncodingException e) {

+				Logger.warn("Error in MOA-ID Configuration. CPEP entry for country " 

+						+ cpep.getCountryCode() + " has an invalid Attribute and is ignored.");

+			}*/

 		}

-

 		attr = new ArrayList<StorkAttribute>();

 		if (stork.getAttributes() != null) {

 			for(StorkAttribute current : stork.getAttributes()) {

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
index c9fc07b70..480deb867 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/entrypoints/DispatcherServlet.java
@@ -54,6 +54,7 @@ import at.gv.egovernment.moa.id.moduls.ModulStorage;
 import at.gv.egovernment.moa.id.moduls.NoPassivAuthenticationException;
 import at.gv.egovernment.moa.id.moduls.RequestStorage;
 import at.gv.egovernment.moa.id.moduls.SSOManager;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.AuthnRequestValidatorException;
 import at.gv.egovernment.moa.id.storage.AuthenticationSessionStoreage;
 import at.gv.egovernment.moa.id.storage.DBExceptionStoreImpl;
 import at.gv.egovernment.moa.id.util.MOAIDMessageProvider;
@@ -108,41 +109,24 @@ public class DispatcherServlet extends AuthServlet{
 				
 				Object idObject = req.getParameter(PARAM_TARGET_PENDINGREQUESTID);
 
-				Map<String, IRequest> errorRequests = RequestStorage.getPendingRequest(req.getSession());
+				//Map<String, IRequest> errorRequests = RequestStorage.getPendingRequest(req.getSession());
 				
 				String pendingRequestID = null;
 				if (idObject != null && (idObject instanceof String)) {
-					if (errorRequests.containsKey((String)idObject))
-						pendingRequestID = (String) idObject; 
+					pendingRequestID = (String) idObject; 
 				}
 				
 				if (throwable != null) {					
-					if (errorRequests != null) {
-		
-						synchronized (errorRequests) {
 													
 						IRequest errorRequest = null;
 						if (pendingRequestID != null) {
-							errorRequest = errorRequests.get(pendingRequestID);
+							errorRequest = RequestStorage.getPendingRequest(pendingRequestID);
 						
-							//remove the 
-							RequestStorage.removePendingRequest(errorRequests, pendingRequestID);
-						}
-						else {
-							if (errorRequests.size() > 1) {
-								handleErrorNoRedirect(throwable.getMessage(), throwable,
-										req, resp);
-								
-							} else {
-								Set<String> keys = errorRequests.keySet();
-								errorRequest = errorRequests.get(keys.toArray()[0]);
-								RequestStorage.removeAllPendingRequests(req.getSession());
-							}
-							
 						}
 						
 						if (errorRequest != null) {
-						
+							RequestStorage.removePendingRequest(pendingRequestID);
+							
 							try {
 								IModulInfo handlingModule = ModulStorage
 										.getModuleByPath(errorRequest
@@ -156,6 +140,10 @@ public class DispatcherServlet extends AuthServlet{
 										StatisticLogger logger = StatisticLogger.getInstance();
 										logger.logErrorOperation(throwable, errorRequest);
 										
+										//remove MOASession
+										AuthenticationSession moaSession = AuthenticationSessionStoreage.getSessionWithPendingRequestID(pendingRequestID);
+										AuthenticationManager.getInstance().logout(req, resp, moaSession.getSessionID());
+										
 										return;
 									}
 								}
@@ -172,16 +160,9 @@ public class DispatcherServlet extends AuthServlet{
 					}
 					handleErrorNoRedirect(throwable.getMessage(), throwable,
 							req, resp);
-
-				} else {
-					// TODO: use better string
-					handleErrorNoRedirect("UNKOWN ERROR DETECTED!", null, req,
-							resp);
-				}
 					
 				return;
 			}
-			}
 
 			Object moduleObject = req.getParameter(PARAM_TARGET_MODULE);
 			String module = null;
@@ -242,32 +223,24 @@ public class DispatcherServlet extends AuthServlet{
 				}
 			}
 
-			HttpSession httpSession = req.getSession();
-			Map<String, IRequest> protocolRequests = null;
+			//HttpSession httpSession = req.getSession();
+			//Map<String, IRequest> protocolRequests = null;
 			IRequest protocolRequest = null;
 			
 			try {
-				protocolRequests = RequestStorage.getPendingRequest(httpSession);
-
 				Object idObject = req.getParameter(PARAM_TARGET_PENDINGREQUESTID);
 	
-				if (protocolRequests != null && 
-					idObject != null && (idObject instanceof String)) {
+				if (idObject != null && (idObject instanceof String)) {
 								
 					protocolRequestID = (String) idObject;
-				
+					protocolRequest = RequestStorage.getPendingRequest(protocolRequestID);
+					
 					//get IRequest if it exits
-					if (protocolRequests.containsKey(protocolRequestID)) {
-						protocolRequest = protocolRequests.get(protocolRequestID);
+					if (protocolRequest != null) {
 						Logger.debug(DispatcherServlet.class.getName()+": Found PendingRequest with ID " + protocolRequestID);
 						
 					} else {
-						Logger.error("No PendingRequest with ID " + protocolRequestID + " found.!");
-
-						Set<String> mapkeys = protocolRequests.keySet();
-						for (String el : mapkeys)
-							Logger.debug("PendingRequest| ID=" + el + "  OAIdentifier=" + protocolRequests.get(el));
-					
+						Logger.error("No PendingRequest with ID " + protocolRequestID + " found.!");		
 						handleErrorNoRedirect("Während des Anmeldevorgangs ist ein Fehler aufgetreten. Bitte versuchen Sie es noch einmal.",
 								null, req, resp);							
 						return;
@@ -277,59 +250,38 @@ public class DispatcherServlet extends AuthServlet{
 						protocolRequest = info.preProcess(req, resp, action);
 						
 						if (protocolRequest != null) {
+								
+							//Start new Authentication
+							protocolRequest.setAction(action);
+							protocolRequest.setModule(module);
+							protocolRequestID = Random.nextRandom();
+							protocolRequest.setRequestID(protocolRequestID);
 							
-							if(protocolRequests != null) {
+							RequestStorage.setPendingRequest(protocolRequest);
 							
-								Set<String> mapkeys = protocolRequests.keySet();
-								for (String el : mapkeys) {
-									IRequest value = protocolRequests.get(el);
-						
-									if (value.getOAURL().equals(protocolRequest.getOAURL())) {
-								
-										if(!AuthenticationSessionStoreage.deleteSessionWithPendingRequestID(el)) {
-											Logger.warn(DispatcherServlet.class.getName()+": NO MOASession with PendingRequestID " + el + " found. Delete all user sessions!");
-											RequestStorage.removeAllPendingRequests(req.getSession());
-									
-										} else {
-											RequestStorage.removePendingRequest(protocolRequests, el);
-										}
-									}
-								}
-
-							} else {
-								protocolRequests = new ConcurrentHashMap<String, IRequest>();
-							}
+							Logger.debug(DispatcherServlet.class.getName()+": Create PendingRequest with ID " + protocolRequestID + ".");
+							
+						} else {
+							Logger.error("Failed to generate a valid protocol request!");
+							resp.setContentType("text/html;charset=UTF-8");
+							resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "NO valid protocol request received!");
+							return;
 							
-							synchronized (protocolRequest) {
-								synchronized (protocolRequests) {
-								
-									//Start new Authentication
-									protocolRequest.setAction(action);
-									protocolRequest.setModule(module);
-									protocolRequestID = Random.nextRandom();
-									protocolRequest.setRequestID(protocolRequestID);
-									protocolRequests.put(protocolRequestID, protocolRequest);
-									Logger.debug(DispatcherServlet.class.getName()+": Create PendingRequest with ID " + protocolRequestID + ".");
-								}
-							}
 						}
-						
+																	
 					} catch (ProtocolNotActiveException e) {
 						resp.getWriter().write(e.getMessage());
 						resp.setContentType("text/html;charset=UTF-8");
 						resp.sendError(HttpServletResponse.SC_FORBIDDEN, e.getMessage());
 						return;
 						
-						
-					} catch (MOAIDException e) {
-						Logger.error("Failed to generate a valid protocol request!");
-						resp.setContentType("text/html;charset=UTF-8");
-						resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "NO valid protocol request received!");
+					} catch (AuthnRequestValidatorException e) {
+						//log Error Message
+						StatisticLogger logger = StatisticLogger.getInstance();
+						logger.logErrorOperation(e, e.getErrorRequest());						
 						return;
-						
-					}
-						
-					if (protocolRequest == null) {
+											
+					} catch (MOAIDException e) {
 						Logger.error("Failed to generate a valid protocol request!");
 						resp.setContentType("text/html;charset=UTF-8");
 						resp.sendError(HttpServletResponse.SC_BAD_REQUEST, "NO valid protocol request received!");
@@ -337,9 +289,7 @@ public class DispatcherServlet extends AuthServlet{
 						
 					}
 				}
-				
-				RequestStorage.setPendingRequest(httpSession, protocolRequests);
-				
+								
 				AuthenticationManager authmanager = AuthenticationManager.getInstance();									
 				SSOManager ssomanager = SSOManager.getInstance();
 				
@@ -460,7 +410,7 @@ public class DispatcherServlet extends AuthServlet{
 		
 				String assertionID = moduleAction.processRequest(protocolRequest, req, resp, moasession);
 
-				RequestStorage.removePendingRequest(protocolRequests, protocolRequestID);
+				RequestStorage.removePendingRequest(protocolRequestID);
 				
 				if (needAuthentication) {
 					boolean isSSOSession = MiscUtil.isNotEmpty(newSSOSessionId);
@@ -491,7 +441,7 @@ public class DispatcherServlet extends AuthServlet{
 				}
 
 			} catch (Throwable e) {
-				Logger.info("An authentication error occous: " + e.getMessage());;
+				Logger.warn("An authentication error occured: ", e);;
 				// Try handle module specific, if not possible rethrow
 				if (!info.generateErrorMessage(e, req, resp, protocolRequest)) {
 					throw e;
@@ -510,6 +460,8 @@ public class DispatcherServlet extends AuthServlet{
 	    	ConfigurationDBUtils.closeSession();
 	    }
 
+        Logger.info("Clossing Dispatcher processing loop");
+        Logger.info("Http response prepared sent: " + resp.toString());
 	}
 	
 	@Override
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
index 65634bed3..b6fe20a61 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/iaik/config/CertStoreConfigurationImpl.java
@@ -2,19 +2,19 @@
  * Copyright 2014 Federal Chancellery Austria
  * MOA-ID has been developed in a cooperation between BRZ, the Federal
  * Chancellery Austria - ICT staff unit, and Graz University of Technology.
- * 
+ *
  * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
  * the European Commission - subsequent versions of the EUPL (the "Licence");
  * You may not use this work except in compliance with the Licence.
  * You may obtain a copy of the Licence at:
  * http://www.osor.eu/eupl/
- * 
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the Licence is distributed on an "AS IS" basis,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the Licence for the specific language governing permissions and
  * limitations under the Licence.
- * 
+ *
  * This product combines work with different licenses. See the "NOTICE" text
  * file for details on the various modules and licenses.
  * The "NOTICE" text file is part of the distribution. Any derivative works
@@ -46,98 +46,120 @@
 
 package at.gv.egovernment.moa.id.iaik.config;
 
-import java.io.File;
-
 import at.gv.egovernment.moa.id.config.ConfigurationException;
 import at.gv.egovernment.moa.id.config.ConfigurationProvider;
 import at.gv.egovernment.moa.id.iaik.servertools.observer.ObservableImpl;
-import at.gv.egovernment.moa.util.FileUtils;
+import at.gv.egovernment.moa.logging.Logger;
 import iaik.pki.store.certstore.CertStoreConfiguration;
 import iaik.pki.store.certstore.CertStoreParameters;
 import iaik.pki.store.certstore.CertStoreTypes;
 import iaik.pki.store.certstore.directory.DirectoryCertStoreParameters;
 
+import java.io.File;
+
 /**
  * Implementation of interface needed to initialize an IAIK JSSE <code>TrustManager</code>
+ *
  * @author Paul Ivancsics
  * @version $Id$
  */
-public class CertStoreConfigurationImpl extends ObservableImpl 
-  implements CertStoreConfiguration, DirectoryCertStoreParameters {
-  /** identifies the rootDirectory */
-  private String rootDirectory;
-  /** ConfigurationProvider */
-  private ConfigurationProvider conf;
-  /** Array for storing all CertStoreParameters */
-  private CertStoreParameters[] parameters;
-
-  /**
-   * Create a new <code>CertStoreConfigurationImpl</code>.
-   * 
-   * @param conf The MOA configuration from which the configuration data is
-   * @throws ConfigurationException an any config-error
-   * being read.
-   */
-  public CertStoreConfigurationImpl(ConfigurationProvider conf) throws ConfigurationException {
-    this.conf=conf;
-    
-    String certStoreRootDirParam = conf.getCertstoreDirectory();
-    
-    if (certStoreRootDirParam == null)
-      throw new ConfigurationException(
-        "config.08", new Object[] {"CertStoreDirectory"});
-
-		rootDirectory = FileUtils.makeAbsoluteURL(certStoreRootDirParam, conf.getRootConfigFileDir());
-		if(rootDirectory.startsWith("file:")) rootDirectory = rootDirectory.substring(6);
-		File f = new File(rootDirectory);
-				if (!f.isDirectory())
-					throw new ConfigurationException(
-						"config.05", new Object[] {"CertStoreDirectory"});
-    
-    parameters = new CertStoreParameters[] { this };
-  }
-
-  /**
-   * @see iaik.pki.store.certstore.CertStoreConfiguration#getParameters()
-   */
-  public CertStoreParameters[] getParameters() {
-    return parameters;
-  }
-
-  /**
-   * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#getRootDirectory()
-   */
-  public String getRootDirectory() {
-    return rootDirectory;
-  }
-
-  /**
-   * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#createNew()
-   */
-  public boolean createNew() {
-    return false;
-  }
-
-  /**
-   * @see iaik.pki.store.certstore.CertStoreParameters#getId()
-   */
-  public String getId() {
-    return "MOA ID Directory CertStore";
-  }
-
-  /**
-   * @see iaik.pki.store.certstore.CertStoreParameters#isReadOnly()
-   */
-  public boolean isReadOnly() {
-    return false;
-  }
-
-  /**
-   * @return <code>CertStoreTypes.DIRECTORY</code>
-   * @see iaik.pki.store.certstore.CertStoreParameters#getType()
-   */
-  public String getType() {
-    return CertStoreTypes.DIRECTORY;
-  }
+public class CertStoreConfigurationImpl extends ObservableImpl
+        implements CertStoreConfiguration, DirectoryCertStoreParameters {
+    /**
+     * identifies the rootDirectory
+     */
+    private String rootDirectory;
+    /**
+     * ConfigurationProvider
+     */
+    private ConfigurationProvider conf;
+    /**
+     * Array for storing all CertStoreParameters
+     */
+    private CertStoreParameters[] parameters;
+
+    /**
+     * Create a new <code>CertStoreConfigurationImpl</code>.
+     *
+     * @param conf The MOA configuration from which the configuration data is
+     * @throws ConfigurationException an any config-error
+     *                                being read.
+     */
+    public CertStoreConfigurationImpl(ConfigurationProvider conf) throws ConfigurationException {
+        this.conf = conf;
+
+        String certStoreRootDirParam = conf.getCertstoreDirectory();
+
+        if (certStoreRootDirParam == null)
+            throw new ConfigurationException(
+                    "config.08", new Object[]{"CertStoreDirectory"});
+
+        //rootDirectory = FileUtils.makeAbsoluteURL(certStoreRootDirParam, conf.getRootConfigFileDir());
+        rootDirectory = certStoreRootDirParam;
+        Logger.error("Using file: " + rootDirectory);
+        if (rootDirectory.startsWith("file:")) rootDirectory = rootDirectory.substring(5);
+        Logger.error("Using file2: " + rootDirectory);
+
+        File f = new File(rootDirectory);
+        //Logger.error("Using file: " + certStoreRootDirParam + " param: " + conf.getRootConfigFileDir());
+
+        if (!f.exists()) {
+            Logger.error("File does not exists: " + f.getAbsolutePath());
+            throw new ConfigurationException(
+                    "config.05", new Object[]{"CertStoreDirectory"});
+        }
+
+        if (!f.isDirectory()) {
+            Logger.error("File is not a directory: " + f.getAbsolutePath());
+            throw new ConfigurationException(
+                    "config.05", new Object[]{"CertStoreDirectory"});
+        }
+
+
+        parameters = new CertStoreParameters[]{this};
+    }
+
+    /**
+     * @see iaik.pki.store.certstore.CertStoreConfiguration#getParameters()
+     */
+    public CertStoreParameters[] getParameters() {
+        return parameters;
+    }
+
+    /**
+     * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#getRootDirectory()
+     */
+    public String getRootDirectory() {
+        return rootDirectory;
+    }
+
+    /**
+     * @see iaik.pki.store.certstore.directory.DirectoryCertStoreParameters#createNew()
+     */
+    public boolean createNew() {
+        return false;
+    }
+
+    /**
+     * @see iaik.pki.store.certstore.CertStoreParameters#getId()
+     */
+    public String getId() {
+        return "MOA ID Directory CertStore";
+    }
+
+    /**
+     * @see iaik.pki.store.certstore.CertStoreParameters#isReadOnly()
+     */
+    public boolean isReadOnly() {
+        return false;
+    }
+
+    /**
+     * @return <code>CertStoreTypes.DIRECTORY</code>
+     * @see iaik.pki.store.certstore.CertStoreParameters#getType()
+     */
+    public String getType() {
+        return CertStoreTypes.DIRECTORY;
+    }
 
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
index 666224b3a..03a61d08f 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/AuthenticationManager.java
@@ -252,7 +252,7 @@ public class AuthenticationManager extends AuthServlet {
 			}
 			
 			//set MOAIDSession
-			request.getSession().setAttribute(MOA_SESSION, moasession.getSessionID());
+			//request.getSession().setAttribute(MOA_SESSION, moasession.getSessionID());
 			
 			response.setContentType("text/html;charset=UTF-8");
 			PrintWriter out = new PrintWriter(response.getOutputStream()); 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/ModulStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/ModulStorage.java
index 91f98608c..4a1da76e2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/ModulStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/ModulStorage.java
@@ -33,6 +33,7 @@ public class ModulStorage {
 	private static final String[] modulClasses = new String[]{
 		"at.gv.egovernment.moa.id.protocols.saml1.SAML1Protocol",
 		"at.gv.egovernment.moa.id.protocols.pvp2x.PVP2XProtocol",
+        "at.gv.egovernment.moa.id.protocols.stork2.STORKProtocol",
 		"at.gv.egovernment.moa.id.protocols.oauth20.protocol.OAuth20Protocol"
 	};
 	
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java
index bfe1151c4..21b4e2b65 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/RequestStorage.java
@@ -22,64 +22,53 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.moduls;
 
-import java.util.Map;
-
-import javax.servlet.http.HttpSession;
-
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.storage.AssertionStorage;
 import at.gv.egovernment.moa.logging.Logger;
 
 public class RequestStorage {
 
-	private static final String PENDING_REQUEST = "PENDING_REQUEST";
-
-	public static Map<String,IRequest> getPendingRequest(HttpSession session) {
+	public static IRequest getPendingRequest(String pendingReqID) {
 		
-				
-			Object obj = session.getAttribute(PENDING_REQUEST);
-			if (obj != null) {
-				synchronized (obj) {
-					if (obj instanceof Map<?,?>) {
-						if (((Map<?,?>) obj).size() > 0) {
-							if ( ((Map<?,?>) obj).keySet().toArray()[0] instanceof String) {
-								if (((Map<?,?>) obj).get(((Map<?,?>) obj).keySet().toArray()[0]) 
-										instanceof IRequest) {
-									return (Map<String, IRequest>) obj;
-							
-							
-							
-								}
-							}
-						}
-					}
-				}
-				session.setAttribute(PENDING_REQUEST, null);
-			}
+		try {
+			AssertionStorage storage = AssertionStorage.getInstance();
+			IRequest pendingRequest = storage.get(pendingReqID, IRequest.class);
+			return pendingRequest;
+		
+		} catch (MOADatabaseException e) {
+			Logger.info("No PendingRequst found with pendingRequestID " + pendingReqID);			
 			return null;
+			
+		}
 	}
 
-	public static void setPendingRequest(HttpSession session, Map<String, IRequest> request) {
-		session.setAttribute(PENDING_REQUEST, request);
-	}
-
-	public static void removeAllPendingRequests(HttpSession session) {
-		
-		Logger.debug(RequestStorage.class.getName()+": Remove all PendingRequests");
+	public static void setPendingRequest(Object pendingRequest) throws MOAIDException {
+		try {
+			AssertionStorage storage = AssertionStorage.getInstance();
+			
+			if (pendingRequest instanceof IRequest) {
+				storage.put(((IRequest)pendingRequest).getRequestID(), pendingRequest);
+				
+			} else {
+				throw new MOAIDException("auth.20", null);
+				
+			}
+			
+		} catch (MOADatabaseException e) {
+			Logger.warn("Pending Request with ID=" + ((IRequest)pendingRequest).getRequestID() +
+					" can not stored.", e);
+			throw new MOAIDException("auth.20", null);
+		}
 		
-		session.setAttribute(PENDING_REQUEST, null);
 	}
 	
-	public static void removePendingRequest(Map<String, IRequest> requestmap, String requestID) {
-		
-		if (requestmap != null && requestID != null) {
+	public static void removePendingRequest(String requestID) {
 		
-			synchronized (requestmap) {
-						
-				if (requestmap.containsKey(requestID)) {
-					requestmap.remove(requestID);
-					Logger.debug(RequestStorage.class.getName()+": Remove PendingRequest with ID " + requestID);
-				
-				}
-			}
+		if (requestID != null) {
+			AssertionStorage storage = AssertionStorage.getInstance();
+			storage.remove(requestID);
+			
 		}
 	}
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
index 82de940db..684c6630a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/moduls/SSOManager.java
@@ -147,9 +147,7 @@ public class SSOManager {
 	public String createSSOSessionInformations(String moaSessionID, String OAUrl) {
 		
 		String newSSOId = Random.nextRandom();
-		
-		System.out.println("generate new SSO Tokken (" + newSSOId + ")");
-		
+				
 		if (MiscUtil.isEmpty(moaSessionID) || MiscUtil.isEmpty(OAUrl)) {
 			Logger.warn("MoaSessionID or OAUrl are empty -> SSO is not enabled!");
 			return null;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/opemsaml/MOAKeyStoreX509CredentialAdapter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/opemsaml/MOAKeyStoreX509CredentialAdapter.java
new file mode 100644
index 000000000..81afcfbc1
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/opemsaml/MOAKeyStoreX509CredentialAdapter.java
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.opemsaml;
+
+import java.security.KeyStore;
+
+import org.opensaml.xml.security.x509.X509Credential;
+
+
+/**
+ * @author tlenz
+ *
+ */
+public class MOAKeyStoreX509CredentialAdapter extends
+		org.opensaml.xml.security.x509.KeyStoreX509CredentialAdapter {
+
+	/**
+	 * @param store
+	 * @param alias
+	 * @param password
+	 */
+	public MOAKeyStoreX509CredentialAdapter(KeyStore store, String alias,
+			char[] password) {
+		super(store, alias, password);
+	}
+	
+	public Class<? extends X509Credential> getCredentialType() {
+		return X509Credential.class;
+	}
+	
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/attributes/OAuth20AttributeBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/attributes/OAuth20AttributeBuilder.java
index 7bb97b9d8..394fd1430 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/attributes/OAuth20AttributeBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/oauth20/attributes/OAuth20AttributeBuilder.java
@@ -156,7 +156,6 @@ public final class OAuth20AttributeBuilder {
 				
 		// STORK
 		buildersSTORK.add(new EIDSTORKTOKEN());
-		buildersSTORK.add(new EIDSTORKTOKEN());
 		buildersSTORK.add(new STORKAdoptedFamilyNameAttributBuilder());
 		buildersSTORK.add(new STORKAgeAttributBuilder());
 		buildersSTORK.add(new STORKCanonicalResidenceAddressAttributBuilder());
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/AuthenticationAction.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/AuthenticationAction.java
index f0d503d88..10618071a 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/AuthenticationAction.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/AuthenticationAction.java
@@ -36,7 +36,6 @@ public class AuthenticationAction implements IAction {
 	public String processRequest(IRequest req, HttpServletRequest httpReq,
 			HttpServletResponse httpResp, AuthenticationSession moasession) throws MOAIDException {
 		
-		System.out.println("Process PVP2 auth request!");
 		PVPTargetConfiguration pvpRequest = (PVPTargetConfiguration) req;
 		return RequestManager.getInstance().handle(pvpRequest.request, httpReq, httpResp, moasession);
 	}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java
index 1668c31ce..99cba3277 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/MetadataAction.java
@@ -46,6 +46,7 @@ import org.opensaml.saml2.metadata.KeyDescriptor;
 import org.opensaml.saml2.metadata.NameIDFormat;
 import org.opensaml.saml2.metadata.SingleSignOnService;
 import org.opensaml.xml.io.Marshaller;
+import org.opensaml.xml.security.SecurityHelper;
 import org.opensaml.xml.security.credential.Credential;
 import org.opensaml.xml.security.credential.UsageType;
 import org.opensaml.xml.security.keyinfo.KeyInfoGenerator;
@@ -106,7 +107,7 @@ public class MetadataAction implements IAction {
 					.getIDPOrganisation());
 
 			X509KeyInfoGeneratorFactory keyInfoFactory = new X509KeyInfoGeneratorFactory();
-			keyInfoFactory.setEmitPublicKeyValue(true);
+			//keyInfoFactory.setEmitPublicKeyValue(true);
 			keyInfoFactory.setEmitEntityIDAsKeyName(true);
 			keyInfoFactory.setEmitEntityCertificate(true);
 			KeyInfoGenerator keyInfoGenerator = keyInfoFactory.newInstance();
@@ -114,7 +115,10 @@ public class MetadataAction implements IAction {
 			Credential metadataSigningCredential = CredentialProvider.getIDPMetaDataSigningCredential();
 			Signature signature = CredentialProvider
 					.getIDPSignature(metadataSigningCredential);
-						
+			
+			//set KeyInfo Element
+			SecurityHelper.prepareSignatureParams(signature, metadataSigningCredential, null, null);
+			
 			idpEntitiesDescriptor.setSignature(signature);
 			
 //			//set SignatureMethode
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
index 84c0138a5..e81b23d41 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVP2XProtocol.java
@@ -40,6 +40,7 @@ import org.opensaml.saml2.core.Response;
 import org.opensaml.saml2.core.Status;
 import org.opensaml.saml2.core.StatusCode;
 import org.opensaml.saml2.core.StatusMessage;
+import org.opensaml.saml2.core.impl.AuthnRequestImpl;
 import org.opensaml.saml2.metadata.AssertionConsumerService;
 import org.opensaml.saml2.metadata.AttributeConsumingService;
 import org.opensaml.saml2.metadata.EntityDescriptor;
@@ -58,11 +59,14 @@ import at.gv.egovernment.moa.id.protocols.pvp2x.binding.IEncoder;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.MOARequest;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.PostBinding;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.RedirectBinding;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.AuthnRequestValidatorException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.MandateAttributesNotHandleAbleException;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NameIDFormatNotSupportedException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMetadataInformationException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.PVP2Exception;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.CheckMandateAttributes;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
+import at.gv.egovernment.moa.id.protocols.pvp2x.validation.AuthnRequestValidator;
 import at.gv.egovernment.moa.id.protocols.pvp2x.verification.SAMLVerificationEngine;
 import at.gv.egovernment.moa.id.protocols.pvp2x.verification.TrustEngineFactory;
 import at.gv.egovernment.moa.id.util.VelocityLogAdapter;
@@ -90,6 +94,8 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 		actions.put(POST, new AuthenticationAction());
 		actions.put(METADATA, new MetadataAction());
 		
+		//TODO: insert getArtifact action
+		
 		instance = new PVP2XProtocol();
 		
 		new VelocityLogAdapter();
@@ -167,7 +173,7 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 			if(!(samlReq instanceof AuthnRequest)) {
 				throw new MOAIDException("Unsupported request", new Object[] {});
 			}
-			
+						
 			EntityDescriptor metadata = moaRequest.getEntityMetadata();
 			if(metadata == null) {
 				throw new NoMetadataInformationException();
@@ -201,7 +207,7 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 					spSSODescriptor.getAttributeConsumingServices().size() > 0) {
 				attributeConsumer  = spSSODescriptor.getAttributeConsumingServices().get(attributeIdx);
 			} 
-			
+						
 			String oaURL = moaRequest.getEntityMetadata().getEntityID();
 			String binding = consumerService.getBinding();
 //			String entityID = moaRequest.getEntityMetadata().getEntityID();
@@ -223,12 +229,33 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 					}
 				}
 			}
-			
-			request.getSession().setAttribute(PARAM_OA, oaURL);
 
+			//validate AuthnRequest
+			try {
+				AuthnRequestValidator.validate((AuthnRequestImpl) samlReq);
+				
+			} catch (AuthnRequestValidatorException e) {
+				if (generateErrorMessage(e, request, response, config)) {
+					throw new AuthnRequestValidatorException(e.getMessage(), 
+							new Object[] {}, config);
+					
+				} else {
+					throw new MOAIDException(e.getMessage(), new Object[] {});
+	
+				}			
+			}
+
+			//request.getSession().setAttribute(PARAM_OA, oaURL);
+			
 			return config;
-		} catch (Exception e) {
-			e.printStackTrace();
+
+		} catch (PVP2Exception e) {
+			throw e;
+			
+		} catch (Throwable e) {			
+			String samlRequest = request.getParameter("SAMLRequest");			
+			Logger.warn("Receive INVALID protocol request: " + samlRequest, e);
+						
 			throw new MOAIDException(e.getMessage(), new Object[] {});
 		}
 	}
@@ -253,17 +280,23 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 		StatusMessage statusMessage = SAML2Utils.createSAMLObject(StatusMessage.class);
 		if(e instanceof NoPassivAuthenticationException) {
 			statusCode.setValue(StatusCode.NO_PASSIVE_URI);
-			statusMessage.setMessage(e.getLocalizedMessage());	
+			statusMessage.setMessage(StringEscapeUtils.escapeXml(e.getLocalizedMessage()));	
+			
+		} else if (e instanceof NameIDFormatNotSupportedException) {
+			statusCode.setValue(StatusCode.INVALID_NAMEID_POLICY_URI);
+			statusMessage.setMessage(StringEscapeUtils.escapeXml(e.getLocalizedMessage()));
+			
 		} else if(e instanceof PVP2Exception) {
 			PVP2Exception ex = (PVP2Exception) e;
 			statusCode.setValue(ex.getStatusCodeValue());
 			String statusMessageValue = ex.getStatusMessageValue();
 			if(statusMessageValue != null) {
-				statusMessage.setMessage(statusMessageValue);
+				statusMessage.setMessage(StringEscapeUtils.escapeXml(statusMessageValue));
 			}
+			
 		} else {
 			statusCode.setValue(StatusCode.RESPONDER_URI);
-			statusMessage.setMessage(e.getLocalizedMessage());
+			statusMessage.setMessage(StringEscapeUtils.escapeXml(e.getLocalizedMessage()));
 		}
 		
 		status.setStatusCode(statusCode);
@@ -271,7 +304,9 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 			status.setStatusMessage(statusMessage);
 		}
 		samlResponse.setStatus(status);
-		
+		String remoteSessionID = SAML2Utils.getSecureIdentifier();
+		samlResponse.setID(remoteSessionID);
+				
 		IEncoder encoder = null;
 		
 		if(pvpRequest.getBinding().equals(SAMLConstants.SAML2_REDIRECT_BINDING_URI)) {
@@ -288,7 +323,12 @@ public class PVP2XProtocol implements IModulInfo, MOAIDAuthConstants {
 			encoder = new RedirectBinding();
 		}
 
-		encoder.encodeRespone(request, response, samlResponse, pvpRequest.getConsumerURL());
+		String relayState = null;
+		if (pvpRequest.getRequest() != null)
+			relayState = pvpRequest.getRequest().getRelayState();
+		
+		encoder.encodeRespone(request, response, samlResponse, pvpRequest.getConsumerURL(), 
+				relayState);
 		return true;
 	}
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java
index 18d757208..b3887a444 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/PVPTargetConfiguration.java
@@ -57,5 +57,4 @@ public class PVPTargetConfiguration extends RequestImpl {
 		this.consumerURL = consumerURL;
 	}
 	
-	
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java
index a0fba918c..43a17af23 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/ArtifactBinding.java
@@ -55,7 +55,7 @@ public class ArtifactBinding implements IDecoder, IEncoder {
 	}
 
 	public void encodeRespone(HttpServletRequest req, HttpServletResponse resp,
-			StatusResponseType response, String targetLocation)
+			StatusResponseType response, String targetLocation, String relayState)
 			throws MessageEncodingException, SecurityException {
 		try {
 			Credential credentials = CredentialProvider
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/IEncoder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/IEncoder.java
index 8b888e806..f7dfd055c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/IEncoder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/IEncoder.java
@@ -47,6 +47,6 @@ public interface IEncoder {
 	 * @throws SecurityException
 	 */
 	public void encodeRespone(HttpServletRequest req, 
-			HttpServletResponse resp, StatusResponseType response, String targetLocation) 
+			HttpServletResponse resp, StatusResponseType response, String targetLocation, String relayState) 
 					throws MessageEncodingException, SecurityException, PVP2Exception;
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/MOARequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/MOARequest.java
index d28c5eeec..11054fd57 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/MOARequest.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/MOARequest.java
@@ -24,27 +24,68 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.binding;
 
 import java.io.Serializable;
 
+import org.opensaml.Configuration;
 import org.opensaml.saml2.core.RequestAbstractType;
+import org.opensaml.saml2.core.impl.RequestAbstractTypeMarshaller;
+import org.opensaml.saml2.core.impl.RequestAbstractTypeUnmarshaller;
 import org.opensaml.saml2.metadata.EntityDescriptor;
+import org.opensaml.saml2.metadata.provider.MetadataProviderException;
+import org.opensaml.xml.XMLObject;
+import org.opensaml.xml.io.Unmarshaller;
+import org.opensaml.xml.io.UnmarshallerFactory;
+import org.opensaml.xml.io.UnmarshallingException;
+import org.w3c.dom.Element;
+
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NoMetadataInformationException;
+import at.gv.egovernment.moa.id.protocols.pvp2x.metadata.MOAMetadataProvider;
+import at.gv.egovernment.moa.logging.Logger;
 
 public class MOARequest implements Serializable{
 
 	private static final long serialVersionUID = 2395131650841669663L;
 	
-	private RequestAbstractType samlRequest;
-	private EntityDescriptor entityMetadata; 
+	private Element samlRequest;
 	private boolean verified = false;
-
+	private String entityID = null;
+	private String relayState = null;
+	
 	public MOARequest(RequestAbstractType request) {
-		samlRequest = request;
+		samlRequest = request.getDOM();
 	}
 
 	public RequestAbstractType getSamlRequest() {
-		return samlRequest;
+		UnmarshallerFactory unmarshallerFactory = Configuration.getUnmarshallerFactory();
+		Unmarshaller unmashaller = unmarshallerFactory.getUnmarshaller(samlRequest);
+		
+		try {
+			return (RequestAbstractType) unmashaller.unmarshall(samlRequest);
+			
+		} catch (UnmarshallingException e) {
+			Logger.warn("AuthnRequest Unmarshaller error", e);
+			return null;
+		}
+		
+	}
+
+	
+	
+	/**
+	 * @return the relayState
+	 */
+	public String getRelayState() {
+		return relayState;
+	}
+
+	/**
+	 * @param relayState the relayState to set
+	 */
+	public void setRelayState(String relayState) {
+		this.relayState = relayState;
 	}
 
 	public void setSamlRequest(RequestAbstractType request) {
-		this.samlRequest = request;
+		this.samlRequest = request.getDOM();
 	}
 
 	public boolean isVerified() {
@@ -55,13 +96,29 @@ public class MOARequest implements Serializable{
 		this.verified = verified;
 	}
 
-	public EntityDescriptor getEntityMetadata() {
-		return entityMetadata;
+	public EntityDescriptor getEntityMetadata() throws NoMetadataInformationException {
+		
+		try {
+			return MOAMetadataProvider.getInstance().getEntityDescriptor(this.entityID);
+			
+		} catch (MetadataProviderException e) {
+			Logger.warn("No Metadata for EntitiyID " + entityID);
+			throw new NoMetadataInformationException();
+		}			
 	}
 
-	public void setEntityMetadata(EntityDescriptor entityMetadata) {
-		this.entityMetadata = entityMetadata;
+	/**
+	 * @return the entitiyID
+	 */
+	public String getEntityID() {
+		return entityID;
+	}
+
+	/**
+	 * @param entitiyID the entitiyID to set
+	 */
+	public void setEntityID(String entitiyID) {
+		this.entityID = entitiyID;
 	}
-	
 	
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
index af29054e1..6517325b9 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/PostBinding.java
@@ -26,7 +26,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.apache.velocity.app.VelocityEngine;
-import org.apache.velocity.runtime.RuntimeConstants;
 import org.opensaml.common.SAMLObject;
 import org.opensaml.common.binding.BasicSAMLMessageContext;
 import org.opensaml.common.xml.SAMLConstants;
@@ -45,10 +44,13 @@ import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
 import org.opensaml.xml.parse.BasicParserPool;
 import org.opensaml.xml.security.SecurityException;
 import org.opensaml.xml.security.credential.Credential;
+import org.opensaml.xml.security.x509.KeyStoreX509CredentialAdapter;
+import org.opensaml.xml.security.x509.X509Credential;
 
 import at.gv.egovernment.moa.id.protocols.pvp2x.metadata.MOAMetadataProvider;
 import at.gv.egovernment.moa.id.protocols.pvp2x.signer.CredentialProvider;
 import at.gv.egovernment.moa.id.protocols.pvp2x.signer.CredentialsNotAvailableException;
+import at.gv.egovernment.moa.id.util.VelocityProvider;
 import at.gv.egovernment.moa.logging.Logger;
 
 public class PostBinding implements IDecoder, IEncoder {
@@ -61,27 +63,16 @@ public class PostBinding implements IDecoder, IEncoder {
 	}
 
 	public void encodeRespone(HttpServletRequest req, HttpServletResponse resp,
-			StatusResponseType response, String targetLocation)
+			StatusResponseType response, String targetLocation, String relayState)
 			throws MessageEncodingException, SecurityException {
 
 		try {
-			Credential credentials = CredentialProvider
+			X509Credential credentials = CredentialProvider
 					.getIDPAssertionSigningCredential();
 
 			Logger.debug("create SAML POSTBinding response");
 			
-			// VelocityEngine engine =
-			// VelocityProvider.getClassPathVelocityEngine();
-			VelocityEngine engine = new VelocityEngine();
-			engine.setProperty(RuntimeConstants.ENCODING_DEFAULT, "UTF-8");
-			engine.setProperty(RuntimeConstants.OUTPUT_ENCODING, "UTF-8");
-			engine.setProperty(RuntimeConstants.ENCODING_DEFAULT, "UTF-8");
-			engine.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
-			engine.setProperty("classpath.resource.loader.class",
-					"org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
-			engine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
-					"org.apache.velocity.runtime.log.SimpleLog4JLogSystem");
-			engine.init();
+			 VelocityEngine engine = VelocityProvider.getClassPathVelocityEngine();
 
 			HTTPPostEncoder encoder = new HTTPPostEncoder(engine,
 					"resources/templates/pvp_postbinding_template.html");
@@ -97,6 +88,7 @@ public class PostBinding implements IDecoder, IEncoder {
 			// context.setOutboundMessage(authReq);
 			context.setOutboundSAMLMessage(response);
 			context.setOutboundMessageTransport(responseAdapter);
+			context.setRelayState(relayState);
 
 			encoder.encode(context);
 		} catch (CredentialsNotAvailableException e) {
@@ -126,9 +118,12 @@ public class PostBinding implements IDecoder, IEncoder {
 		RequestAbstractType inboundMessage = (RequestAbstractType) messageContext
 				.getInboundMessage();
 		
+
+		
 		MOARequest request = new MOARequest(inboundMessage);
 		request.setVerified(false);
-		request.setEntityMetadata(messageContext.getPeerEntityMetadata());
+		request.setEntityID(messageContext.getPeerEntityMetadata().getEntityID());
+		request.setRelayState(messageContext.getRelayState());
 		return request;
 
 	}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/RedirectBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/RedirectBinding.java
index 7c9cc6259..dc6a1f637 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/RedirectBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/RedirectBinding.java
@@ -48,6 +48,7 @@ import org.opensaml.ws.transport.http.HttpServletResponseAdapter;
 import org.opensaml.xml.parse.BasicParserPool;
 import org.opensaml.xml.security.SecurityException;
 import org.opensaml.xml.security.credential.Credential;
+import org.opensaml.xml.security.x509.X509Credential;
 
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVP2XProtocol;
 import at.gv.egovernment.moa.id.protocols.pvp2x.metadata.MOAMetadataProvider;
@@ -66,10 +67,10 @@ public class RedirectBinding implements IDecoder, IEncoder {
 	}
 
 	public void encodeRespone(HttpServletRequest req, HttpServletResponse resp,
-			StatusResponseType response, String targetLocation)
+			StatusResponseType response, String targetLocation, String relayState)
 			throws MessageEncodingException, SecurityException {
 		try {
-			Credential credentials = CredentialProvider
+			X509Credential credentials = CredentialProvider
 					.getIDPAssertionSigningCredential();
 
 			Logger.debug("create SAML RedirectBinding response");
@@ -131,7 +132,7 @@ public class RedirectBinding implements IDecoder, IEncoder {
 				.getInboundMessage();
 		MOARequest request = new MOARequest(inboundMessage);
 		request.setVerified(true);
-		request.setEntityMetadata(messageContext.getPeerEntityMetadata());
+		request.setEntityID(messageContext.getPeerEntityMetadata().getEntityID());
 		return request;
 	}
 
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/SoapBinding.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/SoapBinding.java
index 9fe75618d..1d41654eb 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/SoapBinding.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/binding/SoapBinding.java
@@ -83,7 +83,7 @@ public class SoapBinding implements IDecoder, IEncoder {
 	}
 
 	public void encodeRespone(HttpServletRequest req, HttpServletResponse resp,
-			StatusResponseType response, String targetLocation)
+			StatusResponseType response, String targetLocation, String relayState)
 			throws MessageEncodingException, SecurityException, PVP2Exception {
 		try {
 			Credential credentials = CredentialProvider
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java
index bc90da8df..9def5d22c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/assertion/PVP2AssertionBuilder.java
@@ -22,6 +22,7 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.pvp2x.builder.assertion;
 
+import java.security.MessageDigest;
 import java.util.Iterator;
 import java.util.List;
 
@@ -43,6 +44,7 @@ import org.opensaml.saml2.core.RequestedAuthnContext;
 import org.opensaml.saml2.core.Subject;
 import org.opensaml.saml2.core.SubjectConfirmation;
 import org.opensaml.saml2.core.SubjectConfirmationData;
+import org.opensaml.saml2.core.impl.AuthnRequestImpl;
 import org.opensaml.saml2.metadata.AssertionConsumerService;
 import org.opensaml.saml2.metadata.AttributeConsumingService;
 import org.opensaml.saml2.metadata.EntityDescriptor;
@@ -51,6 +53,8 @@ import org.opensaml.saml2.metadata.RequestedAttribute;
 import org.opensaml.saml2.metadata.SPSSODescriptor;
 import org.w3c.dom.Element;
 
+import edu.emory.mathcs.backport.java.util.Arrays;
+
 import at.gv.e_government.reference.namespace.mandates._20040701_.Mandate;
 import at.gv.e_government.reference.namespace.persondata._20020228_.CorporateBodyType;
 import at.gv.e_government.reference.namespace.persondata._20020228_.IdentificationType;
@@ -75,12 +79,14 @@ import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.UnprovideableAttribut
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
 import at.gv.egovernment.moa.id.util.MandateBuilder;
 import at.gv.egovernment.moa.id.util.QAALevelVerifier;
+import at.gv.egovernment.moa.id.util.Random;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.Base64Utils;
 import at.gv.egovernment.moa.util.Constants;
 
 public class PVP2AssertionBuilder implements PVPConstants {
 	public static Assertion buildAssertion(AuthnRequest authnRequest,
-			AuthenticationSession authSession, EntityDescriptor peerEntity, DateTime date)
+			AuthenticationSession authSession, EntityDescriptor peerEntity, DateTime date, AssertionConsumerService assertionConsumerService)
 			throws MOAIDException {
 		Assertion assertion = SAML2Utils.createSAMLObject(Assertion.class);
 
@@ -95,77 +101,56 @@ public class PVP2AssertionBuilder implements PVPConstants {
 						peerEntity.getEntityID());
 		
 		if (reqAuthnContext == null) {
-			 authnContextClassRef.setAuthnContextClassRef(STORK_QAA_1_4);
+			 authnContextClassRef.setAuthnContextClassRef(authSession.getQAALevel());
 			
-		}
+		} else {
 
-		boolean stork_qaa_1_4_found = false;
+			boolean stork_qaa_1_4_found = false;
 	
-		 List<AuthnContextClassRef> reqAuthnContextClassRefIt = reqAuthnContext
-				.getAuthnContextClassRefs();
+			List<AuthnContextClassRef> reqAuthnContextClassRefIt = reqAuthnContext
+					.getAuthnContextClassRefs();
 		
-		 if (reqAuthnContextClassRefIt.size() == 0) {
+			if (reqAuthnContextClassRefIt.size() == 0) {
 			 
-			 QAALevelVerifier.verifyQAALevel(authSession.getQAALevel(), 
-					 STORK_QAA_1_4);
+				QAALevelVerifier.verifyQAALevel(authSession.getQAALevel(), 
+						STORK_QAA_1_4);
 			
-			 stork_qaa_1_4_found = true;
-			 authnContextClassRef.setAuthnContextClassRef(STORK_QAA_1_4);
+				stork_qaa_1_4_found = true;
+				authnContextClassRef.setAuthnContextClassRef(STORK_QAA_1_4);
 			 
-		 } else {
-			 for (AuthnContextClassRef authnClassRef : reqAuthnContextClassRefIt) {
-				 String qaa_uri = authnClassRef.getAuthnContextClassRef();
-				 if (qaa_uri.trim().equals(STORK_QAA_1_4)
-						 || qaa_uri.trim().equals(STORK_QAA_1_3)
-						 || qaa_uri.trim().equals(STORK_QAA_1_2)
-						 || qaa_uri.trim().equals(STORK_QAA_1_1)) {
+			} else {
+				for (AuthnContextClassRef authnClassRef : reqAuthnContextClassRefIt) {
+					String qaa_uri = authnClassRef.getAuthnContextClassRef();
+					if (qaa_uri.trim().equals(STORK_QAA_1_4)
+							|| qaa_uri.trim().equals(STORK_QAA_1_3)
+							|| qaa_uri.trim().equals(STORK_QAA_1_2)
+							|| qaa_uri.trim().equals(STORK_QAA_1_1)) {
 					
-					 if (authSession.isForeigner()) {
-						 QAALevelVerifier.verifyQAALevel(authSession.getQAALevel(), 
-								 STORK_QAA_PREFIX + oaParam.getQaaLevel());
-						 
-						 stork_qaa_1_4_found = true;
-						 authnContextClassRef.setAuthnContextClassRef(authSession.getQAALevel());
-						 
-					 } else {
-						 
-						 QAALevelVerifier.verifyQAALevel(authSession.getQAALevel(), 
-								 qaa_uri.trim());
-						 
-						 stork_qaa_1_4_found = true;
-						 authnContextClassRef.setAuthnContextClassRef(authSession.getQAALevel());
-						 							 
+						 if (authSession.isForeigner()) {
+							 QAALevelVerifier.verifyQAALevel(authSession.getQAALevel(), 
+									 STORK_QAA_PREFIX + oaParam.getQaaLevel());
+							 
+							 stork_qaa_1_4_found = true;
+							 authnContextClassRef.setAuthnContextClassRef(authSession.getQAALevel());
+							 
+						 } else {
+							 
+							 QAALevelVerifier.verifyQAALevel(authSession.getQAALevel(), 
+									 qaa_uri.trim());
+							 
+							 stork_qaa_1_4_found = true;
+							 authnContextClassRef.setAuthnContextClassRef(authSession.getQAALevel());
+							 							 
+						 }
+						 break;
 					 }
-					 break;
 				 }
 			 }
-		 }
-
-		if (!stork_qaa_1_4_found) {
-			throw new QAANotSupportedException(STORK_QAA_1_4);
+	
+			if (!stork_qaa_1_4_found) {
+				throw new QAANotSupportedException(STORK_QAA_1_4);
+			}
 		}
-
-//		reqAuthnContextClassRefIt = reqAuthnContext.getAuthnContextClassRefs()
-//				.iterator();
-//		
-//		StringBuilder authContextsb = new StringBuilder();
-//		
-//		while (reqAuthnContextClassRefIt.hasNext()) {
-//			AuthnContextClassRef authnClassRef = reqAuthnContextClassRefIt
-//					.next();
-//			String[] qaa_uris = authnClassRef.getAuthnContextClassRef().split(
-//					"\\s+");
-//			for (int i = 0; i < qaa_uris.length; i++) {
-//				if (qaa_uris[i].trim().equals(STORK_QAA_1_4)
-//						|| qaa_uris[i].trim().equals(STORK_QAA_1_3)
-//						|| qaa_uris[i].trim().equals(STORK_QAA_1_2)
-//						|| qaa_uris[i].trim().equals(STORK_QAA_1_1)) {
-//					authContextsb.append(qaa_uris[i].trim());
-//					authContextsb.append(" ");
-//				}
-//			}
-//
-//		}
 		
 		AuthnContext authnContext = SAML2Utils
 				.createSAMLObject(AuthnContext.class);
@@ -184,78 +169,61 @@ public class PVP2AssertionBuilder implements PVPConstants {
 		SPSSODescriptor spSSODescriptor = peerEntity
 				.getSPSSODescriptor(SAMLConstants.SAML20P_NS);
 		
-		Integer aIdx = authnRequest.getAttributeConsumingServiceIndex();
-		int idx = 0;
-
-		if (aIdx != null) {
-			idx = aIdx.intValue();
-			
-		} 
-
 		AttributeStatement attributeStatement = SAML2Utils
 				.createSAMLObject(AttributeStatement.class);
 
 		Subject subject = SAML2Utils.createSAMLObject(Subject.class);
-		NameID subjectNameID = SAML2Utils.createSAMLObject(NameID.class);
-		boolean foundFormat = false;
-
-		// TL: AuthData generation is moved to Assertion generation.
-
-		Iterator<NameIDFormat> formatIt = spSSODescriptor.getNameIDFormats()
-				.iterator();
-		while (formatIt.hasNext()) {
-			if (formatIt.next().getFormat().equals(NameID.PERSISTENT)) {
-				foundFormat = true;
-				break;
-			}
-		}
-		if (!foundFormat) {
-			// TODO use correct exception
-			throw new NameIDFormatNotSupportedException("");
-		}
-
-		// TODO: Check if we need to hide source pin
-		/*
-		 * if(authSession.getUseMandate()) { Element mandate =
-		 * authSession.getMandate(); if(authSession.getBusinessService()) { //
-		 * Hide Source PIN! ParepUtils.HideStammZahlen(mandate, true, null,
-		 * authSession.getDomainIdentifier(), true); } else {
-		 * ParepUtils.HideStammZahlen(mandate, false, authSession.getTarget(),
-		 * null, true); } }
-		 */
 
 		AuthenticationData authData = AuthenticationServer
 				.buildAuthenticationData(authSession, oaParam,
 						oaParam.getTarget());
 
+		//add Attributes to Assertion
 		if (spSSODescriptor.getAttributeConsumingServices() != null && 
 				spSSODescriptor.getAttributeConsumingServices().size() > 0) {
 		
-			AttributeConsumingService attributeConsumingService = spSSODescriptor
-					.getAttributeConsumingServices().get(idx);
+			Integer aIdx = authnRequest.getAttributeConsumingServiceIndex();
+			int idx = 0;
+
+			AttributeConsumingService attributeConsumingService = null;
 			
-			Iterator<RequestedAttribute> it = attributeConsumingService
-					.getRequestAttributes().iterator();
-			while (it.hasNext()) {
-				RequestedAttribute reqAttribut = it.next();
-				try {
-					Attribute attr = PVPAttributeBuilder.buildAttribute(
-							reqAttribut.getName(), authSession, oaParam, authData);
-					if (attr == null) {
+			if (aIdx != null) {
+				idx = aIdx.intValue();
+				attributeConsumingService = spSSODescriptor
+						.getAttributeConsumingServices().get(idx);
+				
+			} else {
+				List<AttributeConsumingService> attrConsumingServiceList = spSSODescriptor.getAttributeConsumingServices();
+				for (AttributeConsumingService el : attrConsumingServiceList) {
+					if (el.isDefault())
+						attributeConsumingService = el;
+				}				
+			}
+				
+			if (attributeConsumingService != null) {
+				Iterator<RequestedAttribute> it = attributeConsumingService
+						.getRequestAttributes().iterator();
+				while (it.hasNext()) {
+					RequestedAttribute reqAttribut = it.next();
+					try {
+						Attribute attr = PVPAttributeBuilder.buildAttribute(
+								reqAttribut.getName(), authSession, oaParam, authData);
+						if (attr == null) {
+							if (reqAttribut.isRequired()) {
+								throw new UnprovideableAttributeException(
+										reqAttribut.getName());
+							}
+						} else {
+							attributeStatement.getAttributes().add(attr);
+						}
+					} catch (PVP2Exception e) {
+						Logger.error(
+								"Attribute generation failed! for "
+										+ reqAttribut.getFriendlyName(), e);
 						if (reqAttribut.isRequired()) {
 							throw new UnprovideableAttributeException(
 									reqAttribut.getName());
 						}
-					} else {
-						attributeStatement.getAttributes().add(attr);
-					}
-				} catch (PVP2Exception e) {
-					Logger.error(
-							"Attribute generation failed! for "
-									+ reqAttribut.getFriendlyName(), e);
-					if (reqAttribut.isRequired()) {
-						throw new UnprovideableAttributeException(
-								reqAttribut.getName());
 					}
 				}
 			}
@@ -263,9 +231,9 @@ public class PVP2AssertionBuilder implements PVPConstants {
 		if (attributeStatement.getAttributes().size() > 0) {
 			assertion.getAttributeStatements().add(attributeStatement);
 		}
-
-		subjectNameID.setFormat(NameID.PERSISTENT);
 		
+		NameID subjectNameID = SAML2Utils.createSAMLObject(NameID.class);
+
 		//TLenz: set correct bPK Type and Value from AuthData
 		if (authSession.getUseMandate()) {
 			Element mandate = authSession.getMandate();
@@ -295,6 +263,7 @@ public class PVP2AssertionBuilder implements PVPConstants {
 			String bpktype = id.getType();
 			String bpk = id.getValue().getValue();
 			
+			
 			if (bpktype.equals(Constants.URN_PREFIX_BASEID)) {
 				if (authSession.getBusinessService()) {						    
 					subjectNameID.setValue(new BPKBuilder().buildWBPK(bpk, oaParam.getIdentityLinkDomainIdentifier()));
@@ -322,7 +291,52 @@ public class PVP2AssertionBuilder implements PVPConstants {
 			subjectNameID.setValue(authData.getBPK());
 		}
 		
-
+		String nameIDFormat = NameID.TRANSIENT;
+		
+		//get NameIDFormat from request		
+		AuthnRequest authnReq = (AuthnRequestImpl) authnRequest;
+		if (authnReq.getNameIDPolicy() != null) {
+			nameIDFormat = authnReq.getNameIDPolicy().getFormat();
+			
+		} else {
+			//get NameIDFormat from metadata
+			List<NameIDFormat> metadataNameIDFormats = spSSODescriptor.getNameIDFormats();
+			
+			if (metadataNameIDFormats != null) {
+				
+				for (NameIDFormat el : metadataNameIDFormats) {
+					if (NameID.PERSISTENT.equals(el.getFormat())) {
+						nameIDFormat = NameID.PERSISTENT;
+						break;
+						
+					} else if (NameID.TRANSIENT.equals(el.getFormat()) ||
+							NameID.UNSPECIFIED.equals(el.getFormat()))
+						break;
+					
+				}				
+			}
+		}
+	
+		if (NameID.TRANSIENT.equals(nameIDFormat) || NameID.UNSPECIFIED.equals(nameIDFormat)) {
+			String random = Random.nextRandom();
+			String nameID = subjectNameID.getValue();
+			
+			try {
+				MessageDigest md = MessageDigest.getInstance("SHA-1");
+				byte[] hash = md.digest((nameID + random).getBytes("ISO-8859-1"));			
+				subjectNameID.setValue(Base64Utils.encode(hash));
+				subjectNameID.setNameQualifier(null);
+				subjectNameID.setFormat(NameID.TRANSIENT);
+				
+			} catch (Exception e) {
+				Logger.warn("PVP2 subjectNameID error", e);
+				throw new MOAIDException("pvp2.13", null, e);
+			}
+			
+		} else 
+			subjectNameID.setFormat(nameIDFormat);			
+		
+		
 		subject.setNameID(subjectNameID);
 
 		SubjectConfirmation subjectConfirmation = SAML2Utils
@@ -332,16 +346,8 @@ public class PVP2AssertionBuilder implements PVPConstants {
 				.createSAMLObject(SubjectConfirmationData.class);
 		subjectConfirmationData.setInResponseTo(authnRequest.getID());
 		subjectConfirmationData.setNotOnOrAfter(date.plusMinutes(5));
-		
-		//TL: change from entityID to destination URL 
-		AssertionConsumerService consumerService = spSSODescriptor
-				.getAssertionConsumerServices().get(idx);
-
-		if (consumerService == null) {
-			throw new InvalidAssertionConsumerServiceException(idx);
-		}
-		
-		subjectConfirmationData.setRecipient(consumerService.getLocation());
+				
+		subjectConfirmationData.setRecipient(assertionConsumerService.getLocation());
 
 		subjectConfirmation.setSubjectConfirmationData(subjectConfirmationData);
 
@@ -357,7 +363,6 @@ public class PVP2AssertionBuilder implements PVPConstants {
 		conditions.setNotBefore(date);
 		
 		conditions.setNotOnOrAfter(date.plusMinutes(5));
-//		conditions.setNotOnOrAfter(new DateTime());
 		
 		conditions.getAudienceRestrictions().add(audienceRestriction);
 
@@ -365,8 +370,6 @@ public class PVP2AssertionBuilder implements PVPConstants {
 
 		Issuer issuer = SAML2Utils.createSAMLObject(Issuer.class);
 		
-		//TODO: check!
-		//change to entity value from entity name to IDP EntityID (URL)
 		issuer.setValue(PVPConfiguration.getInstance().getIDPPublicPath());
 		issuer.setFormat(NameID.ENTITY);
 		
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSTORKTOKEN.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSTORKTOKEN.java
index e3e33d6db..e8fba6af2 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSTORKTOKEN.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/builder/attributes/EIDSTORKTOKEN.java
@@ -22,15 +22,12 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes;
 
-import eu.stork.peps.auth.commons.IPersonalAttributeList;
-import eu.stork.peps.auth.commons.PersonalAttribute;
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
-import at.gv.egovernment.moa.id.auth.stork.STORKConstants;
 import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
 import at.gv.egovernment.moa.id.data.AuthenticationData;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.AttributeException;
 import at.gv.egovernment.moa.id.protocols.pvp2x.builder.attributes.exceptions.UnavailableAttributeException;
-import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
 
 public class EIDSTORKTOKEN implements IPVPAttributeBuilder  {
 
@@ -46,27 +43,14 @@ public class EIDSTORKTOKEN implements IPVPAttributeBuilder  {
 			throw new UnavailableAttributeException(EID_STORK_TOKEN_NAME);
 			
 		} else {
-			IPersonalAttributeList storkAttributes = authSession.getStorkAttributes();
-			
-			if ( storkAttributes == null ) {
+			String storkResponse = authSession.getStorkAuthnResponse();
+						
+			if ( MiscUtil.isEmpty(storkResponse) ) {
 				throw new UnavailableAttributeException(EID_STORK_TOKEN_NAME);
 				
-			}
-
-			try {
-				PersonalAttribute attribut = storkAttributes.get(STORKConstants.EIDENTIFIER_NAME);
-				ATT attr;
-				if (attribut != null) {
-					
-					attr = g.buildStringAttribute(EID_STORK_TOKEN_FRIENDLY_NAME, EID_STORK_TOKEN_NAME, attribut.getValue().get(0));					
-					return attr; 
-					
-				} else
-					throw new UnavailableAttributeException(EID_STORK_TOKEN_NAME);
+			} else {				
+				return g.buildStringAttribute(EID_STORK_TOKEN_FRIENDLY_NAME, EID_STORK_TOKEN_NAME, storkResponse);
 				
-			} catch (Exception e) {
-				Logger.warn("Attribut " + EID_STORK_TOKEN_FRIENDLY_NAME + " generation error", e);
-				throw new UnavailableAttributeException(EID_STORK_TOKEN_NAME);
 			}
 		}
 	}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/MOADefaultSecurityConfigurationBootstrap.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/MOADefaultSecurityConfigurationBootstrap.java
index 1563ba9be..f878b95d3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/MOADefaultSecurityConfigurationBootstrap.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/config/MOADefaultSecurityConfigurationBootstrap.java
@@ -25,6 +25,10 @@ package at.gv.egovernment.moa.id.protocols.pvp2x.config;
 import org.opensaml.xml.encryption.EncryptionConstants;
 import org.opensaml.xml.security.BasicSecurityConfiguration;
 import org.opensaml.xml.security.DefaultSecurityConfigurationBootstrap;
+import org.opensaml.xml.security.credential.BasicKeyInfoGeneratorFactory;
+import org.opensaml.xml.security.keyinfo.KeyInfoGeneratorManager;
+import org.opensaml.xml.security.keyinfo.NamedKeyInfoGeneratorManager;
+import org.opensaml.xml.security.x509.X509KeyInfoGeneratorFactory;
 import org.opensaml.xml.signature.SignatureConstants;
 
 /**
@@ -46,6 +50,25 @@ public class MOADefaultSecurityConfigurationBootstrap extends
 		return config;
 	}
 
+	protected static void populateKeyInfoGeneratorManager(
+			BasicSecurityConfiguration config) {
+		NamedKeyInfoGeneratorManager namedManager = new NamedKeyInfoGeneratorManager();
+		config.setKeyInfoGeneratorManager(namedManager);
+
+		namedManager.setUseDefaultManager(true);
+		KeyInfoGeneratorManager defaultManager = namedManager
+				.getDefaultManager();
+
+		BasicKeyInfoGeneratorFactory basicFactory = new BasicKeyInfoGeneratorFactory();
+		basicFactory.setEmitPublicKeyValue(true);
+
+		X509KeyInfoGeneratorFactory x509Factory = new X509KeyInfoGeneratorFactory();
+		x509Factory.setEmitEntityCertificate(true);
+
+		defaultManager.registerFactory(basicFactory);
+		defaultManager.registerFactory(x509Factory);
+	}
+	
 	protected static void populateSignatureParams(
 			BasicSecurityConfiguration config) {
 		
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/AuthnRequestValidatorException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/AuthnRequestValidatorException.java
new file mode 100644
index 000000000..7ed438471
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/AuthnRequestValidatorException.java
@@ -0,0 +1,62 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.protocols.pvp2x.exceptions;
+
+import at.gv.egovernment.moa.id.moduls.IRequest;
+
+/**
+ * @author tlenz
+ *
+ */
+public class AuthnRequestValidatorException extends PVP2Exception {
+
+	private IRequest errorRequest = null;
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 4939651000658508576L;
+
+	/**
+	 * @param messageId
+	 * @param parameters
+	 */
+	public AuthnRequestValidatorException(String messageId, Object[] parameters) {
+		super(messageId, parameters);
+		
+	}
+	
+	public AuthnRequestValidatorException(String messageId, Object[] parameters, IRequest errorRequest) {
+		super(messageId, parameters);
+		this.errorRequest = errorRequest;
+		
+	}
+
+	/**
+	 * @return the errorRequest
+	 */
+	public IRequest getErrorRequest() {
+		return errorRequest;
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/NameIDFormatNotSupportedException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/NameIDFormatNotSupportedException.java
index 5a393062f..b5facde34 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/NameIDFormatNotSupportedException.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/exceptions/NameIDFormatNotSupportedException.java
@@ -22,7 +22,7 @@
  *******************************************************************************/
 package at.gv.egovernment.moa.id.protocols.pvp2x.exceptions;
 
-public class NameIDFormatNotSupportedException extends PVP2Exception {
+public class NameIDFormatNotSupportedException extends AuthnRequestValidatorException {
 
 	public NameIDFormatNotSupportedException(String nameIDFormat) {
 		super("pvp2.12", new Object[] {nameIDFormat});
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/ArtifactResolution.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/ArtifactResolution.java
index f84e6e588..04ef4cdbf 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/ArtifactResolution.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/ArtifactResolution.java
@@ -67,7 +67,7 @@ public class ArtifactResolution implements IRequestHandler {
 				response.setMessage(assertion.getSamlMessage());
 				response.setIssueInstant(new DateTime());
 				SoapBinding encoder = new SoapBinding();
-				encoder.encodeRespone(req, resp, response, null);
+				encoder.encodeRespone(req, resp, response, null, null);
 			} catch (Exception e) {
 				Logger.error("Failed to resolve artifact", e);
 			}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/AuthnRequestHandler.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/AuthnRequestHandler.java
index 229158778..fd7ff9885 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/AuthnRequestHandler.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/requestHandler/AuthnRequestHandler.java
@@ -58,6 +58,7 @@ import org.opensaml.xml.security.x509.X509Credential;
 
 import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
 import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
 import at.gv.egovernment.moa.id.protocols.pvp2x.PVPConstants;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.ArtifactBinding;
 import at.gv.egovernment.moa.id.protocols.pvp2x.binding.IEncoder;
@@ -85,32 +86,13 @@ public class AuthnRequestHandler implements IRequestHandler, PVPConstants {
 			throw new MOAIDException("pvp2.13", null);
 		}
 
+		//get basic information
 		AuthnRequest authnRequest = (AuthnRequest) obj.getSamlRequest();
-		EntityDescriptor peerEntity = obj.getEntityMetadata();
-		
-		DateTime date = new DateTime();
-		
-		Assertion assertion = PVP2AssertionBuilder.buildAssertion(authnRequest, authSession, peerEntity, date);
-		
-		Response authResponse = SAML2Utils.createSAMLObject(Response.class);
-
-		Issuer nissuer = SAML2Utils.createSAMLObject(Issuer.class);
-		
-		//change to entity value from entity name to IDP EntityID (URL)
-		nissuer.setValue(PVPConfiguration.getInstance().getIDPPublicPath());
-		nissuer.setFormat(NameID.ENTITY);
-		authResponse.setIssuer(nissuer);
-		authResponse.setInResponseTo(authnRequest.getID());
-
-		
-		//SAML2 response required IssueInstant
-		authResponse.setIssueInstant(date);
-		
-		authResponse.setStatus(SAML2Utils.getSuccessStatus());
-
+		EntityDescriptor peerEntity = obj.getEntityMetadata();		
 		SPSSODescriptor spSSODescriptor = peerEntity
 				.getSPSSODescriptor(SAMLConstants.SAML20P_NS);
 		
+		//get AssertionConsumingService
 		Integer aIdx = authnRequest.getAssertionConsumerServiceIndex();
 		int idx = 0;
 
@@ -129,6 +111,31 @@ public class AuthnRequestHandler implements IRequestHandler, PVPConstants {
 			
 		}
 		
+		DateTime date = new DateTime();
+		
+		//build Assertion
+		Assertion assertion = PVP2AssertionBuilder.buildAssertion(authnRequest, authSession, peerEntity, date, consumerService);
+		
+		Response authResponse = SAML2Utils.createSAMLObject(Response.class);
+
+		Issuer nissuer = SAML2Utils.createSAMLObject(Issuer.class);
+		
+		//change to entity value from entity name to IDP EntityID (URL)
+		nissuer.setValue(PVPConfiguration.getInstance().getIDPPublicPath());
+		nissuer.setFormat(NameID.ENTITY);
+		authResponse.setIssuer(nissuer);
+		authResponse.setInResponseTo(authnRequest.getID());
+
+		//set responseID
+		String remoteSessionID = SAML2Utils.getSecureIdentifier();
+		authResponse.setID(remoteSessionID);
+		
+		
+		//SAML2 response required IssueInstant
+		authResponse.setIssueInstant(date);
+		
+		authResponse.setStatus(SAML2Utils.getSuccessStatus());
+				
 		String oaURL = consumerService.getLocation();
 
 		//check, if metadata includes an encryption key				
@@ -150,7 +157,8 @@ public class AuthnRequestHandler implements IRequestHandler, PVPConstants {
 			
 		}
 	
-		if (encryptionCredentials != null) {
+		boolean isEncryptionActive = AuthConfigurationProvider.getInstance().isPVP2AssertionEncryptionActive();		
+		if (encryptionCredentials != null && isEncryptionActive) {
 			//encrypt SAML2 assertion
 				
 			try {
@@ -212,7 +220,7 @@ public class AuthnRequestHandler implements IRequestHandler, PVPConstants {
 		}
 
 		try {
-			binding.encodeRespone(req, resp, authResponse, oaURL);
+			binding.encodeRespone(req, resp, authResponse, oaURL, obj.getRelayState());
 			// TODO add remoteSessionID to AuthSession ExternalPVPSessionStore
 			
 //			Logger logger = new Logger();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
index e3e25b1a9..d95e21a0e 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/signer/CredentialProvider.java
@@ -30,9 +30,11 @@ import org.opensaml.xml.security.credential.Credential;
 import org.opensaml.xml.security.credential.UsageType;
 import org.opensaml.xml.security.x509.BasicX509Credential;
 import org.opensaml.xml.security.x509.KeyStoreX509CredentialAdapter;
+import org.opensaml.xml.security.x509.X509Credential;
 import org.opensaml.xml.signature.Signature;
 import org.opensaml.xml.signature.SignatureConstants;
 
+import at.gv.egovernment.moa.id.opemsaml.MOAKeyStoreX509CredentialAdapter;
 import at.gv.egovernment.moa.id.protocols.pvp2x.config.PVPConfiguration;
 import at.gv.egovernment.moa.id.protocols.pvp2x.utils.SAML2Utils;
 import at.gv.egovernment.moa.logging.Logger;
@@ -42,7 +44,7 @@ public class CredentialProvider {
 	
 	private static KeyStore keyStore = null;
 	
-	public static Credential getIDPMetaDataSigningCredential()
+	public static X509Credential getIDPMetaDataSigningCredential()
 			throws CredentialsNotAvailableException {
 		PVPConfiguration config = PVPConfiguration.getInstance();
 		try {
@@ -51,7 +53,7 @@ public class CredentialProvider {
 				keyStore = KeyStoreUtils.loadKeyStore(config.getIDPKeyStoreFilename(), 
 						config.getIDPKeyStorePassword());
 
-			KeyStoreX509CredentialAdapter credentials = new KeyStoreX509CredentialAdapter(
+			MOAKeyStoreX509CredentialAdapter credentials = new MOAKeyStoreX509CredentialAdapter(
 					keyStore, config.getIDPKeyAliasMetadata(), config
 							.getIDPKeyPasswordMetadata().toCharArray());
 
@@ -64,7 +66,7 @@ public class CredentialProvider {
 		}
 	}
 
-	public static Credential getIDPAssertionSigningCredential()
+	public static X509Credential getIDPAssertionSigningCredential()
 			throws CredentialsNotAvailableException {
 		PVPConfiguration config = PVPConfiguration.getInstance();
 		try {
@@ -72,12 +74,12 @@ public class CredentialProvider {
 				keyStore = KeyStoreUtils.loadKeyStore(config.getIDPKeyStoreFilename(), 
 						config.getIDPKeyStorePassword());
 
-			KeyStoreX509CredentialAdapter credentials = new KeyStoreX509CredentialAdapter(
+			MOAKeyStoreX509CredentialAdapter credentials = new MOAKeyStoreX509CredentialAdapter(
 					keyStore, config.getIDPKeyAliasAssertionSign(), config
 							.getIDPKeyPasswordAssertionSign().toCharArray());
-
+			
 			credentials.setUsageType(UsageType.SIGNING);
-			return credentials;
+			return (X509Credential) credentials;
 		} catch (Exception e) {
 			Logger.error("Failed to generate IDP Assertion Signing credentials");
 			e.printStackTrace();
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java
new file mode 100644
index 000000000..ab8fab5d1
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/pvp2x/validation/AuthnRequestValidator.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2014 Federal Chancellery Austria
+ * MOA-ID has been developed in a cooperation between BRZ, the Federal
+ * Chancellery Austria - ICT staff unit, and Graz University of Technology.
+ *
+ * Licensed under the EUPL, Version 1.1 or - as soon they will be approved by
+ * the European Commission - subsequent versions of the EUPL (the "Licence");
+ * You may not use this work except in compliance with the Licence.
+ * You may obtain a copy of the Licence at:
+ * http://www.osor.eu/eupl/
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the Licence is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the Licence for the specific language governing permissions and
+ * limitations under the Licence.
+ *
+ * This product combines work with different licenses. See the "NOTICE" text
+ * file for details on the various modules and licenses.
+ * The "NOTICE" text file is part of the distribution. Any derivative works
+ * that you distribute must include a readable copy of the "NOTICE" text file.
+ */
+package at.gv.egovernment.moa.id.protocols.pvp2x.validation;
+
+import org.opensaml.saml2.core.AuthnRequest;
+import org.opensaml.saml2.core.NameID;
+import org.opensaml.saml2.core.NameIDPolicy;
+
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.AuthnRequestValidatorException;
+import at.gv.egovernment.moa.id.protocols.pvp2x.exceptions.NameIDFormatNotSupportedException;
+
+/**
+ * @author tlenz
+ *
+ */
+public class AuthnRequestValidator {
+
+	public static void validate(AuthnRequest req) throws AuthnRequestValidatorException{
+
+		//validate NameIDPolicy
+		NameIDPolicy nameIDPolicy = req.getNameIDPolicy();
+		if (nameIDPolicy != null) {
+			String nameIDFormat = nameIDPolicy.getFormat();
+			
+			if ( !(nameIDFormat != null &&
+					(NameID.TRANSIENT.equals(nameIDFormat) ||
+							NameID.PERSISTENT.equals(nameIDFormat) ||
+							NameID.UNSPECIFIED.equals(nameIDFormat))) ) {
+			
+				throw new NameIDFormatNotSupportedException(nameIDFormat);
+				
+			}
+		}
+		
+		
+		
+	}
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java
index 3f6495a1a..c337433b6 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/GetArtifactAction.java
@@ -52,6 +52,13 @@ public class GetArtifactAction implements IAction {
 		String oaURL = (String) req.getOAURL();
 		String target = (String) req.getTarget();
 		
+		String sourceID = null;
+		if (req instanceof SAML1RequestImpl) {
+			SAML1RequestImpl saml1req = (SAML1RequestImpl) req;
+			sourceID = saml1req.getSourceID();
+			
+		}
+		
 		try {
 		
 			
@@ -78,13 +85,13 @@ public class GetArtifactAction implements IAction {
 			// add other stork attributes to MOA assertion if available
 			if(null != session.getStorkAttributes()) {
 				List<ExtendedSAMLAttribute> moaExtendedSAMLAttibutes = STORKResponseProcessor.addAdditionalSTORKAttributes(session.getStorkAttributes());
-				session.setExtendedSAMLAttributesOA(moaExtendedSAMLAttibutes);
+				session.getExtendedSAMLAttributesOA().addAll(moaExtendedSAMLAttibutes);
 				//produce MOA-Assertion and artifact                    
 				AuthenticationServer.getInstance().getForeignAuthenticationData(session);
 				Logger.info("MOA assertion assembled and SAML Artifact generated.");
 			}
 			
-			String samlArtifactBase64 = saml1server.BuildSAMLArtifact(session, oaParam, authData);
+			String samlArtifactBase64 = saml1server.BuildSAMLArtifact(session, oaParam, authData, sourceID);
 			
 			if (AuthenticationSessionStoreage.isSSOSession(session.getSessionID())) {
 				String url = "RedirectServlet";
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
index 7c91026bf..6391860ff 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1AuthenticationServer.java
@@ -165,7 +165,7 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 	
 	public String BuildSAMLArtifact(AuthenticationSession session, 
 			OAAuthParameter oaParam, 
-			AuthenticationData authData) 
+			AuthenticationData authData, String sourceID) 
 					throws ConfigurationException, BuildException, AuthenticationException {
 		
 		//Load SAML1 Parameter from OA config
@@ -326,7 +326,7 @@ public class SAML1AuthenticationServer extends AuthenticationServer {
 				
 			String samlArtifact = new SAMLArtifactBuilder().build(
 			session.getAuthURL(), Random.nextRandom(),
-			saml1parameter.getSourceID());
+			sourceID);
 			
 			storeAuthenticationData(samlArtifact, authData);
 	
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
index e587ef0e1..b6a2ac0b6 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/saml1/SAML1Protocol.java
@@ -44,6 +44,7 @@ import at.gv.egovernment.moa.id.moduls.IRequest;
 import at.gv.egovernment.moa.id.moduls.RequestImpl;
 import at.gv.egovernment.moa.id.util.ParamValidatorUtils;
 import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.MiscUtil;
 import at.gv.egovernment.moa.util.URLEncoder;
 
 public class SAML1Protocol implements IModulInfo, MOAIDAuthConstants {
@@ -81,7 +82,7 @@ public class SAML1Protocol implements IModulInfo, MOAIDAuthConstants {
 
 	public IRequest preProcess(HttpServletRequest request,
 			HttpServletResponse response, String action) throws MOAIDException {
-		RequestImpl config = new RequestImpl();
+		SAML1RequestImpl config = new SAML1RequestImpl();
 		
 		if (!AuthConfigurationProvider.getInstance().getAllowedProtocols().isSAML1Active()) {
 			Logger.info("SAML1 is deaktivated!");
@@ -95,19 +96,34 @@ public class SAML1Protocol implements IModulInfo, MOAIDAuthConstants {
 		String target = (String) request.getParameter(PARAM_TARGET);
 		target = StringEscapeUtils.escapeHtml(target);
 		
+		String sourceID = request.getParameter(PARAM_SOURCEID);
+		sourceID = StringEscapeUtils.escapeHtml(sourceID);
+		
 		//the target parameter is used to define the OA in SAML1 standard
 		if (target != null && target.startsWith("http")) {
 			oaURL = target;
 			target = null;
 		}
 		
+		if (MiscUtil.isEmpty(oaURL)) {
+			Logger.info("Receive SAML1 request with no OA parameter. Authentication STOPPED!");
+			throw new WrongParametersException("StartAuthentication", PARAM_OA,
+					"auth.12");
+			
+		}
+		
 		if (!ParamValidatorUtils.isValidOA(oaURL))
 			throw new WrongParametersException("StartAuthentication", PARAM_OA,
 					"auth.12");
+	
 		config.setOAURL(oaURL);
 		
 		Logger.info("Dispatch SAML1 Request: OAURL=" + oaURL);
 		
+	    if (!ParamValidatorUtils.isValidSourceID(sourceID))
+            throw new WrongParametersException("StartAuthentication", PARAM_SOURCEID, "auth.12");
+		
+		
 		//load Target only from OA config
 		OAAuthParameter oaParam = AuthConfigurationProvider.getInstance()
 				.getOnlineApplicationParameter(oaURL);
@@ -123,10 +139,12 @@ public class SAML1Protocol implements IModulInfo, MOAIDAuthConstants {
 					new Object[] { oaURL });
 		}
 		
+		config.setSourceID(sourceID);
+		
 		config.setTarget(oaParam.getTarget());
 		
-		request.getSession().setAttribute(PARAM_OA, oaURL);
-		request.getSession().setAttribute(PARAM_TARGET, oaParam.getTarget());
+//		request.getSession().setAttribute(PARAM_OA, oaURL);
+//		request.getSession().setAttribute(PARAM_TARGET, oaParam.getTarget());
 		return config;
 	}
 
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
new file mode 100644
index 000000000..1d9e31674
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeCollector.java
@@ -0,0 +1,237 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.List;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.moduls.IAction;
+import at.gv.egovernment.moa.id.moduls.IRequest;
+import at.gv.egovernment.moa.id.storage.AssertionStorage;
+import at.gv.egovernment.moa.id.util.VelocityProvider;
+import at.gv.egovernment.moa.logging.Logger;
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.PEPSUtil;
+import eu.stork.peps.auth.commons.PersonalAttribute;
+import eu.stork.peps.auth.commons.PersonalAttributeList;
+import eu.stork.peps.auth.engine.STORKSAMLEngine;
+import eu.stork.peps.exceptions.STORKSAMLEngineException;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * the AttributeCollector Action tries to get all requested attributes from a set of {@link AttributeProvider} Plugins.
+ * The class is called whenever the {@link AuthenticationRequest} Action is invoked and checks for missing attributes.
+ * Furthermore, the class can handle direct posts. That is when the class triggers an attribute query which needs user
+ * interaction, redirect to another portal, etc. The redirect will hit here and the class can continue to fetch attributes.
+ * 
+ * TODO how do we treat mandatory and optional attributes?
+ */
+public class AttributeCollector implements IAction {
+
+    /**
+     * The Constant ARTIFACT_ID.
+     */
+    private static final String ARTIFACT_ID = "artifactId";
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IAction#processRequest(at.gv.egovernment.moa.id.moduls.IRequest, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, at.gv.egovernment.moa.id.auth.data.AuthenticationSession)
+     */
+    public String processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, AuthenticationSession moasession) throws MOAIDException {
+
+		// - fetch the container
+		String artifactId = (String) httpReq.getParameter(ARTIFACT_ID);
+		DataContainer container;
+		try {
+			container = AssertionStorage.getInstance().get(artifactId, DataContainer.class);
+		} catch (MOADatabaseException e) {
+			Logger.error("Error fetching incomplete Stork response from temporary storage. Most likely a timeout occured.", e);
+			throw new MOAIDException("stork.11", null);
+		}
+
+        // read configuration parameters of OA
+        OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(container.getRequest().getAssertionConsumerServiceURL());
+        if (oaParam == null)
+            throw new AuthenticationException("stork.12", new Object[]{moasession.getPublicOAURLPrefix()});
+
+        // find the attribute provider plugin that can handle the response
+        IPersonalAttributeList newAttributes = null;
+        for (AttributeProvider current : AttributeProviderFactory.getConfiguredPlugins(oaParam.getStorkAPs()))
+            try {
+                newAttributes = current.parse(httpReq);
+                
+                // stop as soon as we hit a capable plugin
+                break;
+            } catch (UnsupportedAttributeException e1) {
+                // the current provider cannot find anything familiar within the
+                // provided httpreq. Try the next one.
+            }
+
+        if (null == newAttributes) {
+            // we do not have a provider which is capable of fetching something
+            // from the received httpreq.
+            Logger.error("No attribute could be retrieved from the response the attribute provider gave us.");
+        }
+
+        // - insert the embedded attribute(s) into the container
+        addOrUpdateAll(container.getResponse().getPersonalAttributeList(), newAttributes);
+
+        // see if we need some more attributes
+        return processRequest(container, httpReq, httpResp, moasession, oaParam);
+    }
+
+    /**
+     * Checks if there are missing attributes and tries to fetch them. If there are no more attribute to fetch,
+     * this very method creates and sends the protocol result to the asking S-PEPS.
+     *
+     * @param container the {@link DataContainer} representing the status of the overall query.
+     * @return the string
+     * @throws MOAIDException
+     */
+    public String processRequest(DataContainer container, HttpServletRequest request, HttpServletResponse response, AuthenticationSession moasession, OAAuthParameter oaParam) throws MOAIDException {
+        // check if there are attributes we need to fetch
+
+        IPersonalAttributeList requestAttributeList = container.getRequest().getPersonalAttributeList();
+        IPersonalAttributeList responseAttributeList = container.getResponse().getPersonalAttributeList();
+        List<PersonalAttribute> missingAttributes = new ArrayList<PersonalAttribute>();
+        for (PersonalAttribute current : requestAttributeList)
+            if (!responseAttributeList.containsKey(current.getName()))
+                missingAttributes.add(current);
+
+        Logger.info("collecting attributes...");
+		Logger.debug("found " + missingAttributes.size() + " missing attributes");
+
+        // Try to get all missing attributes
+        try {
+            // for each attribute still missing
+            for (PersonalAttribute currentAttribute : missingAttributes) {
+            	
+				/*
+				 * prefill attributes with "notAvailable". If we get them later, we override the value and status.
+				 * This way, there is no error case in which an attribute is left unanswered.
+				 */
+				IPersonalAttributeList aquiredAttributes = new PersonalAttributeList();
+				currentAttribute.setStatus("notAvailable");
+				aquiredAttributes.add((PersonalAttribute) currentAttribute.clone());
+				addOrUpdateAll(container.getResponse().getPersonalAttributeList(), aquiredAttributes);
+
+            	// - check if we can find a suitable AttributeProvider Plugin
+                for (AttributeProvider currentProvider : AttributeProviderFactory.getConfiguredPlugins(oaParam.getStorkAPs())) {
+                    try {
+                        // - hand over control to the suitable plugin
+                    	Logger.info(currentProvider.getClass().getSimpleName() + " called to handle attribute '" + currentAttribute.getName() + "'");
+                        aquiredAttributes = currentProvider.acquire(currentAttribute, container.getRequest().getSpCountry(), moasession);
+                    	Logger.info(currentProvider.getClass().getSimpleName() + " can handle attribute '" + currentAttribute.getName() + "'");
+                        break;
+                    } catch (UnsupportedAttributeException e) {
+                        // ok, try the next attributeprovider
+                    	Logger.info(currentProvider.getClass().getSimpleName() + " could not handle attribute '" + currentAttribute.getName() + "'");
+                    } catch (MOAIDException e) {
+                        // the current plugin had an error. Try the next one.
+                    	Logger.info(currentProvider.getClass().getSimpleName() + " could not handle attribute '" + currentAttribute.getName() + "' due to an error");
+                    }
+                }
+                
+				// check if we could fetch the attribute
+				if (null == aquiredAttributes) {
+					// if not
+					Logger.error("We have no suitable plugin for obtaining the attribute '" + currentAttribute.getName() + "'");
+				} else
+					// else, update any existing attributes
+					addOrUpdateAll(container.getResponse().getPersonalAttributeList(), aquiredAttributes);
+            }
+            Logger.info("collecting attributes done");
+            
+            // ask for consent if necessary
+            if(oaParam.isRequireConsentForStorkAttributes())
+            	new ConsentEvaluator().requestConsent(container, response, oaParam);
+            else
+            	new ConsentEvaluator().generateSTORKResponse(response, container);
+
+            return "12345"; // AssertionId
+
+        } catch (ExternalAttributeRequestRequiredException e) {
+            // the attribute request is ongoing and requires an external service.
+            try {
+                // memorize the container again
+				Logger.debug("prepare putting the container into temporary storage...");
+
+                // - generate new key
+                String newArtifactId = new SecureRandomIdentifierGenerator()
+                        .generateIdentifier();
+                // - put container in temporary store.
+                AssertionStorage.getInstance().put(newArtifactId, container);
+
+				Logger.debug("...successful");
+
+				Logger.info(e.getAp().getClass().getSimpleName() + " is going to ask an external service provider for the requested attributes");
+                // add container-key to redirect embedded within the return URL
+                e.getAp().performRedirect(AuthConfigurationProvider.getInstance().getPublicURLPrefix() + "/stork2/ResumeAuthentication?" + ARTIFACT_ID + "=" + newArtifactId, request, response, oaParam);
+
+            } catch (Exception e1) {
+                // TODO should we return the response as is to the PEPS?
+                Logger.error("Error putting incomplete Stork response into temporary storage", e1);
+                e1.printStackTrace();
+                throw new MOAIDException("stork.11", null);
+            }
+
+            return "12345"; // TODO what to do here?
+        }
+    }
+
+    /**
+     * Adds or updates all {@link PersonalAttribute} objects given in {@code source} to/in {@code target}.
+     *
+     * @param target the target
+     * @param source the source
+     * @throws MOAIDException 
+     */
+	private void addOrUpdateAll(IPersonalAttributeList target, IPersonalAttributeList source) throws MOAIDException {
+		Logger.debug("Updating " + source.size() + " attributes...");
+		for (PersonalAttribute current : source) {
+			Logger.trace("treating " + current.getName());
+	        
+			// check if we need to update the current pa
+			if (target.containsKey(current.getName())) {
+				PersonalAttribute existing = target.get(current.getName());
+				if(!(existing.isEmptyValue() && existing.isEmptyComplexValue()))
+					if(!(existing.getValue().equals(current.getValue()) || existing.getComplexValue().equals(current.getComplexValue()))) {
+		                Logger.error("Attribute Value does not match the value from first authentication!");
+		                throw new MOAIDException("stork.16", new Object[] {existing.getName()});
+					}
+
+				target.get(current.getName()).setStatus(current.getStatus());
+				target.get(current.getName()).setValue(current.getValue());
+				target.get(current.getName()).setComplexValue(current.getComplexValue());
+			} else
+				target.add(current);
+
+			Logger.trace("...successfully treated " + current.getName());
+		}
+	}
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IAction#needAuthentication(at.gv.egovernment.moa.id.moduls.IRequest, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    public boolean needAuthentication(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp) {
+    	// this action does not need any authentication. The authentication is already done by the preceding AuthenticationRequest-Action.
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IAction#getDefaultActionName()
+     */
+    public String getDefaultActionName() {
+        return STORKProtocol.ATTRIBUTE_COLLECTOR;
+    }
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProvider.java
new file mode 100644
index 000000000..2914d8f7d
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProvider.java
@@ -0,0 +1,56 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.PersonalAttribute;
+
+/**
+ * An {@link AttributeProvider} can fetch a set of stork attributes. It might complete the query within one method call,
+ * but might also need to redirect to another webservice to accomplish its task.
+ */
+public interface AttributeProvider {
+	
+	/**
+	 * Acquire the specified attribute. Returns {@code null} when attribute retrieval is in progress, but requires for
+	 * for redirecting the user to an external service. Use {@link AttributeProvider#parse(HttpServletRequest)} to parse
+	 * the response.
+	 *
+	 * @param attributes the list of attributes to be acquired
+	 * @param spCountyCode the sp county code
+	 * @param moasession the moasession
+	 * @return the personal attribute
+	 * @throws UnsupportedAttributeException the unsupported attribute exception
+	 * @throws ExternalAttributeRequestRequiredException an attribute request to an external service has to be done
+	 * @throws MOAIDException the mOAID exception
+	 */
+	public IPersonalAttributeList acquire(PersonalAttribute attributes, String spCountyCode, AuthenticationSession moasession) throws UnsupportedAttributeException, ExternalAttributeRequestRequiredException, MOAIDException;
+
+	/**
+	 * Perform redirect.
+	 *
+	 * @param url the return URL ending with ?artifactId=...
+	 * @param req the request we got from the S-PEPS and for which we have to ask our APs
+	 * @param resp the response to the preceding request
+	 * @param oaParam the oa param
+	 * @throws MOAIDException the mOAID exception
+	 */
+	public void performRedirect(String url, HttpServletRequest req, HttpServletResponse resp, OAAuthParameter oaParam) throws MOAIDException;
+	
+	/**
+	 * Parses the response we got from the external attribute provider.
+	 *
+	 * @param httpReq the http req
+	 * @return a list of attributes
+	 * @throws UnsupportedAttributeException if the provider cannot find anything familiar in the provided httpReq
+	 * @throws MOAIDException if something went wrong
+	 */
+	public IPersonalAttributeList parse(HttpServletRequest httpReq) throws UnsupportedAttributeException, MOAIDException;
+
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
new file mode 100644
index 000000000..a339cff23
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AttributeProviderFactory.java
@@ -0,0 +1,73 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import at.gv.egovernment.moa.id.commons.db.dao.config.AttributeProviderPlugin;
+import at.gv.egovernment.moa.logging.Logger;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * A factory for creating AttributeProvider objects.
+ */
+public class AttributeProviderFactory {
+
+    /**
+     * Gets the available plugins.
+     *
+     * @return the available plugins
+     */
+    public static List<String> getAvailablePlugins() {
+        List<String> result = new ArrayList<String>();
+        result.add("StorkAttributeRequestProvider");
+        result.add("EHvdAttributeProvider");
+        result.add("SignedDocAttributeRequestProvider");
+        result.add("MandateAttributeRequestProvider");
+
+        return result;
+    }
+
+    /**
+     * Creates an AttributeProvider object for the given shortname. Returns
+     * {@code null} if there is no such provider available.
+     *
+     * @param shortname the simpleName for the providers class
+     * @return the attribute provider
+     */
+    public static AttributeProvider create(String shortname, String url, String attributes) {
+        if (shortname.equals("StorkAttributeRequestProvider")) {
+            return new StorkAttributeRequestProvider(url, attributes);
+        } else if (shortname.equals("EHvdAttributeProvider")) {
+            return new EHvdAttributeProviderPlugin(url, attributes);
+        } else if (shortname.equals("SignedDocAttributeRequestProvider")) {
+            return new SignedDocAttributeRequestProvider(url, attributes);
+        } else if (shortname.equals("MandateAttributeRequestProvider")) {
+            try {
+                return new MandateAttributeRequestProvider(url, attributes);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+                return null;
+            }
+        } else {
+            return null;
+        }
+    }
+
+    /**
+     * Gets fresh instances of the configured plugins.
+     *
+     * @param configuredAPs the configured a ps
+     * @return the configured plugins
+     */
+    public static List<AttributeProvider> getConfiguredPlugins(
+            List<AttributeProviderPlugin> configuredAPs) {
+
+        List<AttributeProvider> result = new ArrayList<AttributeProvider>();
+        for (AttributeProviderPlugin current : configuredAPs) {
+
+            result.add(create(current.getName(), current.getUrl(), current.getAttributes()));
+            Logger.debug("Adding configured attribute provider: " + current.getClass().getName() + current.getName() + " at " + current.getUrl());
+        }
+
+        return result;
+    }
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
new file mode 100644
index 000000000..5e49fe413
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/AuthenticationRequest.java
@@ -0,0 +1,201 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.AuthenticationException;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.moduls.IAction;
+import at.gv.egovernment.moa.id.moduls.IRequest;
+import at.gv.egovernment.moa.id.util.client.mis.simple.MISMandate;
+import at.gv.egovernment.moa.logging.Logger;
+import eu.stork.peps.auth.commons.*;
+import eu.stork.peps.auth.engine.STORKSAMLEngine;
+import eu.stork.peps.exceptions.STORKSAMLEngineException;
+import org.apache.velocity.app.VelocityEngine;
+import org.apache.velocity.runtime.RuntimeConstants;
+import org.joda.time.DateTime;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+
+/**
+ * Second request step - after authentication of the user is done and moasession obtained,
+ * process request and forward the user further to PEPS and/or other entities
+ *
+ * @author bsuzic
+ */
+
+public class AuthenticationRequest implements IAction {
+
+
+    private VelocityEngine velocityEngine;
+    private AuthenticationSession moaSession = null;
+    private MOASTORKRequest moaStorkRequest = null;
+
+
+    public String processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, AuthenticationSession moasession) throws MOAIDException {
+
+        this.moaSession = moasession;
+
+        if (req instanceof MOASTORKRequest) {
+
+            this.moaStorkRequest = (MOASTORKRequest) req;
+
+            Logger.debug("Entering MOASTORKRequest");
+            httpResp.reset();
+            
+            OAAuthParameter oaParam = AuthConfigurationProvider.getInstance().getOnlineApplicationParameter(moasession.getPublicOAURLPrefix());
+            if (oaParam == null)
+                throw new AuthenticationException("stork.12", new Object[]{moasession.getPublicOAURLPrefix()});
+
+            MOASTORKResponse moaStorkResponse = new MOASTORKResponse();
+            
+            // check if it is attribute query
+            if (moaStorkRequest.isAttrRequest()) {
+                Logger.debug("Starting AttrQueryRequest");
+                
+                moaStorkResponse.setSTORKAttrResponse(new STORKAttrQueryResponse());
+            }
+            // check if we have authentication request
+            else if (moaStorkRequest.isAuthnRequest()) {
+                Logger.debug("Starting AuthenticationRequest");
+                moaStorkResponse.setSTORKAuthnResponse(new STORKAuthnResponse());
+
+
+                STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP");
+
+                Logger.debug("Starting generation of SAML response");
+                try {
+                    moaStorkResponse.setSTORKAuthnResponse(engine.generateSTORKAuthnResponse(moaStorkRequest.getStorkAuthnRequest(), moaStorkResponse.getStorkAuthnResponse(),httpReq.getRemoteAddr(), false));
+                } catch (STORKSAMLEngineException ex) {
+                    // TODO
+                }
+
+                // Get personal attributtes from MOA/IdentityLink
+                moaStorkResponse.setPersonalAttributeList(populateAttributes());
+
+
+            }
+            
+            //moaStorkResponse.setCountry(moaStorkRequest.getSpCountry());
+
+            // Prepare extended attributes
+            Logger.debug("Preparing data container");
+
+            // create fresh container
+            DataContainer container = new DataContainer();
+
+            // - fill in the request we extracted above
+            container.setRequest(moaStorkRequest);
+
+            // - fill in the partial response created above
+            container.setResponse(moaStorkResponse);
+
+            container.setRemoteAddress(httpReq.getRemoteAddr());
+
+
+            STORKAuthnResponse arep = moaStorkResponse.getStorkAuthnResponse();
+
+
+            arep.setCountry("XX");
+            arep.setInResponseTo("xxxx");
+            arep.setMessage("xxxx");
+            arep.setSamlId("xxxx");
+            arep.setStatusCode("xxxx");
+
+           // arep.setNotBefore(new DateTime().withTimeAtStartOfDay());
+           // arep.setNotOnOrAfter(new DateTime().withTimeAtStartOfDay());
+
+
+            Logger.debug("Data container prepared");
+
+            return (new AttributeCollector()).processRequest(container, httpReq, httpResp, moasession, oaParam);
+        } else {
+            Logger.error("Could not recognize request.");
+            throw new MOAIDException("stork.15", null);
+        }
+    }
+
+    public boolean needAuthentication(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp) {
+        return true;
+    }
+
+
+    private void iterate(NamedNodeMap attributesList) {
+        for (int j = 0; j < attributesList.getLength(); j++) {
+            Logger.debug("--Attribute: "
+                    + attributesList.item(j).getNodeName() + " = "
+                    + attributesList.item(j).getNodeValue());
+        }
+    }
+
+
+    // does nothing
+    public void mandate(AuthenticationSession moasession) {
+
+        if (moasession.getUseMandate()) {
+            try {
+                MISMandate mandate = moasession.getMISMandate();
+                String owbpk = mandate.getOWbPK();
+                byte[] mand = mandate.getMandate();
+                String profprep = mandate.getProfRep();
+                //String textdesc = mandate.getTextualDescriptionOfOID();
+                Element mndt = moasession.getMandate();
+
+                iterate(mndt.getAttributes());
+                Logger.debug("mandate encoded: " + new String(org.bouncycastle.util.encoders.Base64.encode(mand)));
+            } catch (Exception x) {
+                Logger.debug("There is no mandate used in transaction");
+            }
+        }
+
+
+    }
+
+    public PersonalAttributeList populateAttributes() {
+
+        IPersonalAttributeList attrLst = moaStorkRequest.getStorkAuthnRequest().getPersonalAttributeList();
+        Logger.info("Found " + attrLst.size() + " personal attributes in the request.");
+
+        // Define attribute list to be populated
+        PersonalAttributeList attributeList = new PersonalAttributeList();
+        MOAAttributeProvider moaAttributeProvider = new MOAAttributeProvider(moaSession.getIdentityLink(), moaStorkRequest);
+
+        try {
+            for (PersonalAttribute personalAttribute : attrLst) {
+                Logger.debug("Personal attribute found in request: " + personalAttribute.getName() + " isRequired: " + personalAttribute.isRequired());
+                moaAttributeProvider.populateAttribute(attributeList, personalAttribute);
+            }
+        } catch (Exception e) {
+            Logger.error("Exception, attributes: " + e.getMessage());
+        }
+
+        Logger.debug("AUTHBLOCK " + moaSession.getAuthBlock());
+        Logger.debug("TARGET " + moaSession.getTarget() + " " + moaSession.getTargetFriendlyName());
+        Logger.debug("SESSION IDENTIFIER " + moaSession.getCcc() + " " + moaSession.getDomainIdentifier());
+        Logger.debug("AUTHBLOCKTOKKEN" + moaSession.getAuthBlockTokken());
+
+        return attributeList;
+    }
+
+    public String getDefaultActionName() {
+        return STORKProtocol.AUTHENTICATIONREQUEST;
+    }
+
+
+    private void initVelocityEngine() throws Exception {
+        velocityEngine = new VelocityEngine();
+        velocityEngine.setProperty(RuntimeConstants.ENCODING_DEFAULT, "UTF-8");
+        velocityEngine.setProperty(RuntimeConstants.OUTPUT_ENCODING, "UTF-8");
+        velocityEngine.setProperty(RuntimeConstants.RESOURCE_LOADER, "classpath");
+        velocityEngine.setProperty("classpath.resource.loader.class",
+                "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
+
+        velocityEngine.init();
+    }
+
+}
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
new file mode 100644
index 000000000..9a3376e4c
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ConsentEvaluator.java
@@ -0,0 +1,208 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.commons.db.ex.MOADatabaseException;
+import at.gv.egovernment.moa.id.config.auth.AuthConfigurationProvider;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.moduls.IAction;
+import at.gv.egovernment.moa.id.moduls.IRequest;
+import at.gv.egovernment.moa.id.storage.AssertionStorage;
+import at.gv.egovernment.moa.id.util.VelocityProvider;
+import at.gv.egovernment.moa.logging.Logger;
+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.exceptions.STORKSAMLEngineException;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+import org.joda.time.DateTime;
+import org.opensaml.common.impl.SecureRandomIdentifierGenerator;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * The ConsentEvaluator assists with fetching user consent on the list of attributes to be sent to the asking S-PEPS.
+ */
+public class ConsentEvaluator implements IAction {
+
+    /**
+     * The Constant ARTIFACT_ID.
+     */
+    private static final String ARTIFACT_ID = "artifactId";
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IAction#processRequest(at.gv.egovernment.moa.id.moduls.IRequest, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, at.gv.egovernment.moa.id.auth.data.AuthenticationSession)
+     */
+    public String processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, AuthenticationSession moasession) throws MOAIDException {
+
+		// - fetch the container
+		String artifactId = (String) httpReq.getParameter(ARTIFACT_ID);
+		DataContainer container;
+		try {
+			container = AssertionStorage.getInstance().get(artifactId, DataContainer.class);
+		} catch (MOADatabaseException e) {
+			Logger.error("Error fetching incomplete Stork response from temporary storage. Most likely a timeout occured.", e);
+			throw new MOAIDException("stork.17", null);
+		}
+
+		// evaluate response
+		for(PersonalAttribute current : container.getResponse().getPersonalAttributeList()) {
+			if(null == httpReq.getParameter(current.getName())) {
+				current.setStatus("notAvailable");
+				current.setValue(new ArrayList<String>());
+				current.setComplexValue(new HashMap<String, String>());
+			}
+		}
+
+        // build and send response
+        generateSTORKResponse(httpResp, container);
+        
+        return "12345"; // AssertionId
+    }
+
+	/**
+	 * Fills the given HttpResponse with the required web page.
+	 *
+	 * @param container the container
+	 * @param response the response
+	 * @param oaParam the oa param
+	 * @return the string
+	 * @throws MOAIDException the mOAID exception
+	 */
+	public String requestConsent(DataContainer container, HttpServletResponse response, OAAuthParameter oaParam) throws MOAIDException {
+		// prepare redirect
+		String newArtifactId;
+		try {
+
+			// memorize the container again
+			Logger.debug("prepare putting the container into temporary storage...");
+
+			// - generate new key
+			newArtifactId = new SecureRandomIdentifierGenerator().generateIdentifier();
+
+			// - put container in temporary store.
+			AssertionStorage.getInstance().put(newArtifactId, container);
+
+			Logger.debug("...successful");
+
+		} catch (Exception e1) {
+			// TODO should we return the response as is to the PEPS?
+			e1.printStackTrace();
+            Logger.error("Error putting incomplete Stork response into temporary storage", e1);
+			throw new MOAIDException("stork.17", null);
+		}
+
+		// ask for consent
+		try {
+			VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine();
+			Template template = velocityEngine.getTemplate("/resources/templates/stork2_consent.html");
+			VelocityContext context = new VelocityContext();
+
+			context.put("action", AuthConfigurationProvider.getInstance().getPublicURLPrefix() + "/stork2/CompleteAuthentication?" + ARTIFACT_ID + "=" + newArtifactId);
+
+			// assemble table
+			String table = "";
+			for (PersonalAttribute current : container.getResponse().getPersonalAttributeList())
+				if ("Available".equals(current.getStatus()))
+					table += "<tr><td><input type=\"checkbox\" checked=\"yes\" name=\"" + current.getName() + "\"></td><td>" + current.getName() + "</td></tr>\n";
+
+			context.put("tablecontent", table);
+
+			StringWriter writer = new StringWriter();
+			template.merge(context, writer);
+			response.getOutputStream().write(writer.getBuffer().toString().getBytes());
+
+		} catch (Exception e) {
+			Logger.error("Velocity error: " + e.getMessage());
+			throw new MOAIDException("stork.17", null);
+		}
+
+		return "12345"; // AssertionId
+	}
+
+    /**
+     * generates binary response from given response class and fill the given HttpResponse with a SAML Post Binding template.
+     *
+     * @param httpResp the http resp
+     * @param container the container
+     * @throws MOAIDException the mOAID exception
+     */
+    public void generateSTORKResponse(HttpServletResponse httpResp, DataContainer container) throws MOAIDException {
+    	MOASTORKRequest request = container.getRequest();
+        MOASTORKResponse response = container.getResponse();
+        
+        Logger.info("generating stork response...");
+
+        try {
+            //Get SAMLEngine instance
+            STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP");
+            Logger.debug("Starting generation of SAML response");
+			if(response.isAuthnResponse())
+				response.setSTORKAuthnResponse(engine.generateSTORKAuthnResponse(request.getStorkAuthnRequest(), response.getStorkAuthnResponse(), container.getRemoteAddress(), false));
+			else
+				response.setSTORKAttrResponse(engine.generateSTORKAttrQueryResponse(request.getStorkAttrQueryRequest(), response.getStorkAttrQueryResponse(), container.getRemoteAddress(), "", false));
+
+
+            //generateSAML Token
+            Logger.info("SAML response succesfully generated!");
+        } catch (STORKSAMLEngineException e) {
+            Logger.error("Failed to generate STORK SAML Response", e);
+            throw new MOAIDException("stork.05", null);
+        }
+
+        // preparing redirection for the client
+        try {
+            VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine();
+            Template template = velocityEngine.getTemplate("/resources/templates/stork2_postbinding_template.html");
+            VelocityContext context = new VelocityContext();
+            
+            byte[] blob;
+			if(request.isAttrRequest())
+            	blob = response.getStorkAttrQueryResponse().getTokenSaml();
+            else
+            	blob = response.getStorkAuthnResponse().getTokenSaml();
+
+            context.put("SAMLResponse", PEPSUtil.encodeSAMLToken(blob));
+            Logger.debug("SAMLResponse original: " + new String(blob));
+
+            Logger.debug("Putting assertion consumer url as action: " + request.getAssertionConsumerServiceURL());
+            context.put("action", request.getAssertionConsumerServiceURL());
+            Logger.debug("Starting template merge");
+            StringWriter writer = new StringWriter();
+
+            Logger.debug("Doing template merge");
+            template.merge(context, writer);
+            Logger.debug("Template merge done");
+
+            Logger.debug("Sending html content: " + writer.getBuffer().toString());
+            Logger.debug("Sending html content2  : " + new String(writer.getBuffer()));
+
+            httpResp.getOutputStream().write(writer.getBuffer().toString().getBytes());
+
+        } catch (Exception e) {
+            Logger.error("Velocity error: " + e.getMessage());
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IAction#needAuthentication(at.gv.egovernment.moa.id.moduls.IRequest, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse)
+     */
+    public boolean needAuthentication(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp) {
+    	// this action does not need any authentication. The authentication is already done by the preceding AuthenticationRequest-Action.
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IAction#getDefaultActionName()
+     */
+    public String getDefaultActionName() {
+        return STORKProtocol.CONSENT_EVALUATOR;
+    }
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/DataContainer.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/DataContainer.java
new file mode 100644
index 000000000..d13754aff
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/DataContainer.java
@@ -0,0 +1,78 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import java.io.Serializable;
+
+/**
+ * Holds info about an ongoing but yet incomplete stork authnrequest process.
+ */
+public class DataContainer implements Serializable {
+	
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = -8765997480582363012L;
+
+	/** The incoming request. */
+	private MOASTORKRequest request;
+	
+	/** The yet incomplete response. */
+	private MOASTORKResponse response;
+	
+	/** The target. */
+	private String target;
+	
+	/** The remote address. */
+	private String remoteAddress;
+	
+	/**
+	 * Gets the request.
+	 *
+	 * @return the request
+	 */
+	public MOASTORKRequest getRequest() {
+		return request;
+	}
+
+	/**
+	 * Sets the request.
+	 *
+	 * @param moaStorkRequest the new request
+	 */
+	public void setRequest(MOASTORKRequest moaStorkRequest) {
+		this.request = moaStorkRequest;
+	}
+
+	/**
+	 * Gets the response.
+	 *
+	 * @return the response
+	 */
+	public MOASTORKResponse getResponse() {
+		return response;
+	}
+
+	/**
+	 * Sets the response.
+	 *
+	 * @param moaStorkResponse the new response
+	 */
+	public void setResponse(MOASTORKResponse moaStorkResponse) {
+		this.response = moaStorkResponse;
+	}
+
+	/**
+	 * Gets the remote address.
+	 *
+	 * @return the remote address
+	 */
+	public String getRemoteAddress() {
+		return remoteAddress;
+	}
+
+	/**
+	 * Sets the remote address.
+	 *
+	 * @param remoteAddress the new remote address
+	 */
+	public void setRemoteAddress(String remoteAddress) {
+		this.remoteAddress = remoteAddress;
+	}
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java
new file mode 100644
index 000000000..5e9d9404c
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/EHvdAttributeProviderPlugin.java
@@ -0,0 +1,222 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import java.io.StringWriter;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import javax.xml.soap.MessageFactory;
+import javax.xml.soap.SOAPBody;
+import javax.xml.soap.SOAPConnection;
+import javax.xml.soap.SOAPConnectionFactory;
+import javax.xml.soap.SOAPElement;
+import javax.xml.soap.SOAPEnvelope;
+import javax.xml.soap.SOAPMessage;
+import javax.xml.soap.SOAPPart;
+import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+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;
+
+/**
+ * Fetches the attribute IsHealthcareProfessional from the BAGDAD SOAP service
+ */
+public class EHvdAttributeProviderPlugin implements AttributeProvider {
+	
+	/** The destination. */
+	private Object destination;
+	
+	/** The attributes. */
+	private String attributes;
+
+	/**
+	 * Instantiates a new e hvd attribute provider plugin.
+	 *
+	 * @param url the service url
+	 * @param attributes 
+	 */
+	public EHvdAttributeProviderPlugin(String url, String supportedAttributes) {
+		destination = url;
+		attributes = supportedAttributes;
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#acquire(eu.stork.peps.auth.commons.PersonalAttribute)
+	 */
+	public IPersonalAttributeList acquire(PersonalAttribute attribute, String spCountryCode, AuthenticationSession moasession)
+			throws UnsupportedAttributeException,
+			ExternalAttributeRequestRequiredException, MOAIDException {
+
+		// break when we cannot handle the requested attribute
+		if(!attributes.contains(attribute.getName()))
+			throw new UnsupportedAttributeException();
+		
+		try {
+	    	Logger.debug("initializing SOAP connections...");
+			// create SOAP connection
+			SOAPConnection soapConnection = SOAPConnectionFactory.newInstance().createConnection();
+			
+			// assemble SOAP request
+			MessageFactory messageFactory = MessageFactory.newInstance();
+			SOAPMessage requestMessage = messageFactory.createMessage();
+			SOAPPart requestPart = requestMessage.getSOAPPart();
+
+			// (soap 1.1 relevant part. could not find a solution to use soap 1.2 in time.
+			requestMessage.getMimeHeaders().setHeader("SOAPAction", "http://gesundheit.gv.at/BAGDAD/DataAccessService/IsHealthcareProfessional");
+
+            /*
+            Construct SOAP Request Message:
+			<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+			  <soap:Body>
+			    <IsHealthcareProfessional xmlns="http://gesundheit.gv.at/BAGDAD/DataAccessService">
+			      <bPK>string</bPK>
+			    </IsHealthcareProfessional>
+			  </soap:Body>
+			</soap:Envelope>
+
+			see https://stork.ehealth.gv.at/GDAService.asmx?op=IsHealthcareProfessional
+             */
+
+			// SOAP Envelope
+			SOAPEnvelope envelope = requestPart.getEnvelope();
+
+			// SOAP Body
+			SOAPBody requestBody = envelope.getBody();
+			SOAPElement requestBodyElem = requestBody.addChildElement("IsHealthcareProfessional");
+			requestBodyElem.addAttribute(envelope.createName("xmlns"), "http://gesundheit.gv.at/BAGDAD/DataAccessService");
+
+			SOAPElement requestBodyElem1 = requestBodyElem.addChildElement("bPK");
+			requestBodyElem1.addTextNode(new BPKBuilder().buildBPK(moasession.getIdentityLink().getIdentificationValue(), "GH"));
+
+			requestMessage.saveChanges();
+
+			// perform SOAP call
+	    	Logger.debug("call...");
+			SOAPMessage responseMessage = soapConnection.call(requestMessage, destination);
+
+			// parse SOAP response
+
+            /*
+			<soap:Envelope xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">
+			  <soap:Body>
+			    <IsHealthcareProfessionalResponse xmlns="http://gesundheit.gv.at/BAGDAD/DataAccessService">
+			      <IsHealthcareProfessionalResult>
+			        <RequestOK>boolean</RequestOK>
+			        <Message>string</Message>
+			        <IsHealthcareProfessional>boolean</IsHealthcareProfessional>
+			        <NameOfOrganisation>string</NameOfOrganisation>
+			        <Type>string</Type>
+			        <Specialization>string</Specialization>
+			      </IsHealthcareProfessionalResult>
+			    </IsHealthcareProfessionalResponse>
+			  </soap:Body>
+			</soap:Envelope>
+
+			see https://stork.ehealth.gv.at/GDAService.asmx?op=IsHealthcareProfessional
+             */
+	    	Logger.debug("call successful. Parse...");
+			SOAPBody responseBody = responseMessage.getSOAPBody();
+
+			// iterate through tree
+			SOAPElement responseElement = (SOAPElement) responseBody.getChildElements().next();
+			SOAPElement resultElement = (SOAPElement) responseElement.getChildElements().next();
+
+			// collect all info in a map
+			Iterator<?> it = resultElement.getChildElements();
+			Map<String, String> collection = new HashMap<String, String>();
+			while (it.hasNext()) {
+				SOAPElement current = (SOAPElement) it.next();
+
+				collection.put(current.getNodeName(), current.getTextContent());
+			}
+
+			// check if there is anything valid in the map
+			if (collection.isEmpty() || collection.size() != 6) {
+				Logger.warn("eHVD returned an unexpected count of values. Expected 6 got " + collection.size());
+				throw new IndexOutOfBoundsException("response attributes not like specified");
+			}
+
+			// - fetch request validity
+			if (collection.get("RequestOK").equals("false")) {
+				Logger.warn("eHVD reported an invalid request. The error message is: " + collection.get("Message"));
+				throw new Exception("eHVD reported an invalid request");
+			}
+
+			PersonalAttribute acquiredAttribute = null;
+
+			if (collection.get("IsHealthcareProfessional").equals("false")) {
+				// the citizen is no HCP
+				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, new ArrayList<String>(), "NotAvailable");
+			} else {
+				// go on and parse the data
+				IsHealthCareProfessionalType result = new IsHealthCareProfessionalType();
+				result.setNameOfOrganisation(collection.get("NameOfOrganisation"));
+
+				if (collection.get("Type").equals("Medical doctor"))
+					result.setHCPType("D");
+				else
+					result.setHCPType("?");
+
+				if (collection.get("Specialization").contains("Arzt für Allgemeinmedizin"))
+					result.setSpecialisation("GP");
+				else
+					result.setSpecialisation("??");
+
+				result.setAQAA(4);
+
+				final Marshaller m = JAXBContext.newInstance(IsHealthCareProfessionalType.class).createMarshaller();
+			    m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
+			    
+			    StringWriter stringWriter = new StringWriter();
+			    m.marshal(new ObjectFactory().createIsHealthCareProfessional(result), stringWriter);		    
+				
+				ArrayList<String> value = new ArrayList<String>();
+				value.add(stringWriter.toString());
+
+				acquiredAttribute = new PersonalAttribute("isHealthCareProfessional", false, value, "Available");
+			}
+
+			// pack and return the result
+			PersonalAttributeList result = new PersonalAttributeList();
+			result.add(acquiredAttribute);
+
+			// add stork id for verification
+			ArrayList<String> value = new ArrayList<String>();
+			value.add(new BPKBuilder().buildStorkbPK(moasession.getIdentityLink().getIdentificationValue(), spCountryCode));
+			result.add(new PersonalAttribute("eIdentifier", false, value, "Available"));
+
+			return result;
+		} catch (Exception e) {
+			throw new MOAIDException("stork.13", new Object[] { e });
+		}
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#performRedirect(java.lang.String, java.lang.String, javax.servlet.http.HttpServletRequest, javax.servlet.http.HttpServletResponse, at.gv.egovernment.moa.id.config.auth.OAAuthParameter)
+	 */
+	public void performRedirect(String url,
+			HttpServletRequest req, HttpServletResponse resp,
+			OAAuthParameter oaParam) throws MOAIDException {
+		// there is no redirect required
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#parse(javax.servlet.http.HttpServletRequest)
+	 */
+	public IPersonalAttributeList parse(HttpServletRequest httpReq)
+			throws UnsupportedAttributeException, MOAIDException {
+		// there is no redirect required, so we throw an exception when someone asks us to parse a response
+		throw new UnsupportedAttributeException();
+	}
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ExternalAttributeRequestRequiredException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ExternalAttributeRequestRequiredException.java
new file mode 100644
index 000000000..67fbd50f8
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/ExternalAttributeRequestRequiredException.java
@@ -0,0 +1,29 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+public class ExternalAttributeRequestRequiredException extends Exception {
+	
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = 5207631348933518908L;
+	
+	/** The ap. */
+	private AttributeProvider ap;
+
+	/**
+	 * Instantiates a new external attribute request required exception.
+	 *
+	 * @param provider the provider
+	 */
+	public ExternalAttributeRequestRequiredException(AttributeProvider provider) {
+		ap = provider;
+	}
+
+	/**
+	 * Gets the ap that caused the exception.
+	 *
+	 * @return the ap
+	 */
+	public AttributeProvider getAp() {
+		return ap;
+	}
+
+}
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
new file mode 100644
index 000000000..873ec1e26
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOAAttributeProvider.java
@@ -0,0 +1,104 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import at.gv.egovernment.moa.id.auth.builder.BPKBuilder;
+import at.gv.egovernment.moa.id.auth.data.IdentityLink;
+import at.gv.egovernment.moa.id.auth.exception.BuildException;
+import at.gv.egovernment.moa.logging.Logger;
+import eu.stork.peps.auth.commons.PersonalAttribute;
+import eu.stork.peps.auth.commons.PersonalAttributeList;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * @author bsuzic
+ *         Date: 2/19/14, Time: 4:42 PM
+ */
+public class MOAAttributeProvider {
+    private final IdentityLink identityLink;
+    private static final Map<String, String> storkAttributeSimpleMapping;
+    private static final Map<String, String> storkAttributeFunctionMapping;
+    private final MOASTORKRequest moastorkRequest;
+
+    static {
+        Map<String, String> tempSimpleMap = new HashMap<String, String>();
+        tempSimpleMap.put("givenName", "getGivenName");
+        tempSimpleMap.put("surname", "getFamilyName");
+        tempSimpleMap.put("dateOfBirth", "getDateOfBirth");
+        storkAttributeSimpleMapping = Collections.unmodifiableMap(tempSimpleMap);
+        Map<String, String> tempFunctionMap = new HashMap<String, String>();
+        tempFunctionMap.put("eIdentifier", "geteIdentifier");
+        storkAttributeFunctionMapping = Collections.unmodifiableMap(tempFunctionMap);
+    }
+
+    public MOAAttributeProvider(IdentityLink identityLink, MOASTORKRequest moastorkRequest) {
+        this.identityLink = identityLink;
+        this.moastorkRequest = moastorkRequest;
+        Logger.debug("identity " + identityLink.getIdentificationType() + " " + identityLink.getIdentificationValue());
+    }
+
+    public void populateAttribute(PersonalAttributeList attributeList, PersonalAttribute requestedAttribute ) {
+        String storkAttribute = requestedAttribute.getName();
+        if (storkAttributeSimpleMapping.containsKey(storkAttribute)) {
+            Logger.debug("Trying to get value for attribute using simple mapping [" + storkAttribute + "]");
+            try {
+                Method method = identityLink.getClass().getDeclaredMethod(storkAttributeSimpleMapping.get(storkAttribute));
+                populateAttributeWithMethod(method, identityLink, attributeList, storkAttribute, requestedAttribute.isRequired());
+            } catch (NoSuchMethodException e) {
+                Logger.error("Could not found MOA extraction method while getting attribute: " + storkAttribute);
+                e.printStackTrace();
+            }
+
+        } else if (storkAttributeFunctionMapping.containsKey(storkAttribute)) {
+
+            Logger.debug("Trying to get value for attribute using function mapping [" + storkAttribute + "]");
+            try {
+                Method method = this.getClass().getDeclaredMethod(storkAttributeFunctionMapping.get(storkAttribute));
+                populateAttributeWithMethod(method, this, attributeList, storkAttribute, requestedAttribute.isRequired());
+            } catch (NoSuchMethodException e) {
+                Logger.error("Could not found MOA extraction method while getting attribute: " + storkAttribute);
+                e.printStackTrace();
+            }
+        } else {
+            Logger.debug("MOA method for extraction of attribute " + storkAttribute + " not defined.");
+        }
+    }
+
+    private String geteIdentifier() {
+        Logger.debug("Using base urn for identification value: " + identityLink.getIdentificationType() + " and target country: " + moastorkRequest.getStorkAuthnRequest().getSpCountry());
+        try {
+            return new BPKBuilder().buildStorkbPK(identityLink.getIdentificationValue(), moastorkRequest.getStorkAuthnRequest().getSpCountry());
+        } catch (BuildException be) {
+            Logger.error("Stork eid could not be constructed; " + be.getMessage());
+            return null; // TODO error
+        }
+    }
+
+
+    private void populateAttributeWithMethod(Method method, Object object, PersonalAttributeList attributeList, String storkAttribute, Boolean isRequired) {
+        try {
+            String attributeValue = method.invoke(object, new Class[]{}).toString();
+            PersonalAttribute newAttribute = new PersonalAttribute();
+            newAttribute.setName(storkAttribute);
+
+            newAttribute.setStatus("Available");
+            newAttribute.setIsRequired(isRequired);
+            Logger.info("Got attribute value: " + attributeValue);
+            newAttribute.setValue(new ArrayList<String>(edu.emory.mathcs.backport.java.util.Collections.singletonList(attributeValue)));
+            attributeList.add(newAttribute);
+        } catch (InvocationTargetException e) {
+            Logger.error("Invocation target exception while getting attribute: " + storkAttribute);
+            e.printStackTrace();
+        } catch (IllegalAccessException e) {
+            Logger.error("Illegal access exception while getting attribute: " + storkAttribute);
+            e.printStackTrace();
+        }
+    }
+
+
+}
+
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKRequest.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKRequest.java
new file mode 100644
index 000000000..9ea33c8ef
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKRequest.java
@@ -0,0 +1,213 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import java.io.Serializable;
+
+import at.gv.egovernment.moa.id.moduls.IRequest;
+import at.gv.egovernment.moa.logging.Logger;
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.STORKAttrQueryRequest;
+import eu.stork.peps.auth.commons.STORKAuthnRequest;
+
+/**
+ * Implements MOA request and stores StorkAuthn/Attr-Request related data.
+ *
+ * @author bsuzic
+ */
+public class MOASTORKRequest implements IRequest, Serializable {
+	
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = 4581953368724501376L;
+	
+	/** The request id. */
+	private String requestID;
+    
+    /** The target. */
+    private String target = null;
+    
+    /** The module. */
+    String module = null;
+    
+    /** The action. */
+    String action = null;
+    
+    /** The stork authn request. */
+    private STORKAuthnRequest storkAuthnRequest;
+    
+    /** The stork attr query request. */
+    private STORKAttrQueryRequest storkAttrQueryRequest;
+
+    /**
+     * Sets the sTORK authn request.
+     *
+     * @param request the new sTORK authn request
+     */
+    public void setSTORKAuthnRequest(STORKAuthnRequest request) {
+        this.storkAuthnRequest = request;
+    }
+
+    /**
+     * Sets the sTORK attr request.
+     *
+     * @param request the new sTORK attr request
+     */
+    public void setSTORKAttrRequest(STORKAttrQueryRequest request) {
+        this.storkAttrQueryRequest = request;
+    }
+
+    /**
+     * Checks if the container holds an AttrQueryRequest
+     *
+     * @return true, if is attr request
+     */
+    public boolean isAttrRequest() {
+        return null != storkAttrQueryRequest;
+    }
+
+    /**
+     * Checks if the container holds an AuthnRequest
+     *
+     * @return true, if is authn request
+     */
+    public boolean isAuthnRequest() {
+        return null != storkAuthnRequest;
+    }
+
+
+    /**
+     * Gets the stork authn request.
+     *
+     * @return the stork authn request
+     */
+    public STORKAuthnRequest getStorkAuthnRequest() {
+        return this.storkAuthnRequest;
+    }
+
+    /**
+     * Gets the stork attr query request.
+     *
+     * @return the stork attr query request
+     */
+    public STORKAttrQueryRequest getStorkAttrQueryRequest() {
+        return this.storkAttrQueryRequest;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#getOAURL()
+     */
+    public String getOAURL() {
+        if (isAuthnRequest())
+            return storkAuthnRequest.getAssertionConsumerServiceURL();
+        else if (isAttrRequest())
+            return storkAttrQueryRequest.getAssertionConsumerServiceURL();
+        else {
+            Logger.error("There is no authentication or attribute request contained in MOASTORKRequest.");
+            return null;
+        }
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#isPassiv()
+     */
+    public boolean isPassiv() {
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#forceAuth()
+     */
+    public boolean forceAuth() {
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#isSSOSupported()
+     */
+    public boolean isSSOSupported() {
+        return false;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#requestedModule()
+     */
+    public String requestedModule() {
+        return this.module;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#requestedAction()
+     */
+    public String requestedAction() {
+        return action;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#setModule(java.lang.String)
+     */
+    public void setModule(String module) {
+        this.module = module;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#setAction(java.lang.String)
+     */
+    public void setAction(String action) {
+        this.action = action;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#getTarget()
+     */
+    public String getTarget() {
+        return this.target;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#setRequestID(java.lang.String)
+     */
+    public void setRequestID(String id) {
+        this.requestID = id;
+    }
+
+    /* (non-Javadoc)
+     * @see at.gv.egovernment.moa.id.moduls.IRequest#getRequestID()
+     */
+    public String getRequestID() {
+        return this.requestID;
+    }
+    
+    /**
+     * Gets the personal attribute list.
+     *
+     * @return the personal attribute list
+     */
+    public IPersonalAttributeList getPersonalAttributeList() {
+    	if(isAttrRequest())
+    		return this.storkAttrQueryRequest.getPersonalAttributeList();
+    	else
+    		return this.storkAuthnRequest.getPersonalAttributeList();
+    }
+
+	/**
+	 * Gets the sp country.
+	 *
+	 * @return the sp country
+	 */
+	public String getSpCountry() {
+    	if(isAttrRequest())
+    		return this.storkAttrQueryRequest.getSpCountry();
+    	else
+    		return this.storkAuthnRequest.getSpCountry();
+	}
+
+	/**
+	 * Gets the assertion consumer service url.
+	 *
+	 * @return the assertion consumer service url
+	 */
+	public String getAssertionConsumerServiceURL() {
+    	if(isAttrRequest())
+    		return this.storkAttrQueryRequest.getAssertionConsumerServiceURL();
+    	else
+    		return this.storkAuthnRequest.getAssertionConsumerServiceURL();
+	}
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKResponse.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKResponse.java
new file mode 100644
index 000000000..4e0f57779
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MOASTORKResponse.java
@@ -0,0 +1,117 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import java.io.Serializable;
+
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.PersonalAttributeList;
+import eu.stork.peps.auth.commons.STORKAttrQueryResponse;
+import eu.stork.peps.auth.commons.STORKAuthnResponse;
+
+/**
+ * Implements MOA request and stores StorkAuthn/Attr-Request related data.
+ *
+ * @author bsuzic
+ */
+public class MOASTORKResponse implements Serializable {
+	
+	/** The Constant serialVersionUID. */
+	private static final long serialVersionUID = -5798803155055518747L;
+	
+	/** The stork authn request. */
+	private STORKAuthnResponse storkAuthnResponse;
+    
+    /** The stork attr query request. */
+    private STORKAttrQueryResponse storkAttrQueryResponse;
+    
+    /**
+     * Sets the sTORK authn response.
+     *
+     * @param request the new sTORK authn response
+     */
+    public void setSTORKAuthnResponse(STORKAuthnResponse request) {
+        this.storkAuthnResponse = request;
+    }
+
+    /**
+     * Sets the sTORK attr response.
+     *
+     * @param request the new sTORK attr response
+     */
+    public void setSTORKAttrResponse(STORKAttrQueryResponse request) {
+        this.storkAttrQueryResponse = request;
+    }
+
+    /**
+     * Checks if the container holds an AttrQuery
+     *
+     * @return true, if is attr response
+     */
+    public boolean isAttrResponse() {
+        return null != storkAttrQueryResponse;
+    }
+
+    /**
+     * Checks if the container holds an AuthnRequest
+     *
+     * @return true, if is authn response
+     */
+    public boolean isAuthnResponse() {
+        return null != storkAuthnResponse;
+    }
+
+
+    /**
+     * Gets the AuthnResponse.
+     *
+     * @return the stork authn response
+     */
+    public STORKAuthnResponse getStorkAuthnResponse() {
+        return this.storkAuthnResponse;
+    }
+
+    /**
+     * Gets the AttrQueryResponse.
+     *
+     * @return the stork attr query response
+     */
+    public STORKAttrQueryResponse getStorkAttrQueryResponse() {
+        return this.storkAttrQueryResponse;
+    }
+    
+    /**
+     * Gets the personal attribute list.
+     *
+     * @return the personal attribute list
+     */
+    public IPersonalAttributeList getPersonalAttributeList() {
+    	if(isAttrResponse())
+    		return this.storkAttrQueryResponse.getPersonalAttributeList();
+    	else
+    		return this.storkAuthnResponse.getPersonalAttributeList();
+    }
+
+    /**
+     * Sets the personal attribute list.
+     *
+     * @param populateAttributes the new personal attribute list
+     */
+    public void setPersonalAttributeList(PersonalAttributeList populateAttributes) {
+    	if(isAttrResponse())
+    		this.storkAttrQueryResponse.setPersonalAttributeList(populateAttributes);
+    	else
+    		this.storkAuthnResponse.setPersonalAttributeList(populateAttributes);
+    }
+    
+	/**
+	 * Sets the country.
+	 *
+	 * @param spCountry the new country
+	 */
+	public void setCountry(String spCountry) {
+    	if(isAttrResponse())
+    		this.storkAttrQueryResponse.setCountry(spCountry);
+    	else
+    		this.storkAuthnResponse.setCountry(spCountry);
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateAttributeRequestProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateAttributeRequestProvider.java
new file mode 100644
index 000000000..0e94600db
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateAttributeRequestProvider.java
@@ -0,0 +1,125 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.util.HTTPUtils;
+import at.gv.egovernment.moa.id.util.VelocityProvider;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.StringUtils;
+import eu.stork.peps.auth.commons.*;
+import eu.stork.peps.auth.engine.STORKSAMLEngine;
+import eu.stork.peps.exceptions.STORKSAMLEngineException;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.StringWriter;
+
+/**
+ * Provides mandate attribute from MIS
+ */
+public class MandateAttributeRequestProvider implements AttributeProvider {
+    /**
+     * The destination.
+     */
+    private String destination;
+
+    /**
+     * The attributes.
+     */
+    private String attributes;
+
+    private String spCountryCode;
+
+    private PersonalAttributeList requestedAttributes;
+
+    public MandateAttributeRequestProvider(String aPurl, String supportedAttributes) throws MOAIDException {
+        destination = aPurl;
+        attributes = supportedAttributes;
+    }
+
+    public String getAttrProviderName() {
+        return "MandateAttributeRequestProvider";
+    }
+
+    public IPersonalAttributeList acquire(PersonalAttribute attribute, String spCountryCode, AuthenticationSession moasession) throws UnsupportedAttributeException, ExternalAttributeRequestRequiredException, MOAIDException {
+        Logger.info("Acquiring attribute: " + attribute.getName() + ", by: " + getAttrProviderName());
+        this.spCountryCode = spCountryCode;
+        requestedAttributes = new PersonalAttributeList(1);
+        requestedAttributes.add(attribute);
+
+        // break if we cannot handle the requested attribute
+        if (!attributes.contains(attribute.getName())) {
+            Logger.info("Attribute " + attribute.getName() + " not supported by the provider: " + getAttrProviderName());
+            throw new UnsupportedAttributeException();
+        }
+        PersonalAttributeList result = new PersonalAttributeList();
+        //return result;
+        Logger.info("Thrown external request by: " + getAttrProviderName());
+        throw new ExternalAttributeRequestRequiredException(this);
+    }
+
+    public void performRedirect(String url, HttpServletRequest req, HttpServletResponse resp, OAAuthParameter oaParam) throws MOAIDException {
+
+        String spSector = "Business";
+        String spInstitution = StringUtils.isEmpty(oaParam.getFriendlyName()) ? "UNKNOWN" : oaParam.getFriendlyName();
+        String spApplication = spInstitution;
+
+        //generate AuthnRquest
+        STORKAttrQueryRequest attributeRequest = new STORKAttrQueryRequest();
+        attributeRequest.setDestination(destination);
+        attributeRequest.setAssertionConsumerServiceURL(url);
+        attributeRequest.setIssuer(HTTPUtils.getBaseURL(req));
+        attributeRequest.setQaa(oaParam.getQaaLevel());
+        attributeRequest.setSpInstitution(spInstitution);
+        attributeRequest.setCountry(spCountryCode);
+        attributeRequest.setSpCountry(spCountryCode);
+        attributeRequest.setSpApplication(spApplication);
+        attributeRequest.setSpSector(spSector);
+        attributeRequest.setPersonalAttributeList(requestedAttributes);
+
+        attributeRequest.setCitizenCountryCode("AT");
+
+
+        Logger.info("STORK AttrRequest successfully assembled.");
+
+        STORKSAMLEngine samlEngine = STORKSAMLEngine.getInstance("VIDP");
+        try {
+            attributeRequest = samlEngine.generateSTORKAttrQueryRequest(attributeRequest);
+        } catch (STORKSAMLEngineException e) {
+            Logger.error("Could not sign STORK SAML AttrRequest.", e);
+            throw new MOAIDException("stork.00", null);
+        }
+
+        Logger.info("STORK AttrRequest successfully signed!");
+
+        try {
+            Logger.trace("Initialize VelocityEngine...");
+
+            VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine();
+            Template template = velocityEngine.getTemplate("/resources/templates/saml2-post-binding-moa.vm");
+            VelocityContext context = new VelocityContext();
+            context.put("SAMLRequest", PEPSUtil.encodeSAMLToken(attributeRequest.getTokenSaml()));
+            context.put("action", destination);
+
+            StringWriter writer = new StringWriter();
+            template.merge(context, writer);
+
+            resp.getOutputStream().write(writer.toString().getBytes());
+        } catch (Exception e) {
+            Logger.error("Error sending STORK SAML AttrRequest.", e);
+            throw new MOAIDException("stork.11", null);
+        }
+        Logger.info("STORK AttrRequest successfully rendered!");
+
+    }
+
+    public IPersonalAttributeList parse(HttpServletRequest httpReq) throws UnsupportedAttributeException, MOAIDException {
+        return null;  //
+    }
+
+}
+
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
new file mode 100644
index 000000000..3bd1686b4
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/MandateRetrievalRequest.java
@@ -0,0 +1,28 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.moduls.IAction;
+import at.gv.egovernment.moa.id.moduls.IRequest;
+import at.gv.egovernment.moa.logging.Logger;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ *
+ */
+public class MandateRetrievalRequest implements IAction {
+    public String processRequest(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp, AuthenticationSession moasession) throws MOAIDException {
+        Logger.info("Entering mandateretrievalrequest");
+        return null;  //
+    }
+
+    public boolean needAuthentication(IRequest req, HttpServletRequest httpReq, HttpServletResponse httpResp) {
+        return true;  //
+    }
+
+    public String getDefaultActionName() {
+        return STORKProtocol.MANDATERETRIEVALREQUEST;
+    }
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
new file mode 100644
index 000000000..5b844580d
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/STORKProtocol.java
@@ -0,0 +1,126 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import at.gv.egovernment.moa.id.auth.MOAIDAuthConstants;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.moduls.IAction;
+import at.gv.egovernment.moa.id.moduls.IModulInfo;
+import at.gv.egovernment.moa.id.moduls.IRequest;
+import at.gv.egovernment.moa.logging.Logger;
+import eu.stork.peps.auth.commons.*;
+import eu.stork.peps.auth.engine.STORKSAMLEngine;
+import eu.stork.peps.exceptions.STORKSAMLEngineException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.util.HashMap;
+
+/**
+ * Stork 2 Protocol Support
+ *
+ * @author bsuzic
+ */
+public class STORKProtocol implements IModulInfo, MOAIDAuthConstants {
+
+    public static final String NAME = STORKProtocol.class.getName();
+    public static final String PATH = "id_stork2";
+
+    public static final String AUTHENTICATIONREQUEST = "AuthenticationRequest";
+    public static final String ATTRIBUTE_COLLECTOR = "AttributeCollector";
+    public static final String MANDATERETRIEVALREQUEST = "MandateRetrievalRequest";
+	public static final String CONSENT_EVALUATOR = "ConsentEvaluator";
+
+    private static HashMap<String, IAction> actions = new HashMap<String, IAction>();
+
+    static {
+        actions.put(AUTHENTICATIONREQUEST, new AuthenticationRequest());
+        actions.put(ATTRIBUTE_COLLECTOR, new AttributeCollector());
+        actions.put(CONSENT_EVALUATOR, new ConsentEvaluator());
+        actions.put(MANDATERETRIEVALREQUEST, new MandateRetrievalRequest());
+    }
+
+    public String getName() {
+        return NAME;
+    }
+
+    public String getPath() {
+        return PATH;
+    }
+
+    public IAction getAction(String action) {
+        return actions.get(action);
+    }
+
+    public STORKProtocol() {
+        super();
+    }
+
+    /*
+        First request step - send it to BKU selection for user authentication. After the user credentials
+        and other info are obtained, in the second step the request will be processed and the user redirected
+         */
+    public IRequest preProcess(HttpServletRequest request, HttpServletResponse response, String action) throws MOAIDException {
+        Logger.info("Starting preprocessing for Stork2 protocol");
+        Logger.debug("Request method: " + request.getMethod());
+        Logger.debug("Request content length: " + request.getContentLength());
+        Logger.debug("Initiating action: " + action);
+
+        MOASTORKRequest STORK2Request = new MOASTORKRequest();
+
+		if (AttributeCollector.class.getSimpleName().equals(action) || ConsentEvaluator.class.getSimpleName().equals(action))
+			return STORK2Request;
+
+        //extract STORK Response from HTTP Request
+        byte[] decSamlToken;
+        try {
+            decSamlToken = PEPSUtil.decodeSAMLToken(request.getParameter("SAMLRequest"));
+        } catch (NullPointerException e) {
+            Logger.error("Unable to retrieve STORK Request", e);
+            throw new MOAIDException("stork.04", null);
+        }
+
+        //Get SAMLEngine instance
+        STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP");
+
+        STORKAuthnRequest authnRequest = null;
+        STORKAttrQueryRequest attrRequest = null;
+
+        // check if valid authn request is contained
+        try {
+            authnRequest = engine.validateSTORKAuthnRequest(decSamlToken);
+        } catch (STORKSAMLEngineException ex) {
+            Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
+        } catch(ClassCastException e) {
+        	// we do not have a authnRequest
+        	// check if a valid attr request is container
+        	try {
+        		attrRequest = engine.validateSTORKAttrQueryRequest(decSamlToken);
+        	} catch (STORKSAMLEngineException ex) {
+        		Logger.error("Unable to validate Stork AuthenticationRequest: " + ex.getMessage());
+        	}
+        }
+
+        // if there is no authn or attr request, raise error
+        if ((authnRequest == null) && (attrRequest == null)) {
+            Logger.error("There is no authentication or attribute request contained.");
+            throw new MOAIDException("stork.14", null);
+        }
+
+        STORK2Request.setSTORKAuthnRequest(authnRequest);
+        STORK2Request.setSTORKAttrRequest(attrRequest);
+
+        return STORK2Request;
+    }
+
+    public IAction canHandleRequest(HttpServletRequest request, HttpServletResponse response) {
+        return null;
+    }
+
+    public boolean generateErrorMessage(Throwable e, HttpServletRequest request, HttpServletResponse response, IRequest protocolRequest) throws Throwable {
+        return false;
+    }
+
+    public boolean validate(HttpServletRequest request, HttpServletResponse response, IRequest pending) {
+        return false;
+    }
+}
+
+
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/SignedDocAttributeRequestProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/SignedDocAttributeRequestProvider.java
new file mode 100644
index 000000000..89eb07815
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/SignedDocAttributeRequestProvider.java
@@ -0,0 +1,129 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import java.io.StringWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.codec.binary.Base64;
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.util.VelocityProvider;
+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;
+
+/**
+ * Forwards a signedDoc attribute request to the oasis-dss service instance
+ */
+public class SignedDocAttributeRequestProvider implements AttributeProvider {
+
+	private PersonalAttribute requestedAttribute;
+
+	/**
+	 * The URL of the service listening for the oasis dss webform post request
+	 */
+	private String oasisDssWebFormURL;
+
+	/** The attributes. */
+	private String attributes;
+
+	/**
+	 * Instantiates a new signed doc attribute request provider.
+	 * 
+	 * @param oasisDssWebFormURL
+	 *            the AP location
+	 * @param attributes 
+	 */
+	public SignedDocAttributeRequestProvider(String oasisDssWebFormURL, String attributes) {
+		this.oasisDssWebFormURL = oasisDssWebFormURL;
+		this.attributes = attributes;
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#acquire(java
+	 * .lang.String)
+	 */
+	public IPersonalAttributeList acquire(PersonalAttribute attribute, String spCountyCode, AuthenticationSession moasession) throws UnsupportedAttributeException,
+			ExternalAttributeRequestRequiredException {
+		if(!attributes.contains(attribute.getName())) {
+			throw new UnsupportedAttributeException();
+		}
+		
+		requestedAttribute = attribute;
+
+		throw new ExternalAttributeRequestRequiredException(this);
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#parse(javax
+	 * .servlet.http.HttpServletRequest)
+	 */
+	public IPersonalAttributeList parse(HttpServletRequest httpReq) throws MOAIDException, UnsupportedAttributeException {
+		Logger.debug("Beginning to extract OASIS-DSS response out of HTTP Request");
+
+		try {
+			String signResponse = new String(Base64.decodeBase64(httpReq.getParameter("signresponse")), "UTF8");
+			List<String> values = new ArrayList<String>();
+			values.add(signResponse);
+
+			Logger.debug("Assembling signedDoc attribute");
+			PersonalAttribute signedDocAttribute = new PersonalAttribute("signedDoc", false, values,
+					"Available");
+
+			// pack and return the result
+			PersonalAttributeList result = new PersonalAttributeList();
+			result.add(signedDocAttribute);
+			return result;
+		} catch (UnsupportedEncodingException e) {
+			Logger.error("Failed to assemble signedDoc attribute");
+			throw new MOAIDException("stork.05", null);
+		}
+	}
+
+	/*
+	 * (non-Javadoc)
+	 * 
+	 * @see
+	 * at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#performRedirect
+	 * (java.lang.String)
+	 */
+	public void performRedirect(String url, HttpServletRequest req, HttpServletResponse resp, OAAuthParameter oaParam)
+			throws MOAIDException {
+
+		try {
+			Logger.trace("Initialize VelocityEngine...");
+
+			VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine();
+			Template template = velocityEngine.getTemplate("/resources/templates/oasis_dss_webform_binding.vm");
+			VelocityContext context = new VelocityContext();
+			context.put("signrequest", Base64.encodeBase64String(requestedAttribute.getValue().get(0).getBytes("UTF8")));
+			context.put("clienturl", url);
+			context.put("action", oasisDssWebFormURL);
+
+			StringWriter writer = new StringWriter();
+			template.merge(context, writer);
+
+			resp.getOutputStream().write(writer.toString().getBytes());
+		} catch (Exception e) {
+			Logger.error("Error sending DSS signrequest.", e);
+			throw new MOAIDException("stork.11", null);
+		}
+	}
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/StorkAttributeRequestProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/StorkAttributeRequestProvider.java
new file mode 100644
index 000000000..c0e613b82
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/StorkAttributeRequestProvider.java
@@ -0,0 +1,162 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+import java.io.StringWriter;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.velocity.Template;
+import org.apache.velocity.VelocityContext;
+import org.apache.velocity.app.VelocityEngine;
+
+import at.gv.egovernment.moa.id.auth.data.AuthenticationSession;
+import at.gv.egovernment.moa.id.auth.exception.MOAIDException;
+import at.gv.egovernment.moa.id.config.auth.OAAuthParameter;
+import at.gv.egovernment.moa.id.util.HTTPUtils;
+import at.gv.egovernment.moa.id.util.VelocityProvider;
+import at.gv.egovernment.moa.logging.Logger;
+import at.gv.egovernment.moa.util.StringUtils;
+
+import eu.stork.peps.auth.commons.IPersonalAttributeList;
+import eu.stork.peps.auth.commons.PEPSUtil;
+import eu.stork.peps.auth.commons.PersonalAttribute;
+import eu.stork.peps.auth.commons.PersonalAttributeList;
+import eu.stork.peps.auth.commons.STORKAttrQueryRequest;
+import eu.stork.peps.auth.commons.STORKAttrQueryResponse;
+import eu.stork.peps.auth.engine.STORKSAMLEngine;
+import eu.stork.peps.exceptions.STORKSAMLEngineException;
+
+/**
+ * creates a STORK attribute request for a configurable set of attributes
+ */
+public class StorkAttributeRequestProvider implements AttributeProvider {
+
+	private PersonalAttributeList requestedAttributes;
+	
+	/** The destination. */
+	private String destination;
+
+	/** The attributes. */
+	private String attributes;
+
+	/** The sp country code. */
+	private String spCountryCode;
+
+	/**
+	 * Instantiates a new stork attribute request provider.
+	 *
+	 * @param apUrl the AP location
+	 * @param supportedAttributes the supported attributes as csv
+	 */
+	public StorkAttributeRequestProvider(String apUrl, String supportedAttributes) {
+		destination = apUrl;
+		attributes = supportedAttributes;
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#acquire(java.lang.String)
+	 */
+	public IPersonalAttributeList acquire(PersonalAttribute attribute, String spCountyCode, AuthenticationSession moasession)
+			throws UnsupportedAttributeException, ExternalAttributeRequestRequiredException {
+
+		if (!attributes.contains(attribute.getName()))
+			throw new UnsupportedAttributeException();
+		
+		this.spCountryCode = spCountyCode;
+
+		requestedAttributes = new PersonalAttributeList(1);
+		requestedAttributes.add(attribute);
+		throw new ExternalAttributeRequestRequiredException(this);
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#parse(javax.servlet.http.HttpServletRequest)
+	 */
+	public IPersonalAttributeList parse(HttpServletRequest httpReq) throws MOAIDException, UnsupportedAttributeException {
+
+		Logger.info(this.getClass().getSimpleName() + " tries to extract SAMLResponse out of HTTP Request");
+		
+		//extract STORK Response from HTTP Request
+		//Decodes SAML Response
+		byte[] decSamlToken;
+		try {
+			decSamlToken = PEPSUtil.decodeSAMLToken(httpReq.getParameter("SAMLResponse"));
+		} catch(NullPointerException e) {
+			throw new UnsupportedAttributeException();
+		}
+
+		//Get SAMLEngine instance
+		STORKSAMLEngine engine = STORKSAMLEngine.getInstance("VIDP");
+
+		STORKAttrQueryResponse attrResponse = null;
+		try {
+			//validate SAML Token
+			Logger.debug("Starting validation of SAML response");
+			attrResponse = engine.validateSTORKAttrQueryResponse(decSamlToken, (String) httpReq.getRemoteHost());
+			Logger.info("SAML response successfully verified!");
+		}catch(STORKSAMLEngineException e){
+			Logger.error("Failed to verify STORK SAML Response", e);
+			throw new MOAIDException("stork.05", null);
+		}
+		
+		return attrResponse.getPersonalAttributeList();
+	}
+
+	/* (non-Javadoc)
+	 * @see at.gv.egovernment.moa.id.protocols.stork2.AttributeProvider#performRedirect(java.lang.String)
+	 */
+	public void performRedirect(String url, HttpServletRequest req, HttpServletResponse resp, OAAuthParameter oaParam) throws MOAIDException {
+
+    	String spSector = "Business";
+    	String spInstitution = StringUtils.isEmpty(oaParam.getFriendlyName()) ? "UNKNOWN" : oaParam.getFriendlyName();
+    	String spApplication = spInstitution;
+
+    	//generate AuthnRquest
+    	STORKAttrQueryRequest attributeRequest = new STORKAttrQueryRequest();
+    	attributeRequest.setDestination(destination);
+    	attributeRequest.setAssertionConsumerServiceURL(url);
+    	attributeRequest.setIssuer(HTTPUtils.getBaseURL(req));
+    	attributeRequest.setQaa(oaParam.getQaaLevel());
+    	attributeRequest.setSpInstitution(spInstitution);
+    	attributeRequest.setCountry(spCountryCode);
+    	attributeRequest.setSpCountry(spCountryCode);
+    	attributeRequest.setSpApplication(spApplication);
+    	attributeRequest.setSpSector(spSector);
+    	attributeRequest.setPersonalAttributeList(requestedAttributes);
+
+    	attributeRequest.setCitizenCountryCode("AT");
+
+
+    	Logger.debug("STORK AttrRequest successfully assembled.");
+
+    	STORKSAMLEngine samlEngine = STORKSAMLEngine.getInstance("VIDP");
+    	try {
+    		attributeRequest = samlEngine.generateSTORKAttrQueryRequest(attributeRequest);
+    	} catch (STORKSAMLEngineException e) {
+			Logger.error("Could not sign STORK SAML AttrRequest.", e);
+			throw new MOAIDException("stork.00", null);
+		}
+
+		Logger.info("STORK AttrRequest successfully signed!");
+		
+		try {
+			Logger.trace("Initialize VelocityEngine...");
+
+			VelocityEngine velocityEngine = VelocityProvider.getClassPathVelocityEngine();
+			Template template = velocityEngine.getTemplate("/resources/templates/saml2-post-binding-moa.vm");
+			VelocityContext context = new VelocityContext();
+			context.put("SAMLRequest", PEPSUtil.encodeSAMLToken(attributeRequest.getTokenSaml()));
+			context.put("action", destination);
+
+			StringWriter writer = new StringWriter();
+			template.merge(context, writer);
+
+			resp.getOutputStream().write(writer.toString().getBytes());
+		} catch (Exception e) {
+			Logger.error("Error sending STORK SAML AttrRequest.", e);
+			throw new MOAIDException("stork.11", null);
+		}
+		Logger.info("STORK AttrRequest successfully rendered!");
+	}
+
+}
+
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/UnsupportedAttributeException.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/UnsupportedAttributeException.java
new file mode 100644
index 000000000..9447c079f
--- /dev/null
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/protocols/stork2/UnsupportedAttributeException.java
@@ -0,0 +1,7 @@
+package at.gv.egovernment.moa.id.protocols.stork2;
+
+public class UnsupportedAttributeException extends Exception {
+
+	private static final long serialVersionUID = -7720066381435378111L;
+
+}
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
index e1e03bce7..6d8979da3 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/storage/AssertionStorage.java
@@ -73,10 +73,10 @@ public class AssertionStorage {
 		//store AssertionStore element to Database
 		try {
 			MOASessionDBUtils.saveOrUpdate(element);
-			Logger.info("Assertion with Artifact=" + artifact + " is stored in Database");
+			Logger.info("Sessioninformation with ID=" + artifact + " is stored in Database");
 			
 		} catch (MOADatabaseException e) {
-			Logger.warn("Assertion could not be stored.");
+			Logger.warn("Sessioninformation could not be stored.");
 			throw new MOADatabaseException(e);
 		}
 		
@@ -96,8 +96,8 @@ public class AssertionStorage {
 		return test;
 		
 	  } catch (Exception e) {
-		Logger.warn("Assertion Cast-Exception by using Artifact=" + artifact);
-		throw new MOADatabaseException("Assertion Cast-Exception");
+		Logger.warn("Sessioninformation Cast-Exception by using Artifact=" + artifact);
+		throw new MOADatabaseException("Sessioninformation Cast-Exception");
 	  }
 	}
 	
@@ -119,11 +119,11 @@ public class AssertionStorage {
 			for(AssertionStore result : results) {
 				try { 
 					MOASessionDBUtils.delete(result);
-					Logger.info("Remove Assertion with Artifact=" + result.getArtifact() 
-							+ " after assertion timeout.");
+					Logger.info("Remove sessioninformation with ID=" + result.getArtifact() 
+							+ " after timeout.");
 				
 				} catch (HibernateException e){
-					Logger.warn("Assertion with Artifact=" + result.getArtifact() 
+					Logger.warn("Sessioninformation with ID=" + result.getArtifact() 
 							+ " not removed after timeout! (Error during Database communication)", e);
 				}
 
@@ -136,22 +136,22 @@ public class AssertionStorage {
 		 try {
 			AssertionStore element = searchInDatabase(artifact);
 			MOASessionDBUtils.delete(element);
-			Logger.info("Remove Assertion with Artifact" + artifact);
+			Logger.info("Remove sessioninformation with ID" + artifact);
 			
 			
 		} catch (MOADatabaseException e) {
-			Logger.info("Assertion not removed! (Assertion with Artifact=" + artifact 
+			Logger.info("Sessioninformation not removed! (Sessioninformation with ID=" + artifact 
 					+ "not found)");
 
 		} catch (HibernateException e) {
-			Logger.warn("Assertion not removed! (Error during Database communication)", e);
+			Logger.warn("Sessioninformation not removed! (Error during Database communication)", e);
 		}
 	}
 
 	@SuppressWarnings("rawtypes")
 	private AssertionStore searchInDatabase(String artifact) throws MOADatabaseException {
 		  MiscUtil.assertNotNull(artifact, "artifact");	  
-		  Logger.trace("Getting Assertion with Artifact " + artifact + " from database.");
+		  Logger.trace("Getting sessioninformation with ID " + artifact + " from database.");
 		  Session session = MOASessionDBUtils.getCurrentSession();
 		  List result;
 		  
@@ -170,7 +170,7 @@ public class AssertionStorage {
 		  //Assertion requires an unique artifact
 		  if (result.size() != 1) {
 			 Logger.trace("No entries found.");
-		   	throw new MOADatabaseException("No Assertion found with this Artifact");
+		   	throw new MOADatabaseException("No sessioninformation found with this ID");
 		  }
 		  
 		  return (AssertionStore) result.get(0);
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
index 9df283965..6efe9b39c 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/ParamValidatorUtils.java
@@ -508,7 +508,6 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
 		

 	    String oaURL = req.getParameter(PARAM_OA);

 	    String bkuURL = req.getParameter(PARAM_BKU);

-	    String templateURL = req.getParameter(PARAM_TEMPLATE);

 	    String useMandate = req.getParameter(PARAM_USEMANDATE);

 	    String ccc = req.getParameter(PARAM_CCC);

 	    

@@ -519,8 +518,6 @@ public class ParamValidatorUtils implements MOAIDAuthConstants{
 				throw new WrongParametersException("StartAuthentication", PARAM_OA, "auth.12");

 		    if (MiscUtil.isEmpty(bkuURL))

 		       throw new WrongParametersException("StartAuthentication", PARAM_BKU, "auth.12");

-//		    if (MiscUtil.isEmpty(templateURL))

-//		       throw new WrongParametersException("StartAuthentication", PARAM_TEMPLATE, "auth.12");

 		    if (!ParamValidatorUtils.isValidUseMandate(useMandate))

 	           throw new WrongParametersException("StartAuthentication", PARAM_USEMANDATE, "auth.12");		    

 		    if (!ParamValidatorUtils.isValidCCC(ccc))

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/VelocityProvider.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/VelocityProvider.java
index b923727f9..231f36fa8 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/VelocityProvider.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/VelocityProvider.java
@@ -48,7 +48,7 @@
 /**

  * 

  */

-package at.gv.egovernment.moa.id.auth.stork;

+package at.gv.egovernment.moa.id.util;

 

 import org.apache.velocity.app.VelocityEngine;

 import org.apache.velocity.runtime.RuntimeConstants;

@@ -103,6 +103,8 @@ public class VelocityProvider {
 		VelocityEngine velocityEngine = new VelocityEngine();

         velocityEngine.setProperty(RuntimeConstants.ENCODING_DEFAULT, "UTF-8");

         velocityEngine.setProperty(RuntimeConstants.OUTPUT_ENCODING, "UTF-8");

+        velocityEngine.setProperty(RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,

+				"org.apache.velocity.runtime.log.SimpleLog4JLogSystem");

         

         return velocityEngine;

 	}

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
index c0fde8146..b9c4e88b7 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/util/client/mis/simple/MISSimpleClient.java
@@ -157,7 +157,7 @@ public class MISSimpleClient {
 		} 

 	}

 	

-	public static MISSessionId sendSessionIdRequest(String webServiceURL, byte[] idl, byte[] cert, String oaFriendlyName, String redirectURL, String referenceValue, String mandateIdentifier[], String targetType, SSLSocketFactory sSLSocketFactory) throws MISSimpleClientException {

+	public static MISSessionId sendSessionIdRequest(String webServiceURL, byte[] idl, byte[] cert, String oaFriendlyName, String redirectURL, String referenceValue, List<String> mandateIdentifier, String targetType, SSLSocketFactory sSLSocketFactory) throws MISSimpleClientException {

 		if (webServiceURL == null) {

 			throw new NullPointerException("Argument webServiceURL must not be null.");

 		}

@@ -205,12 +205,12 @@ public class MISSimpleClient {
 			referenceValueElement.appendChild(doc.createTextNode(referenceValue));

 			mirElement.appendChild(referenceValueElement);

 			

-			if (mandateIdentifier != null && mandateIdentifier.length > 0) {

+			if (mandateIdentifier != null && mandateIdentifier.size() > 0) {

 				Element filtersElement = doc.createElementNS(MIS_NS, "Filters");

 				Element mandateIdentifiersElement = doc.createElementNS(MIS_NS, "MandateIdentifiers");

-				for (int i=0; i<mandateIdentifier.length; i++) {

+				for (int i=0; i<mandateIdentifier.size(); i++) {

 					Element mandateIdentifierElement = doc.createElementNS(MIS_NS, "MandateIdentifier");

-					mandateIdentifierElement.appendChild(doc.createTextNode(mandateIdentifier[i]));

+					mandateIdentifierElement.appendChild(doc.createTextNode(mandateIdentifier.get(i)));

 					mandateIdentifiersElement.appendChild(mandateIdentifierElement);

 				}

 				filtersElement.appendChild(mandateIdentifiersElement);

@@ -306,15 +306,24 @@ public class MISSimpleClient {
 			//Element elem = parse(post.getResponseBodyAsStream());

 			Document doc = DOMUtils.parseDocumentSimple(post.getResponseBodyAsStream());

 			return unpackFromSOAP(doc.getDocumentElement());

+			

 		} catch(IOException e) {

-			throw new MISSimpleClientException(e);

+			throw new MISSimpleClientException(e.getLocalizedMessage(), e);

+			

 		} catch (TransformerException e) {

 			throw new MISSimpleClientException(e);

+			

 		} catch (SAXException e) {

 			throw new MISSimpleClientException(e);

+			

 		} catch (ParserConfigurationException e) {

 			throw new MISSimpleClientException(e);

+			

+		} catch (Exception e) {

+			throw new MISSimpleClientException(e.getLocalizedMessage(), e);

+			

 		}

+		

 	}

 	

 	private static Element packIntoSOAP(Element element) throws MISSimpleClientException {

diff --git a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
index 2559d3d18..3cd8ee24a 100644
--- a/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
+++ b/id/server/idserverlib/src/main/resources/resources/properties/id_messages_de.properties
@@ -192,6 +192,7 @@ validator.67=Der Specialtext ({0}) stimmt nicht mit dem f\u00FCr diese Applikati
 validator.68=SigningTime im AUTH-Block konnte nicht eruiert werden.

 validator.69=SigningTime im AUTH-Block und Serverzeit weichen zu stark ab ({0}).

 validator.70=Das einmale Tokken im signierten AuthBlock ({0}) stimmt nicht mit dem von generierten Tokken ({1}) \u00FCberein.

+validator.71=Das Signaturzertifikat ist nicht qualifiziert.

 

 ssl.01=Validierung des SSL-Server-Endzertifikates hat fehlgeschlagen

 

@@ -205,6 +206,14 @@ stork.07=Es existiert kein STORK AuthnRequest f\u00FCr diese STORK Response
 stork.08=STORK SAML Assertion Validierung fehlgeschlagen

 stork.09=Fehler beim \u00FCberpr\u00FCfen der STORK B\u00FCrgerInnen Signatur

 stork.10=Fehler in der Verbindung zum SZR-Gateway

+stork.11=Fehler beim Sammeln von StorkAttributen

+stork.12=Konnte keine VIDP Konfiguration finden

+stork.13=Fehler beim Sammeln eines Attributes in einem AttributProviderPlugin

+stork.14=Es wurde weder Authentifizierungs/  noch Attributerequest empfangen

+stork.15=Unbekannte request.

+stork.16=Ein Attribute aus zwei verschiedenen Quellen unterscheidet sich\: {0}

+stork.17=Fehler beim Einholen der Zustimmung für Attribut\u00FCbertragung durch den Benutzer

+stork.18=STORK-SAML Engine konnte nicht initialisiert werden. 

 

 pvp2.00={0} ist kein gueltiger consumer service index

 pvp2.01=Fehler beim kodieren der PVP2 Antwort

diff --git a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
index 9d6ad4085..b9d3eafa7 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/loginFormFull.html
@@ -628,6 +628,10 @@
 			document.getElementById("localBKU").style.display="block";
 			return;
 		}
+    function bkuLocalClicked() {
+       setMandateSelection();
+    }
+    
 		function bkuOnlineClicked() {
 			if (isMetro())
 				document.getElementById("metroDetected").style.display="block";
@@ -796,9 +800,11 @@
 									type="hidden" name="CCC" id="ccc"> <input type="hidden"
 									name="MODUL" value="#MODUL#"> <input type="hidden"
 									name="ACTION" value="#ACTION#"> <input type="hidden"
-									name="MOASessionID" value="#SESSIONID#"> <input
-									type="submit" value=">lokale Bürgerkartenumgebung" tabindex="4"
-									role="button" class="hell">
+									name="MOASessionID" value="#SESSIONID#"> 
+                  <input type="submit" value=">lokale Bürgerkartenumgebung" tabindex="4"
+									role="button" class="hell"
+                  onclick="setMandateSelection();"
+                  >
 								<!--p>
                     <small>Alternativ können Sie eine lokal installierte BKU verwenden.</small>								                                  
                   </p-->								                                  
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/oasis_dss_webform_binding.vm b/id/server/idserverlib/src/main/resources/resources/templates/oasis_dss_webform_binding.vm
new file mode 100644
index 000000000..7fcc1bb36
--- /dev/null
+++ b/id/server/idserverlib/src/main/resources/resources/templates/oasis_dss_webform_binding.vm
@@ -0,0 +1,36 @@
+##
+## Velocity Template for OASIS WEBFORM BINDING
+##
+## Velocity context may contain the following properties
+## action - String - the action URL for the form
+## signresponse - String - the Base64 encoded SAML Request
+## verifyresponse - String - the Base64 encoded SAML Response
+## clienturl - String - URL where the USer gets redirected after the signature process
+
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+    <body onload="document.forms[0].submit()">
+        <noscript>
+            <p>
+                <strong>Note:</strong> Since your browser does not support JavaScript,
+                you must press the Continue button once to proceed.
+            </p>
+        </noscript>
+        
+        <form action="${action}" method="post">
+            <div>
+                #if($signrequest)<input type="hidden" name="signrequest" value="${signrequest}"/>#end
+                
+                #if($verifyrequest)<input type="hidden" name="verifyrequest" value="${verifyrequest}"/>#end
+                #if($clienturl)<input type="hidden" name="clienturl" value="${clienturl}"/>#end
+                
+            </div>
+            <noscript>
+                <div>
+                    <input type="submit" value="Continue"/>
+                </div>
+            </noscript>
+        </form>
+        
+    </body>
+</html>
\ No newline at end of file
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/redirectForm.html b/id/server/idserverlib/src/main/resources/resources/templates/redirectForm.html
index 517f207ff..9bddee931 100644
--- a/id/server/idserverlib/src/main/resources/resources/templates/redirectForm.html
+++ b/id/server/idserverlib/src/main/resources/resources/templates/redirectForm.html
@@ -7,7 +7,7 @@
 
 
 <body onload="document.getElementById('link').click();">
-	<a href="#URL#" target="_parent" id="link">CLICK to perform a
+	<a href="#URL#" target="#TARGET#" id="link">CLICK to perform a
 		redirect back to Online Application</a>
 </body>
 </html>
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/stork2_consent.html b/id/server/idserverlib/src/main/resources/resources/templates/stork2_consent.html
new file mode 100644
index 000000000..2ad03e34e
--- /dev/null
+++ b/id/server/idserverlib/src/main/resources/resources/templates/stork2_consent.html
@@ -0,0 +1,444 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta content="text/html; charset=utf-8" http-equiv="Content-Type">
+
+   <!-- MOA-ID 2.x BKUSelection Layout CSS -->               
+    <style type="text/css">
+			@media screen and (min-width: 650px) {
+			
+				body {
+					margin:0;
+					padding:0;
+					color : #000;
+					background-color : #fff;
+			  	text-align: center;
+			  	background-color: #6B7B8B;
+				}
+        
+        #bku_header h2 {
+          font-size: 0.8em;
+        } 
+        
+        
+			  #page {
+			    display: block;
+			    border: 2px solid rgb(0,0,0);
+			    width: 650px;
+			    height: 460px;
+			    margin: 0 auto;
+			    margin-top: 5%;
+			    position: relative;
+			    border-radius: 25px;
+			    background: rgb(255,255,255);
+			  }
+			  
+			  #page1 {
+			    text-align: center;
+			  }
+			  
+			  #main {
+			    /*	clear:both; */
+				  position:relative;
+			    margin: 0 auto;
+			    width: 250px;
+			    text-align: center;
+			  }
+			  
+			  .OA_header {
+			/*	  background-color: white;*/
+			    font-size: 20pt;
+			    margin-bottom: 25px;
+			    margin-top: 25px;
+			  }
+			
+			  #leftcontent {
+			    /*float:left; */
+				  width:250px;
+				  margin-bottom: 25px;
+			    text-align: left;
+			    border: 1px solid rgb(0,0,0);
+			  }
+			  			  
+			  #selectArea {
+				 font-size: 15px;
+				 padding-bottom: 65px;
+			  }
+			
+			  #leftcontent {
+				 width: 300px;
+				 margin-top: 30px;
+			  }
+			
+        #bku_header {
+          height: 5%;
+          padding-bottom: 3px;
+          padding-top: 3px;
+        }
+      
+        #bkulogin {
+				  overflow:auto;	
+          min-width: 190px;
+          height: 260px;
+			  }
+      
+        h2#tabheader{
+				  font-size: 1.1em; 
+          padding-left: 2%;
+          padding-right: 2%;
+          position: relative;
+			  }
+        		  
+			  .setAssertionButton_full {
+			  	background: #efefef;
+				  cursor: pointer;
+				  margin-top: 15px;
+			    width: 100px;
+			    height: 30px
+			  }
+			
+			  #leftbutton  {
+				 width: 30%; 
+				 float:left; 
+				 margin-left: 40px;
+			  }
+			
+			  #rightbutton {
+				 width: 30%; 
+				 float:right; 
+				 margin-right: 45px; 
+				 text-align: right;
+			  }
+        
+        button {
+          height: 25px;
+          width: 75px;
+          margin-bottom: 10px;
+        }
+        
+       #validation {
+        position: absolute;
+        bottom: 0px;
+        margin-left: 270px;
+        padding-bottom: 10px;
+      }
+			
+			}
+
+      @media screen and (max-width: 205px) {        
+        #bku_header h2 {
+          font-size: 0.8em;
+          margin-top: -0.4em;
+          padding-top: 0.4em;
+        }
+        
+        #bkulogin {
+        min-height: 150px;
+        } 
+      }
+
+      @media screen and (max-width: 249px) and (min-width: 206px) {        
+        #bku_header h2 {
+          font-size: 0.9em;
+          margin-top: -0.45em;
+          padding-top: 0.45em;
+        }
+        
+        #bkulogin {
+          height: 180px;
+        }  
+      }
+
+      @media screen and (max-width: 299px) and (min-width: 250px) {
+        #bku_header h2 {
+          font-size: 1.1em;
+          margin-top: -0.55em;
+          padding-top: 0.55em;
+        } 
+      }
+      
+      @media screen and (max-width: 649px) and (min-width: 400px) {
+        #bku_header h2 {
+          font-size: 1.3em;
+          margin-top: -0.65em;
+          padding-top: 0.65em;
+        } 
+      }
+
+
+			
+			@media screen and (max-width: 649px) {
+				
+        body {
+					margin:0;
+					padding:0;
+					color : #000;
+			  	text-align: center;
+          font-size: 100%;
+			  	background-color: #MAIN_BACKGOUNDCOLOR#;
+				}
+        				
+			  #page {
+			     visibility: hidden;
+			     margin-top: 0%;
+			  }
+			  
+			  #page1 {
+			    visibility: hidden;
+			  }
+			  
+			  #main {
+			    visibility: hidden;
+			  }
+        
+        #validation {
+          visibility: hidden;
+          display: none;
+        }
+			  
+			  .OA_header {
+			    margin-bottom: 0px;
+			    margin-top: 0px;
+			    font-size: 0pt;
+			    visibility: hidden;
+			  }
+			
+			  #leftcontent {
+			    visibility: visible;
+			    margin-bottom: 0px;
+			    text-align: left;
+			    border:none;
+          vertical-align: middle;
+          min-height: 173px;
+          min-width: 204px;
+          
+			  }
+			  
+        #bku_header {
+          height: 10%;
+          min-height: 1.2em;
+          margin-top: 1%;
+        }
+        
+        h2#tabheader{
+          padding-left: 2%;
+          padding-right: 2%;
+          position: relative;
+          top: 50%;
+			  }
+        
+       	#bkulogin {	
+          min-width: 190px;
+          height: 155px;	
+			 }
+        
+			 .setAssertionButton_full {
+			     	background: #efefef;
+				    cursor: pointer;
+				    margin-top: 15px;
+			      width: 70px;
+			      height: 25px;
+			 }
+       
+        input[type=button] {
+/*          height: 11%;  */
+          width: 70%;
+        }
+			}
+			      
+			* {
+				margin: 0;
+				padding: 0;
+        font-family: #FONTTYPE#;
+			}
+							      			
+			#selectArea {
+				padding-top: 10px;
+				padding-bottom: 55px;
+				padding-left: 10px;
+			}
+			
+			.setAssertionButton {
+				background: #efefef;
+				cursor: pointer;
+				margin-top: 15px;
+			  width: 70px;
+			  height: 25px;
+			}
+			
+			#leftbutton  {
+				width: 35%; 
+				float:left; 
+				margin-left: 15px;
+			}
+			
+			#rightbutton {
+				width: 35%; 
+				float:right; 
+				margin-right: 25px; 
+				text-align: right;
+			}
+      
+      .verticalcenter {
+        vertical-align: middle;
+      }
+      
+			input {
+				/*border:1px solid #000;*/
+				cursor: pointer;
+			}
+      
+
+			#installJava, #BrowserNOK {
+				clear:both;
+				font-size:0.8em;
+				padding:4px;
+			}
+						
+			.selectText{
+			
+			}
+			
+			.selectTextHeader{
+			
+			}
+			
+			.sendButton {
+        width: 30%;
+        margin-bottom: 1%;	
+			}
+			
+			#leftcontent a {
+				text-decoration:none; 
+				color: #000;
+			/*	display:block;*/
+				padding:4px;	
+			}
+			
+			#leftcontent a:hover, #leftcontent a:focus, #leftcontent a:active {
+				text-decoration:underline;
+				color: #000;	
+			}
+						
+			.infobutton {
+				background-color: #005a00;
+				color: white;
+				font-family: serif;
+				text-decoration: none;
+				padding-top: 2px;
+				padding-right: 4px;
+				padding-bottom: 2px;
+				padding-left: 4px;
+				font-weight: bold;
+			}
+			
+			.hell {
+				background-color : #MAIN_BACKGOUNDCOLOR#;
+        color: #MAIN_COLOR#;	
+			}
+			
+			.dunkel {
+				background-color: #HEADER_BACKGROUNDCOLOR#;
+        color: #HEADER_COLOR#;
+			}
+			      
+			.main_header {
+			   color: black;
+			    font-size: 32pt;
+			    position: absolute;
+			    right: 10%;
+			    top: 40px;
+				
+			}
+			
+			#controls {
+				text-align: right;
+			}
+      			                        
+    </style>       
+<!-- MOA-ID 2.x BKUSelection JavaScript fucnctions-->
+<script type="text/javascript">
+		function isIE() {
+			return (/MSIE (\d+\.\d+);/.test(navigator.userAgent));
+		}
+		function isFullscreen() {
+			try {
+				return ((top.innerWidth == screen.width) && (top.innerHeight == screen.height));
+			} catch (e) {
+				return false;
+			}
+		}
+		function isActivexEnabled() {
+			var supported = null;
+			try {
+				supported = !!new ActiveXObject("htmlfile");
+			} catch (e) {
+				supported = false;
+			}
+			return supported;
+		}
+		function generateIFrame(iFrameURL) {
+			var el = document.getElementById("bkulogin");
+      var width = el.clientWidth;
+      var heigth = el.clientHeight - 20;
+			var parent = el.parentNode;
+            
+      iFrameURL += "&heigth=" + heigth;
+      iFrameURL += "&width=" + width;
+      
+			var iframe = document.createElement("iframe");
+			iframe.setAttribute("src", iFrameURL);
+			iframe.setAttribute("width", el.clientWidth - 1);
+			iframe.setAttribute("height", el.clientHeight - 1);
+			iframe.setAttribute("frameborder", "0");
+			iframe.setAttribute("scrolling", "no");
+			iframe.setAttribute("title", "Login");
+			parent.replaceChild(iframe, el);
+		}
+		function onChangeChecks() {
+      if (top.innerWidth < 650) {
+         document.getElementById("moaidform").setAttribute("target","_parent");
+      } else {
+         document.getElementById("moaidform").removeAttribute("target");
+      }
+      
+    }
+	</script>
+<title>#HEADER_TEXT#</title>
+</head>
+<body onload="onChangeChecks();" onresize="onChangeChecks();">
+	<div id="page">
+		<div id="page1" class="case selected-case" role="main">
+			<h2 class="OA_header" role="heading">STORK Informationsfreigabe</h2>
+			<div id="main">
+				<div id="leftcontent" class="hell" role="application">
+					<form method="POST" action="${action}">
+						<div id="bku_header" class="dunkel">
+							<h2 id="tabheader" class="dunkel" role="heading">STORK Informationsfreigabe</h2>
+						</div>
+						<div id="bkulogin" class="hell" role="form">
+							Alle angehakten Daten werden an das fragende Drittland &uuml;bermittelt.
+	  						<table>
+	  							${tablecontent}
+							</table>
+						</div>
+						<div id="controls" class="hell">
+							<input type="submit" value="weiter" />
+						</div>
+					</form>
+				</div>
+			</div>
+		</div>
+		<div id="validation">
+			<a href="http://validator.w3.org/check?uri="> <img
+				style="border: 0; width: 88px; height: 31px"
+				src="#CONTEXTPATH#/img/valid-html5-blue.png" alt="HTML5 ist valide!" />
+			</a> <a href="http://jigsaw.w3.org/css-validator/"> <img
+				style="border: 0; width: 88px; height: 31px"
+				src="http://jigsaw.w3.org/css-validator/images/vcss-blue"
+				alt="CSS ist valide!" />
+			</a>
+		</div>
+	</div>
+</body>
+</html
\ No newline at end of file
diff --git a/id/server/idserverlib/src/main/resources/resources/templates/stork2_postbinding_template.html b/id/server/idserverlib/src/main/resources/resources/templates/stork2_postbinding_template.html
new file mode 100644
index 000000000..f655caee0
--- /dev/null
+++ b/id/server/idserverlib/src/main/resources/resources/templates/stork2_postbinding_template.html
@@ -0,0 +1,42 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<body onload="document.forms[0].submit()">
+	<noscript>
+		<p>
+			<strong>Note:</strong> Since your browser does not support
+			JavaScript, you must press the Continue button once to proceed.
+		</p>
+	</noscript>
+
+
+	<div id="alert">Your login is being processed. Thank you for
+		waiting.</div>
+
+	<style type="text/css">
+<!--
+#alert {
+	margin: 100px 250px;
+	font-family: Verdana, Arial, Helvetica, sans-serif;
+	font-size: 14px;
+	font-weight: normal;
+}
+-->
+</style>
+
+	<form action="${action}" method="post" target="_parent">
+		<div>
+			#if($RelayState)<input type="hidden" name="RelayState"
+				value="${RelayState}" />#end #if($SAMLRequest)<input type="hidden"
+				name="SAMLRequest" value="${SAMLRequest}" />#end #if($SAMLResponse)<input
+				type="hidden" name="SAMLResponse" value="${SAMLResponse}" />#end
+
+		</div>
+		<noscript>
+			<div>
+				<input type="submit" value="Continue" />
+			</div>
+		</noscript>
+	</form>
+
+</body>
+</html>