diff --git a/www/example-simple/saml2-example.php b/www/example-simple/saml2-example.php
index 7dd041364a2648f2691906428e55b42bc5eff63c..c0483c9e8089cdd344172ddd3bef5a06ef61f60c 100644
--- a/www/example-simple/saml2-example.php
+++ b/www/example-simple/saml2-example.php
@@ -50,7 +50,7 @@ if (!$session->isValid('saml2') ) {
 /* Prepare attributes for presentation 
 * and call a hook function for organizing the attribute array
 */
-$attributes = $session->getAttributes();
+$attributes = $session->getAuthData('saml2', 'Attributes');
 $para = array(
 	'attributes' => &$attributes
 );
@@ -69,7 +69,7 @@ SimpleSAML_Module::callHooks('attributepresentation', $para);
 $t = new SimpleSAML_XHTML_Template($config, 'status.php', 'attributes');
 
 $t->data['header'] = '{status:header_saml20_sp}';
-$t->data['remaining'] = $session->remainingTime();
+$t->data['remaining'] = $session->getAuthData('saml2', 'Expire') - time();
 $t->data['sessionsize'] = $session->getSize();
 $t->data['attributes'] = $attributes;
 $t->data['logouturl'] = '/' . $config->getBaseURL() . 'saml2/sp/initSLO.php?RelayState=/' .
diff --git a/www/saml2/sp/AssertionConsumerService.php b/www/saml2/sp/AssertionConsumerService.php
index 3e36f9616a9c9f019de9dc959342b8302b9005e7..bb5a3c1dae49861a31b51eac1848d65e6bc6038e 100644
--- a/www/saml2/sp/AssertionConsumerService.php
+++ b/www/saml2/sp/AssertionConsumerService.php
@@ -37,14 +37,15 @@ function finishLogin($authProcState) {
 	assert('array_key_exists("Source", $authProcState)');
 	assert('array_key_exists("entityid", $authProcState["Source"])');
 
-	global $session;
+	$authData = array(
+		'Attributes' => $authProcState['Attributes'],
+		'saml:sp:NameID' => $authProcState['core:saml20-sp:NameID'],
+		'saml:sp:SessionIndex' => $authProcState['core:saml20-sp:SessionIndex'],
+		'saml:sp:IdP' => $authProcState['Source']['entityid'],
+	);
 
-	/* Update the session information */
-	$session->doLogin('saml2');
-	$session->setAttributes($authProcState['Attributes']);
-	$session->setNameID($authProcState['core:saml20-sp:NameID']);
-	$session->setSessionIndex($authProcState['core:saml20-sp:SessionIndex']);
-	$session->setIdP($authProcState['Source']['entityid']);
+	global $session;
+	$session->doLogin('saml2', $authData);
 
 	SimpleSAML_Utilities::redirect($authProcState['core:saml20-sp:TargetURL']);
 }
diff --git a/www/saml2/sp/SingleLogoutService.php b/www/saml2/sp/SingleLogoutService.php
index 3b6b1a4e8d330da8414fbaef936fbc72eb67498a..559a088c05bd5e9d8d9e3367048f07746c809def 100644
--- a/www/saml2/sp/SingleLogoutService.php
+++ b/www/saml2/sp/SingleLogoutService.php
@@ -17,7 +17,7 @@ if (!$config->getBoolean('enable.saml20-sp', TRUE))
 
 
 // Destroy local session if exists.
-$session->doLogout();
+$session->doLogout('saml2');
 
 $binding = SAML2_Binding::getCurrentBinding();
 $message = $binding->receive();
diff --git a/www/saml2/sp/initSLO.php b/www/saml2/sp/initSLO.php
index b280a1311f342ebd2e32a25922bb25c3b9a23c0d..7d4bb8f86fd9c29ef5f4c6c2927c3544233c6f78 100644
--- a/www/saml2/sp/initSLO.php
+++ b/www/saml2/sp/initSLO.php
@@ -22,7 +22,7 @@ if (isset($_REQUEST['RelayState'])) {
 try {
 	$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
 
-	$idpEntityId = $session->getIdP();
+	$idpEntityId = $session->getAuthData('saml2', 'saml:sp:IdP');
 	if ($idpEntityId === NULL) {
 		SimpleSAML_Logger::info('SAML2.0 - SP.initSLO: User not authenticated with an IdP.');
 		SimpleSAML_Utilities::redirect($returnTo);
@@ -30,7 +30,7 @@ try {
 	$idpMetadata = $metadata->getMetaDataConfig($idpEntityId, 'saml20-idp-remote');
 	$SLOendpoint = $idpMetadata->getDefaultEndpoint('SingleLogoutService', array(SAML2_Const::BINDING_HTTP_REDIRECT), NULL);
 	if ($SLOendpoint === NULL) {
-		$session->doLogout();
+		$session->doLogout('saml2');
 		SimpleSAML_Logger::info('SAML2.0 - SP.initSLO: No supported SingleLogoutService endpoint in IdP.');
 		SimpleSAML_Utilities::redirect($returnTo);
 	}
@@ -38,13 +38,13 @@ try {
 	$spEntityId = isset($_GET['spentityid']) ? $_GET['spentityid'] : $metadata->getMetaDataCurrentEntityID();
 	$spMetadata = $metadata->getMetaDataConfig($spEntityId, 'saml20-sp-hosted');
 
-	$nameId = $session->getNameId();
+	$nameId = $session->getAuthData('saml2', 'saml:sp:NameID');
 
 	$lr = sspmod_saml_Message::buildLogoutRequest($spMetadata, $idpMetadata);
 	$lr->setNameId($nameId);
-	$lr->setSessionIndex($session->getSessionIndex());
+	$lr->setSessionIndex($session->getAuthData('saml2', 'saml:sp:SessionIndex'));
 
-	$session->doLogout();
+	$session->doLogout('saml2');
 
 	/* Save the $returnTo url until the user returns from the IdP. */
 	$session->setData('spLogoutReturnTo', $lr->getId(), $returnTo);