diff --git a/.travis.yml b/.travis.yml
index 4f83a53..fe03a6e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,8 @@ php:
 - 5.5
 - 5.6
 - 7.0
+- 7.4
+- 8.1
 - hhvm
 matrix:
   allow_failures:
diff --git a/composer.json b/composer.json
index 291a57a..63ef876 100644
--- a/composer.json
+++ b/composer.json
@@ -1,16 +1,23 @@
 {
     "name": "niif/simplesamlphp-module-attributeaggregator",
-    "description": "Attribute Aggregator implementation or SAML AttributeQuery",
+    "description": "Attribute Aggregator implementation for SAML AttributeQuery",
     "type": "simplesamlphp-module",
     "require": {
         "simplesamlphp/composer-module-installer": "~1.1",
         "ext-soap": "*"
     },
     "require-dev": {
-        "simplesamlphp/simplesamlphp": ">=1.14",
-        "phpunit/phpunit": "~3.7"
+        "simplesamlphp/simplesamlphp": "^2.0",
+        "phpunit/phpunit": "^9.5"
+    },
+    "autoload": {
+        "psr-4": {
+            "SimpleSAML\\Module\\AttributeAggregator\\": "src/"
+        }
     },
     "autoload-dev": {
-      "files": ["tests/_autoload_modules.php"]
+        "files": [
+            "tests/_autoload_modules.php"
+        ]
     }
 }
diff --git a/public/attributequery.php b/public/attributequery.php
new file mode 100644
index 0000000..675acdb
--- /dev/null
+++ b/public/attributequery.php
@@ -0,0 +1,227 @@
+<?php
+
+declare(strict_types=1);
+
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\Auth\ProcessingChain;
+use SimpleSAML\Auth\Source;
+use SimpleSAML\Auth\State;
+use SimpleSAML\Configuration;
+use SimpleSAML\Error\BadRequest;
+use SimpleSAML\Error\Exception;
+use SimpleSAML\Logger;
+use SimpleSAML\Metadata\MetaDataStorageHandler;
+use SimpleSAML\Metadata\MetaDataStorageSource;
+use SimpleSAML\Module\saml\Message;
+use SimpleSAML\Session;
+use SimpleSAML\Utils\Random;
+use SAML2\Constants;
+use SAML2\AttributeQuery;
+use SAML2\SOAPClient;
+use SAML2\XML\saml\NameID;
+
+
+$session = Session::getSessionFromRequest();
+
+if (!array_key_exists('StateId', $_REQUEST)) {
+	throw new BadRequest(
+			'[attributeaggregator] - Missing required StateId query parameter.'
+	);
+}
+
+$id = $_REQUEST['StateId'];
+$state = State::loadState($id, 'attributeaggregator:request');
+Logger::info('[attributeaggregator] - Querying attributes from ' . $state['attributeaggregator:entityId'] );
+
+$aaMetadata = null;
+
+$globalConfig = Configuration::getInstance();
+$metadataSources = $globalConfig->getArray('metadata.sources', []);
+
+foreach ($metadataSources as $source) {
+    try {
+        $mdq = MetaDataStorageSource::getSource($source);
+        $aaMetadata = $mdq->getMetaData($state['attributeaggregator:entityId'],'attributeauthority-remote');
+
+        if ($aaMetadata) {
+            if (array_keys($aaMetadata) === range(0, count($aaMetadata) - 1)) {
+                $aaMetadata = $aaMetadata[0];
+            }
+            break;
+        }
+    } catch (Exception $e) {
+        Logger::warning('Metadata lookup failed:' . $e->getMessage());
+    }
+}
+
+if (!$aaMetadata) {
+    throw new Exception(
+        'attributeaggregator: AA entityId (' . $state['attributeaggregator:entityId'] .
+        ') does not exist in any available metadata sources.'
+    );
+}
+
+
+/* Find an AttributeService with SOAP binding */
+$aas = $aaMetadata['AttributeService'];
+
+if (!is_array($aas)) {
+    throw new Exception("AttributeService is missing or invalid in metadata for entityId: " . var_export($aaMetadata, true));
+}
+
+for ($i=0;$i<count($aas);$i++){
+	if ($aas[$i]['Binding'] == Constants::BINDING_SOAP){
+		$index = $i;
+		break;
+	}
+}
+
+if (empty($aas[$index]['Location'])) {
+	throw new Exception("Can't find the AttributeService endpoint to send the attribute query.");
+}
+$url = $aas[$index]['Location'];
+
+/* nameId */
+$data['nameIdValue'] = $state['attributeaggregator:attributeId'][0];
+$data['nameIdFormat'] = $state['attributeaggregator:nameIdFormat'];
+$data['nameIdQualifier'] = '';
+$data['nameIdSPQualifier'] = '';
+
+/* VO AttributeAuthority endpoint */
+$data['url'] = $url;
+$data['stateId'] = $id;
+
+
+/* Building the query */
+
+$random = new Random();
+$dataId = $random->generateID();
+$session->setData('attributeaggregator:data', $dataId, $data, 3600);
+
+$nameId = new NameID();
+$nameId->setFormat($data['nameIdFormat']);
+$nameId->setValue($data['nameIdValue']);
+$nameId->setNameQualifier($data['nameIdQualifier']);
+$nameId->setSPNameQualifier($data['nameIdSPQualifier']);
+
+if (empty($nameId->getNameQualifier())) {
+	$nameId->setNameQualifier(NULL);
+}
+if (empty($nameId->getSPNameQualifier())) {
+	$nameId->setSPNameQualifier(NULL);
+}
+
+
+
+$attributes = $state['attributeaggregator:attributes'];
+$attributes_to_send = array();
+foreach ($attributes as $name => $params) {
+	if (array_key_exists('values', $params)){
+		$attributes_to_send[$name] = $params['values'];
+	}
+	else {
+		$attributes_to_send[$name] = array();
+	}
+}
+
+$attributeNameFormat = $state['attributeaggregator:attributeNameFormat'];
+
+$authsource = Source::getById($state["attributeaggregator:authsourceId"]);
+$src = $authsource->getMetadata();
+$dst = Configuration::loadFromArray($aaMetadata, 'attributeauthority-remote' . '/' . var_export($state['attributeaggregator:entityId'], true));
+
+// Sending query
+try {
+	$response = sendQuery($dataId, $data['url'], $nameId, $attributes_to_send, $attributeNameFormat, $src, $dst);
+} catch (Exception $e) {
+	throw new Exception('[attributeaggregator] Got an exception while performing attribute query. Exception: '.get_class($e).', message: '.$e->getMessage());
+}
+
+$idpEntityId = $response->getIssuer();
+if ($idpEntityId === NULL) {
+	throw new Exception('Missing issuer in response.');
+}
+$assertions = Message::processResponse($src, $dst, $response);
+$attributes_from_aa = $assertions[0]->getAttributes();
+$expected_attributes = $state['attributeaggregator:attributes'];
+// get attributes from response, and put it in the state.
+foreach ($attributes_from_aa as $name=>$values){
+	// expected?
+	if (array_key_exists($name, $expected_attributes)){
+		// There is in the existing attributes?
+		if(array_key_exists($name, $state['Attributes'])){
+			// has multiSource rule?
+			if (! empty($expected_attributes[$name]['multiSource'])){
+				switch ($expected_attributes[$name]['multiSource']) {
+					case 'override':
+						$state['Attributes'][$name] = $values;
+						break;
+					case 'keep':
+						continue 2;
+						break;
+					case 'merge':
+						$state['Attributes'][$name] = array_merge($state['Attributes'][$name], $values);
+						break;
+				}
+			}
+			// default: merge the attributes
+			else {
+				$state['Attributes'][$name] = array_merge($state['Attributes'][$name], $values);
+			}
+		}
+		// There is not in the existing attributes, create it.
+		else {
+			$state['Attributes'][$name] = $values;
+		}
+	}
+	// not expected? Put it to attributes array.
+	else {
+		if (!empty($state['Attributes'][$name])){
+			$state['Attributes'][$name] = array_merge($state['Attributes'][$name],$values);
+		}
+		else
+			$state['Attributes'][$name] = $values;
+	}
+}
+
+Logger::debug('[attributeaggregator] - Attributes now:'.var_export($state['Attributes'],true));
+ProcessingChain::resumeProcessing($state);
+exit;
+
+/**
+ * build and send AttributeQuery
+ */
+function sendQuery($dataId, $url, $nameId, $attributes, $attributeNameFormat,$src,$dst) {
+	Assert::string($dataId);
+    Assert::string($url);
+    Assert::isInstanceOf($nameId, NameID::class);
+    Assert::isArray($attributes);
+
+	Logger::debug('[attributeaggregator] - sending request');
+
+    $issuer = new \SAML2\XML\saml\Issuer();
+    $issuer->setValue($src->getValue('entityid'));
+
+	$query = new AttributeQuery();
+	$query->setRelayState($dataId);
+	$query->setDestination($url);
+	$query->setIssuer($issuer);
+	$query->setNameId($nameId);
+	$query->setAttributeNameFormat($attributeNameFormat);
+
+	if (! empty($attributes)){
+		$query->setAttributes($attributes);
+	}
+
+	Message::addSign($src,$dst,$query);
+
+	if (! $query->getSignatureKey()){
+		throw new Exception('[attributeaggregator] - Unable to find private key for signing attribute request.');
+	}
+
+	Logger::debug('[attributeaggregator] - sending attribute query: '.var_export($query, true));
+	$binding = new SOAPClient();
+
+	$result = $binding->send($query, $src, $dst);
+	return $result;
+}
\ No newline at end of file
diff --git a/lib/Auth/Process/attributeaggregator.php b/src/Auth/Process/AttributeAggregator.php
similarity index 51%
rename from lib/Auth/Process/attributeaggregator.php
rename to src/Auth/Process/AttributeAggregator.php
index 97949fa..3ec90ed 100644
--- a/lib/Auth/Process/attributeaggregator.php
+++ b/src/Auth/Process/AttributeAggregator.php
@@ -1,4 +1,7 @@
 <?php
+
+declare(strict_types=1);
+
 /**
  * Attribute Aggregator Authentication Processing filter
  *
@@ -8,7 +11,22 @@
  * @package simpleSAMLphp
  * @version $Id$
  */
-class sspmod_attributeaggregator_Auth_Process_attributeaggregator extends SimpleSAML_Auth_ProcessingFilter
+
+namespace SimpleSAML\Module\attributeaggregator\Auth\Process;
+
+use SimpleSAML\Assert\Assert;
+use SimpleSAML\Auth\ProcessingFilter;
+use SimpleSAML\Auth\State;
+use SimpleSAML\Error\Exception;
+use SimpleSAML\Logger;
+use SimpleSAML\Module;
+use SimpleSAML\Configuration;
+use SimpleSAML\Utils\HTTP;
+use SimpleSAML\Metadata\MetaDataStorageSource;
+use SimpleSAML\Metadata\Sources\MDQ;
+use SAML2\Constants;
+
+class AttributeAggregator extends ProcessingFilter
 {
 
 	/**
@@ -33,24 +51,24 @@ class sspmod_attributeaggregator_Auth_Process_attributeaggregator extends Simple
 	private $required = FALSE;
 
 	/**
-	 * 
+	 *
 	 * nameIdFormat, the format of the attributeId. Default is "urn:oasis:names:tc:SAML:2.0:nameid-format:persistent";
 	 * @var unknown_type
 	 */
-	private $nameIdFormat = SAML2_Const::NAMEID_PERSISTENT;
+	private $nameIdFormat = Constants::NAMEID_PERSISTENT;
 
 
 	/**
 	 * Array of the requested attributes
 	 * @var array
 	 */
-	private $attributes = array();
+	private $attributes = [];
 
 	/**
 	 * nameFormat of attributes. Default is "urn:oasis:names:tc:SAML:2.0:attrname-format:uri"
 	 * @var string
 	 */
-	private $attributeNameFormat = "urn:oasis:names:tc:SAML:2.0:attrname-format:uri";
+	private $attributeNameFormat = Constants::NAMEFORMAT_URI;
 
 	/**
 	 * Initialize attributeaggregator filter
@@ -60,43 +78,57 @@ class sspmod_attributeaggregator_Auth_Process_attributeaggregator extends Simple
 	 * @param array $config   Configuration information
 	 * @param mixed $reserved For future use
 	 */
-	public function __construct($config, $reserved)
+	public function __construct(array $config, $reserved)
 	{
-		assert('is_array($config)');
+		Assert::isArray($config);
 		parent::__construct($config, $reserved);
 
-		$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
+		if (empty($config['entityId'])) {
+			throw new Exception(
+				'attributeaggregator: AA entityId is not specified in the configuration.'
+			);
+		}
+
+		$aameta = null;
+
+		$globalConfig = Configuration::getInstance();
+		$metadataSources = $globalConfig->getArray('metadata.sources', []);
+
+		foreach ($metadataSources as $source) {
+			try {
+				$mdq = MetaDataStorageSource::getSource($source);
+				$aameta = $mdq->getMetaData($config['entityId'], 'attributeauthority-remote');
 
-		if ($config['entityId']) {
-			$aameta = $metadata->getMetaData($config['entityId'], 'attributeauthority-remote');
-			if (!$aameta) {
-				throw new SimpleSAML_Error_Exception(
-                    'attributeaggregator: AA entityId (' . $config['entityId'] .
-					') does not exist in the attributeauthority-remote metadata set.'
-				);
+				if ($aameta) {
+					break;
+				}
+			} catch (Exception $e) {
+				Logger::warning('Metadata lookup failed:' . $e->getMessage());
 			}
-			$this->entityId = $config['entityId'];
 		}
-		else {
-			throw new SimpleSAML_Error_Exception(
-                    'attributeaggregator: AA entityId is not specified in the configuration.'
-				);
+
+		if (!$aameta) {
+			throw new Exception(
+				'attributeaggregator: AA entityId (' . $config['entityId'] .
+				') does not exist in any available metadata sources.'
+			);
 		}
 
+		$this->entityId = $config['entityId'];
+
 		if (! empty($config["attributeId"])){
 			$this->attributeId = $config["attributeId"];
 		}
-		
+
 		if (! empty($config["required"])){
 			$this->required = $config["required"];
 		}
 
 		if (!empty($config["nameIdFormat"])){
-			foreach (array(
-							SAML2_Const::NAMEID_UNSPECIFIED,
-							SAML2_Const::NAMEID_PERSISTENT,
-							SAML2_Const::NAMEID_TRANSIENT,
-							SAML2_Const::NAMEID_ENCRYPTED) as $format) {
+			foreach ([  Constants::NAMEID_UNSPECIFIED,
+						Constants::NAMEID_PERSISTENT,
+						Constants::NAMEID_TRANSIENT,
+						Constants::NAMEID_ENCRYPTED] as $format) {
 				$invalid = TRUE;
 				if ($config["nameIdFormat"] == $format) {
 					$this->nameIdFormat = $config["nameIdFormat"];
@@ -105,25 +137,25 @@ public function __construct($config, $reserved)
 				}
 			}
 			if ($invalid)
-				throw new SimpleSAML_Error_Exception("attributeaggregator: Invalid nameIdFormat: ".$config["nameIdFormat"]);
+				throw new Exception("attributeaggregator: Invalid nameIdFormat: ".$config["nameIdFormat"]);
 		}
 
 		if (!empty($config["attributes"])){
 			if (! is_array($config["attributes"])) {
-				throw new SimpleSAML_Error_Exception("attributeaggregator: Invalid format of attributes array in the configuration");
+				throw new Exception("attributeaggregator: Invalid format of attributes array in the configuration");
 			}
 			foreach ($config["attributes"] as $attribute) {
 				if (! is_array($attribute)) {
-					throw new SimpleSAML_Error_Exception("attributeaggregator: Invalid format of attributes array in the configuration");
+					throw new Exception("attributeaggregator: Invalid format of attributes array in the configuration");
 				}
 				if (array_key_exists("values", $attribute)) {
 					if (! is_array($attribute["values"])) {
-						throw new SimpleSAML_Error_Exception("attributeaggregator: Invalid format of attributes array in the configuration");
-					}	
+						throw new Exception("attributeaggregator: Invalid format of attributes array in the configuration");
+					}
 				}
 				if (array_key_exists('multiSource', $attribute)){
 					if(! preg_match('/^(merge|keep|override)$/', $attribute['multiSource']))
-						throw new SimpleSAML_Error_Exception(
+						throw new Exception(
                     		'attributeaggregator: Invalid multiSource value '.$attribute['multiSource'].' for '.key($attribute).'. It not mached keep, merge or override.'
 					);
 				}
@@ -132,10 +164,9 @@ public function __construct($config, $reserved)
 		}
 
 		if (!empty($config["attributeNameFormat"])){
-			foreach (array(
-							SAML2_Const::NAMEFORMAT_UNSPECIFIED,
-							SAML2_Const::NAMEFORMAT_URI,
-							SAML2_Const::NAMEFORMAT_BASIC) as $format) {
+			foreach ([  Constants::NAMEFORMAT_UNSPECIFIED,
+						Constants::NAMEFORMAT_URI,
+						Constants::NAMEFORMAT_BASIC] as $format) {
 				$invalid = TRUE;
 				if ($config["attributeNameFormat"] == $format) {
 					$this->attributeNameFormat = $config["attributeNameFormat"];
@@ -144,7 +175,7 @@ public function __construct($config, $reserved)
 				}
 			}
 			if ($invalid)
-				throw new SimpleSAML_Error_Exception("attributeaggregator: Invalid attributeNameFormat: ".$config["attributeNameFormat"], 1);
+				throw new Exception("attributeaggregator: Invalid attributeNameFormat: ".$config["attributeNameFormat"], 1);
 		}
 	}
 
@@ -158,9 +189,9 @@ public function __construct($config, $reserved)
 	 *
 	 * @return void
 	 */
-	public function process(&$state)
+	public function process(array &$state): void
 	{
-		assert('is_array($state)');
+		Assert::isArray($state);
 		$state['attributeaggregator:authsourceId'] = $state["saml:sp:State"]["saml:sp:AuthId"];
 		$state['attributeaggregator:entityId'] = $this->entityId;
 
@@ -172,16 +203,18 @@ public function process(&$state)
 
 		if (! $state['attributeaggregator:attributeId']){
 			if (! $this->required) {
-				SimpleSAML_Logger::info('[attributeaggregator] This user session does not have '.$this->attributeId.', which is required for querying the AA! Continue processing.');
-				SimpleSAML_Logger::debug('[attributeaggregator] Attributes are: '.var_export($state['Attributes'],true));
+				Logger::info('[attributeaggregator] This user session does not have '.$this->attributeId.', which is required for querying the AA! Continue processing.');
+				Logger::debug('[attributeaggregator] Attributes are: '.var_export($state['Attributes'],true));
 				SimpleSAML_Auth_ProcessingChain::resumeProcessing($state);
-			}	
-			throw new SimpleSAML_Error_Exception("This user session does not have ".$this->attributeId.", which is required for querying the AA! Attributes are: ".var_export($state['Attributes'],1));
+			}
+			throw new Exception("This user session does not have ".$this->attributeId.", which is required for querying the AA! Attributes are: ".var_export($state['Attributes'],1));
 		}
-		
-		// Save state and redirect
-		$id  = SimpleSAML_Auth_State::saveState($state, 'attributeaggregator:request');
-		$url = SimpleSAML_Module::getModuleURL('attributeaggregator/attributequery.php');
-		SimpleSAML_Utilities::redirect($url, array('StateId' => $id)); // FIXME: redirect is deprecated
+
+		$id  = State::saveState($state, 'attributeaggregator:request');
+		$url = Module::getModuleURL('attributeaggregator/attributequery.php');
+        $params = ['StateId' => $id];
+
+        $httpUtils = new HTTP();
+        $httpUtils->redirectTrustedURL($url, $params);
 	}
 }
diff --git a/tests/_autoload_modules.php b/tests/_autoload_modules.php
index a6fdea7..4011497 100644
--- a/tests/_autoload_modules.php
+++ b/tests/_autoload_modules.php
@@ -1,32 +1,48 @@
 <?php
 
+declare(strict_types=1);
+
 /**
- * This file implements a trimmed down version of the SSP module aware autoloader that can be used in tests.
+ * This file registers an autoloader for SimpleSAMLphp modules.
  *
- * @author Patrick Radtke
+ * @author Boy Baukema, SURFnet
+ * @author Jaime Perez <jaime.perez@uninett.no>, UNINETT
+ * @package SimpleSAMLphp
  */
 
 /**
- * Autoload function for local SimpleSAMLphp modules.
+ * Autoload function for SimpleSAMLphp modules following PSR-4.
  *
  * @param string $className Name of the class.
  */
-function SimpleSAML_test_module_autoload($className)
+function sspmodAutoloadPSR4(string $className): void
 {
-    $modulePrefixLength = strlen('sspmod_');
-    $classPrefix = substr($className, 0, $modulePrefixLength);
-    if ($classPrefix !== 'sspmod_') {
-        return;
+    $elements = explode('\\', $className);
+    if ($elements[0] === '') {
+        // class name starting with /, ignore
+        array_shift($elements);
+    }
+    if (count($elements) < 4) {
+        return; // it can't be a module
+    }
+    if (array_shift($elements) !== 'SimpleSAML') {
+        return; // the first element is not "SimpleSAML"
+    }
+    if (array_shift($elements) !== 'Module') {
+        return; // the second element is not "module"
     }
 
-    $modNameEnd = strpos($className, '_', $modulePrefixLength);
-    $moduleClass = substr($className, $modNameEnd + 1);
+    // this is a SimpleSAMLphp module following PSR-4
+    $module = array_shift($elements);
+    if (!\SimpleSAML\Module::isModuleEnabled($module)) {
+        return; // module not enabled, avoid giving out any information at all
+    }
 
-    $file = dirname(dirname(__FILE__)) . '/lib/' . str_replace('_', '/', $moduleClass) . '.php';
+    $file = \SimpleSAML\Module::getModuleDir($module) . '/src/' . implode('/', $elements) . '.php';
 
     if (file_exists($file)) {
         require_once($file);
     }
 }
 
-spl_autoload_register('SimpleSAML_test_module_autoload');
+spl_autoload_register('sspmodAutoloadPSR4');
\ No newline at end of file
diff --git a/tests/lib/Auth/Process/attributeaggregatorTest.php b/tests/lib/Auth/Process/attributeaggregatorTest.php
deleted file mode 100644
index af3fe11..0000000
--- a/tests/lib/Auth/Process/attributeaggregatorTest.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<?php
-
-class Test_sspmod_attributeaggregator_Auth_Process_attributeaggregator extends PHPUnit_Framework_TestCase {
-
-    /**
-     * Helper function to run the filter with a given configuration.
-     *
-     * @param  array $config The filter configuration.
-     * @param  array $request The request state.
-     * @return array  The state array after processing.
-     */
-    private static function processFilter(array $config, array $request)
-    {
-        $filter = new sspmod_attributeaggregator_Auth_Process_attributeaggregator($config, null);
-        $filter->process($request);
-        return $request;
-    }
-
-    public function testAny()
-    {
-        $this->assertTrue(true, 'Just for travis.yml test');
-    }
-}
diff --git a/tests/src/Auth/Process/AttributeAggregatorTest.php b/tests/src/Auth/Process/AttributeAggregatorTest.php
new file mode 100644
index 0000000..9ef9516
--- /dev/null
+++ b/tests/src/Auth/Process/AttributeAggregatorTest.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+namespace SimpleSAML\Test\Module\attributeaggregator\Auth\Process;
+
+use PHPUnit\Framework\TestCase;
+use SimpleSAML\Module\attributeaggregator\Auth\Process\attributeaggregator;
+
+class AttributeAggregatorTest extends TestCase
+{
+    /**
+     * Helper function to run the filter with a given configuration.
+     *
+     * @param array $config The filter configuration.
+     * @param array $request The request state.
+     * @return array The state array after processing.
+     */
+    private static function processFilter(array $config, array $request): array
+    {
+        $filter = new attributeaggregator($config, null);
+        $filter->process($request);
+        return $request;
+    }
+
+    public function testAny(): void
+    {
+        $this->assertTrue(true, 'Just for travis.yml test');
+    }
+}
diff --git a/www/attributequery.php b/www/attributequery.php
deleted file mode 100644
index 55ebaa0..0000000
--- a/www/attributequery.php
+++ /dev/null
@@ -1,166 +0,0 @@
-<?php
-
-$session = SimpleSAML_Session::getSessionFromRequest();
-$metadata = SimpleSAML_Metadata_MetaDataStorageHandler::getMetadataHandler();
-
-if (!array_key_exists('StateId', $_REQUEST)) {
-	throw new SimpleSAML_Error_BadRequest(
-			'[attributeaggregator] - Missing required StateId query parameter.'
-	);
-}
-
-$id = $_REQUEST['StateId'];
-$state = SimpleSAML_Auth_State::loadState($id, 'attributeaggregator:request');
-SimpleSAML_Logger::info('[attributeaggregator] - Querying attributes from ' . $state['attributeaggregator:entityId'] );
-$aaMetadata = $metadata->getMetadata($state['attributeaggregator:entityId'],'attributeauthority-remote');
-
-/* Find an AttributeService with SOAP binding */
-$aas = $aaMetadata['AttributeService'];
-for ($i=0;$i<count($aas);$i++){
-	if ($aas[$i]['Binding'] == SAML2_Const::BINDING_SOAP){
-		$index = $i;
-		break;
-	}
-}
-
-if (empty($aas[$index]['Location'])) {
-	throw new SimplesSAML_Error("Can't find the AttributeService endpoint to send the attribute query.");
-}
-$url = $aas[$index]['Location'];
-
-/* nameId */
-$data['nameIdValue'] = $state['attributeaggregator:attributeId'][0];
-$data['nameIdFormat'] = $state['attributeaggregator:nameIdFormat'];
-$data['nameIdQualifier'] = '';
-$data['nameIdSPQualifier'] = '';
-
-/* VO AttributeAuthority endpoint */
-$data['url'] = $url;
-$data['stateId'] = $id;
-
-
-/* Building the query */
-
-$dataId = SimpleSAML_Utilities::generateID();
-$session->setData('attributeaggregator:data', $dataId, $data, 3600);
-
-$nameId = array(
-		'Format' => $data['nameIdFormat'],
-		'Value' => $data['nameIdValue'],
-		'NameQualifier' => $data['nameIdQualifier'],
-		'SPNameQualifier' => $data['nameIdSPQualifier'],
-);
-if (empty($nameId['NameQualifier'])) {
-	$nameId['NameQualifier'] = NULL;
-}
-if (empty($nameId['SPNameQualifier'])) {
-	$nameId['SPNameQualifier'] = NULL;
-}
-
-$attributes = $state['attributeaggregator:attributes'];
-$attributes_to_send = array();
-foreach ($attributes as $name => $params) {
-	if (array_key_exists('values', $params)){
-		$attributes_to_send[$name] = $params['values'];
-	}
-	else {
-		$attributes_to_send[$name] = array();
-	}
-}
-
-$attributeNameFormat = $state['attributeaggregator:attributeNameFormat'];
-
-$authsource = SimpleSAML_Auth_Source::getById($state["attributeaggregator:authsourceId"]);
-$src = $authsource->getMetadata();
-$dst = $metadata->getMetaDataConfig($state['attributeaggregator:entityId'],'attributeauthority-remote');
-
-// Sending query
-try {
-	$response = sendQuery($dataId, $data['url'], $nameId, $attributes_to_send, $attributeNameFormat, $src, $dst);	
-} catch (Exception $e) {
-	throw new SimpleSAML_Error_Exception('[attributeaggregator] Got an exception while performing attribute query. Exception: '.get_class($e).', message: '.$e->getMessage());
-}
-
-$idpEntityId = $response->getIssuer();
-if ($idpEntityId === NULL) {
-	throw new SimpleSAML_Error_Exception('Missing issuer in response.');
-}
-$assertions = sspmod_saml_Message::processResponse($src, $dst, $response);
-$attributes_from_aa = $assertions[0]->getAttributes();
-$expected_attributes = $state['attributeaggregator:attributes'];
-// get attributes from response, and put it in the state.
-foreach ($attributes_from_aa as $name=>$values){
-	// expected?
-	if (array_key_exists($name, $expected_attributes)){
-		// There is in the existing attributes?
-		if(array_key_exists($name, $state['Attributes'])){
-			// has multiSource rule?
-			if (! empty($expected_attributes[$name]['multiSource'])){
-				switch ($expected_attributes[$name]['multiSource']) {
-					case 'override':
-						$state['Attributes'][$name] = $values;
-						break;
-					case 'keep':
-						continue;
-						break;
-					case 'merge':
-						$state['Attributes'][$name] = array_merge($state['Attributes'][$name],$values);
-						break;					
-				}
-			}
-			// default: merge the attributes
-			else {
-				$state['Attributes'][$name] = array_merge($state['Attributes'][$name],$values);
-			}
-		}
-		// There is not in the existing attributes, create it.
-		else {
-			$state['Attributes'][$name] = $values;
-		}
-	}
-	// not expected? Put it to attributes array.
-	else {
-		if (!empty($state['Attributes'][$name])){
-			$state['Attributes'][$name] = array_merge($state['Attributes'][$name],$values);
-		}
-		else
-			$state['Attributes'][$name] = $values;
-	}
-}
-
-SimpleSAML_Logger::debug('[attributeaggregator] - Attributes now:'.var_export($state['Attributes'],true));
-SimpleSAML_Auth_ProcessingChain::resumeProcessing($state);
-exit;
-
-/**
- * build and send AttributeQuery
- */
-function sendQuery($dataId, $url, $nameId, $attributes, $attributeNameFormat,$src,$dst) {
-	assert('is_string($dataId)');
-	assert('is_string($url)');
-	assert('is_array($nameId)');
-	assert('is_array($attributes)');
-
-	SimpleSAML_Logger::debug('[attributeaggregator] - sending request');
-
-	$query = new SAML2_AttributeQuery();
-	$query->setRelayState($dataId);
-	$query->setDestination($url);
-	$query->setIssuer($src->getValue('entityid'));
-	$query->setNameId($nameId);
-	$query->setAttributeNameFormat($attributeNameFormat);
-	if (! empty($attributes)){
-		$query->setAttributes($attributes);
-	}
-	sspmod_saml_Message::addSign($src,$dst,$query);
-
-	if (! $query->getSignatureKey()){
-		throw new SimpleSAML_Error_Exception('[attributeaggregator] - Unable to find private key for signing attribute request.');
-	}
-	
-	SimpleSAML_Logger::debug('[attributeaggregator] - sending attribute query: '.var_export($query,1));
-	$binding = new SAML2_SOAPClient();
-
-	$result = $binding->send($query, $src, $dst);
-	return $result;
-}