diff --git a/www/example-simple/wsfed-example.php b/www/example-simple/wsfed-example.php
index a7c5610c27c6462fdcdb279ae61be8c20ae982a6..6962ab884ecaa1d4ef4b6329f3c2ae3a46b520d8 100644
--- a/www/example-simple/wsfed-example.php
+++ b/www/example-simple/wsfed-example.php
@@ -12,12 +12,12 @@ if (!$session->isValid('wsfed') ) {
 	);
 }
 
-$attributes = $session->getAttributes();
+$attributes = $session->getAuthData('wsfed', 'Attributes');
 
 $t = new SimpleSAML_XHTML_Template($config, 'status.php', 'attributes');
 
 $t->data['header'] = '{status:header_wsfed}';
-$t->data['remaining'] = $session->remainingTime();
+$t->data['remaining'] = $session->getAuthData('wsfed', 'Expire') - time();
 $t->data['sessionsize'] = $session->getSize();
 $t->data['attributes'] = $attributes;
 $t->data['logouturl'] = '/' . $config->getBaseURL() . 'wsfed/sp/initSLO.php?RelayState=/' . $config->getBaseURL() . 'logout.php';
diff --git a/www/wsfed/sp/initSLO.php b/www/wsfed/sp/initSLO.php
index 13b39d1a7c7d87acbb3fc100e0dbb6d3624bc9d9..9aef7fc26541e0ee5ffc343a1858c68afebd635c 100644
--- a/www/wsfed/sp/initSLO.php
+++ b/www/wsfed/sp/initSLO.php
@@ -25,14 +25,14 @@ if (isset($session) ) {
 	
 		$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
 	
-		$idpentityid = $session->getIdP();
+		$idpentityid = $session->getAuthData('wsfed', 'saml:sp:IdP');
 		$spentityid = isset($_GET['spentityid']) ? $_GET['spentityid'] : $metadata->getMetaDataCurrentEntityID();
 	
 		/**
 		 * Create a logout request
 		 */		
 		
-		$session->doLogout();
+		$session->doLogout('wsfed');
 		
 		SimpleSAML_Logger::info('WS-Fed - SP.initSLO: SP (' . $spentityid . ') is sending logout request to IdP (' . $idpentityid . ')');
 			
diff --git a/www/wsfed/sp/prp.php b/www/wsfed/sp/prp.php
index 3100fd2908b82012be068af5edb850a8ca5332b1..d2fea79cadda309e57f4e03cc603ee77fae0f510 100644
--- a/www/wsfed/sp/prp.php
+++ b/www/wsfed/sp/prp.php
@@ -134,10 +134,12 @@ try {
 
 
 	/* Mark the user as logged in. */
-	$session->doLogin('wsfed');
-	$session->setAttributes($attributes);
-	$session->setNameID($nameid);
-	$session->setIdP($idpEntityId);
+	$authData = array(
+		'Attributes' => $attributes,
+		'saml:sp:NameID' => $nameid,
+		'saml:sp:IdP' => $idpEntityId,
+	);
+	$session->doLogin('wsfed', $authData);
 
 	/* Redirect the user back to the page which requested the login. */
 	SimpleSAML_Utilities::redirect($wctx);