Merge branch 'master' of md-master.swamid.se:swamid-metadata

833 files changed, 20752 insertions, 8454 deletions

diff --git a/swamid-2.0/idp.sics.se-idp-shibboleth.xml b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
index 9a461ab0..ddfbf228 100644
--- a/swamid-2.0/idp.sics.se-idp-shibboleth.xml
+++ b/swamid-2.0/idp.sics.se-idp-shibboleth.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.sics.se/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0                                                 urn:oasis:names:tc:SAML:1.1:protocol                                                 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope regexp="false">sics.se</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -55,11 +55,11 @@ SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sics.se/idp/profile/SAML2/Redirect/SLO"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sics.se/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/SLO"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sics.se/idp/profile/Shibboleth/SSO"/>
@@ -106,9 +106,20 @@ SAjl7oNIQRzT56t4Npa0p4GNvEUKkevkVfF3AChSdg==
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sics.se/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sics.se/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">SICS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SICS</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="sv">SICS</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.sics.se</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <Company>SICS</Company>
+    <SurName>CRIT</SurName>
+    <EmailAddress>crit@sics.se</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml b/swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml
new file mode 100644
index 00000000..00009d88
--- /dev/null
+++ b/swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://passporttest.lu.se/activateaccount/shibboleth">
+  <md:Extensions xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha224"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category">
+        <samla:AttributeValue>http://www.swamid.se/category/hei-service</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
+        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.swamid.se/category/sfs-1993-1153</samla:AttributeValue>
+      </samla:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://passporttest.lu.se/Shibboleth.sso/Login-antagning"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://passporttest.lu.se/Shibboleth.sso/Login-eduid"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://passporttest.lu.se/Shibboleth.sso/Login-lu"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Lund University user account activation and password reset</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Lund universitets kontoaktivering och lösenordsåterställning</mdui:DisplayName>
+        <mdui:Description xml:lang="en">As a new user you use this service to activate your university user account.</mdui:Description>
+        <mdui:Description xml:lang="sv">Denna tjänst används för att du som ny vid universitetet ska kunna aktivera ditt användarkonto vid universitetet.</mdui:Description>
+        <mdui:Logo height="50" width="50">http://www.lunduniversity.lu.se/sites/www.lunduniversity.lu.se/files/lund_university_logotype.png</mdui:Logo>
+        <mdui:Logo xml:lang="sv" height="50" width="50"> http://www.lu.se/sites/www.lu.se/files/logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://passporttest.lu.se/activateaccount</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv"> https://passporttest.lu.se/activateaccount</mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>uwtestws01.uwtest.lu.se</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=uwtestws01.uwtest.lu.se</ds:X509SubjectName>
+          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAIXu3O5M/nIOMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF3V3dGVzdHdzMDEudXd0ZXN0Lmx1LnNlMB4XDTE0MTAyMTE1MDAyNFoXDTI0
+MTAxODE1MDAyNFowIjEgMB4GA1UEAxMXdXd0ZXN0d3MwMS51d3Rlc3QubHUuc2Uw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5CSxXWUV+CxQKCIvis/Li
+ounrcRbo5wb+6EUvyTNo5v8kiY+g6FTkVYypzYu2zMQMbMZMbLC6gIYHmoCTY4a4
+5SfP0UBrKFMr1fhnXNrRMhx3e2yRCMDQ6MW5TeTHyKqWt5LnQza5gdXF8rddXapU
+G3o7/6J9siYqJFS4qJ4flOtI98WA49jmiHJFutir6tS0FVqdLVNfmUIfo8+ua4dm
+WU7CXyKJkFIYfuCUyAWk7WWdrmjLMg+ujmbWG+lFRy0rU7JpMnOZ/4xnm4DdYYdT
+oBka1qpxzdu4i7zKRwBvMpdeik6pbwMXcj9/qAq5wDm7OWulYwOceKbHLR/zUm1F
+AgMBAAGjRTBDMCIGA1UdEQQbMBmCF3V3dGVzdHdzMDEudXd0ZXN0Lmx1LnNlMB0G
+A1UdDgQWBBTHsEqrpHmU4lcM2mhVlQGMNN/agDANBgkqhkiG9w0BAQUFAAOCAQEA
+Rbk93Mxqs96mm8RgxuogewDXQIwRsxEpdikP6VjhcHkCkM/oRpeXsGjgqY44BNuW
+8PwPRMjYlbqen8bzbOP9YknrC5QczVVgKIUFMRqE2TgU9pLl6MpLaH+weT8hKX/H
+EBmKKnmi55mNxx5bq3pu8vUL03VnqtjpssKXGLdY0waAdssxf0df72gNpKdQ+TMH
+hLW84PHAzXW4q3d3FK8RTe41YPbyFaosVULPyBrKm91A5qbfIdCvyz9rCYYeNiTC
+tnp8qHXMMEECQXRq8CM7UGqBJY9BUPRwGsyk0YpsRyqQzk2CR7IqQwj85V5HdQxi
+FLZnYYc2YEZAVn2+7pTtmA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes128-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes192-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#aes256-gcm"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passporttest.lu.se/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passporttest.lu.se/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passporttest.lu.se/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passporttest.lu.se/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passporttest.lu.se/Shibboleth.sso/SLO/Artifact"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://passporttest.lu.se/Shibboleth.sso/NIM/SOAP"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://passporttest.lu.se/Shibboleth.sso/NIM/Redirect"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passporttest.lu.se/Shibboleth.sso/NIM/POST"/>
+    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passporttest.lu.se/Shibboleth.sso/NIM/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://passporttest.lu.se/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://passporttest.lu.se/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://passporttest.lu.se/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://passporttest.lu.se/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://passporttest.lu.se/Shibboleth.sso/SAML/Artifact" index="6"/>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
index f73de3b8..12e9fc74 100644
--- a/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
+++ b/swamid-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -4,6 +4,7 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" Name="http://macedir.org/entity-category-support">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
+        <samla:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </Extensions>
diff --git a/swamid-externals-1.0.mxml b/swamid-externals-1.0.mxml
index a6bf6670..0ff82034 100644
--- a/swamid-externals-1.0.mxml
+++ b/swamid-externals-1.0.mxml
@@ -3,7 +3,9 @@
 <xi:include href="swamid-externals-1.0/downloads.channel8.msdn.com.xml"/>
 <xi:include href="swamid-externals-1.0/idp.shibboleth.net.xml"/>
 <xi:include href="swamid-externals-1.0/issues.shibboleth.net.xml"/>
+<xi:include href="swamid-externals-1.0/spaces.internet2.edu-shibboleth.xml"/>
 <xi:include href="swamid-externals-1.0/spaces.internet2.edu.xml"/>
+<xi:include href="swamid-externals-1.0/terena.org-sp.xml"/>
 <xi:include href="swamid-externals-1.0/terena.org.xml"/>
 <xi:include href="swamid-externals-1.0/wiki.shibboleth.net.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-externals-1.0/spaces.internet2.edu-shibboleth.xml b/swamid-externals-1.0/spaces.internet2.edu-shibboleth.xml
new file mode 100644
index 00000000..f0acc0cb
--- /dev/null
+++ b/swamid-externals-1.0/spaces.internet2.edu-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://spaces.internet2.edu/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spaces.internet2.edu/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://spaces.internet2.edu/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://spaces.internet2.edu/shibboleth</ds:KeyName>
+        <ds:KeyName>spaces.internet2.edu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=spaces.internet2.edu,O=Internet2,C=US</ds:X509SubjectName>
+          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIBADANBgkqhkiG9w0BAQQFADBAMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSW50ZXJuZXQyMR0wGwYDVQQDExRzcGFjZXMuaW50ZXJuZXQyLmVk
+dTAeFw0wNjEyMTMxNzQwMjdaFw0xNjEyMTAxNzQwMjdaMEAxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQKEwlJbnRlcm5ldDIxHTAbBgNVBAMTFHNwYWNlcy5pbnRlcm5ldDIu
+ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfZWpU5/8rgfFbxh
+DOwYuQ4/TNycAQ/VQ5DFMU3M3bvF52WktUtfwBDozdXQt/tOIlBFvPVHH/pdp0q6
+RrzjXP5pQFZoKKc+p9cGdxHqKlx7RWAnFycNaKFZyV9kUTUvSHDjQk00i5gJUGEt
+D1j8NLE9o0y68x+5jK3onhQs3IXkHVYDslXHNXPovcv7OQuWIL69oBxyTxeTBUIA
+WoIiSZh6XrjGmNUid2ZnFFk7YtY1UNGV18LbfVhnxBlIxIq5v9KQgK9T0P5pogYs
+6N7Ki4eMK3cKCJkAibrbo8iPcOJnwbCXTlLmnhv5yd/W8Bk8A/pluNX7kbsSYr1f
+7P6YqQIDAQABo4H5MIH2MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8t+Ty3BI/EncjTRX+
+JB8jn/SU0zBoBgNVHSMEYTBfgBQ8t+Ty3BI/EncjTRX+JB8jn/SU06FEpEIwQDEL
+MAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjEdMBsGA1UEAxMUc3BhY2Vz
+LmludGVybmV0Mi5lZHWCAQAwMgYDVR0RBCswKYYnaHR0cHM6Ly9zcGFjZXMuaW50
+ZXJuZXQyLmVkdS9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBAUAA4IBAQCd2JE3zSY3
+JLYBdr/WhFphpMHavrXpcK8GYro0YYfPN0QDxjBUSGkGgw0QzKAGmthqJWJ6yeip
+Ht36uzobQ2iQtFU08LKiK2jPNegSU3uW/LsmnweFCDmWDyacmK91q+m3oNfY631l
++vLX82GQYRssQbis1CJbrD/XE1W+2sEnGHc4eNRJZYNzMRvfSatNavCgI1IoOFEC
+gBAD9negf1qiDeouxjXCiixAMR5XnVd7lyZ7VN3goXIN//4SdCLT5fd1tIspaOOy
+BPE4P/6N3KmAMY7VNejGcpoRKvb0R0Yd7a8aMR7xImUNsycFlthz+sl26fTVNNmz
+/n0PiqFXEkFy
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Artifact"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Internet2-Hosted Federated Wiki</ServiceName>
+      <ServiceDescription xml:lang="en">
+              A shared Wiki service with automatic registration for users who can supply a supported
+              identifier, such as eduPersonPrincipalName or swissEduPersonUniqueID.
+          </ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Internet2</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Internet2</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.internet2.edu/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Internet2 Technical Support</GivenName>
+    <EmailAddress>tsg@internet2.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>IJ Kim</GivenName>
+    <EmailAddress>ij@internet2.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Scott Cantor</GivenName>
+    <EmailAddress>cantor.2@osu.edu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-externals-1.0/terena.org-sp.xml b/swamid-externals-1.0/terena.org-sp.xml
new file mode 100644
index 00000000..ef1f5bb4
--- /dev/null
+++ b/swamid-externals-1.0/terena.org-sp.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">TERENA Service Provider Proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p</mdui:PrivacyStatementURL>
+        <mdui:Logo width="350" height="94">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TERENA</md:GivenName>
+    <md:SurName>AAI team</md:SurName>
+    <md:EmailAddress>aai@terena.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-externals-2.0.mxml b/swamid-externals-2.0.mxml
index 461c1ddb..ab6a3c3d 100644
--- a/swamid-externals-2.0.mxml
+++ b/swamid-externals-2.0.mxml
@@ -5,8 +5,10 @@
 <xi:include href="swamid-externals-2.0/idp.shibboleth.net.xml"/>
 <xi:include href="swamid-externals-2.0/issues.shibboleth.net.xml"/>
 <xi:include href="swamid-externals-2.0/kantarainitiative.org.xml"/>
+<xi:include href="swamid-externals-2.0/spaces.internet2.edu-shibboleth.xml"/>
 <xi:include href="swamid-externals-2.0/spaces.internet2.edu.xml"/>
 <xi:include href="swamid-externals-2.0/swamid.user.uu.se.xml"/>
+<xi:include href="swamid-externals-2.0/terena.org-sp.xml"/>
 <xi:include href="swamid-externals-2.0/terena.org.xml"/>
 <xi:include href="swamid-externals-2.0/wiki.shibboleth.net.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-externals-2.0/spaces.internet2.edu-shibboleth.xml b/swamid-externals-2.0/spaces.internet2.edu-shibboleth.xml
new file mode 100644
index 00000000..f0acc0cb
--- /dev/null
+++ b/swamid-externals-2.0/spaces.internet2.edu-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://spaces.internet2.edu/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport">
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+  </md:Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://spaces.internet2.edu/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://spaces.internet2.edu/Shibboleth.sso/Login" index="1"/>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>https://spaces.internet2.edu/shibboleth</ds:KeyName>
+        <ds:KeyName>spaces.internet2.edu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=spaces.internet2.edu,O=Internet2,C=US</ds:X509SubjectName>
+          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIBADANBgkqhkiG9w0BAQQFADBAMQswCQYDVQQGEwJVUzES
+MBAGA1UEChMJSW50ZXJuZXQyMR0wGwYDVQQDExRzcGFjZXMuaW50ZXJuZXQyLmVk
+dTAeFw0wNjEyMTMxNzQwMjdaFw0xNjEyMTAxNzQwMjdaMEAxCzAJBgNVBAYTAlVT
+MRIwEAYDVQQKEwlJbnRlcm5ldDIxHTAbBgNVBAMTFHNwYWNlcy5pbnRlcm5ldDIu
+ZWR1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxfZWpU5/8rgfFbxh
+DOwYuQ4/TNycAQ/VQ5DFMU3M3bvF52WktUtfwBDozdXQt/tOIlBFvPVHH/pdp0q6
+RrzjXP5pQFZoKKc+p9cGdxHqKlx7RWAnFycNaKFZyV9kUTUvSHDjQk00i5gJUGEt
+D1j8NLE9o0y68x+5jK3onhQs3IXkHVYDslXHNXPovcv7OQuWIL69oBxyTxeTBUIA
+WoIiSZh6XrjGmNUid2ZnFFk7YtY1UNGV18LbfVhnxBlIxIq5v9KQgK9T0P5pogYs
+6N7Ki4eMK3cKCJkAibrbo8iPcOJnwbCXTlLmnhv5yd/W8Bk8A/pluNX7kbsSYr1f
+7P6YqQIDAQABo4H5MIH2MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5T
+U0wgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBQ8t+Ty3BI/EncjTRX+
+JB8jn/SU0zBoBgNVHSMEYTBfgBQ8t+Ty3BI/EncjTRX+JB8jn/SU06FEpEIwQDEL
+MAkGA1UEBhMCVVMxEjAQBgNVBAoTCUludGVybmV0MjEdMBsGA1UEAxMUc3BhY2Vz
+LmludGVybmV0Mi5lZHWCAQAwMgYDVR0RBCswKYYnaHR0cHM6Ly9zcGFjZXMuaW50
+ZXJuZXQyLmVkdS9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBAUAA4IBAQCd2JE3zSY3
+JLYBdr/WhFphpMHavrXpcK8GYro0YYfPN0QDxjBUSGkGgw0QzKAGmthqJWJ6yeip
+Ht36uzobQ2iQtFU08LKiK2jPNegSU3uW/LsmnweFCDmWDyacmK91q+m3oNfY631l
++vLX82GQYRssQbis1CJbrD/XE1W+2sEnGHc4eNRJZYNzMRvfSatNavCgI1IoOFEC
+gBAD9negf1qiDeouxjXCiixAMR5XnVd7lyZ7VN3goXIN//4SdCLT5fd1tIspaOOy
+BPE4P/6N3KmAMY7VNejGcpoRKvb0R0Yd7a8aMR7xImUNsycFlthz+sl26fTVNNmz
+/n0PiqFXEkFy
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SLO/Artifact"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://spaces.internet2.edu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Internet2-Hosted Federated Wiki</ServiceName>
+      <ServiceDescription xml:lang="en">
+              A shared Wiki service with automatic registration for users who can supply a supported
+              identifier, such as eduPersonPrincipalName or swissEduPersonUniqueID.
+          </ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Internet2</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Internet2</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.internet2.edu/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Internet2 Technical Support</GivenName>
+    <EmailAddress>tsg@internet2.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>IJ Kim</GivenName>
+    <EmailAddress>ij@internet2.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Scott Cantor</GivenName>
+    <EmailAddress>cantor.2@osu.edu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-externals-2.0/terena.org-sp.xml b/swamid-externals-2.0/terena.org-sp.xml
new file mode 100644
index 00000000..ef1f5bb4
--- /dev/null
+++ b/swamid-externals-2.0/terena.org-sp.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">TERENA Service Provider Proxy</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A service provider proxy for all TERENA federated services</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://confluence.terena.org/display/aai/Service+Provider+Proxy</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.terena.org/p3p</mdui:PrivacyStatementURL>
+        <mdui:Logo width="350" height="94">https://www.terena.org/gfx/terena_logo_slogan_rgb-350x97.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">A Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">TERENA</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">TERENA</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.terena.org/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>TERENA</md:GivenName>
+    <md:SurName>AAI team</md:SurName>
+    <md:EmailAddress>aai@terena.org</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0.mxml b/swamid-interfederations-1.0.mxml
index f1714091..d7faae9b 100644
--- a/swamid-interfederations-1.0.mxml
+++ b/swamid-interfederations-1.0.mxml
@@ -1,51 +1,88 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-interfederations-1.0.xml">
 <xi:include href="swamid-interfederations-1.0/agw-sparknet.utu.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/atlases.muni.cz.xml"/>
 <xi:include href="swamid-interfederations-1.0/auth.asiaportal.info.xml"/>
 <xi:include href="swamid-interfederations-1.0/compute.deic.dk.xml"/>
+<xi:include href="swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/core.uwap.org.xml"/>
 <xi:include href="swamid-interfederations-1.0/data.deic.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/filesender.funet.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml"/>
 <xi:include href="swamid-interfederations-1.0/foodl.org.xml"/>
+<xi:include href="swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml"/>
 <xi:include href="swamid-interfederations-1.0/fse.eduuni.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/haka.saimia.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.aalto.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.abo.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.csc.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.feide.no.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.ids-mannheim.de.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.lapinamk.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.metropolia.fi-idp.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.metropolia.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.oamk.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.shh.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.tut.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.uef.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/idp.ulapland.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/login.helsinki.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/logout.uwasa.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/moodle.helsinki.fi-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/moodle.helsinki.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/moodle.utu.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/openwiki.uninett.no.xml"/>
+<xi:include href="swamid-interfederations-1.0/portal.clarin.inl.nl-.xml"/>
 <xi:include href="swamid-interfederations-1.0/portal.clarin.inl.nl.xml"/>
+<xi:include href="swamid-interfederations-1.0/rr.funet.fi-attribute-test.xml"/>
 <xi:include href="swamid-interfederations-1.0/rr.funet.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/shibboleth.bbaw.de-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/shibboleth.bbaw.de.xml"/>
+<xi:include href="swamid-interfederations-1.0/software.msdnaa.dk-.xml"/>
 <xi:include href="swamid-interfederations-1.0/software.msdnaa.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.catalog.clarin.eu.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.corpus1.mpi.nl.xml"/>
+<xi:include href="swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.dev.clarin.inl.nl.xml"/>
+<xi:include href="swamid-interfederations-1.0/sp.korp.csc.fi-.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.korp.csc.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.lat.csc.fi.xml"/>
 <xi:include href="swamid-interfederations-1.0/sp.lux17.mpi.nl.xml"/>
+<xi:include href="swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml"/>
 <xi:include href="swamid-interfederations-1.0/sso.utu.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml"/>
 <xi:include href="swamid-interfederations-1.0/synnefo.sky.deic.dk.xml"/>
+<xi:include href="swamid-interfederations-1.0/terena.org-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/terena.org.xml"/>
+<xi:include href="swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml"/>
 <xi:include href="swamid-interfederations-1.0/tullbommen.arcada.fi.xml"/>
+<xi:include href="swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/ufal-point.mff.cuni.cz.xml"/>
+<xi:include href="swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml"/>
+<xi:include href="swamid-interfederations-1.0/urn-ibistic-prod-services.ibistic.net.xml"/>
+<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
+<xi:include href="swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.xml"/>
+<xi:include href="swamid-interfederations-1.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
 <xi:include href="swamid-interfederations-1.0/wayf.card.kilroy.eu.xml"/>
 <xi:include href="swamid-interfederations-1.0/wayf.ordbogen.com.xml"/>
 <xi:include href="swamid-interfederations-1.0/wayf.wayf.dk.xml"/>
 <xi:include href="swamid-interfederations-1.0/weblicht.sfs.uni-tuebingen.de.xml"/>
 <xi:include href="swamid-interfederations-1.0/wiseflow.dk.xml"/>
+<xi:include href="swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.emeraldinsight.com.xml"/>
 <xi:include href="swamid-interfederations-1.0/www.ordbogen.com.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-interfederations-1.0/.xml b/swamid-interfederations-1.0/.xml
index 0d2bbd12..fae36ad8 100644
--- a/swamid-interfederations-1.0/.xml
+++ b/swamid-interfederations-1.0/.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-09-07T09:17:01Z" cacheDuration="PT345600S">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net" validUntil="2014-11-02T19:17:01Z" cacheDuration="PT345600S">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml b/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
index 7df78638..796e6c69 100644
--- a/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
+++ b/swamid-interfederations-1.0/agw-sparknet.utu.fi.xml
@@ -4,39 +4,6 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIQbnMIzP8TsRk95w/HSxaw8TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMTEyMzAwMDAwMFoXDTEzMTEyMjIzNTk1OVowgboxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUyMDUwMDEYMBYGA1UECBMPV2VzdGVybiBGaW5sYW5k
-MQ4wDAYDVQQHEwVUdXJrdTEaMBgGA1UECRMRQXNzaXN0ZW50aW5rYXR1IDUxHDAa
-BgNVBAoTE1VuaXZlcnNpdHkgb2YgVHVya3UxGTAXBgNVBAsTEENvbXB1dGluZyBD
-ZW50cmUxHDAaBgNVBAMTE2Fndy1zcGFya25ldC51dHUuZmkwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC/DfwsS+l2OcvB8YLJqMKLUrUc9KmEgLuCIBNh
-sy5hZDOnV7vieUzsxibSsz8LO/sqNXZu+oAJvQEbKVzglohKVpvZkXDWB4fJ7/Hk
-AXSSnKFUvA6D7NyITFHus2OuPVtWg7rOH53Hcsj7zDey1tLpt75+r9VYz+rfj7dY
-ZhBjQxjnVboDdD0KCw5SuPTYo2L+ZQit7Ede4g9KY970iSjXsPA5pFrjN1pezrse
-7MLBeqfiISwvEsmFvnRImzhnGlc1jkgK1mAxpGGFUOB3wRvlR9uQ1KjlSaFhPfUj
-V09/dG5tdEvc3bUV+3FEM+5Wv/9JMFXmfW/twfGE1cFVL5mRAgMBAAGjggFmMIIB
-YjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUpAIR
-/AL9x2BJgB91p7Z1RDOOGjowDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYB
-BAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYIT
-YWd3LXNwYXJrbmV0LnV0dS5maTANBgkqhkiG9w0BAQUFAAOCAQEAQ09BWmqzKH3P
-ywMfrWMAShhiowX3us9JTTJ8HLlApPWjW0feHpzvPCv86J2Ryeg+tRqtsYGAenvL
-FLqYnD65FaKos7/RrwQuxrwsDDbCk0LLVyDhlms7aOSvKRCmK1oyK9MABnraFh8e
-m3ueojjatPYaUG+ivTalv5oWuYi/Ye6GRGBlhyx2u972UqngRYnHAHCYrRzRA/l8
-VRtAw/rJTS3Yj5kDUG3LYeBH5A4myDeIHghg7n0s7A9qDtepxZFYgDzrwUusEo/a
-NbLlYF90/H/wrBP9SogebSqmAAEd7V+vMe2+W7N03f80xajbIli0+P0sEolPPgrW
-DSWPf8vQpQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQOWGPWke4DcPypq61jxi5UzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDcxMDAwMDAwMFoXDTE3MDcwOTIzNTk1OVowQTEhMB8GA1UE
diff --git a/swamid-interfederations-2.0/atlases.muni.cz.xml b/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml
index a385fe38..a385fe38 100644
--- a/swamid-interfederations-2.0/atlases.muni.cz.xml
+++ b/swamid-interfederations-1.0/atlases.muni.cz-shibboleth.xml
diff --git a/swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..ac7aacde
--- /dev/null
+++ b/swamid-interfederations-1.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://core.uwap.org/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">UWAP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">UWAP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</mdui:Description>
+        <mdui:Description xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</mdui:Description>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">norway</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9zCCAt+gAwIBAgIJAK6OQWf0KU3yMA0GCSqGSIb3DQEBBQUAMFoxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEOMAwGA1UECxMFRmVpZGUwHhcNMTMxMDE3MTA0NzMxWhcNMjMxMDE3MTA0NzMxWjBaMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxDjAMBgNVBAsTBUZlaWRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6QRUddKwIJVwc2QvcDEyV+OZR9wLv1wpY6196HNixA1N21uFcy5KdnyUvpCBr/MaNFBXiJEKayr3Ugo48eGNvdkkyXu9hP6PUMXvd/86eFyEDYhnaIYyVIpK9dINBno8uUd3TuEXu9DQP2M+ifOwMy0Ng3yofHItiqQk1tXpoLvi3B8YZ9qn+iYa9wT13npCjB2mH7g9OY8vjUa7Dy/ZUE4SB/ZwqAIIPOrIgHzOX1X4+zzgVgIhi4FdiUVZRrVo48ukKnR5D1QhpEc3M1gDFiDxZAFaff4h+/GCYrkd2yVfN2IwHNXBNwjOWnsQMyf7YQdViMoEG5biKMXvuuLB9QIDAQABo4G/MIG8MB0GA1UdDgQWBBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4DCBjAYDVR0jBIGEMIGBgBTeHFJiZGcXgAdUJXKbWsv/ZzVQ4KFepFwwWjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMQ4wDAYDVQQLEwVGZWlkZYIJAK6OQWf0KU3yMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAKL3nPuAspxcApatUIYesIfDrrX5ATo+Wi2nB6lq4ZZNLYUQRM4ca+ACKebZgg4TLzmCg697IB65GIZvFgh3/lz+W1ZfoAPkNgF4td2J1+IkfwDvBMh9Zq2ML/WRtkTQzvLjSzLvYQZMy7q++M8NC13YODtWY5H8IWeRqrsrvxXF634NZWPky7Gwi3orRK09U0lxZmEDJnCN5ac9nEO0BlYwBszHy0tBtIFX11tUmxa3QpG0IHspFX3z8+CmQQmFreA3zul3GngBBykEtHhoJ7YbDe2bcpnk3Mn1nxLrlQLLjqWhmfxpslJhrIXCS4m4wVaOVad72+n+/To1r78QlVw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://core.uwap.org/simplesaml/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">UWAP</md:ServiceName>
+      <md:ServiceName xml:lang="no">UWAP</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The service platform of UNINETT for next generation collaboration tools for higher education.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">UNINETTs tjenesteplattform for neste generasjons samarbeidsverktøy for høyere utdanning.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">UNINETT</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UNINETT</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://uninett.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Åkre Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml b/swamid-interfederations-1.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
new file mode 100644
index 00000000..91edbfcc
--- /dev/null
+++ b/swamid-interfederations-1.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://foodl.org/simplesaml/module.php/saml/sp/metadata.php/saml">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEAzCCAuugAwIBAgIJAN6InyocvS6WMA0GCSqGSIb3DQEBBQUAMF4xCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzESMBAGA1UEAxMJZm9vZGwub3JnMB4XDTEzMTExNTA3MzAzN1oXDTIzMTExNTA3MzAzN1owXjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRIwEAYDVQQDEwlmb29kbC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCs9ZRmG1+NCOVT3GA3rSoK2iv4hJg7XLlVWGZgd1YVV07msCVrioenq5EBUQHFf5BZbmDuiml0CTjM2qEXxbgII2KIOtBUsofe9S9qXXErBksVc5mRZrOBg93tYo5yGS2tWglaGra2zdkYpgVOD9CRR+cwWy1eGG9aZwGzBOQ9SJFA47jKtveJhfSedKDYc9ecEHVBS6VYP1rzPBurCSp/zxQmR78GHl7hHiLhoZkuHE2K0X5G3f9dzv+5iJJtyGJoRvSM+m0s+w5j0DMXb/4qCfiDpXnf2O/LIUFdnQZDZcGWHiec2oNcpnBODWdKmVoKH3FwTUPXpKlrtKxzTp0XAgMBAAGjgcMwgcAwHQYDVR0OBBYEFNlwjQzSL6Oy0QdRww1HZY3rFV+aMIGQBgNVHSMEgYgwgYWAFNlwjQzSL6Oy0QdRww1HZY3rFV+aoWKkYDBeMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxEjAQBgNVBAMTCWZvb2RsLm9yZ4IJAN6InyocvS6WMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAFtWxCyhzpjsGnCARlZPCOR1SPLwDnJjbyrX0pJ+ESfY+kPi41G658WAsu2xxvNgOoV3aas66b1llCtCUBjRyXRCCHZP87nXpmXZMSqD7XNEBB70HoD2KAQ0U7yM/gPNFRTqxKtEKTH7EV9Uv++eYfLusPLq++l+pwkOcsgAFlEkCwr/6QZl54G+WnSlCyuHH4UDUu+e/TJgQoA4/a6GyMO1YBMyHQY8TblE8yfkogzvpgqBHp4EXjc7rvMJpcARmbMT69c0OQ+OoJqooa+pzSJ8WlckT/Kv8YDB/SZTDO38ZAOcwHF74LvVUCqN24kEFkf94mvMMCiZyE5djOyNxhY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-logout.php/saml"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://foodl.org/simplesaml/module.php/saml/sp/saml2-acs.php/saml" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Foodle</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Foodle is a generic poll and survey tool for deciding meeting dates.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">Foodle er et generisk poll og survey verktøy for å bli enige om møtedatoer.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="nn">Foodle er eit generisk poll- og survey-verktøy for å verte einige om møtedatoar.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>UNINETT AS</md:Company>
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fse.eduuni.fi.xml b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
index 40e8b13c..40e8b13c 100644
--- a/swamid-interfederations-2.0/fse.eduuni.fi.xml
+++ b/swamid-interfederations-1.0/fse.eduuni.fi-adfs-services-trust.xml
diff --git a/swamid-interfederations-2.0/haka.saimia.fi.xml b/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml
index 4fd30a12..4fd30a12 100644
--- a/swamid-interfederations-2.0/haka.saimia.fi.xml
+++ b/swamid-interfederations-1.0/haka.saimia.fi-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.aalto.fi.xml b/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
index 09d7ec24..09d7ec24 100644
--- a/swamid-interfederations-2.0/idp.aalto.fi.xml
+++ b/swamid-interfederations-1.0/idp.aalto.fi-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.abo.fi.xml b/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
index c373b984..c373b984 100644
--- a/swamid-interfederations-2.0/idp.abo.fi.xml
+++ b/swamid-interfederations-1.0/idp.abo.fi-idp-shibboleth.xml
diff --git a/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..d75aeb63
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.csc.fi-idp-shibboleth.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.csc.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">csc.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">funet.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
+        <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
+        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
+        <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
+        <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="sv">http://www.csc.fi/svenska</mdui:InformationURL>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>csc.fi</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:64.2311008,27.7041552</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:60.1785928,24.8332895</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFxTCCBK2gAwIBAgIRAL73x8HVOpETqtPrUQiDLkowDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMDgxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmNzYy5m
+aTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBALxQbKAbjH1Y6nXZLERE
++8+VuH3w0K/FXMG3K0ySP36uU5QylaFDTx++DZT+IlEwuEXEHoW673P1ymL/Gg1j
++SlZdBxH6fFOqSLaT1jFtrpWleIwTWJtupwbB+GVNaPCFvo0snB0u4x1czcisFvG
+kc+GTN99e7dcuLA2kaQsVtoH9BLY99rubto6jbPdAb98htm+1a4yBZ/k3cirpDLo
+TZn2ILV/wEnsU/CdELweBm+3Ws6RcneqS6q+iNX6arA3+/eskksqbvd0PbbWHVl1
+b3r21T82lo+V6AdxBEKyZvlrxek8T8/m15AIAy6Id4GC/dc2crMFfrQV0hjXl//M
+ssOzUnbf5gJsX1ZHg8XrdEb60cssI0kriOOjDahYOCfP7nYYC26XzTrwfqQuQv/s
+3ZADXmQeLcMG42U2iBJaeXoqS1GymnToX08hx/UxabLSi+Hd2xOkurddq7A9x+Y7
+43q/6wKLoByNyFdyDVe+Tczap6vySov/WF5NgSn6mHfiC+EOHDhLQsRISyCTYWh/
+nmECl7nwaslnKfotwh+ax5EIlOF89dWOYgQk99ry6p8PrnJciHp5YsQGFi2uahwX
+Wy0Q0GWwPluh9QPRyV2Msk/xKYfkQV+JGk6jrES+6kHMI3xj6kf47u1jn8hSZmVR
+EbJgpgP8VadStP6zCWMBWbTdAgMBAAGjggHKMIIBxjAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUT4gxrqHsUIEm8Q6JLQ79lpx1VrIw
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMHgGA1UdEQRxMG+CCmlkcC5jc2Mu
+ZmmCEWhha2EtaWRwMDEuY3NjLmZpghFoYWthLWlkcDAyLmNzYy5maYIRaGFrYS1p
+ZHAwMy5jc2MuZmmCDGlkcDAxLmNzYy5maYIMaWRwMDIuY3NjLmZpggxpZHAwMy5j
+c2MuZmkwDQYJKoZIhvcNAQEFBQADggEBAHLHoTcTEV6UgJ/RvzuRuQJlcxEURYzs
+Vg5WroFJYpGUa3OPHqHdWWJIAYWjE21oRKoxrOigpr/Ux24AP7z6OEh/ACUtrT86
+nwl2FZsWJOQ/7kkplDs3Yjy+7kkQyUVZoiPcNVE9nRVJuX0J2pwq29dkDibgTiv1
+QsoRrRYbh+Ocsi72e5feCe/vY9ZjnwKQmfQsDmzU72PwaJ5AwHh2bHE+9Eoj7AiN
+OrrMi7TzCc5DvLYpuskPWaTstbxW2d+c/wWX+2eaC51BUS4SRgc2QXGj4YgEmYvT
+yfHB/Vk5J4H+DO2SNiPj868WRhf2sTanPMS7LxqSsL+wiOXVBbISe+c=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.csc.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Lauros</md:SurName>
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.csc.fi.xml b/swamid-interfederations-1.0/idp.csc.fi.xml
index b2285811..d75aeb63 100644
--- a/swamid-interfederations-1.0/idp.csc.fi.xml
+++ b/swamid-interfederations-1.0/idp.csc.fi.xml
@@ -8,9 +8,9 @@
         <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
         <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
         <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
+        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
         <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
         <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
diff --git a/swamid-interfederations-1.0/idp.feide.no.xml b/swamid-interfederations-1.0/idp.feide.no.xml
index f18288de..5cce1aef 100644
--- a/swamid-interfederations-1.0/idp.feide.no.xml
+++ b/swamid-interfederations-1.0/idp.feide.no.xml
@@ -29,6 +29,7 @@
       <shibmd:Scope regexp="false">bfk.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bi.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bibsys.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">bo.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">boe.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bokn.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">bomlo.kommune.no</shibmd:Scope>
@@ -37,6 +38,7 @@
       <shibmd:Scope regexp="false">diakonova.no</shibmd:Scope>
       <shibmd:Scope regexp="false">dmmh.no</shibmd:Scope>
       <shibmd:Scope regexp="false">donna.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">dovreskulane.no</shibmd:Scope>
       <shibmd:Scope regexp="false">drammen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">dvm.iktsenteret.no</shibmd:Scope>
       <shibmd:Scope regexp="false">eid.kommune.no</shibmd:Scope>
@@ -136,7 +138,7 @@
       <shibmd:Scope regexp="false">haugesund.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hbv.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hedmark.org</shibmd:Scope>
-      <shibmd:Scope regexp="false">hemnegs.fronter.com</shibmd:Scope>
+      <shibmd:Scope regexp="false">hemne.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hemnes.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hemsedal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">heroy-no.kommune.no</shibmd:Scope>
@@ -145,7 +147,6 @@
       <shibmd:Scope regexp="false">hials.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hib.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hibu.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">hifm.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hig.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hih.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hihm.no</shibmd:Scope>
@@ -173,10 +174,12 @@
       <shibmd:Scope regexp="false">hoylandet.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hsh.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">hurum.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">hyllestad.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">iktsenteret.no</shibmd:Scope>
       <shibmd:Scope regexp="false">jolster.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">jondal.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">kafjord.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">karmoyskolen.no</shibmd:Scope>
       <shibmd:Scope regexp="false">khib.no</shibmd:Scope>
       <shibmd:Scope regexp="false">khio.no</shibmd:Scope>
@@ -192,14 +195,18 @@
       <shibmd:Scope regexp="false">kvn.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lardal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">larvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lavangen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">ldh.no</shibmd:Scope>
       <shibmd:Scope regexp="false">leikanger.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">leirfjord.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lenvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lesjaskulane.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lier.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lierne.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lillesand.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lindas.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">lomskulane.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">loten.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lunner.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">luster.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">lybskole.no</shibmd:Scope>
@@ -210,11 +217,11 @@
       <shibmd:Scope regexp="false">marker.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">masfjorden.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">meland.kommune.no</shibmd:Scope>
-      <shibmd:Scope regexp="false">meldal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">melhus.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">meraker.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">met.no</shibmd:Scope>
       <shibmd:Scope regexp="false">mf.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">mhs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">midsund.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">modalen.kommune.no</shibmd:Scope>
@@ -223,6 +230,7 @@
       <shibmd:Scope regexp="false">namsos.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">namsskogan.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nannestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">narvik.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">naustdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nb.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
@@ -236,8 +244,10 @@
       <shibmd:Scope regexp="false">nla.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nmbu.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nmh.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nome.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nordkapp.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">nordreisa.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">notodden.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">notteroy.kommune.no</shibmd:Scope>
@@ -270,21 +280,26 @@
       <shibmd:Scope regexp="false">romskog.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">royken.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">royrvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">salangen.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">saltdal.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">samfunnsforskning.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sami.vgs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">samiskhs.no</shibmd:Scope>
       <shibmd:Scope regexp="false">samnanger.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sande.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sandefjord.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sandnes.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sauda.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">sauherad.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">selbu.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">selje.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">seljord.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">selskolene.no</shibmd:Scope>
       <shibmd:Scope regexp="false">sfj.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skanland.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skaun.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skiptvet.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">skjaakskulane.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skjervoy.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skole.fredrikstad.no</shibmd:Scope>
       <shibmd:Scope regexp="false">skole.svk.no</shibmd:Scope>
@@ -321,6 +336,7 @@
       <shibmd:Scope regexp="false">tinn.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">tjome.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">tokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope regexp="false">tonsberg.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">torsken.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">trogstad.kommune.no</shibmd:Scope>
       <shibmd:Scope regexp="false">troms.vgs.no</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.lapinamk.fi.xml b/swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml
index 818d2020..e1e1e9e7 100644
--- a/swamid-interfederations-2.0/idp.lapinamk.fi.xml
+++ b/swamid-interfederations-1.0/idp.lapinamk.fi-idp-shibboleth.xml
@@ -7,9 +7,9 @@
       <shibmd:Scope regexp="false">ramk.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">tokem.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Lapin ammattikorkeakoulu</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Lapplands YH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
       </mdui:UIInfo>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-1.0/idp.lapinamk.fi.xml b/swamid-interfederations-1.0/idp.lapinamk.fi.xml
index 818d2020..e1e1e9e7 100644
--- a/swamid-interfederations-1.0/idp.lapinamk.fi.xml
+++ b/swamid-interfederations-1.0/idp.lapinamk.fi.xml
@@ -7,9 +7,9 @@
       <shibmd:Scope regexp="false">ramk.fi</shibmd:Scope>
       <shibmd:Scope regexp="false">tokem.fi</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
         <mdui:DisplayName xml:lang="fi">Lapin ammattikorkeakoulu</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">Lapplands YH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
       </mdui:UIInfo>
       <saml:Attribute Name="tags">
         <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
diff --git a/swamid-interfederations-2.0/idp.metropolia.fi.xml b/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml
index 0bd93690..840bd980 100644
--- a/swamid-interfederations-2.0/idp.metropolia.fi.xml
+++ b/swamid-interfederations-1.0/idp.metropolia.fi-idp.xml
@@ -11,31 +11,6 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIECzCCAvOgAwIBAgIRAL+szgnI0qWlv5j0dv0UYtswDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMTEx
-MjQwNjQwMThaFw0xNDExMjMwNjQwMThaMFExCzAJBgNVBAYTAkZJMSYwJAYDVQQKDB1NZXRyb3Bv
-bGlhIEFtbWF0dGlrb3JrZWFrb3VsdTEaMBgGA1UEAwwRaWRwLm1ldHJvcG9saWEuZmkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS9Nz6Ju8uVYvBqzZq/HSzPL8yZzRRIexBXG7rsZEE
-ti0U+ERX/QJ7nDoQCCn4P8PQoGgZvl6A69F4TBxw27KcLEutuZfFAKhvd8P/X3+vbwDMIlJfMi2o
-oVWGxcIRfvuLoP5gsTJpmuDQE1xB6ZToA0xs5aIQOJFKzAznWOf8PPrUF7V2SE90xt4gE9OmpnOF
-w1gfp243SRnvxNJwai2+3L+FFAyygiCk4ao9IcdguXxpW42bLghb8GZAsla8ULvrNB+PaAMjYYkd
-EbvcoxbxynSE2LBrRlQ7cn769INlQkv7yVgo12zJ1GHBn2JgSdjiK/mPg68M24S5fAZXZVdBAgMB
-AAGjgfUwgfIwEwYDVR0jBAwwCoAISqCqWITTXjwwGQYDVR0gBBIwEDAOBgwrBgEEAYIPAgMBAQIw
-cgYDVR0fBGswaTBnoGWgY4ZhbGRhcDovLzE5NC4yNTIuMTI0LjI0MTozODkvY249U29uZXJhJTIw
-Q2xhc3MyJTIwQ0Esbz1Tb25lcmEsYz1GST9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0O2JpbmFy
-eTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgSwMB0GA1UdDgQW
-BBSetcs1P8mXrxv31HIiIZRlQ5pMizANBgkqhkiG9w0BAQUFAAOCAQEAJXlZQSERzZyIyD5t6zfC
-velNXend4z9jhUb3ZqFd86xAYNPRj+wNJBCSUJ3+mn1MWW5kV8D28jixtVvtqKZUgSCBBrxRJ5D9
-Hl7CRqNPubvcrxkXETZv0uEfnJaEK7wEWR0LP3r5RUjBc9AbSbsHOIX/sBxS/IMjTrb3PAwbAypT
-417lCgBzdpTIiDq+QF4bb4Tt/kjTRqPT21lporYTW+/NWFK02X+rgsABklvOQKSTEGvyDr6dLbSD
-tto9jTy1FzEicXFLvj36B+MB87UChYNTW7IJMJvJZgbuod76mjg9LkY+PHaxcn2kNmUYQKuuio0g
-LQc3QWj/dW5XWHUtjA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
@@ -76,31 +51,6 @@ G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</ds:X509Certificate>
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIECzCCAvOgAwIBAgIRAL+szgnI0qWlv5j0dv0UYtswDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMTEx
-MjQwNjQwMThaFw0xNDExMjMwNjQwMThaMFExCzAJBgNVBAYTAkZJMSYwJAYDVQQKDB1NZXRyb3Bv
-bGlhIEFtbWF0dGlrb3JrZWFrb3VsdTEaMBgGA1UEAwwRaWRwLm1ldHJvcG9saWEuZmkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS9Nz6Ju8uVYvBqzZq/HSzPL8yZzRRIexBXG7rsZEE
-ti0U+ERX/QJ7nDoQCCn4P8PQoGgZvl6A69F4TBxw27KcLEutuZfFAKhvd8P/X3+vbwDMIlJfMi2o
-oVWGxcIRfvuLoP5gsTJpmuDQE1xB6ZToA0xs5aIQOJFKzAznWOf8PPrUF7V2SE90xt4gE9OmpnOF
-w1gfp243SRnvxNJwai2+3L+FFAyygiCk4ao9IcdguXxpW42bLghb8GZAsla8ULvrNB+PaAMjYYkd
-EbvcoxbxynSE2LBrRlQ7cn769INlQkv7yVgo12zJ1GHBn2JgSdjiK/mPg68M24S5fAZXZVdBAgMB
-AAGjgfUwgfIwEwYDVR0jBAwwCoAISqCqWITTXjwwGQYDVR0gBBIwEDAOBgwrBgEEAYIPAgMBAQIw
-cgYDVR0fBGswaTBnoGWgY4ZhbGRhcDovLzE5NC4yNTIuMTI0LjI0MTozODkvY249U29uZXJhJTIw
-Q2xhc3MyJTIwQ0Esbz1Tb25lcmEsYz1GST9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0O2JpbmFy
-eTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgSwMB0GA1UdDgQW
-BBSetcs1P8mXrxv31HIiIZRlQ5pMizANBgkqhkiG9w0BAQUFAAOCAQEAJXlZQSERzZyIyD5t6zfC
-velNXend4z9jhUb3ZqFd86xAYNPRj+wNJBCSUJ3+mn1MWW5kV8D28jixtVvtqKZUgSCBBrxRJ5D9
-Hl7CRqNPubvcrxkXETZv0uEfnJaEK7wEWR0LP3r5RUjBc9AbSbsHOIX/sBxS/IMjTrb3PAwbAypT
-417lCgBzdpTIiDq+QF4bb4Tt/kjTRqPT21lporYTW+/NWFK02X+rgsABklvOQKSTEGvyDr6dLbSD
-tto9jTy1FzEicXFLvj36B+MB87UChYNTW7IJMJvJZgbuod76mjg9LkY+PHaxcn2kNmUYQKuuio0g
-LQc3QWj/dW5XWHUtjA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
diff --git a/swamid-interfederations-1.0/idp.metropolia.fi.xml b/swamid-interfederations-1.0/idp.metropolia.fi.xml
index 0bd93690..840bd980 100644
--- a/swamid-interfederations-1.0/idp.metropolia.fi.xml
+++ b/swamid-interfederations-1.0/idp.metropolia.fi.xml
@@ -11,31 +11,6 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIECzCCAvOgAwIBAgIRAL+szgnI0qWlv5j0dv0UYtswDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMTEx
-MjQwNjQwMThaFw0xNDExMjMwNjQwMThaMFExCzAJBgNVBAYTAkZJMSYwJAYDVQQKDB1NZXRyb3Bv
-bGlhIEFtbWF0dGlrb3JrZWFrb3VsdTEaMBgGA1UEAwwRaWRwLm1ldHJvcG9saWEuZmkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS9Nz6Ju8uVYvBqzZq/HSzPL8yZzRRIexBXG7rsZEE
-ti0U+ERX/QJ7nDoQCCn4P8PQoGgZvl6A69F4TBxw27KcLEutuZfFAKhvd8P/X3+vbwDMIlJfMi2o
-oVWGxcIRfvuLoP5gsTJpmuDQE1xB6ZToA0xs5aIQOJFKzAznWOf8PPrUF7V2SE90xt4gE9OmpnOF
-w1gfp243SRnvxNJwai2+3L+FFAyygiCk4ao9IcdguXxpW42bLghb8GZAsla8ULvrNB+PaAMjYYkd
-EbvcoxbxynSE2LBrRlQ7cn769INlQkv7yVgo12zJ1GHBn2JgSdjiK/mPg68M24S5fAZXZVdBAgMB
-AAGjgfUwgfIwEwYDVR0jBAwwCoAISqCqWITTXjwwGQYDVR0gBBIwEDAOBgwrBgEEAYIPAgMBAQIw
-cgYDVR0fBGswaTBnoGWgY4ZhbGRhcDovLzE5NC4yNTIuMTI0LjI0MTozODkvY249U29uZXJhJTIw
-Q2xhc3MyJTIwQ0Esbz1Tb25lcmEsYz1GST9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0O2JpbmFy
-eTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgSwMB0GA1UdDgQW
-BBSetcs1P8mXrxv31HIiIZRlQ5pMizANBgkqhkiG9w0BAQUFAAOCAQEAJXlZQSERzZyIyD5t6zfC
-velNXend4z9jhUb3ZqFd86xAYNPRj+wNJBCSUJ3+mn1MWW5kV8D28jixtVvtqKZUgSCBBrxRJ5D9
-Hl7CRqNPubvcrxkXETZv0uEfnJaEK7wEWR0LP3r5RUjBc9AbSbsHOIX/sBxS/IMjTrb3PAwbAypT
-417lCgBzdpTIiDq+QF4bb4Tt/kjTRqPT21lporYTW+/NWFK02X+rgsABklvOQKSTEGvyDr6dLbSD
-tto9jTy1FzEicXFLvj36B+MB87UChYNTW7IJMJvJZgbuod76mjg9LkY+PHaxcn2kNmUYQKuuio0g
-LQc3QWj/dW5XWHUtjA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
@@ -76,31 +51,6 @@ G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</ds:X509Certificate>
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIECzCCAvOgAwIBAgIRAL+szgnI0qWlv5j0dv0UYtswDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
-BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMTEx
-MjQwNjQwMThaFw0xNDExMjMwNjQwMThaMFExCzAJBgNVBAYTAkZJMSYwJAYDVQQKDB1NZXRyb3Bv
-bGlhIEFtbWF0dGlrb3JrZWFrb3VsdTEaMBgGA1UEAwwRaWRwLm1ldHJvcG9saWEuZmkwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDS9Nz6Ju8uVYvBqzZq/HSzPL8yZzRRIexBXG7rsZEE
-ti0U+ERX/QJ7nDoQCCn4P8PQoGgZvl6A69F4TBxw27KcLEutuZfFAKhvd8P/X3+vbwDMIlJfMi2o
-oVWGxcIRfvuLoP5gsTJpmuDQE1xB6ZToA0xs5aIQOJFKzAznWOf8PPrUF7V2SE90xt4gE9OmpnOF
-w1gfp243SRnvxNJwai2+3L+FFAyygiCk4ao9IcdguXxpW42bLghb8GZAsla8ULvrNB+PaAMjYYkd
-EbvcoxbxynSE2LBrRlQ7cn769INlQkv7yVgo12zJ1GHBn2JgSdjiK/mPg68M24S5fAZXZVdBAgMB
-AAGjgfUwgfIwEwYDVR0jBAwwCoAISqCqWITTXjwwGQYDVR0gBBIwEDAOBgwrBgEEAYIPAgMBAQIw
-cgYDVR0fBGswaTBnoGWgY4ZhbGRhcDovLzE5NC4yNTIuMTI0LjI0MTozODkvY249U29uZXJhJTIw
-Q2xhc3MyJTIwQ0Esbz1Tb25lcmEsYz1GST9jZXJ0aWZpY2F0ZXJldm9jYXRpb25saXN0O2JpbmFy
-eTAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwDgYDVR0PAQH/BAQDAgSwMB0GA1UdDgQW
-BBSetcs1P8mXrxv31HIiIZRlQ5pMizANBgkqhkiG9w0BAQUFAAOCAQEAJXlZQSERzZyIyD5t6zfC
-velNXend4z9jhUb3ZqFd86xAYNPRj+wNJBCSUJ3+mn1MWW5kV8D28jixtVvtqKZUgSCBBrxRJ5D9
-Hl7CRqNPubvcrxkXETZv0uEfnJaEK7wEWR0LP3r5RUjBc9AbSbsHOIX/sBxS/IMjTrb3PAwbAypT
-417lCgBzdpTIiDq+QF4bb4Tt/kjTRqPT21lporYTW+/NWFK02X+rgsABklvOQKSTEGvyDr6dLbSD
-tto9jTy1FzEicXFLvj36B+MB87UChYNTW7IJMJvJZgbuod76mjg9LkY+PHaxcn2kNmUYQKuuio0g
-LQc3QWj/dW5XWHUtjA==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
diff --git a/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml b/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..c2536800
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.oamk.fi-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.oamk.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">oamk.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEJDCCAwygAwIBAgIRAJDZbv9JChO1v4c2PegLC3gwDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
+BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMjAx
+MjQwOTA0MjNaFw0xNTAxMjMwOTA0MjNaMGoxCzAJBgNVBAYTAmZpMSkwJwYDVQQKDCBPdWx1biBz
+ZXVkdW4ga291bHV0dXNrdW50YXlodHltYTEUMBIGA1UEAwwLaWRwLm9hbWsuZmkxGjAYBgkqhkiG
+9w0BCQEWC25vY0BvYW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz1pmmgwq
+ddeiMWmthZP0W34WIKx4g5csiP/9p6DigzhNGn5+sZgsh7gb6FS1VtXWhwCFnCZCb/f0vm0AEqc2
+H9IQHTKPWWeM33S3uCOUBh1Jf7B9/3ysa70gZIdPFMkt+tX0Fd8hByeybu8FDyRwq95la1L3kPuQ
+qX6do0Ks2kEmALSHwPP9aMfCB8Mr4hZx0YpECVheIS2NgISbCtvx5F9IvfUds7FNr5eVHbz5j1dm
+gSalDjSGZN2HAwMw8EW91d314SYDtwdEC2PdvUCdbjdOnTXoHsftcDtS9PoWGzqZjLoptDjalc1z
+j8Q3UUVyqXDX9HGwDq9p+ZdEaYokPwIDAQABo4H1MIHyMBMGA1UdIwQMMAqACEqgqliE0148MBkG
+A1UdIAQSMBAwDgYMKwYBBAGCDwIDAQECMHIGA1UdHwRrMGkwZ6BloGOGYWxkYXA6Ly8xOTQuMjUy
+LjEyNC4yNDE6Mzg5L2NuPVNvbmVyYSUyMENsYXNzMiUyMENBLG89U29uZXJhLGM9Rkk/Y2VydGlm
+aWNhdGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUAuG1dJ173cm7/fePBi906Va3TdUwDQYJKoZIhvcN
+AQEFBQADggEBAHSh0AVK4D+979981GuW1T+gEsp7vGBH1x9TiFPc8WI25UJ46eSf14wSzB+f3irK
+T4s6CyvMJr2lZylvZF61orVJ/p2Ii21z8l/SEbk3ZbAT/vawdKU0dffypy4FhwWfTXADHAc9Li7z
+K3YfRLJLUxYw8nt/3XjqiZ0q6CkEu7ZOZ163ew27oGv8TpNTjQAFh1ZX5xkKrwMhrhaykpO2Ww3E
+Df2IYPvrPLtJYSHAn0aZ1UIn5dl8+/tFu9dpYn7p12/c9IBiBzyOUEn6uczxGlyf7NG35lscHuwR
+Ry8FNbWVwbylLohU2Ms9XOSxHmexafsdLuZYGASMnCUQQgdzX/E=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oamk.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.oamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.oamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.oamk.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Panu</md:GivenName>
+    <md:SurName>Jylha</md:SurName>
+    <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Panu</md:GivenName>
+    <md:SurName>Jylha</md:SurName>
+    <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/idp.oamk.fi.xml b/swamid-interfederations-1.0/idp.oamk.fi.xml
new file mode 100644
index 00000000..c2536800
--- /dev/null
+++ b/swamid-interfederations-1.0/idp.oamk.fi.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.oamk.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">oamk.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEJDCCAwygAwIBAgIRAJDZbv9JChO1v4c2PegLC3gwDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
+BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMjAx
+MjQwOTA0MjNaFw0xNTAxMjMwOTA0MjNaMGoxCzAJBgNVBAYTAmZpMSkwJwYDVQQKDCBPdWx1biBz
+ZXVkdW4ga291bHV0dXNrdW50YXlodHltYTEUMBIGA1UEAwwLaWRwLm9hbWsuZmkxGjAYBgkqhkiG
+9w0BCQEWC25vY0BvYW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz1pmmgwq
+ddeiMWmthZP0W34WIKx4g5csiP/9p6DigzhNGn5+sZgsh7gb6FS1VtXWhwCFnCZCb/f0vm0AEqc2
+H9IQHTKPWWeM33S3uCOUBh1Jf7B9/3ysa70gZIdPFMkt+tX0Fd8hByeybu8FDyRwq95la1L3kPuQ
+qX6do0Ks2kEmALSHwPP9aMfCB8Mr4hZx0YpECVheIS2NgISbCtvx5F9IvfUds7FNr5eVHbz5j1dm
+gSalDjSGZN2HAwMw8EW91d314SYDtwdEC2PdvUCdbjdOnTXoHsftcDtS9PoWGzqZjLoptDjalc1z
+j8Q3UUVyqXDX9HGwDq9p+ZdEaYokPwIDAQABo4H1MIHyMBMGA1UdIwQMMAqACEqgqliE0148MBkG
+A1UdIAQSMBAwDgYMKwYBBAGCDwIDAQECMHIGA1UdHwRrMGkwZ6BloGOGYWxkYXA6Ly8xOTQuMjUy
+LjEyNC4yNDE6Mzg5L2NuPVNvbmVyYSUyMENsYXNzMiUyMENBLG89U29uZXJhLGM9Rkk/Y2VydGlm
+aWNhdGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUAuG1dJ173cm7/fePBi906Va3TdUwDQYJKoZIhvcN
+AQEFBQADggEBAHSh0AVK4D+979981GuW1T+gEsp7vGBH1x9TiFPc8WI25UJ46eSf14wSzB+f3irK
+T4s6CyvMJr2lZylvZF61orVJ/p2Ii21z8l/SEbk3ZbAT/vawdKU0dffypy4FhwWfTXADHAc9Li7z
+K3YfRLJLUxYw8nt/3XjqiZ0q6CkEu7ZOZ163ew27oGv8TpNTjQAFh1ZX5xkKrwMhrhaykpO2Ww3E
+Df2IYPvrPLtJYSHAn0aZ1UIn5dl8+/tFu9dpYn7p12/c9IBiBzyOUEn6uczxGlyf7NG35lscHuwR
+Ry8FNbWVwbylLohU2Ms9XOSxHmexafsdLuZYGASMnCUQQgdzX/E=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oamk.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.oamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.oamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.oamk.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Panu</md:GivenName>
+    <md:SurName>Jylha</md:SurName>
+    <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Panu</md:GivenName>
+    <md:SurName>Jylha</md:SurName>
+    <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shh.fi.xml b/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml
index 4e0db6ad..4e0db6ad 100644
--- a/swamid-interfederations-2.0/idp.shh.fi.xml
+++ b/swamid-interfederations-1.0/idp.shh.fi-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.tut.fi.xml b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
index 8fe21a38..8fe21a38 100644
--- a/swamid-interfederations-2.0/idp.tut.fi.xml
+++ b/swamid-interfederations-1.0/idp.tut.fi-shibboleth2.xml
diff --git a/swamid-interfederations-2.0/idp.uef.fi.xml b/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
index 5c0771e6..5c0771e6 100644
--- a/swamid-interfederations-2.0/idp.uef.fi.xml
+++ b/swamid-interfederations-1.0/idp.uef.fi-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ulapland.fi.xml b/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml
index 2c4ebebd..2c4ebebd 100644
--- a/swamid-interfederations-2.0/idp.ulapland.fi.xml
+++ b/swamid-interfederations-1.0/idp.ulapland.fi-idp-shibboleth.xml
diff --git a/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml b/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
new file mode 100644
index 00000000..986ba144
--- /dev/null
+++ b/swamid-interfederations-1.0/login.helsinki.fi-shibboleth.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://login.helsinki.fi/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">helsinki.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE3jCCA8agAwIBAgIQWSnA5EzgO1nthR4AsdlaoTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDYxNTAwMDAwMFoXDTE1MDYxNTIzNTk1OVowgbcxCzAJBgNV
+BAYTAkZJMQ4wDAYDVQQREwUwMDAxNDEQMA4GA1UECBMHVXVzaW1hYTERMA8GA1UE
+BxMISGVsc2lua2kxIjAgBgNVBAkTGVBMIDI2IChUZW9sbGlzdXVza2F0dSAyMykx
+HzAdBgNVBAoTFlVuaXZlcnNpdHkgb2YgSGVsc2lua2kxEjAQBgNVBAsTCUlUIENl
+bnRlcjEaMBgGA1UEAxMRbG9naW4uaGVsc2lua2kuZmkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDrQpyohqDuaPxlOQDkWC/I/aw1ZhYMjLVDEx7x6XxR
+W9C5J4tTXpYYT3Us+oEUSJObhBTSm9EQ0tbDqnZjubwWZDkXHr1tnyP+JCFoFTZ/
+tqV768I3fE3TKdgEY3paVM8MWZPoyJf4uy1dKCz5lwie3anIYNVXw6mlPqbI9zAT
+b5elTMn+cBw9dML4dAQVODTuDJ2+avRMO4ItuqEj5f5PdI0HUjLU2ejRUQLP2nNX
+2MWgtweWvTIS/IWO1neE3Kn8v3j1VLdS3Xk2t/UBSeGl5e6MARhiHbLtigAWuIZv
+1pznlwdppBOzACm0e3somcJrbFnFOnbGmRQKtXq2yQJ3AgMBAAGjggFkMIIBYDAf
+BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUqm3ksXlN
+/umZswjtgICNhBMvWlAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
+VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
+MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
+dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
+BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRbG9n
+aW4uaGVsc2lua2kuZmkwDQYJKoZIhvcNAQEFBQADggEBACHDbip+j9xIvdz0WXvF
+4jhBCz4FoGoe7THcFwhVZL8oO3pKGyFHvAFQjdxibgWimOjYQyEnRoE2NYi27ccj
+S3hTQ3xcxoN6Zwq7Nq7iFNmQJ6Lc2uimU5zW7tLRqlTWQKKUm6/niFYv598Mg0PT
+NYY+HvJbSaNYXLkLzxOl8+fWFZqxmThOsb5KAx1xVjNVo2DiwC0crol7Wd0uDJEm
+9W8PdlbMcU04uznzo1v5EggbllAoFoqgWLL36H9zkbkh9NpA3a3j0PyvPaQHzwaC
+54RgRywzt/5g35mU+1cX4gTxt3aP6buBLAaEVtDJ+XQcfZJj3KhPQ2oo2y6Z6fNd
+Ahw=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.helsinki.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.helsinki.fi/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Peltonen</md:SurName>
+    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Juha</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:idm-hosting@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/logout.uwasa.fi.xml b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
index 5c2b029d..a5ba47cc 100644
--- a/swamid-interfederations-2.0/logout.uwasa.fi.xml
+++ b/swamid-interfederations-1.0/logout.uwasa.fi-idp-shibboleth.xml
@@ -40,6 +40,37 @@ OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
+bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
+pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
+jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
+V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
+8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
+4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
+tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
+BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
+c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
+9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
+StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
++4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
+6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
+ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
+yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logout.uwasa.fi/idp/profile/Shibboleth/SSO"/>
@@ -82,6 +113,37 @@ OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
+bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
+pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
+jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
+V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
+8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
+4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
+tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
+BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
+c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
+9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
+StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
++4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
+6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
+ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
+yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logout.uwasa.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logout.uwasa.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
diff --git a/swamid-interfederations-1.0/logout.uwasa.fi.xml b/swamid-interfederations-1.0/logout.uwasa.fi.xml
index 5c2b029d..a5ba47cc 100644
--- a/swamid-interfederations-1.0/logout.uwasa.fi.xml
+++ b/swamid-interfederations-1.0/logout.uwasa.fi.xml
@@ -40,6 +40,37 @@ OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
+bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
+pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
+jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
+V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
+8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
+4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
+tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
+BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
+c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
+9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
+StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
++4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
+6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
+ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
+yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
     <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logout.uwasa.fi/idp/profile/Shibboleth/SSO"/>
@@ -82,6 +113,37 @@ OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
+bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
+pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
+jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
+V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
+8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
+4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
+tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
+BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
+c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
+9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
+StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
++4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
+6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
+ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
+yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logout.uwasa.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logout.uwasa.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
diff --git a/swamid-interfederations-2.0/moodle.helsinki.fi.xml b/swamid-interfederations-1.0/moodle.helsinki.fi-shibboleth.xml
index 02ddf702..02ddf702 100644
--- a/swamid-interfederations-2.0/moodle.helsinki.fi.xml
+++ b/swamid-interfederations-1.0/moodle.helsinki.fi-shibboleth.xml
diff --git a/swamid-interfederations-1.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-1.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..8e67777f
--- /dev/null
+++ b/swamid-interfederations-1.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEGzCCAwOgAwIBAgIJAOrEig4Ycg6MMA0GCSqGSIb3DQEBBQUAMGYxCzAJBgNVBAYTAk5PMRIwEAYDVQQIEwlUcm9uZGhlaW0xEjAQBgNVBAcTCVRyb25kaGVpbTETMBEGA1UEChMKVU5JTkVUVCBBUzEaMBgGA1UEAxMRb3Blbndpa2kuZmVpZGUubm8wHhcNMTIxMDA1MTIzOTI5WhcNMjIxMDA1MTIzOTI5WjBmMQswCQYDVQQGEwJOTzESMBAGA1UECBMJVHJvbmRoZWltMRIwEAYDVQQHEwlUcm9uZGhlaW0xEzARBgNVBAoTClVOSU5FVFQgQVMxGjAYBgNVBAMTEW9wZW53aWtpLmZlaWRlLm5vMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAySsOo8gS8Gx7oQ19CIhVJ5wyJhAW9w073MH0xsSPseqWMur67LSCeT3gN5KFNJ2SP13xD2Htutc1oTMzufdmWviWGQisArcpmFaBbQoJQHSjdYxbKMQ57NXb9wzzp3uQjkzNrMBqekYFy5LtQirOjlEY3fzatWXjwa9IZvqb2u7B0wxpVZjyvuuoklMSYnHom1d+a/crQrNhYEPwm+6juXn8S4/bNxuOvpfUWcuLp90BVvlx3QOUqHI09hLRMU9Ab2C/nVUViUCDuB4mHSmZoj04IbKpdgNlR9HMJjB1p0RbpMG5IZ4NtmgxQkPbU5+ABj6ItzOK0vcto/zD8DHeGQIDAQABo4HLMIHIMB0GA1UdDgQWBBTCEFpRccjnmaW7kroNrJ2iLTYkgTCBmAYDVR0jBIGQMIGNgBTCEFpRccjnmaW7kroNrJ2iLTYkgaFqpGgwZjELMAkGA1UEBhMCTk8xEjAQBgNVBAgTCVRyb25kaGVpbTESMBAGA1UEBxMJVHJvbmRoZWltMRMwEQYDVQQKEwpVTklORVRUIEFTMRowGAYDVQQDExFvcGVud2lraS5mZWlkZS5ub4IJAOrEig4Ycg6MMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAIWi86krhY7Sou8ggyQmwNtq2+qDnJuvJx2Pt4LMCmubxFH6rFXRsoxj7UmmeklScvgZeOT8pcd4rFhqEgh6eX9V5achDeKYqeCt3RVIjhe33O44Lc+cjNmQCchf55QI+qnG7ATtYdDWu37AzXL6q6POVuxx2XHggWPpSlreU+4QWV5wfqWBXblyEFjLoFXzq3yVfTW4N/yM8UXZTUdPiFKmqQ2gmlDSo7EloCE2OMOsbbyTvoXHLMa3mVjfpyk+iEDNsKq/1AHVgDqekE8EH52pWeTOPmx6lGTbviwPvpIDHGxkBv9AZ2JAoN185KET7AuQN1H6neiB9TGnYYuAZGA=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://openwiki.uninett.no/simplesaml/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">UNINETT OpenWiki</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">UNINETT OpenWiki is a wikifarm where Feide users can create their own wiki.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">UNINETT OpenWiki er en wikifarm hvor Feidebrukere kan lage egne wikier.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="nn">UNINETT OpenWiki er ein wikifarm der Feidebrukarar kan lage eigne wikiar.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>UNINETT AS</md:Company>
+    <md:GivenName>Andreas</md:GivenName>
+    <md:SurName>Solberg</md:SurName>
+    <md:EmailAddress>andreas.solberg@uninett.no</md:EmailAddress>
+    <md:TelephoneNumber>+47 73557894</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/portal.clarin.inl.nl-.xml b/swamid-interfederations-1.0/portal.clarin.inl.nl-.xml
new file mode 100644
index 00000000..33a0d19e
--- /dev/null
+++ b/swamid-interfederations-1.0/portal.clarin.inl.nl-.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://portal.clarin.inl.nl/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://portal.clarin.inl.nl/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</mdui:Description>
+        <mdui:Description xml:lang="fi">Hollannin kielen lähderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian työkaluja.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://portal.clarin.inl.nl/doc/information_about_deposition.pdf</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://portal.clarin.inl.nl/doc/end_user_license_agreement.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFwTCCBKmgAwIBAgIQYT/URYqjuNs5Wvey06PWozANBgkqhkiG9w0BAQUFADCB
+iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+BAMTJkNPTU9ETyBIaWdoLUFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTEx
+MDgyNTAwMDAwMFoXDTE2MDgyNDIzNTk1OVowgdIxCzAJBgNVBAYTAk5MMRAwDgYD
+VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
+aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
+EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTETMBEG
+A1UECxMKSW5zdGFudFNTTDEdMBsGA1UEAxMUcG9ydGFsLmNsYXJpbi5pbmwubmww
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+faM4kQs7smclVpmqWzzX
+ZbhhPBW4ulwloBRQY7iR0unaMAGbxobpHvar28sASdvZ7W8IL+Az2J714pceJpit
+s/1Q10cJBzmcopvHtR4Hp6PZxjdEUljrCifQt+IZeZw99TMH4gpeC9zhAdzyubFs
+d452dy8+oljTOlTumbr1zACGU5ZGUInru467GJtMHYTJDDS1/BGuVx0XKwo0idCC
+goGF8ZIxyHQq/2Q37Py10238nKx614U6KtE//dHP5KkLEHow1Vfm90N+czIkRt+4
+4jl91Cel58jfvjXF3I/Cspi7vFDjRMaeBHsrxtDBWVUOo9GSMWRUiCOeQvGASXcb
+AgMBAAGjggHYMIIB1DAfBgNVHSMEGDAWgBQ/1bXQ1kR5UEoXo5uMSty4sCJkazAd
+BgNVHQ4EFgQUbmgntbNatGZ2IBRNLqazqtbpwGAwDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMEYGA1Ud
+IAQ/MD0wOwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2Vj
+dXJlLmNvbW9kby5jb20vQ1BTME8GA1UdHwRIMEYwRKBCoECGPmh0dHA6Ly9jcmwu
+Y29tb2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0Eu
+Y3JsMIGABggrBgEFBQcBAQR0MHIwSgYIKwYBBQUHMAKGPmh0dHA6Ly9jcnQuY29t
+b2RvY2EuY29tL0NPTU9ET0hpZ2gtQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0
+MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIw
+MIIUcG9ydGFsLmNsYXJpbi5pbmwubmyCGHd3dy5wb3J0YWwuY2xhcmluLmlubC5u
+bDANBgkqhkiG9w0BAQUFAAOCAQEARI37zQIk6P0aQkSMyambDpkm+ciyvWTur0Z4
+wVaPQRJ8CAJ75BRokKozs/dbRFsK7nykWIz4ryP8ygPDVVOxVdvweTZY6iRrMhhm
+ipw6JOA9+S12wS4ZVDTw1Lnqx55zhvZufKE/IcYUtXQG9zIThXvkSaZsbl81PeiJ
+JzPwUvRo8xI+nUirIcO80HN9FlZJ2MUHnt5EJNvdzWMOrwVyvIkSPllFsVLwRIih
+EYedRymWuO/OSGWReWSkDjCXxPNrqd4aaZSZH67bOcYLz4FUMR64+4JXSN8/gchW
+zq4XJzocDxUe2X15eEg+Nw6f/ORaY9V9249atYZCavmDX/4vXw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portal.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Hollannin leksikologian instituutin kieliresurssiportaali</md:ServiceName>
+      <md:ServiceName xml:lang="en">Institute for Dutch Lexicology Language Resource Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Hollannin kielen lahderesursseja, mm. korpuksia, sanakirjoja, kieliteknologian tyokaluja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Repository for source material for Dutch in the form of historical and contemporary corpora, dictionaries and language technology tools.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>systeembeheer@inl.nl</md:GivenName>
+    <md:SurName>INL</md:SurName>
+    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>servicedesk@inl.nl</md:GivenName>
+    <md:SurName>INL</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/rr.funet.fi-attribute-test.xml b/swamid-interfederations-1.0/rr.funet.fi-attribute-test.xml
new file mode 100644
index 00000000..5c5d5cb3
--- /dev/null
+++ b/swamid-interfederations-1.0/rr.funet.fi-attribute-test.xml
@@ -0,0 +1,156 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://rr.funet.fi/attribute-test">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Haka attribuuttitestipalvelu</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Haka Attribute Test Service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Attributes released by IdP-server can be tested against this SP.</mdui:Description>
+        <mdui:Description xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</mdui:Description>
+        <mdui:Keywords xml:lang="en">attribute test</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="en">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://confluence.csc.fi/x/6o4uAg</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFijCCBHKgAwIBAgIRAOpF8XtkiUr3wCQ16Yh9PYYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MDkwMDAwMDBaFw0xNzA0MDgyMzU5NTlaMDkxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UEAxMLcnIuZnVuZXQu
+ZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCo3JlR09DvNOKqY8J0
+X+OnAIgOz8mhKid0kjE/2sYlxPf+NJljQnIZYixD/Oj1eX0E2pb7XNZeSaUeBN+y
+Ge0L9b5r72910p0N8G2ZsycUfpzwUc80jJKPi0Vj0wE7M4itwF6ix7wUDLVKm7WF
+j19VdNhEO5v6oKql+Y1+LioWAGymfhxIf92r4VxUq7x4g5AFUwLE3U6MDa7KPreQ
+MVaPYX6MQBjhl1IksuMYiL9l32vRIBnsvKgJLPuj9w4rRLQksIS3Kq/ubaWcHRLV
+2vdTAlwSJGyFVvsKKUaLMa8PDi7Qh9XyGKBYNqpVT/y73Jen0qxB2ey/i/7s8Wpv
+bVaBmtPaSdrEzJAiF97wvShgKsMsMre5gQwb5Xm9+ivBr73nHyDOw8pPCgcXAZRS
+lMTu6YhVDqWpOj/FyGMmMo0Mr0CAsIKPN3uG2iT5ORkVBhtHufUkKbKtA/lHzGVq
+Wd5UXhvqJJCkdIR+6hW0KuhZCV3rQmav9uT5n0TLQehRL1MQWdno/U7e3gx364vt
+kBbSK6fLvRvUsdHI+82MkWfTFNa9auCgQr55cY5o6kDiEc1d7ofqXbMZFY4+9V9s
+A5b4a2rYfYKmA6QzoNz4Ed0ls45i44AbgBVMgB6gjWWnl8cwLGwbtXIXG2lLHJuJ
+ebv5jS3kU2+biivwcXfacBT+XwIDAQABo4IBjjCCAYowHwYDVR0jBBgwFoAUDL2T
+aAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFGdyR9kleLAF9CwyvqrCaVT6cRNi
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUF
+BwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAEC
+ATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzA8BgNVHREENTAzggtyci5mdW5l
+dC5maYIQaGFrYS1yci5mdW5ldC5maYISaGFrYS1ycjAxLmZ1bmV0LmZpMA0GCSqG
+SIb3DQEBBQUAA4IBAQCqH0bVH4duhVkYw63tkRZTRLG83JGJWuZYA6bmntr80Wdp
+1OUW3Ez66sByA6hddAX1trKs+ChOehatsSVV4g9YvZzOT5fEU5kkl5ZX+j8aVHwc
+55q2VVkv9RmCdt23hLPZD6eoNc7uDmz8/Ol94zmd/jcXz5lwq3FNss0yMOJ5W5hz
+HnVn+FAnphU6TsJhBYuXkNziSOkrUeZyUTPpRMsz7OlmdrW+i6sLS6RxUprMM6rV
+aUiD/5UIQRBIZKprBZPaQHh3M9a6FfXTAKWnwrePtRcite62ajmeGa3G0Ldh0TLO
+7RGEenBRxaphXGAv1Eb0nZKFlktgZNSVgkJTGQH0</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SLO/Redirect"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rr.funet.fi/attribute-test/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Haka attribuuttitestipalvelu</md:ServiceName>
+      <md:ServiceName xml:lang="en">Haka Attribute Test Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Palvelua vasten voi testata IdP-palvelimen luovuttamia attribuutteja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Attributes released by IdP-server can be tested against this SP.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCategory"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="businessCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="CountryOfResidence"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="description"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseMember"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.6.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduCourseOffering"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonEntitlement"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonOrgUnitDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrimaryOrgUnitDN"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="electronicIdentificationNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="employeeNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="facsimileTelephoneNumber"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonCreditUnits"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonECTS"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonEPPNTimeStamp"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonHomeCity"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonPrimaryStudyStart"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonProgram"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonSpecialisation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentCategory"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentStatus"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudentUnion"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyStart"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonStudyToEnd"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.16161.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="funetEduPersonTargetDegree"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="givenName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePhone"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="homePostalAddress"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.43" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="initials"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.60" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="jpegPhoto"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="l"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="labeledURI"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mobile"/>
+      <md:RequestedAttribute Name="urn:oid:1.2.246.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="nationalIdentificationNumber"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="Nickname"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="ou"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalAddress"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postalCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.18" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="postOfficeBox"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="preferredLanguage"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacCountryOfCitizenship"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacDateOfBirth"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacGender"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacMotherTongue"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueID"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPlaceOfBirth"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="seeAlso"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="street"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="telephoneNumber"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="title"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="uid"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userCertificate"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userPresenceID"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.19" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="userStatus"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kari</md:GivenName>
+    <md:SurName>Laalo</md:SurName>
+    <md:EmailAddress>mailto:kari.laalo@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Mustonen</md:SurName>
+    <md:EmailAddress>mailto:haka@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.bbaw.de.xml b/swamid-interfederations-1.0/shibboleth.bbaw.de-shibboleth.xml
index 8ceef1b3..8ceef1b3 100644
--- a/swamid-interfederations-2.0/shibboleth.bbaw.de.xml
+++ b/swamid-interfederations-1.0/shibboleth.bbaw.de-shibboleth.xml
diff --git a/swamid-interfederations-2.0/software.msdnaa.dk.xml b/swamid-interfederations-1.0/software.msdnaa.dk-.xml
index 7306b3e2..7306b3e2 100644
--- a/swamid-interfederations-2.0/software.msdnaa.dk.xml
+++ b/swamid-interfederations-1.0/software.msdnaa.dk-.xml
diff --git a/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml b/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml
index eb77557b..071fb97a 100644
--- a/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml
+++ b/swamid-interfederations-1.0/sp.catalog.clarin.eu.xml
@@ -3,13 +3,9 @@
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="fi">Catalog Clarin</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Catalog Clarin</mdui:DisplayName>
-        <mdui:Description xml:lang="fi">Catalog Clarin</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Clarin Catalog Service Provider</mdui:DisplayName>
         <mdui:Description xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Description>
-        <mdui:Keywords xml:lang="en">Clarin Data Category Registry ISOcat Component Registry Virtual Language Observatory VLO</mdui:Keywords>
-        <mdui:Keywords xml:lang="fi">Clarin Data Category Registry ISOcat Component Registry Virtual Language Observatory VLO</mdui:Keywords>
-        <mdui:PrivacyStatementURL xml:lang="fi">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
+        <mdui:Keywords xml:lang="en">Clarin Catalog Service Provider, providing services like the Data Category Registry (ISOcat), Component Registry, Virtual Language Observatory (VLO) and more</mdui:Keywords>
         <mdui:PrivacyStatementURL xml:lang="en">https://catalog.clarin.eu/privacy_statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
       <saml:Attribute Name="tags">
@@ -45,14 +41,14 @@ gDLbA/e0dbDclBvxUIm9cemA</ds:X509Certificate>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://catalog.clarin.eu/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
     <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Catalog Clarin</md:ServiceName>
-      <md:ServiceName xml:lang="en">Catalog Clarin</md:ServiceName>
-      <md:ServiceName xml:lang="sv">Catalog Clarin</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Catalog Clarin</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">CMDI Component Registry - web application for managing, creating and editing metadata components.</md:ServiceDescription>
+      <md:ServiceName xml:lang="fi">Clarin Catalog Service Provider</md:ServiceName>
+      <md:ServiceName xml:lang="en">Clarin Catalog Service Provider</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Clarin Catalog Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Providing services like the Data Category Registry (ISOcat), Component Registry, Virtual  Language Observatory (VLO) and more</md:ServiceDescription>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
diff --git a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml b/swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml
index f1ee1523..f1ee1523 100644
--- a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml
+++ b/swamid-interfederations-1.0/sp.dev.clarin.inl.nl-shibboleth.xml
diff --git a/swamid-interfederations-1.0/sp.korp.csc.fi-.xml b/swamid-interfederations-1.0/sp.korp.csc.fi-.xml
new file mode 100644
index 00000000..45933ebd
--- /dev/null
+++ b/swamid-interfederations-1.0/sp.korp.csc.fi-.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.korp.csc.fi/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://korp.csc.fi/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Concordance search service for text corpora</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Konkordanssihakuohjelma tekstiaineistolle</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Tällä työkalulla voit tutkia tekstikorpuksia.</mdui:Description>
+        <mdui:Description xml:lang="en">With this service you can study text corpora.</mdui:Description>
+        <mdui:Logo height="66" width="168">https://korp.csc.fi/img/korplogo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">http://spraakbanken.gu.se/swe/korp-info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="sv">https://korp.csc.fi/privacy-policy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIQTmDBZrbiqJFnGKHn80dL1zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE2MTIxMjIzNTk1OVowOTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRQwEgYDVQQDEwtrb3JwLmNzYy5m
+aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU16/1jE06KKH6uErmq
+e2wE5u+8SkWqR4Gks+iH67OiPTgoPSVfx1t55FHDUl1zQjijwcvejH26lYIpS7Ts
+js1MGcjcgEt1qFDDQ/eC6931hIg1jRa0PF/cxFjP9qEcd/I7UxuyM5QJga4pfl/o
+IHSL9oPYi5iCJ6qoC3dgNy0glMiisLkKyOKOHIXYzfAdMlIfRAMGCDAnDj3Kw4wK
+zv+RCWSGPEKHxfnPZwY8fgUs0vugICJBfQkSliUQm9P9l9Pt/8PP3XoIzgfXmxKK
+VQg/3EW+u2dnAzV1OKNrbJAajCJYL4VuGejWE7y8x+ixTqFCCPBT1cFZFWgFnzsh
+Yi0CAwEAAaOCAWgwggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBTkZV9BIXGhYb67UVmwNByxJxsAITAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
+VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
+K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+LnRlcmVuYS5vcmcwFgYDVR0RBA8wDYILa29ycC5jc2MuZmkwDQYJKoZIhvcNAQEF
+BQADggEBAJClAngseLp5qnRUj2iFSlNVccoP9KZKhLaeqiUk6vvwNdyetfMu9Txi
+vllrbfIaoVMvcA3nE5lfWEAlpvoqnQO/wmDv3ObX/XLJpXqSFpNpDOllhEbVeylT
+v8qqjG84Y4OUAd46zhiFpXr+6InhbkahABizqoXs2/aLm3nutf8rWzwFQqm+8YLE
+eLvEROIn209q+8M0V95avRxK1/wTTqwTnEGlGfRU5aTct+hLpJIRQS1DsAJpVDLU
+eeQKhPUjOTj9UPCeCE8rjrLqJ3pBtqlfhwUkfbIpUeGbYh9FI3zJNDKLmwCGS0g+
+5G7muSfVNRBDgubGawMy3pYMrrCOxB4=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://korp.csc.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Korp – hakuohjelma tekstiaineistoille</md:ServiceName>
+      <md:ServiceName xml:lang="en">Korp – search service for text material</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Korp on kielitutkijoille tarkoitettu tyokalu, jolla voi tutkia tekstiaineistoja.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Korp is a user interface for language researchers to examine text material.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Fin-Clarin</md:GivenName>
+    <md:EmailAddress>mailto:fin-clarin@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>Matthiesen</md:SurName>
+    <md:EmailAddress>mailto:ling@csc.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jyrki</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:jyrki.niemi@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-1.0/sp.lux17.mpi.nl.xml
index 4f14f4fd..52390543 100644
--- a/swamid-interfederations-1.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-1.0/sp.lux17.mpi.nl.xml
@@ -1,83 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.lux17.mpi.nl">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.lux17.mpi.nl">
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Max Planck Institute for Psycholinguistics lux17 SP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Max Planck Institute for Psycholinguistics lux17 SP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Max Planck Institute for Psycholinguistics lux17 Service Provider for Linguistic Services aimed at researchers</mdui:Description>
+        <mdui:Logo height="90" width="90">https://lux17.mpi.nl/gif/mpg-logo-90x90-grey.gif</mdui:Logo>
+        <mdui:Keywords xml:lang="en">Max Planck Institute for Psycholinguistics Lux17 Service Provider Linguistic Services</mdui:Keywords>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://lux17.mpi.nl/privacy_statement.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE1zCCA7+gAwIBAgIEDeB5KTANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQGEwJE
-RTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMTBk1Q
-RyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0wOTAzMTgxMzQ4
-MTBaFw0xNDAzMTcxMzQ4MTBaMHoxCzAJBgNVBAYTAk5MMSAwHgYDVQQKExdNYXgt
-UGxhbmNrLUdlc2VsbHNjaGFmdDEyMDAGA1UECxMpTWF4LVBsYW5jay1JbnN0aXR1
-dCBmdWVyIFBzeWNob2xpbmd1aXN0aWsxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL0wTdnMTgPC8/x6+0reirYB
-bifyQwbOLHE0bOtHD6et5oT9WPRosJFpFxnxs2aF/SqR7Kar4Z/7lMBFbL3vdgrJ
-h6fCNVofBI/Zs7d8aCwfcc6aMJORJPlTtFElmNvZD8TE035qzRNfkwqPOYkmwqlC
-CP9pJwebt3kEJSHHOVngydBJaVzSDayJLp1WzQ2FyEVfbPyUaQ2z2RyPGG0C1yX4
-Thin64YaRlBH78INIlCf8NpQwc+CCG7SgVSuDq1DEZXbm7z789kUJtqnlNe2Nahj
-inYfMr4Jtc27TwD+We9cs14LjSst4L3gd0kT511Wycs53+BpMWRWVKD4tFMva+EC
-AwEAAaOCAX8wggF7MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgTwMBMGA1UdJQQMMAoG
-CCsGAQUFBwMBMB0GA1UdDgQWBBRY3hAzheVZXJug0vL3ndQWl8CAjTAfBgNVHSME
-GDAWgBQC1h5uCau/WGWnCjxIM2HRzn3DWzB3BgNVHR8EcDBuMDWgM6Axhi9odHRw
-Oi8vY2RwMS5wY2EuZGZuLmRlL21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOg
-MYYvaHR0cDovL2NkcDIucGNhLmRmbi5kZS9tcGctY2EvcHViL2NybC9jYWNybC5j
-cmwwgZIGCCsGAQUFBwEBBIGFMIGCMD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMS5w
-Y2EuZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwPwYIKwYBBQUH
-MAKGM2h0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvbXBnLWNhL3B1Yi9jYWNlcnQvY2Fj
-ZXJ0LmNydDANBgkqhkiG9w0BAQUFAAOCAQEAbTiXJjoL5ulDq6yP3g2cBE4tpXN/
-LMe2gNgvBmzWIuvoMtI/qf5CWZI2Z/3T8uPHrzcrhWxjazhcrdMsdCrFEp1YCdUv
-3+ielpse2O+k7ZF/OKZtP2yBBrPqfn46K2luYs7omROhkzfKU76inhSn7aMDH8sp
-A483fjEFPdYorFjq087bpHkXqJuDKHm7Jz91+vjMZMJ5v5IH5oec84pT6yPO1f0k
-7v7NeAtHCybR2fYZnSGrjUOEOPCJx5ufyE5EOzATp5BVLXSLa2H4B0Ws2IOv9ORw
-0cYjl0hBJw+lYT0LPIUaE0SU1jtoOKUHevuygdjyiG0JPNgUks8Ow3+v/A==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIFszCCBJugAwIBAgIHFy/fQCmDdDANBgkqhkiG9w0BAQUFADBeMQswCQYDVQQG
-EwJERTEgMB4GA1UEChMXTWF4LVBsYW5jay1HZXNlbGxzY2hhZnQxDzANBgNVBAMT
-Bk1QRyBDQTEcMBoGCSqGSIb3DQEJARYNbXBnLWNhQG1wZy5kZTAeFw0xNDAyMjgx
-MDE1MTNaFw0xOTAyMjcxMDE1MTNaMIGiMQswCQYDVQQGEwJOTDETMBEGA1UECBMK
-R2VsZGVybGFuZDERMA8GA1UEBxMITmlqbWVnZW4xIDAeBgNVBAoTF01heC1QbGFu
-Y2stR2VzZWxsc2NoYWZ0MTIwMAYDVQQLEylNYXgtUGxhbmNrLUluc3RpdHV0IGZ1
-ZXIgUHN5Y2hvbGluZ3Vpc3RpazEVMBMGA1UEAxMMbHV4MTcubXBpLm5sMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsJhlBpssTOOtNvBbnzE7VWsQfaOA
-LrwBcSNZbH928rPC75slLQpYTFeiHFhZ0ua3P7HzrHG/L4xxIYbmxBik2wI10xDQ
-sa+6lfOIOhttOTBoeciMni6eesRtPL1sVoBit6IHpthmL9+o0/t/erB+JOwAKnY7
-6eqCEO1Vx7gepyYAJEvXsIStPVQDhOGilTNlaRMykx89op97oQEwD1k/9sm9aGoU
-vVOiEuMVVfvRteboaJcC/MRNWQtRrN3lw9u3J77We5HTNcMESTLe7cTA7zY10pV1
-L4SwpraLaWtntQ7jtvgnmrCQF4UEjNuoyGdFqK1Cp0OU93oVsLCRJfNe/wIDAQAB
-o4ICLzCCAiswOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYPKwYBBAGB
-rSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNV
-HSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFDo9I15dgi4VQw2g
-GDI0mzvjmtVrMB8GA1UdIwQYMBaAFALWHm4Jq79YZacKPEgzYdHOfcNbMDQGA1Ud
-EQQtMCuCDGx1eDE3Lm1waS5ubIEbdG9iaWFzLnZhbnZhbGtlbmhvZWZAbXBpLm5s
-MHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvbXBnLWNh
-L3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2RwMi5wY2EuZGZuLmRl
-L21wZy1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUHAQEEgbowgbcwMwYI
-KwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1TZXJ2ZXIvT0NT
-UDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9tcGctY2EvcHVi
-L2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL21wZy1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEF
-BQADggEBAMkKEc7OA0faJhU0gBJPc6BOb069aYUKYRWY0wfaLdGh/thMzdJQRC8Z
-YMN3BmqHUJukCcSPgxNKpd3KsiqxWODNpv3w7cOEDfJkOpWijbw+qRMvF83Tg9Bm
-9TuH80hWEn0AI+ECaWw7Lz8sSaPdEb+Qe4532JcLfDLiFo44RdFA8dFZepvwoKIg
-scv6u9W6FYUcQPEo9x0SmXMbC1Z8TEwXbICB/jp6w163B9zZ62o75gr0SJdlQvp6
-2tUUynz9p6HP8Qss2Ic1hyVjgSqzS3mcbbQvYOKWoQnWDKoZ0I5VTsP3pbrL4QIt
-IYFUWnGAtIjYcIIj3qFP/fJDyuZx9sA=</ds:X509Certificate>
+          <ds:X509Certificate>MIIDaDCCAlACCQD2mDCAJYMG3jANBgkqhkiG9w0BAQUFADB2MQswCQYDVQQGEwJO
+TDEMMAoGA1UECBMDR0xEMREwDwYDVQQHEwhOaWptZWdlbjEPMA0GA1UEChMGTVBJ
+LVBMMRUwEwYDVQQDEwxsdXgxNy5tcGkubmwxHjAcBgkqhkiG9w0BCQEWD2xhdGFk
+bWluQG1waS5ubDAeFw0xNDA1MDIxMTI2MDZaFw0xOTA1MDExMTI2MDZaMHYxCzAJ
+BgNVBAYTAk5MMQwwCgYDVQQIEwNHTEQxETAPBgNVBAcTCE5pam1lZ2VuMQ8wDQYD
+VQQKEwZNUEktUEwxFTATBgNVBAMTDGx1eDE3Lm1waS5ubDEeMBwGCSqGSIb3DQEJ
+ARYPbGF0YWRtaW5AbXBpLm5sMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
+AQEA3QaSP0LJ0mVZZIdEh7zFJW8lnkVGQFuueAiDfVVvGtGvJ5iz7CRoyrdTQDco
+oJjQDFub/uU6v0i+saVgI+LuzUlq28hrKF5hIjhWCLMRgYZzsnArcGK3etcChsNE
+OPfWNCOCGi90sIqNmJcVRoDw36tLiHXmIkhcy4ZE06SYXvT+qAwo4h30Z/IH2de/
+QlYEpkqF131p2lJGWx1Bi5l7IMeZtlwIzbJn08htAT/T8h6g9XvDfmQxS4xuiXGr
+uRwVhTTkTP9OsdrXkktJEkSE2p+qP0tYekb+ZPd4LzlSjnDWf3V1T/DrbL071eiC
+rx2iDW3n5Wy7so0iwmU5nr9QhwIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAFSrqi
+HOMohDd4JXB3rjX8npCSTTeam84LTI1Twd8GXOmDQ8izcwsfUIILusEqd+66V/kh
+iwnBgmrwgw0CVEZjgwkbVdZH68RGO4i6n5hZwmzr5jx4yNkfLZ5uwfHLIkqgJjj0
+DvsA6Saom/5BD6dln6TuQ9cwFu+9pOxaWjfEeD2Rm5HFP+VF9GPxM19Gs6xcYi2L
+GlEfBQvH/6vp65r3ciw760KPeO1ITxaIfqX5fOxOaA0NLOIGLjX0G11vf/i3n1OQ
+MZTR7RMV+bjZiLNoPOJ/Ezz5lr+k0V12yVJ35J2J6TIz6lcB9M1tCFDY7tS89nYf
+HFhkY9jzkGrcHMME</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lux17.mpi.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
     <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">IMDI Browsable Corpus</md:ServiceName>
-      <md:ServiceName xml:lang="en">IMDI Browsable Corpus</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Repository of Linguistic Resources. For Humanities and Social Sciences researchers.</md:ServiceDescription>
+      <md:ServiceName xml:lang="fi">Max Planck Institute for Psycholinguistics second Service Provider</md:ServiceName>
+      <md:ServiceName xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Max Planck Institute for Psycholinguistics second Service Provider for Linguistic Services aimed at researchers</md:ServiceDescription>
       <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
       <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
       <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
@@ -95,8 +66,7 @@ IYFUWnGAtIjYcIIj3qFP/fJDyuZx9sA=</ds:X509Certificate>
     <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
-    <md:GivenName>Tobias</md:GivenName>
-    <md:SurName>van Valkenhoef</md:SurName>
-    <md:EmailAddress>mailto:tobias.vanvalkenhoef@mpi.nl</md:EmailAddress>
+    <md:SurName>Technical support</md:SurName>
+    <md:EmailAddress>mailto:latadmin@mpi.nl</md:EmailAddress>
   </md:ContactPerson>
 </md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml b/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
new file mode 100644
index 00000000..7b50bdbc
--- /dev/null
+++ b/swamid-interfederations-1.0/sso.utu.fi-sso-idp.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sso.utu.fi/sso-idp">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">utu.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Turun yliopisto</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Turku</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Åbo universitet</mdui:DisplayName>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHATCCBemgAwIBAgIQA4hFUiEZYqQbSVWEoSGbCjANBgkqhkiG9w0BAQUFADBp
+MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
+d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5j
+ZSBFViBDQS0xMB4XDTEzMDUwMzAwMDAwMFoXDTE1MDcyNzEyMDAwMFowgccxHTAb
+BgNVBA8MFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkZJ
+MRIwEAYDVQQFEwkwMjQ1ODk2LTMxFzAVBgNVBAkTDllsaW9waXN0b25tYWtpMQ4w
+DAYDVQQREwUyMDAxNDELMAkGA1UEBhMCRkkxGDAWBgNVBAcTD1R1cnVuIHlsaW9w
+aXN0bzEYMBYGA1UEChMPVHVydW4geWxpb3Bpc3RvMRMwEQYDVQQDEwpzc28udXR1
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1vhuuU33l0RwmzLX
+vgxp4qondQQzWnRu7y+OMFgLKm4Zfxs/d6XyJZxI/yVzEZGuYAJwPkqjQ33L8RJP
+DQusjfYcMu+oBFC73bi4SR+82DObxleNNS2wfH9f48KwQJrOZHEG4VWtf9zv7OSz
+YU8nrnRF8oEnUpFMH8OMfUFWBPVkTsMTkTlqA527v8C8y+I16vMFThD8KSJHx1bg
+Gg70uLJjcssAvOprsVTxCINCIDtT9C42gfUFN1o5pOD78Gp70zXTjdNz5p+eZ4Uy
+7d9TjCzMEaxi9Lw6XJ5GyMceicZOwmRNIuyeoKTB78QnqTNHcVPIV7ziZlUuTDM4
++9lnqwIDAQABo4IDRDCCA0AwHwYDVR0jBBgwFoAUTFjLJfBBT1L0KMiBQ5umqKDm
+kuUwHQYDVR0OBBYEFBVqgvD+vMcjkY79qLX45EWTop2lMBUGA1UdEQQOMAyCCnNz
+by51dHUuZmkwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjBjBgNVHR8EXDBaMCugKaAnhiVodHRwOi8vY3JsMy5kaWdpY2VydC5j
+b20vZXZjYTEtZzIuY3JsMCugKaAnhiVodHRwOi8vY3JsNC5kaWdpY2VydC5jb20v
+ZXZjYTEtZzIuY3JsMIIBxAYDVR0gBIIBuzCCAbcwggGzBglghkgBhv1sAgEwggGk
+MDoGCCsGAQUFBwIBFi5odHRwOi8vd3d3LmRpZ2ljZXJ0LmNvbS9zc2wtY3BzLXJl
+cG9zaXRvcnkuaHRtMIIBZAYIKwYBBQUHAgIwggFWHoIBUgBBAG4AeQAgAHUAcwBl
+ACAAbwBmACAAdABoAGkAcwAgAEMAZQByAHQAaQBmAGkAYwBhAHQAZQAgAGMAbwBu
+AHMAdABpAHQAdQB0AGUAcwAgAGEAYwBjAGUAcAB0AGEAbgBjAGUAIABvAGYAIAB0
+AGgAZQAgAEQAaQBnAGkAQwBlAHIAdAAgAEMAUAAvAEMAUABTACAAYQBuAGQAIAB0
+AGgAZQAgAFIAZQBsAHkAaQBuAGcAIABQAGEAcgB0AHkAIABBAGcAcgBlAGUAbQBl
+AG4AdAAgAHcAaABpAGMAaAAgAGwAaQBtAGkAdAAgAGwAaQBhAGIAaQBsAGkAdAB5
+ACAAYQBuAGQAIABhAHIAZQAgAGkAbgBjAG8AcgBwAG8AcgBhAHQAZQBkACAAaABl
+AHIAZQBpAG4AIABiAHkAIAByAGUAZgBlAHIAZQBuAGMAZQAuMH0GCCsGAQUFBwEB
+BHEwbzAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZGlnaWNlcnQuY29tMEcGCCsG
+AQUFBzAChjtodHRwOi8vY2FjZXJ0cy5kaWdpY2VydC5jb20vRGlnaUNlcnRIaWdo
+QXNzdXJhbmNlRVZDQS0xLmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBBQUA
+A4IBAQDCtPwaft7YbgqxW67NORhve9oSg1sqafSHg7edecvgH9UHZlC8VAr0WyAM
+m+tyPyi6UTAVo8VxQL3NO3lXZMLzdKdsSbYz0EZIaZCItuR7wW6Ca+idDx9yP8yA
+nmkbwLzbAnU2gnlYlqmZlndlZKaSRpJvangOhiXM1ekE7qlSxHWfucuSsG2nUvja
+njozQAomahtd02Vl0gONjgJIzxu/wzqefV1QON7qmFbeTH4JDXtdOGSK3zvVJI13
+5yoWgJf59vwhK9XIM+yoT5eapixOXaIFBI3faMN6hCWu43rkKw0hZNe5CBLMTOQz
+8MIAfW66Oc6zKMOf26tiwK0/jhtn</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.utu.fi:443/sso/SSORedirect/metaAlias/utu/sso-idp"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Tuomas</md:GivenName>
+    <md:SurName>Honkala</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Petri</md:GivenName>
+    <md:SurName>Teraspuro</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Elina</md:GivenName>
+    <md:SurName>Toivanen</md:SurName>
+    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/synnefo.sky.deic.dk.xml b/swamid-interfederations-1.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml
index 4d09729f..4d09729f 100644
--- a/swamid-interfederations-2.0/synnefo.sky.deic.dk.xml
+++ b/swamid-interfederations-1.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml
diff --git a/swamid-interfederations-1.0/terena.org-sp.xml b/swamid-interfederations-1.0/terena.org-sp.xml
new file mode 100644
index 00000000..7b64359e
--- /dev/null
+++ b/swamid-interfederations-1.0/terena.org-sp.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://terena.org/sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEkjCCA3qgAwIBAgIJAL90CxMEVb/kMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJOTDELMAkGA1UECBMCTkgxEjAQBgNVBAcTCUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMQwwCgYDVQQLEwNJVFMxHjAcBgNVBAMTFWh0dHBzOi8vdGVyZW5hLm9yZy9zcDEdMBsGCSqGSIb3DQEJARYOYWFpQHRlcmVuYS5vcmcwHhcNMTEwMTEyMTUyNjM4WhcNMjEwMTExMTUyNjM4WjCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwTxx8JBWSpBJiZgdvGOJDXLwaE29Opx1CBbIrYHm47Oy4btsf0BzCmfdSPDlydDm6//355hsQU8BgIh/waEwFZZCg/XyzrJEXCDTZBm1H210aT7FNp356azqKOO1bYWcku0xpFOWWf3jCIkjtOiTkbl12Tw7Y+zJRhV2+jleC5td3JxZ6k1qotgN+1cGwZ2Tv2HhSNeMC4QsGOyBqeP+7B1CLFqFZSiLWGVqcZi0fGkXf+SrTSEH/kLzdciEg2EePyQPcLCKNz9RiIhSmsLE/Rr1ksOvZGmyWFe7YsPyJOLsNyYcZTufDVwpl9fDuJdYy2GdMT1kSNNOpZXZ7QcgYwIDAQABo4H0MIHxMB0GA1UdDgQWBBQ6tVqjpKC8+30XF/qWlaZ3fUKTvDCBwQYDVR0jBIG5MIG2gBQ6tVqjpKC8+30XF/qWlaZ3fUKTvKGBkqSBjzCBjDELMAkGA1UEBhMCTkwxCzAJBgNVBAgTAk5IMRIwEAYDVQQHEwlBbXN0ZXJkYW0xDzANBgNVBAoTBlRFUkVOQTEMMAoGA1UECxMDSVRTMR4wHAYDVQQDExVodHRwczovL3RlcmVuYS5vcmcvc3AxHTAbBgkqhkiG9w0BCQEWDmFhaUB0ZXJlbmEub3JnggkAv3QLEwRVv+QwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAn+06i7zZE7MjuB68gCaNvnCkrgfumi4PWiP6kaE6+LU2MTbxdFyoSAoKh6Ft9TDi+8ANAsn5jRQ5xLUE4YoVbub/KufMwdlX0zO9i+Q//npDTFESnWsiMi7DHg/av1LtzrYYZvE2E1e5c/7wo/axx8Bk7qsE9YXFRs372vDkDwOGSkLbRtgwdCUX47CE/fXvccPDHH217XMed2cVOGFjQgidsFZlJbSfSvQjWYw5LIE0wo9RtsEu5I3WAIar8Wr6/nhVOgIBUStpcw94GwlPxLywfij5CJ9HT+sN2SOj4YmKPBtcwHI75uNZp7XRy85jRjrvhahg5baIQ0u3aL8aMA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.terena.org/wayf/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://login.terena.org/wayf/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">TERENA Service Provider Proxy</md:ServiceName>
+      <md:ServiceName xml:lang="da">TERENA Service Provider Proxy</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to be a Service Provider Proxy for all TERENA Federated Services</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at fungere som tjenesteudbyder-proxy for alle TERENAs fødererede tjenester</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tullbommen.arcada.fi.xml b/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml
index 7e98ca78..7e98ca78 100644
--- a/swamid-interfederations-2.0/tullbommen.arcada.fi.xml
+++ b/swamid-interfederations-1.0/tullbommen.arcada.fi-simplesaml-.xml
diff --git a/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
new file mode 100644
index 00000000..8b7b2688
--- /dev/null
+++ b/swamid-interfederations-1.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://ufal-point.mff.cuni.cz/shibboleth/eduid/sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">LINDAT/CLARIN repository and services</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">LINDAT/CLARIN säilytyspaikka ja palvelut</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">LINDAT/CLARIN-projektin säilytyspaikka, jonka sijainti on \"Institute of Formal and Applied Linguistics\", Kaarlen yliopisto, Praha.</mdui:Description>
+        <mdui:Description xml:lang="en">The repository of the LINDAT/CLARIN project at Institute of Formal and Applied Linguistics, Charles University in Prague.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="fi">http://ufal.mff.cuni.cz/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://lindat.mff.cuni.cz/privacypolicy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEgTCCA2mgAwIBAgIRANAZM0fxIWg+DEEhaZlreVowDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjEwMjQwMDAwMDBaFw0xNTEwMjQyMzU5NTlaMFUxCzAJBgNV
+BAYTAkNaMSUwIwYDVQQKExxDaGFybGVzIFVuaXZlcnNpdHkgaW4gUHJhZ3VlMR8w
+HQYDVQQDExZ1ZmFsLXBvaW50Lm1mZi5jdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAz4nCZa/xBh1ebd2+99GEqRMSqSkCEVfFi4Tndz6v87Iv
+ZMvLY40OJg3lIEzngOz8tnn/ft6xcLxGwr+IbY6raHT08Xu8lQMd8Rj8Gmdi3Ov3
+XuCgjVpAID+GGfNkahzxebWORNfHyqEGSx2oFgRe8HD9BbT8mqheBPF8FIy6mYvs
+495IEkQVc0BvPvTwqEw+qOHKBX+AWQQIHDJDQQnjoteXplHugOFDJiJYH0T/80u3
+DO7h6oyiLlnyDywOVCQdiJPXNOtPMyM9rMT3Vw9SO4iIaMUkF5EafFFdEPLsi+FO
+2Z3r7pBxv1/LkK9AWuzAYSnjK/szHym25FWroxJZOwIDAQABo4IBaTCCAWUwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFKKMnXN92GaN
+5uyL8cZdchPl9NpQMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
+AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCEGA1UdEQQaMBiCFnVmYWwt
+cG9pbnQubWZmLmN1bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAKWQZsd0zZBi+hz6
+3LBx49MOoCXkpUkIdqecMhz0bpIhC+2Q3Uxp97lpfB/9CIMoI5tq+PRXDXQt2D6A
+fk90Maa8HYp1OQagBlY9jhs4ImbPbsHM5Aa3f4ycxhXs+hecaJBD4WiaxeWpOWes
+k5Q+FdJCZoPqHRD2chNwhBErztJgujEarVtMBCUpCEpy5lwgFFFc2oekH8CkhWLw
+sv6GENdYGamg5HfRAq57+mGW3FUnox3gkqTWDuVzOaMfDlHvfqRVtC7n4mhHVAqz
+adGmTo4VvqYQsi0gVzrts5HDZAQBI13mpxua74rU8XyluKEyjS4gkVXLnlRjwXeF
+IhAZYQU=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lindat.mff.cuni.cz/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">LINDAT/CLARIN sailytyspaikka ja palvelut</md:ServiceName>
+      <md:ServiceName xml:lang="en">LINDAT/CLARIN repository and services</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">LINDAT/CLARIN-projektin sailytyspaikka, jonka sijainti on "Institute of Formal and Applied Linguistics", Kaarlen yliopisto, Praha .</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">The repository of the LINDAT/CLARIN project at the Institute of Formal and Applied Linguistics, Charles University in Prague .</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonTargetedID"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jozef</md:GivenName>
+    <md:SurName>Misutka</md:SurName>
+    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jozef</md:GivenName>
+    <md:SurName>Misutka</md:SurName>
+    <md:EmailAddress>mailto:clarin-list@ufal.mff.cuni.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml b/swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml
new file mode 100644
index 00000000..85e45d15
--- /dev/null
+++ b/swamid-interfederations-1.0/urn-ibistic-prod-dk.ibistic.net.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:dk.ibistic.net">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE3jCCA8agAwIBAgIKVFd/+wAAAAAAVTANBgkqhkiG9w0BAQUFADBoMR0wGwYDVQQKExRJYmlzdGljIFRlY2hub2xvZ2llczEUMBIGA1UECxMLaWJpc3RpYy5uZXQxMTAvBgNVBAMTKEliaXN0aWMgU2VydmljZXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTEwOTEyMTI0MjI0WhcNMzYwMjEwMTEyMzUxWjCBkzELMAkGA1UEBhMCREsxHTAbBgNVBAoTFEliaXN0aWMgVGVjaG5vbG9naWVzMRMwEQYDVQQLEwpPcGVyYXRpb25zMSswKQYDVQQDEyJJYmlzdGljIFNzbyAtIFNlY29uZGFyeSBkYXRhY2VudGVyMSMwIQYJKoZIhvcNAQkBFhRpdGFkbWluc0BpYmlzdGljLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALOlseCtQInKCW4gm1g9z/1wWo7eqr3qhYAgRW/YFD05wO+aP2Q82AF5qXIzJnI+bmi6UIK8WGU0MwcpAfwmY7E4G0kiqxvkY8w+a0eS0bB/9BEP0wGNHCABi5F0k5gccq1gAroHO8KHrvxwC2QdF5bpOtmc5yZhn39F6vW1CMa+1e4szXLRfnNEUcAC9BfP8TBZ468/2n8bAgCooXw6NeLTEsLYWF9ZUtd7oQCoM8Vzh9EQYiP/bkNjI3Espr3IqmsjBU92LND2FCZMd0VnP+09WBALPPqecICSxwU/g0pEBD9gJffoaLB4pr9ytHj345dfZA5gZbFJus83D6bhb8sCAwEAAaOCAVwwggFYMA4GA1UdDwEB/wQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQUEA1cOFio+1n2Gl51vXhc6BxHIeowHwYDVR0jBBgwFoAUk5xu2Q3v2+7MptSjR6/WlKEwYAUwgeIGCCsGAQUFBwEBBIHVMIHSMIHPBggrBgEFBQcwAoaBwmxkYXA6Ly8vQ049SWJpc3RpYyUyMFNlcnZpY2VzJTIwQ2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1pYmlzdGljLERDPWxvY2FsP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0aW9uQXV0aG9yaXR5MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAK+rMn969MQZW98WhCuixX80SxDO7eARBJ2IY6aZRQ/seo/GD4qbis23CqZy7BI20nlcgnVEW4mZY+LkeBJ5sHDOTL9R2oo90/LouMsDsvqYk4oL5PtIH1yMTUod6ZUsGCvY6iXs06zY7KXJWPM5PeDg/z07GsmEhWELiQ+OeXG5UFlgzvt0uFuqE3iRpvKP6NztxDPNx4nhFXh2DIVg1f+pMXRRF8jM5mXSXsD144IvpEkgyHL5CkSRcxNNZt3UPAZl54e6cDfWI6aSQdH2v/TcoeeEJcHPBL3PFeQEtypZTHYdhPdhai0fcKsSNcZ4Ed1qAOwORlC0CorwiXeB57A=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE3jCCA8agAwIBAgIKVFd/+wAAAAAAVTANBgkqhkiG9w0BAQUFADBoMR0wGwYDVQQKExRJYmlzdGljIFRlY2hub2xvZ2llczEUMBIGA1UECxMLaWJpc3RpYy5uZXQxMTAvBgNVBAMTKEliaXN0aWMgU2VydmljZXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTEwOTEyMTI0MjI0WhcNMzYwMjEwMTEyMzUxWjCBkzELMAkGA1UEBhMCREsxHTAbBgNVBAoTFEliaXN0aWMgVGVjaG5vbG9naWVzMRMwEQYDVQQLEwpPcGVyYXRpb25zMSswKQYDVQQDEyJJYmlzdGljIFNzbyAtIFNlY29uZGFyeSBkYXRhY2VudGVyMSMwIQYJKoZIhvcNAQkBFhRpdGFkbWluc0BpYmlzdGljLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALOlseCtQInKCW4gm1g9z/1wWo7eqr3qhYAgRW/YFD05wO+aP2Q82AF5qXIzJnI+bmi6UIK8WGU0MwcpAfwmY7E4G0kiqxvkY8w+a0eS0bB/9BEP0wGNHCABi5F0k5gccq1gAroHO8KHrvxwC2QdF5bpOtmc5yZhn39F6vW1CMa+1e4szXLRfnNEUcAC9BfP8TBZ468/2n8bAgCooXw6NeLTEsLYWF9ZUtd7oQCoM8Vzh9EQYiP/bkNjI3Espr3IqmsjBU92LND2FCZMd0VnP+09WBALPPqecICSxwU/g0pEBD9gJffoaLB4pr9ytHj345dfZA5gZbFJus83D6bhb8sCAwEAAaOCAVwwggFYMA4GA1UdDwEB/wQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQUEA1cOFio+1n2Gl51vXhc6BxHIeowHwYDVR0jBBgwFoAUk5xu2Q3v2+7MptSjR6/WlKEwYAUwgeIGCCsGAQUFBwEBBIHVMIHSMIHPBggrBgEFBQcwAoaBwmxkYXA6Ly8vQ049SWJpc3RpYyUyMFNlcnZpY2VzJTIwQ2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1pYmlzdGljLERDPWxvY2FsP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0aW9uQXV0aG9yaXR5MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAK+rMn969MQZW98WhCuixX80SxDO7eARBJ2IY6aZRQ/seo/GD4qbis23CqZy7BI20nlcgnVEW4mZY+LkeBJ5sHDOTL9R2oo90/LouMsDsvqYk4oL5PtIH1yMTUod6ZUsGCvY6iXs06zY7KXJWPM5PeDg/z07GsmEhWELiQ+OeXG5UFlgzvt0uFuqE3iRpvKP6NztxDPNx4nhFXh2DIVg1f+pMXRRF8jM5mXSXsD144IvpEkgyHL5CkSRcxNNZt3UPAZl54e6cDfWI6aSQdH2v/TcoeeEJcHPBL3PFeQEtypZTHYdhPdhai0fcKsSNcZ4Ed1qAOwORlC0CorwiXeB57A=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dk.ibistic.net/redirector/saml/post/ac" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Ibistic</md:ServiceName>
+      <md:ServiceName xml:lang="da">Ibistic</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/urn-ibistic-prod-services.ibistic.net.xml b/swamid-interfederations-1.0/urn-ibistic-prod-services.ibistic.net.xml
new file mode 100644
index 00000000..89a35ef1
--- /dev/null
+++ b/swamid-interfederations-1.0/urn-ibistic-prod-services.ibistic.net.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
+      <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.test.xml b/swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.test.xml
new file mode 100644
index 00000000..36c1d868
--- /dev/null
+++ b/swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.test.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:com.itslearning.test">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.itslearning.com/elogin/logout.aspx"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.itslearning.com/elogin/default.aspx" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">itslearning is a virtual learning environment specifically designed for schools and universities.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">itslearning er et virtuelt læringsmiljø, spesielt utformet for skoler og universiteter.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.xml b/swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.xml
new file mode 100644
index 00000000..dfecea53
--- /dev/null
+++ b/swamid-interfederations-1.0/urn-mace-feide.no-services-com.itslearning.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:com.itslearning">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itslearning.com/elogin/logout.aspx"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/elogin/default.aspx" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">itslearning is a virtual learning environment specifically designed for schools and universities.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">itslearning er et virtuelt læringsmiljø, spesielt utformet for skoler og universiteter.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">itslearning</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">itslearning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itslearning.eu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>itslearning</md:Company>
+    <md:GivenName>itslearning Support</md:GivenName>
+    <md:EmailAddress>support@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.card.kilroy.eu.xml b/swamid-interfederations-1.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml
index 982ad3d1..982ad3d1 100644
--- a/swamid-interfederations-2.0/wayf.card.kilroy.eu.xml
+++ b/swamid-interfederations-1.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-interfederations-1.0/wayf.wayf.dk.xml b/swamid-interfederations-1.0/wayf.wayf.dk.xml
index c4852dcb..b4cacf95 100644
--- a/swamid-interfederations-1.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-1.0/wayf.wayf.dk.xml
@@ -105,7 +105,6 @@
       <shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sosuesbjerg.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">deff.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
@@ -170,6 +169,7 @@
       <shibmd:Scope regexp="false">campusvejle.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">rosborg-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">fhavnhs.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ah.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
diff --git a/swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml b/swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml
new file mode 100644
index 00000000..07391e53
--- /dev/null
+++ b/swamid-interfederations-1.0/www.emeraldinsight.com-shibboleth.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://www.emeraldinsight.com/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNVBAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYwNjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZNgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5YKFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178KfsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQIDAQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRwczovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQUj3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193ff50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGYMaa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3dBt7qcpd9uOc=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Emerald Insight</md:ServiceName>
+      <md:ServiceName xml:lang="da">Emerald Insight</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to provide personalized access to journals and papers on social sciences</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at give adgang til Emerald Insights tidsskrifter og artikler indenfor socialvidenskab</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Emerald Group Publishing</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Emerald Group Publishing</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="support">
+    <md:Company>Atypon Systems Inc.</md:Company>
+    <md:GivenName>SSO-Support</md:GivenName>
+    <md:SurName>SSO-Support</md:SurName>
+    <md:EmailAddress>SSO-Support@atypon.com</md:EmailAddress>
+    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:Company>Atypon Systems Inc.</md:Company>
+    <md:GivenName>SSO-Tech</md:GivenName>
+    <md:SurName>SSO-Tech</md:SurName>
+    <md:EmailAddress>SSO-Tech@atypon.com</md:EmailAddress>
+    <md:TelephoneNumber>+14089881240</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0.mxml b/swamid-interfederations-2.0.mxml
index f1d167e7..f88e80e6 100644
--- a/swamid-interfederations-2.0.mxml
+++ b/swamid-interfederations-2.0.mxml
@@ -1,665 +1,753 @@
 <?xml version="1.0"?>
 <EntitiesDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:xi="http://www.w3.org/2001/XInclude" Name="http://md.swamid.se/md/swamid-interfederations-2.0.xml">
-<xi:include href="swamid-interfederations-2.0/aai-idp.unibe.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-idp.uzh.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-integration.dfn.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-login.fh-htwchur.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.bfh.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.fhnw.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.fhsg.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.hes-so.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.switch.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.uni.li.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-logon.wsl.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai.sztaki.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/aai-viewer.switch.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/adfs.tue.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/agata.suz.cvut.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai.sztaki.hu-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/agw-sparknet.utu.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/aishib.agropolis.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/aleph.svkhk.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/ambre.vetagro-sup.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/antimoine.insa-strasbourg.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/appdb.egi.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/applications.eu-decide.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/applications.eumedgrid.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/apu.uepb.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/araripe.uece.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/arauto.fapesp.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/atlases.muni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.agrosupdijon.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml"/>
+<xi:include href="swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml"/>
+<xi:include href="swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/atlases.muni.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/auth.asiaportal.info.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.crous-versailles.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.mines-paristech.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.services.bmj.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.univ-paris-diderot.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.univ-pau.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/auth.u-pec.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/box-idp.nordu.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/butare.ifrn.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe01.unicamp.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe1.ufes.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.accamargo.org.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.fucape.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe-idp.ufc.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifb.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifes.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifg.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifpa.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifro.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifrs.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ifsp.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.on.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.pucminas.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafernp.insa.gov.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.sti.uff.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafetools.ufpi.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.udesc.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.uesb.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.uesc.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufba.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufop.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.ufra.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unicentro.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unifap.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unifran.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.unisc.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.upf.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cafe.uscs.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/capuccino.iff.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/capuccino.info.ufrn.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.ac-martinique.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.crous-lyon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.cuni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.educagri.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.ent-etrs.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/cerbere2.mines-douai.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/cern.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/clarin.ids-mannheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/clarino.uib.no.xml"/>
-<xi:include href="swamid-interfederations-2.0/cloudidp1.canarie.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/colreg.de.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/community.ja.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.services.bmj.com-auth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml"/>
+<xi:include href="swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/cern.ch-login.xml"/>
+<xi:include href="swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/clarino.uib.no-.xml"/>
+<xi:include href="swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml"/>
+<xi:include href="swamid-interfederations-2.0/community.ja.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/compute.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/connect-beta.sunet.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/connect.sunet.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/core.uwap.org.xml"/>
+<xi:include href="swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/data.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/de.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev1.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev2.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/dev.emeraldinsight.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/doccom.iml.unibe.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/doit.swisdom.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/dourado.ufs.br.xml"/>
+<xi:include href="swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dev.emeraldinsight.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/du-idp.lanet.lv.xml"/>
 <xi:include href="swamid-interfederations-2.0/e5.onthehub.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/ecsg.dch-rp.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/edev.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/educonf-directory.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/edugate.heanet.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/edugate.itb.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/eduspot.ens-cachan.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/egiswamid.egi.kth.se.xml"/>
+<xi:include href="swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml"/>
+<xi:include href="swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/eka-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/eliot.isae.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/e-localcourses.unibo.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/encecafe.ibge.gov.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml"/>
-<xi:include href="swamid-interfederations-2.0/engine.surfconext.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/epoq.compilatio.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/febe.ufpe.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/federacao.ifpi.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/federacao.uvanet.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation2.univ-brest.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation2.univ-perp.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.agrocampus-ouest.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.bretagne.iufm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.esiee.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation-identite.univ-paris13.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.ined.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federationrenater.univ-montp2.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.sciences-po.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.unimes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.u-pem.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.upf.pf.xml"/>
-<xi:include href="swamid-interfederations-2.0/federation.utbm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/fed.id.univ-bordeaux.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.du1.cesnet.cz.xml"/>
+<xi:include href="swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/filesender.funet.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/filesender.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/fod.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/foodl.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/forge.switch.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/fortbildung.unibas.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/fse.eduuni.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/ghgtool.grnet.gr.xml"/>
+<xi:include href="swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fod.geant.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml"/>
+<xi:include href="swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/gidp.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/gn-vho.grnet.gr.xml"/>
+<xi:include href="swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml"/>
 <xi:include href="swamid-interfederations-2.0/gteavirtual.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/gw-astronomy.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/gw.ct.infn.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/haka.saimia.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/halfback.cnaf.infn.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/hbidp.hb.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/homeproj.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/iam.cf.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.auf.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.ced.inaf.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idemfero.units.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idem.univpm.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.ensta-bretagne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.ensta.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident.groupe-esa.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.ec-lyon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.enim.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/identites.ensea.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/identities.univ-jfc.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/identity.mdh.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident-shib.ensc-rennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.agroparistech.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.crous-aix-marseille.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.crous-toulouse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.hogent.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.inria.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp1.uwaterloo.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2-1.slu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.civ.cvut.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.crous-toulouse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.iay.org.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.ics.muni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.idem.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.kau.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp2.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aai.arnes.si.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aalto.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.abo.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.aco.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.admin.grnet.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.amue.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bc.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.bth.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcafe.ufjf.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-cafe.unir.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcafe.usp.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.canarie.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.capes.gov.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cardiff.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cereq.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cirad.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpcnous.cnous.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cnous.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.company.ja.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.condorcet.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cpe.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.craw.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crihan.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-antillesguyane.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-besancon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-caen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-clermont.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-creteil.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-dijon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-grenoble.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-limoges.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-montpellier.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-nancy-metz.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-nantes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-nice.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-orleans-tours.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-paris.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-poitiers.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-reims.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-rennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.crous-strasbourg.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cs.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.csc.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-css.irccs.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cvgz.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.cyceron.fr:8443.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dante.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dfn.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dijon.iufm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dir.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dit.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.dkit.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ebi.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ecam.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ec-lille.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ed.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ehess.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.elte.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enib.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enitab.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enit.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensai.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensait.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ens-cachan.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ens.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ensma.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-ensr.ens-rennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.enssib.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ent.dauphine.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.entpe.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.epfl.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-etu.crous-grenoble.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.eurecom.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml"/>
+<xi:include href="swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identites.enim.fr-idp-.xml"/>
+<xi:include href="swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-montpellier.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.feide.no.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fgu.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fh-kaernten.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fh-rosenheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.fzu.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.georgikon.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.gli.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hainaut-promsoc.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.heanet.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hebis.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hesam.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hig.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hs-esslingen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.hslu.ch.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ibp.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.icpf.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ids-mannheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifal.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifap.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifc.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifpb.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifremer.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ifto.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.iit.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.img.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inalco.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inha.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inpa.gov.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inp-toulouse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inra.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.insa-rennes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.inserm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ipa.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ipb.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ipm.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.irstea.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it.gu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.its.fz-juelich.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.itsligo.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.it.su.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ittralee.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.kb.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lapinamk.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lib.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.lrz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mast.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mci4me.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.meduniwien.ac.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.metropolia.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mnhn.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.mta.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ncirl.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.niif.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nordu.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.normandie-univ.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.nuigalway.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.parisdescartes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ppke.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.psu.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.renater.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.reuna.cl.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.rnp.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpr.tem-tsp.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.scc.kit.edu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sciencespobordeaux.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sgi.cefetmg.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.shh.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpshib01.ifma.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.shibboleth.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.sissa.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.soc.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ssc.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idpstaff.belnet.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.strasbourg.archi.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.student.bth.se.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifc.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inalco.fr-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ittralee.ie-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lapinamk.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.metropolia.fi-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.oamk.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shh.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/idp.surfnet.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.szie.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-bretagne.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-lille1.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.telecom-paristech.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptl.telecom-lille.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idptoo.osu.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.tut.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux2.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux4.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-cergy.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-clermont1.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ueb.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uef.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufe.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufgd.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufmg.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufpr.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ufsm.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uha.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uhk.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ujep.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ujf.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ulapland.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ul.ie.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.umk.pl.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unibocconi-prod.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unicaen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unica.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unijui.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unimc.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uniparthenope.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unipi.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uniroma3.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unistra.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp-unito-prod.cineca.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-ag.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-amu.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-artois.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-avignon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-bpclermont.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.universite-lyon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-fcomte.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lehavre.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lille3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lorraine.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lyon2.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-lyon3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-orleans.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris4.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-paris8.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.univ-tours.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.unoesc.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uoa.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-paris2.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.u-picardie.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.upmc.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.uqam.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.urca.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.ut-capitole.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utia.cas.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vet-alfort.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.vib.be.xml"/>
-<xi:include href="swamid-interfederations-2.0/idp.zid.tuwien.ac.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.ucly.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/id.vse.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/imogen.surfnet.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/instantanatomy.co.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/issues.shibboleth.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/itacare.bahiana.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/katalog.svkos.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/keybucket.app.nordu.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/kiidp.ki.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/laife-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/laife.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ulapland.fi-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml"/>
+<xi:include href="swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/lanet-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/liepu-idp.lanet.lv.xml"/>
+<xi:include href="swamid-interfederations-2.0/lists.geant.net.xml"/>
 <xi:include href="swamid-interfederations-2.0/lma-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/lmuidp.lrz.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/lmuza-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.aaiedu.hr.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.aai.pionier.net.pl.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.athena-innovation.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.bme.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.du.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.feld.cvut.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.fhv.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.helsinki.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/login-idp.auth.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.idp.hhs.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.insa-lyon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.liu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ntua.gr.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.terena.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/login.ufrgs.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/logout.uwasa.fi.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.fhv.at-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml"/>
+<xi:include href="swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/lu-idp.lu.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/mayumba.msh-paris.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/meta.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/monitor.eduroam.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/moodle.helsinki.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/moodle.utu.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/neugrid4you.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/ns.crous-dijon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/nte.gemtech.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/openwiki.uninett.no.xml"/>
-<xi:include href="swamid-interfederations-2.0/pan.unifei.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/papi.kfki.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/perun-dev.ics.muni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/portal.clarin.inl.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/portal.moonshot.ja.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/portofranco.ufma.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/qub.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/quod.lib.umich.edu.xml"/>
+<xi:include href="swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/moodle.helsinki.fi-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml"/>
+<xi:include href="swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/portail.u-picardie.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/portal.clarin.inl.nl-.xml"/>
+<xi:include href="swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml"/>
 <xi:include href="swamid-interfederations-2.0/ra-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/rastreador.ifba.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/registration.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/rems.elixir-finland.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/repos.ids-mannheim.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/ricevi.ct.infn.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/rigal.enpc.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/rir.dariah.eu.xml"/>
+<xi:include href="swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/rja-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/ross.impa.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/rr.funet.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/saml-1.sys.kth.se.xml"/>
+<xi:include href="swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml"/>
 <xi:include href="swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/sdauth.sciencedirect.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/sesame.ifsttar.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sgw.africa-grid.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/sgw.garr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb1.hj.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb.crous-amiens.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ec-nantes.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.emse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.enise.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ephe.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth2.ufms.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ac-limoges.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.bbaw.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.cndp.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.crous-poitiers.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensi-bourges.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensicaen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ensiie.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.envt.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.grenoble-inp.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ifpr.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.im.jku.at.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.insa-cvl.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.insa-rouen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.mines-ales.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.mzk.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.nkp.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.obspm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.techlib.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.u-bourgogne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/Shibboleth.uem.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ufsc.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.u-grenoble3.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.unb.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.unifi.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-corse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-evry.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-paris-est.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-savoie.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.univ-toulouse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.ups-tlse.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.utb.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibboleth.uvsq.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.ltu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibbo.tul.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibb-prod.eseo.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.comune.trieste.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp-1.oru.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.cca.unipd.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.oca.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/shibidp.unipr.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.manchester.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.mines-albi.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.ufg.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.unibo.it.xml"/>
-<xi:include href="swamid-interfederations-2.0/shib.u-paris10.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/siaiap08.univali.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/si.crous-rouen.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sistemas.uepg.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/sivic.redclara.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml"/>
+<xi:include href="swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml"/>
+<xi:include href="swamid-interfederations-2.0/search.de.dariah.eu-search.xml"/>
+<xi:include href="swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib-sp.mediacore.tv.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/skmms-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/software.msdnaa.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/sourcesup.cru.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp24-test.garr.it.xml"/>
+<xi:include href="swamid-interfederations-2.0/software.msdnaa.dk-.xml"/>
+<xi:include href="swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.catalog.clarin.eu.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.corpus1.mpi.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.dev.clarin.inl.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.ebrary.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.korp.csc.fi.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.korp.csc.fi-.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.lat.csc.fi.xml"/>
 <xi:include href="swamid-interfederations-2.0/sp.lux17.mpi.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.swamid.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp-test.swamid.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/sp.upv.es.xml"/>
-<xi:include href="swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/srvcafe.uniso.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/srv-fii.insa-toulouse.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml"/>
+<xi:include href="swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/sse-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.institutoptique.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.ird.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.man.poznan.pl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.nikhef.nl.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.siropglobal.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.u-psud.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/sso.utu.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/ssso.uni-muenster.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.u-psud.fr-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/store.lu.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/synnefo.sky.deic.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/terena.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-adfs.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/test-bod-gui.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.federation.renater.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/testssso.uni-muenster.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/theia.unifei.edu.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/tonga.univ-tlse2.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/tullbommen.arcada.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/tumidp.lrz.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat-adfs.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml"/>
+<xi:include href="swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml"/>
+<xi:include href="swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/terena.org-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml"/>
+<xi:include href="swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/tullbommen.arcada.fi-simplesaml-.xml"/>
+<xi:include href="swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml"/>
+<xi:include href="swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml"/>
 <xi:include href="swamid-interfederations-2.0/ucopia-shib.ensta-bretagne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/umbrella.psi.ch.xml"/>
+<xi:include href="swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml"/>
+<xi:include href="swamid-interfederations-2.0/umbrella.psi.ch-.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-ibistic-prod-services.ibistic.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml"/>
+<xi:include href="swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml"/>
+<xi:include href="swamid-interfederations-2.0/utwente.nl-.xml"/>
 <xi:include href="swamid-interfederations-2.0/va-idp.lanet.lv.xml"/>
 <xi:include href="swamid-interfederations-2.0/vea-idp.lanet.lv.xml"/>
-<xi:include href="swamid-interfederations-2.0/verify.studentbeans.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/vip.espci.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/vmfetid.iamm.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/vmshib.ufrpe.br.xml"/>
-<xi:include href="swamid-interfederations-2.0/vvc.niif.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/wayf.card.kilroy.eu.xml"/>
+<xi:include href="swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml"/>
 <xi:include href="swamid-interfederations-2.0/wayf.ordbogen.com.xml"/>
 <xi:include href="swamid-interfederations-2.0/wayf.wayf.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/webinar.nordu.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/weblicht.sfs.uni-tuebingen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/weblogin2.geant.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/weblogin.uu.se.xml"/>
-<xi:include href="swamid-interfederations-2.0/whoami.cesnet.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml"/>
-<xi:include href="swamid-interfederations-2.0/wifi.espci.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki2.redclara.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.edugain.org.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.helsinki.fi.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.moonshot.ja.net.xml"/>
-<xi:include href="swamid-interfederations-2.0/wiki.shibboleth.net.xml"/>
+<xi:include href="swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml"/>
+<xi:include href="swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/wiseflow.dk.xml"/>
-<xi:include href="swamid-interfederations-2.0/www2.eduroam.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/www3.eduid.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.ebi.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.emeraldinsight.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.knodium.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.meertens.knaw.nl.xml"/>
+<xi:include href="swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml"/>
 <xi:include href="swamid-interfederations-2.0/www.ordbogen.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.portal.euromonitor.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.qoam.eu.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.rediris.es.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.researchprofessional.com.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.scran.ac.uk.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.uco.fr.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.vho.de.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.videotorium.hu.xml"/>
-<xi:include href="swamid-interfederations-2.0/www.vutbr.cz.xml"/>
-<xi:include href="swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml"/>
-<xi:include href="swamid-interfederations-2.0/zividp.uni-muenster.de.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.qoam.eu-.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.vho.de-idpvzg.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml"/>
+<xi:include href="swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml"/>
+<xi:include href="swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml"/>
 </EntitiesDescriptor>
diff --git a/swamid-interfederations-2.0/.xml b/swamid-interfederations-2.0/.xml
deleted file mode 100644
index 531d52a7..00000000
--- a/swamid-interfederations-2.0/.xml
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="urn:mace:kuleuven.be:kulassoc:kuleuven.be">
-<Extensions>
-<mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
-<mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
-</mdrpi:RegistrationInfo>
-</Extensions>
-<IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-<Extensions>
-<shibmd:Scope regexp="false">kuleuven.be</shibmd:Scope>
-<shibmd:Scope regexp="false">groept.be</shibmd:Scope>
-<shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
-<shibmd:Scope regexp="false">odisee.be</shibmd:Scope>
-<shibmd:Scope regexp="false">vives.be</shibmd:Scope>
-<shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
-<shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
-<shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
-<shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
-<mdui:UIInfo>
-<mdui:DisplayName xml:lang="en">KU Leuven Association</mdui:DisplayName>
-<mdui:DisplayName xml:lang="nl">Associatie KU Leuven</mdui:DisplayName>
-<mdui:Description xml:lang="en">KU Leuven and the associated university colleges</mdui:Description>
-<mdui:Description xml:lang="en">KU Leuven en de geassocieerde hogescholen</mdui:Description>
-<mdui:InformationURL xml:lang="en">http://associatie.kuleuven.be/eng</mdui:InformationURL>
-<mdui:InformationURL xml:lang="nl">http://associatie.kuleuven.be/over</mdui:InformationURL>
-<mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcFJpZ2h0czpNYXJrZWQ9IlRydWUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDUwMUMyNENENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDUwMUMyNERENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENTAxQzI0QUQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpENTAxQzI0QkQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnDgVQAAAAIVSURBVHjadFLNaxNBFJ+dnd3ZbDeaRJuvGhoPGqGt0iqpgpJ68NRj8aIInsSLqFSPFf8CPXrwIB6KYCXSqwcVpILUQz0EvJaINYY0CU33a3ZmfJtE3UL7Y5mdeR/zfu/9Rrn9vokiUBBiQoq/ew0raC9I9ABen0s3kKQfx6WElaqKkAck+Bx5HN2bPpyOqXB0Avl0o7vLZIz8r4OjZFouLyW1s2laiBP4Tia1mTRtOjxKC0fp24EsZ2i05vksJRjJfRNsJgsWuZDbkzCR0k8k9K4nIn32gbHScsX0qG5p4RW/bFHv8cEYZjO040uMh5HETCVDOio20G45O5zBVxu3fXTDCvflLF3dkjRlYRHWIZ9fLMOv1bWL+eTMpauDhMdLz+vNnesr9+Ha8TgRXz6uftvMpA9BN6T27gNU69Q25xYXcH/8LOCTJiseQa7HTEMHy5TuvFqutiaLUkhlbO4h4+J3o71efXRuYhzth/rWdml+iRr6CO1L32x0Ls6eOigaUMil5iunOz+3w6ZBdtmz71y7/M+9cPfZj0YbnkVx7OjrJ7cGxsWbV968XQsCQXwWJAqjwHXjex0csFZXPqFYSH19rfayMnWmdCx8NSzIH885jqfkKw90XXNcv2d74BBCJOImUTEID913dxxQAOwxqlkmhTQCtBh4uDBoKIKKsapiAYRggqoaHzG4GMrsBxzG+EeAAQCt0M7G/zjX3wAAAABJRU5ErkJggg==</mdui:Logo>
-<mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABLCAYAAAA1fMjoAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDozMkNEMEY5MDg3OUQxMURDOTFDN0UzMEIyRjdCQjM1QyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5QzUzODlCMkQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5QzUzODlCMUQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBJbGx1c3RyYXRvciBDUzUuMSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+R5rIdQAADfdJREFUeNrsXV1oHNcVHtlSYtlyIrW1caChu41bSJw2kh/8EEorOQ8tdaBKUxIKBdslfSgJxKIBQ0tjy6UPhhS54LyVWC70IaHBNsQlfXBXgSYQPdhKK8tQN5WKCzF2QJv4R2tLtnq/2XvXV3fPnbnzu6vd88Gw2tHMmftz/s+dux3Ly8sesLVQnBcfIx//d27cS4gfnvl02WMwWgBrtL+nxHHska8USuIo8NAwGJqACMsxJD6eEUe/OM4JIdnHw8Nod3QoF6ujo8P/FILRKz4OiGOftCpl7Xq4YFPsYjHa0cWi0MtDxGhndOpfhPUYFh9j4kAMMiqsxUEeIgYLSFU4ToiPYelWDbi4UgxGO1mQYbYaDIZdQIpCOOaaoVGFnk5vQ1dH3fnz84vONHZsus/b1tvlFTeuNWgseR9eve3NXV/KhQawobOjRmtz972w78rCXe98edGbFLRuLEXLa1Btu7G4LNp0xyt9UvGuVO5GGtu5a0vWNqD9hY2ddeevLtype87mdWu8Td1rY899tQ9LVjp6O7f1dcV+TlB/dazIYgk3q19akpOg4VWzWThXltbFye1KmsX647e/4E+KiaMXrovJvxXKOHu/tsEf4CCAMY/OXCcZKQ0aCs8X13u7Hl5H9qfGFGKiTl+qeG/O3nQSDJe2QegwXiYTHNr+gC9YJl4997lVAT0t2o9nmkC/f/7BfF1/nyt2x557jOmrZz+30tHb+fbOL8Z+TlB/dazRYhC4VuekUOATMYmqhQyKoyRTwJkCDGBjph1fui/w3qGH7vf2f2NjKPP42kcwyWs7euuuTYOG0rq/2/GgP8lBwqGuxXVg3qBrX3q0x7ltGMcweq7AmFBAO2CRWhn6SP9AWo4+WAspFCOygDjgVVO+/Vk3aGjL/bGEB+cpLRfGmC891pMqDYX939wYmXkgcBACCmiXjVGDXFW0I6m7G9SPqG1azQIC5j8lBALu1BF5znep8opNlK8ephltE0UJD1wMmG1bvODHBVIjp0FDuSSUG+NqQU2mg68NmnGAdiTx1cMEIGy+WilI92TcAYEoC3cq98a4DDbcLCoOoe6Fj/zKZLnmh9t8aQSgVyq3U6EB7Hq42xprvCXijFkRSBd71gq3aj0pkDiv9/HpL68LjF2mhfBCQNEuih7uj5LgiDInys1SyuNK5Y6vTOqCfMIKYWyviut1zF67k4iHMCYuyRMkA+IISEMRFmPobpZLBsKfPMG4ijmm55fqJk9NYFo00D4qRkB7EXyqyQM90KLiBNwPOgi0g6zq4X9eq7XrvGQuxD11ViSmBQFTu8Q7sDLHLlb7BcE2FRief2jggbr7JsR1LomJSNkpMb4Y56wsSMmwHKW8LImLe6ULSVg2q5a1ERMDTQVmUxmSqIhCw+ZaQdObmg3f0Q/KfSoK5sTzbMyNdphWAfRwjzmOcQN11/iiKiA3Wt7FGnUR0MyCc2IyoHUpBsJ3U0B8ZrIwJ7Qg7lF0cO3kp7czoWHWTBRQN6EAGpSAbOsTUzNbFRRSQOaXrFYlyzl5a3ahLv2qlNukpY95AvMXlv5FH1wtV230G11BpyZDaWyTgZTp1+sPYFSbT09ZIBy4/vA/rtU0exo0gkw/zejxYoPp8mKm82HLGKIIuWNTV11MAfe4GQQkyyxWw2DLp1NuhC14NH181+ciBlDPToNGq4CKB6GQqq7mYttks5pCQGyDq5ZgUEExZXHA2L+Y/MyvILtqM2jJn359fao0osZeed6XZE7UeExbkhStKCRNofYoZodQqEwVFRtQbpbubuHQ10AFFRnxfzMzFpeG1TcWwTZlDW1BuEpD3li6a30eJcBwRylGfeNfN50to62fiJeUW4ixMq9pBjfLJc17pXJn9QiIrVLrEmxhIt+5VPEFjBIyxeR+IH2hKoi2WoG/vql7TSIa1XTwEhnoY4UAJSC21LaymqiZ2PpOZY5Qg6FSszeX7rorLMtqBipVWydYFzsiL7xME1mnedWCxUHv3tuEEyKAn8jTergCzAAB2bxuLcmU1aLTrRXMjudR14Lhk9KA1ke2ilpkh3vA9HrWyybYujtj09aqMKgLCayHrQYTtKAyLVdJ3euagl91LpYQjmPiY49xzQFxHktO9mbxElUSv1UF9/CJn/NoplS1BvXdlsZ9538Vsi1RaNSKgKI91DVYZ+ULCqxMX6eVDu7XGRo1FEroIBCP93X6QXOhZ21gLJfHfCiL2EgBcfE8ANdUr/5G4T4pHKiHHJFrsnAe5/AaLoRnIG33yqVSG2aBoEXBUCYtfyGhYErbAkCdgaCpk9JQeFMM/qGBLusEhq3TQrywQngvLViXzIctJqwyw81IDJ5U4bmudFhtFgSrecfNegg2khNCMudVq+r9aVoRm3sBhjd9bww6lnrbfHEc1P9dgjowtHpuUhrKLaIKai5A9swMMkEf5+O0Dfclda/Qnjcu1gsZ1nhR17eSm6WrS8Qd71EXaTFIqu+D2KrniCvAZPoxaXmDT7lZ6gWhqIytM2QaNO5ZkZuRl18EvRCGtqFKHkUzQ0ijMKpNYYGGOR84SpdvZWKFmjYG8TJcSuKcSgzwl7G4j3In1GI5TCSC6ueF5g7ypcFkeA5cD1O7pkHjnmtU8dscRgt0YIHC0pO47pVrZb96H5TcQAwDelGr9Daa0/PRVgG0kpvVoe3Niz9GPPkOCKVIMIYuGa1m2DhOvUf9uObvo6YA182VcdKgsSJL1te1Ym3VrBAIlaVKo3/+UvP5RWeXihFdQEKVzGoREAYjbRdryOF63iuL0Z4WRO3NmwbYgjBaBfquJsviGNS+H9R/BsH8P4PRVgJCANv/FHiIGCwgDAaDBYTBiIpMlrtj20gGoxWQSR1kWRFlMFrIgqS2q8no8b/xyDJay4KkWQfxBn/JFoTRWkE61zkYjAABYTAYLCAMRuwgHQjbi3coyw0cGIxmF5Cg90E8j1fzMtpcQKbYQjAYHIMwGJEtyFCeLtTBPU95B3bvrDuPIuPB8TO17/1bH/JKYy94vT30rywNjfzBm5iarQZQ4rrB/mLdNR1Dv6o7Z7tWp+eK5dJvyfPUc6PScIE5ZhQt9Al9i9L2fT960ht7cVfd/478+QNv5PXTzrSKP37NK2zp9cc8LvR5wbzZaOFZc5fnQ9tljlmoBZGuVa/cH8uHfCcEgfsJueNiroBQHNv/rFU49h5+OzIzM9xx8u8XyPOUYqHO+T77vz+pY9gsQSndVFwsuUEcuG1MCYdXfSdE/bptLj8DrQPaCxaEAjTY+LtnmYszBBibYm7Miam0Bvu/StI49f6FXNu853vbhbXqyyQGgWDAiijq2EgO+/JiN0W1o+Jwnh3FQQGCATPPaKQVWSkQ33miaLl/Jvc2j734/UwEBNZhVP7CrbIax6X7VZbxSSGPDkJDUb6vEg64Vox88N5HtAtrCgTlYpWvV3wXK28Mf+sxq8uXJEhf0V8V2xkClDke3GCPOzDYVHDYyogS6GdjQWYsTPhobS5szOhiPWzJg+SxyFOCdnK6ugWBldgtrcfLcEGF5ZiT8cigtCiZZ7mQOaHiDggHBhJaidF4IYGfr3z9Zok/TIuWhhXRLQiq6PrPH4xK4ShJi4Ii4slGdRhuVTsKR1hqNA+rCjcLbgvFhOPvzlvjj4mp/zi502F9PP7Xs7ESMmlYEf1Xbsfl74AME8Lg/yRCIxll93e3C2Y43XYCkpYvnTRQp2JCCAYYl2ojrI6LQoMrHdZHWxyUhxVZEYPInzaYMs4NNQOjwPU69f4M1z0aAJXuNdOnQQwYl6mTAAJpxq6wImnFIHCnUCg8Jo5Z+QLVsiwSDjfDRAUVDRnZWxEqDoFld70+a8CamXWbpBZELxQiCJ+VMciE5lbhPIRkrNGThAmJoxFYqJKPgc0iULWqvKvnCp/dqKS+H4LuYkEAkMkaUNkrFbzL3y7cJz5/b/wvE6AICMmnsllxXC3QMa/H2iDanSg3FWOnlealxtJWcaaYO0rBL8rcpJ3mhRXBcpO0qunmL0yNUAIgzu31qjua7MnelM/4WZmgzExUV8tMQ4JZojBHqwb8qGVEURKuQoKsUyMx8vpfMrEgnrQg1lgtj8599PHlmmaBNqBMuHK1TCGCG0D5nGoBG9KO1Xt35iIcYelLF83psgLWTPVi7KhxOPGbn/jXoZ9QGi8/+2SkcbCle81AOUr13CXNq4TONdULQbaNQVIBKQT1RRyn8tUEp/0JoawF5WphYGzMj/NhKz3TzpClMUFxaGBcqPvU6ui48YbL+ERde+WS5g1qkw2jx88Iui8kHn/dxULdY4xa1i5jkF55TW6ANoriakFzJWHyVtnwDpo2blEV1sOmqV2C70ZWz01hTkPh6QIyIl2sc/IdkIMy5TsvY4+9eQTo1GTbOkplteJW3HFfq8Qf6H+cBZ2475lf/ymRlXWpnufpgaQmIJL5saxdbUF6QLpVsBrYzWS8GTtqrt0Ckw/87Kiz9sD1YIpWe7cErg5iHFehV9mksPghyEK4Vs/zAvqSdF4btvVodbFbL5lBcX1Jx+UexDBPPLJF3Ntd59NiANN4XyFurKELcZJ4JSwwxhhgLMw1U+XrC35SBGPgGlhjDmwvsdnmIew+N0V2j7aNFvX8KNcGCsjWQnHQRSjluyGJBYTBWA3Qs1glh+uxLmuCh43RjgJiLkosefUbyfHGcYz2FBBzwzi5BSlvJMdoa/DGcQwGCwiDkdDFsvx4Tr+x27tbFovBaMEgncpime+AcBaL0Vb4vwADAI6r9hTmuAw9AAAAAElFTkSuQmCC</mdui:Logo>
-</mdui:UIInfo>
-<mdui:DiscoHints>
-<mdui:DomainHint>kuleuven.be</mdui:DomainHint>
-<mdui:IPHint>134.58.0.0/16</mdui:IPHint>
-<mdui:IPHint>193.190.168.0/23</mdui:IPHint>
-<mdui:IPHint>193.190.176.0/22</mdui:IPHint>
-<mdui:IPHint>193.190.180.0/23</mdui:IPHint>
-<mdui:IPHint>193.190.253.0/24</mdui:IPHint>
-<mdui:IPHint>193.190.146.160/27</mdui:IPHint>
-<mdui:IPHint>193.190.57.0/26</mdui:IPHint>
-<mdui:IPHint>193.190.57.192/27</mdui:IPHint>
-<mdui:IPHint>193.190.57.224/27</mdui:IPHint>
-<mdui:IPHint>193.190.58.0/26</mdui:IPHint>
-<mdui:IPHint>193.190.59.0/24</mdui:IPHint>
-<mdui:IPHint>193.190.255.0/25</mdui:IPHint>
-<mdui:IPHint>193.190.138.0/24</mdui:IPHint>
-<mdui:IPHint>193.191.187.0/25</mdui:IPHint>
-<mdui:IPHint>193.190.77.0/26</mdui:IPHint>
-<mdui:IPHint>193.190.224.0/24</mdui:IPHint>
-<mdui:IPHint>193.190.225.0/24</mdui:IPHint>
-<mdui:IPHint>193.190.130.128/26</mdui:IPHint>
-<mdui:IPHint>2a02:2c40::/32</mdui:IPHint>
-<mdui:GeolocationHint>geo:50.9378101,4.0409517000000505</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.2194475,4.40246430000002</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.209348,3.2246995000000424</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.84999999999999,4.350000000000023</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.91083,5.4133600000000115</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.98965,5.050160000000005</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.8464506,4.262063000000012</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.16257,4.990839999999935</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.0543422,3.717424299999948</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.93069,5.332480000000032</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.8194776,3.2577263000000584</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.87822088437878,4.702697216918987</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.1302138,4.571509200000037</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.0258761,4.477536200000031</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.2166667,2.8999999999999772</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.94990869999999,3.129447099999993</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.8674164,4.377298099999962</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.07045,4.53135999999995</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.1558839,4.15444100000002</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.940892,4.904695599999968</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.06498,3.101570000000038</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.3216509,4.93755770000007</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:51.2025247,4.770882700000016</mdui:GeolocationHint>
-<mdui:GeolocationHint>geo:50.8134333,4.324834399999986</mdui:GeolocationHint>
-</mdui:DiscoHints>
-</Extensions>
-<KeyDescriptor>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
-DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
-WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
-CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
-KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
-GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
-d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
-bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
-llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
-AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
-vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
-+yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
-yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
-5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-<ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-<SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kuleuven.be/idp/profile/Shibboleth/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-<SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kuleuven.be/idp/profile/SAML2/Redirect/SSO"/>
-</IDPSSODescriptor>
-<AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-<Extensions>
-<shibmd:Scope regexp="false">kuleuven.be</shibmd:Scope>
-<shibmd:Scope regexp="false">groept.be</shibmd:Scope>
-<shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
-<shibmd:Scope regexp="false">odisee.be</shibmd:Scope>
-<shibmd:Scope regexp="false">vives.be</shibmd:Scope>
-<shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
-<shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
-<shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
-<shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
-</Extensions>
-<KeyDescriptor>
-<ds:KeyInfo>
-<ds:X509Data>
-<ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
-BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
-DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
-WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
-CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
-KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
-GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
-d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
-o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
-bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
-llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
-AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
-vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
-+yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
-yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
-5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
-</ds:X509Data>
-</ds:KeyInfo>
-</KeyDescriptor>
-<AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-<AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-<NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-<NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-</AttributeAuthorityDescriptor>
-<Organization>
-<OrganizationName xml:lang="nl">KU Leuven / Associatie KU Leuven</OrganizationName>
-<OrganizationDisplayName xml:lang="nl">KU Leuven / Associatie KU Leuven</OrganizationDisplayName>
-<OrganizationURL xml:lang="nl">https://admin.kuleuven.be/icts/servicepunt</OrganizationURL>
-</Organization>
-<ContactPerson contactType="technical">
-<GivenName>AAI team</GivenName>
-<EmailAddress>shib@kuleuven.be</EmailAddress>
-</ContactPerson>
-<ContactPerson contactType="support">
-<GivenName>ICTS Servicepunt</GivenName>
-<EmailAddress>servicepunt@icts.kuleuven.be</EmailAddress>
-</ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/Shibboleth.uem.br.xml b/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml
index 4fa3f850..4fa3f850 100644
--- a/swamid-interfederations-2.0/Shibboleth.uem.br.xml
+++ b/swamid-interfederations-2.0/Shibboleth.uem.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/aai-idp.unibe.ch.xml b/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
index 47af7a48..ea2cb100 100644
--- a/swamid-interfederations-2.0/aai-idp.unibe.ch.xml
+++ b/swamid-interfederations-2.0/aai-idp.unibe.ch-idp-shibboleth.xml
@@ -4,6 +4,11 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-11T08:10:51Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor errorURL="http://www.id.unibe.ch/content/helpdesk" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
index d893e6ec..9933e3bc 100644
--- a/swamid-interfederations-2.0/aai-idp.uzh.ch.xml
+++ b/swamid-interfederations-2.0/aai-idp.uzh.ch-idp-shibboleth.xml
@@ -4,6 +4,11 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-14T09:16:40Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor errorURL="http://www.id.uzh.ch/support.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/aai-integration.dfn.de.xml b/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
index f211dc89..f211dc89 100644
--- a/swamid-interfederations-2.0/aai-integration.dfn.de.xml
+++ b/swamid-interfederations-2.0/aai-integration.dfn.de-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/aai-login.fh-htwchur.ch.xml b/swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml
index 2c3765fe..9b355f22 100644
--- a/swamid-interfederations-2.0/aai-login.fh-htwchur.ch.xml
+++ b/swamid-interfederations-2.0/aai-login.fh-htwchur.ch-idp-shibboleth.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.fh-htwchur.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-14T09:29:33Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-30T11:15:35Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..d4ff3751
--- /dev/null
+++ b/swamid-interfederations-2.0/aai-login.ph-gr.ch-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-login.ph-gr.ch/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-06T10:56:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <IDPSSODescriptor errorURL="http://my.ph-gr.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gr.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">PHGR - Pädagogische Hochschule Graubünden</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">PHGR - University of Teacher Education Graubünden</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">PHGR - Alta Scuola Pedagogica dei Grigioni</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Pädagogische Hochschule Graubünden</mdui:Description>
+        <mdui:Description xml:lang="en">University of Teacher Education Graubünden</mdui:Description>
+        <mdui:Description xml:lang="it">Alta Scuola Pedagogica dei Grigioni</mdui:Description>
+        <mdui:Keywords xml:lang="en">Chur</mdui:Keywords>
+        <mdui:Keywords xml:lang="de">Chur</mdui:Keywords>
+        <mdui:Keywords xml:lang="it">Coira</mdui:Keywords>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAitJREFUeJyUUztv01AUPsBWhIRER1bEQEURSAgEA/+BAQkWBCNLFyQEEmIqDDACC0VCCFiogEpdWWjVgiGkjZ30JrFvTxOT+DqO7dw8becG22lDWipIBz/O6zvnfPe70Ov1YNTHLD9BRQKmZc7hlm+kQrH5datvqby8j5n6/f8DCCGG7P5/1XiMme/AvHZe2hVAiH9MItqgymdxPXMeh/1/JVqlh4jkEoqwYNjfakop+Ssw23xFI9v3y2FD7w+A11kH13pHsz/HOUkeRF27jrY5E3YL+gQWHiD5cYT7HoJrz9K8cgYL+WvYH73bAMd6Q3V6FeVvwFz7Pa2UH+HKAnC78pqKePwTWMxfQZs9xZrzkWxkL6O8DGxzdx+63ToYG7eRJMZY5AsCHaKEX3QKvXZWSofkaelT2OBfUlFcUy4gZk6ywQrdwIK1xFGuazdikurOPFlZBF6zZmnVeBZPY5Wm41innZNWl4Dz6jQOAGr2B6qEJDX5YtxBlU9jbvUYil4HVOU4qqkJ7IlOnMv0u5iWxlgQ4BaJAqL9MonD3OsQMIr3cC0kMyK2wRdScTf3E2m3spJtvsBccjzk4jkOjtH3DSDJQ6ilJ7BUuIXl4h30fT2OOZUZLGo342TuzBEa6sCp9I8yEltfYebLkP39rFn/TCJCdypwu73dF7+QXERVngzF0xr5Yg0AmvWllCIdYEZxCvdaHANEZEUSVZVJdO05sleA3wAAAP//AwBuF/0Z3Mc5jQAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="43" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAArCAYAAADv9A+vAAAAAXNSR0IArs4c6QAACSNpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+Cjx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuMS4yIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIvPgogICA8L3JkZjpSREY+CjwveDp4bXBtZXRhPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgCjw/eHBhY2tldCBlbmQ9InciPz4s45Y3AAAQ7UlEQVR4nOxaDYwc1X0fbEiqNFUbtZEinJbQFgi0sQHJSoPxR2piKDYfjbChATkWjatKAYOCSCLaFFSTtpYiEMExrnFVt8GJprKooThZHzJtalyvudu9vdvvj7nbvdu927vb2Y+3t7e7M/Pm3/d/897s7N6ez0dbaglOepq9mTdv5v3e7//7f7xRAEC51Gbb9iX37dtsNgZQxbYMNpbFGuXnzVZBrcz9VJ/UHiGZ2A0kHlJIdFCB8OC10Ji/EFjJc//H77jCtuTD+73ISl+uX3+LnaOs2bwxMMFWpgovkpH3FIgOKRDHFrwCEuw4ntpBqLXA+yD4K3nmBwEkPuMDB5BSi4HoAEcZGyn73WqkfIXc35DE8KcgGVQgMXwlRBigevFVYtumYoH1EYAugMhAECxkYFJuyqC0W2lfMriWgccARBCZGbcbEyowkAH7rvCZ/y8Avh9AVtQYUMg6br4UOmbMztf0E3p86Nc5A2NM//Ljf0Ysk4j76IoB/KDaMgyUqwl9f0tQuo6e+5diMToQKsCjtsHutZS89hSJM+BSwVWADqSuv60BN3FwNNB9hmCj+zy77xwuIxN2gETgvKCCdATgabbdBVz/SVDHjJFVjIXAWquZ8KVHd5BkgDkQ1pIjCmkupHzuGLYtPLhYQPc9vO942QJIBYBodhIgZzJdeoZsYmKPumZT2ncSkr2oe2iWCB6eL7MQJobAMfONMO87mdzHvG9FtSVjqWP2VCykAyB13+0yZqDXbCWQYjICUMpFngEiwLXEZJeeBOvDPKtcBKAtJT/2LDdfdCAYxpSmj+vAF8gSz6NO/OhxJh0pEaBeDgAu6iDjL2G+PPTgpmd1zJUDKPpQab60a1Juc02RjSNYarSyaiZ8B0mIGDAz+kXSmP+vgMNwyvWSL9AS5rqY5ZeTE5GZgxB+h3niyM5bVlmt66e0WulfdbOZUyU7L8oCl8EW/79euxBA3YsHHQBzmWeY+RKXZXwMKhgoHIhkonzeZWzCXhH3aKFoxfFnSDTwSZZB/Bqkop8h7WaW6ZbpEfw+k6BC0/A6JcpM4dVijAGXEg5kbuaYLhnPWWp3TLfTHD2EizDwsgCQmzAFEW7YHjZSxTDm1Mzol7nnTDD9yqW+SixDV11PKSbbGV/qF3VMHTB4Lqhjic0kgQ6EtdToV0hrIepzAHRYJ++n9jy7r+6OKy1i0TuvMG++1P5LhWTLAOiYHGqRIdIveb08d5wFvlcBTj6KzGH5bLuV9BntSdW0dBVcJkjTB8EYcLwvOzZIyIcZh3QeE+lvEgCDmzelJr/fNEpqvXo+gEydZa1WPue3zIqK16ndcSC9YExNTenh8KgeCARgaGgI8DgyMqKn0ymd/fm9/VutphKPx3S8HgqFeMPfyWRSr9frF2X4JZgw0zqcELKANcuYUSszP9XHwptJik06ObyaNYzdtpBk+CtEi2wn44k/J4XcAdKoXwjY1ODgOU0Gz2w8a16Zmfw7En8Pg2dk8SehVvoXHRfJoo7+Vio/19Kx3YAeGs0cA2xnsX5UxOuYI9Me3Y3H4/oLL7wAd955J5udAmvXfh7uuOPL8LnPfYb/j+0b3/hTyGZzupzr9HRBl9d62+OPPw6nTp0CSvvrbZem9TbvylKzqszN/AMZi3yNTyIWxLjt41z8k8OfBi1+G8lEf48gk6LvOZNNhzeQMtM0m7ZdjyrLWKZRVjPR3yGxQQfAzMjNpM3Y5mjjgjKb//tilC1MJv5FMhb9EjfzRGg1wTw5Hd5BzHaW96WemBOZdvvtt8Ndd90FAwMDMDMz40e2lctldiz5i8Wi/9y5c/Diiy/C5OSk3mGrA+AvfvEfUK2yec7N+bHFYjF97969HEgE0cWCdhZtWQZSy1CIfkZLR7eSaOizjF27GIhbCPecw1fwElQ+8z1CTV2lVkOpzP5Yx3oehiUJ7hg+BdWyT3MckIjrLFupV88FYsMI3pWALCxoewlet8ySUsy/QOKh3yTVuRMM/Cbz1MEAjxP5YiGQ6xm73w1433N4eJhP9OjRo1CpVPwX0zLTNDtOijNwigMYDof13v4I6FNPPQU7duyA+fn5bmzY/csCWK8OaImR3yC59LdIrfwzjRoFJZ9+lqBJce3invMn7oMpbSiF7F8RZGF6eBWv62VTewil844M2E62MpV7hrMvM/xLfBHmq/+uWeYsy4m/Q+Js3GY95JMOgzCtRACTQ062kg5tJAtYaBXPRJatX78enn/+eWi3212W09tonyxJMhB1TwLjNdnXXnsNbrvtNkBN7B17WQCNZsZXq/g0atb4/22WoyZHPssZyCcT3sYmMxSQnhaYLpHyWT+aMNdGBHpkM+sT8nGTw1zYIMpY7A9JTEhBJvJbxGgVlOncDwj+Xyu/o0n9tW1Dqcyd0pCl6cCVfEwt/MdgNsd8tkgFjxw5AnfffTdkMhnd++69Jtc7+V4GSgBlP3n9jTfegE2bNsHo6OgKAeyTOtVKpzVkDnpP1LvC+F8TDDcsnqI5tbv52mAAwUGTS3GtvJExbEBzGcUWJB5Yw8HAsWYnv0+KEwcYeL8CdcZE+Tzsa1pVpZD7tuNsmMPCYy71GHEyFFDmZmf9999/P7z88svQ640vpundAHYzsPeew4cPw5YtW7g09F67BC8MTsmJe2BdLWDZCdkQdACqzak88KUiZ8WsoVp5R5PFAa6DwVuhQf4zIMcuTj7H2YemiiCOJ79K0DHNTr9StFlu7DoHNq7RLqla7Fq+WLgYyOyZ/N8SubDvvHOGmdeXAJ1DP73rB6BkZAfAaQ7g6OjIIg2MRqP69u3bYf/+/dBvvOWdiKdzs5H2pUYY84IOOGPRe4jVmlRlesdjRmtBKRYPcw3E2h4GyJnRu0iLSQHXwPa0mo1/jXvTBIZAwV/moEym9xJMDWX6hqV8DLoX6hGfU6VeJcr910CjdtbVv3/652Owbu0XoFAouPq1FAOXylokgH6/H9DBLCwscOdx+vRpbrqPPPIIoFfuh9ElMdBZLUMpl05qjrat4oHvVPbbBEQtkL84a5ZZV3LaThIdcgBEBk6kHmX5bctxSuW3tETw0/x8cvhKHuOlw9cQYz7t6xQknJCHMhBnigfJKK/UXMHvySa2EdusK7KocOjQIbjllnU8/Og3By/bpAfGcAYD5F4A165dC/feey8Pg2688Ua477774KWXXgJ0Ur3ysCIAUdcw8M2lHySRQSd4RhMk5Z9rjmPoFFWNVl5NMJZy/QtdxU2vNHOEyHGnJ35YjAhzTAU/wTWwXDyuo7OQMiDTRWRzLnkv9/jJ0Mf5Vmdp5ihBSZHvd+jQQbj55nVQq9WU3kn20zuMCffs2QM+nw96TRhDlTVr1sCTTz4JZ86cgXQ63eVUVg6grNmxyTTrCR/XrMBVHLx0dC0LZlngSx39c5hoKKXpQ0UeHCPIWJ6K30oMY1blHt2YUrXoQ9wzp4Ifgxgz83GWaWAMic/hu3XUdEBk/6N3T4Su5fk2jpWO/S5pt4uqw3anmnP06Ktwww3XQT6fX+QAesHEI5riunXrAD2rZVldAL777rtw8OBB2LVrFyQSCb0f63q9vNJdNO3XySlplaYPFyM8a1gN0QvoOZ8lPMOgIkDGanS7pmRifySKAx/jk66WTuiWKCTMs9iOM3PYKV9hv/LsT0TxVDgiKvdB2GSnf8BjxTQuBjvOTbOsxm5y05bv9/rrJ+D666/jk1/OeeARzXHDhg19AUSHgfr30EMPwaOPPgoTExOLGNjrZJTuyq7noZ6KCuaz48ldvGqMQo4xYKPGsnOufZY7YZ1lIVHhXXHCU+P7CBUVGrBbSnnmDY2XrlD7sPaXfoJlMHNu6Z6C5RYIqFVTxhJ73H2ScaZ97WZOdbVNfNUQiYT1TZs2cq1azolIADEofvPNNxcBiEUE/H9sbEy/+uqr4bnnnoNGo6HIcfuN6Tkpy0Oy/ibqgOx6qz4UiIduIRK8ifg2YjBv6lRWHHa15uO+TGS7k+IhayK3Ms+b5X1Mdt1kppdjGQmPDxHg4K+yFO+k5rDP6sSb4lir/JuWCq7hz0OHVC2L+NASWwfIQgScTWzfvn3wwAMPAFZgljJjCWCpVOIM9AKITsUbB+L5s2fP8tTw5MmT4AVP/u7SQNsTx8nPLbhJilWem/5hESeSFsyamTxAMGWTmYBl1fm2JNYF8YsCLfz7pF5juSpnEuUpXLMe8+FuG0//WL+x5B5iUSK002RjVFnIkvThEccsjH2fpNhYqJOFzLecEAfAs7HVAQXNFyd74MAB8E6wn+khAzdu3NiXgd5MBFPC48eP83FljNlvUVwT9hYovQ+l1pyaTewlSdS/kVU81dLS9/DqM6Zt9fp7gcn0dwgCF0F2Zr5OmgsZn1tVxnDEXFDm8j/iledk8CrOqlrlbc2tWjM2TedfKqL557N/QSqz/0hSw+shwrR2cuwJYhozPTt0tBOfCqk5ceIEnyxWWiQT+zVCiLJ169YuDZQMlCYs544hD+bXeO38+fOLQOzSQHezm9pi39Z5OUJOa8nR6wjPaZl2JYSJZhOPkfz4fpIa3UwifgZuWCEzxVeZaRdU734FOiAsXWnx9QTZlDiP+x47iUnrDhBY+7PaSiaxm8QuONVt/oERO05nv0faCxMu85ytUEf/TFEdlwC2Wi3mUF7nk0UHcOzYMRgcHORlKyxroa4hCJg3Yx8EEAHCexFwh4GhRcE4grt7927AbETTtCVyYdsxWQlgZ/Js8MIr3HzRcyJ4mfCtJBvbShIjnyDJUYWMJe4hc8VXSLvFJmq3hNl0Yjlu4kadxX9/SeIj15N05BYyX/UH3MKqeJGqflLLRG8nqZGbyBgbv1b6mWZZxN1/dphnKe59QBdbC+uDoGER9KabboJt27bBgw/ugocffhh27tzJi6wbN26AJ554HDKZTownGSjLWb3j4nkc6+mnn+4CkTOw+wbL2fegBmemQXVVS33Tqe2JWlyFhSW22VBMBpjVrqgYt2GWYlHnIyGvRoEIN/h5xjJM4yyzpMrvYbxZB/8Ky6iyQHxKpUxTcUFBbKvatveTODkxb9DdHa6gaaKzCAaHYGDgNLz99gBcuOCHbHY83Gw22HXDXVzsbxiGgnFks7ngjtVhoc37l0qzfgQPx+0CsN/erxvINkZ8yZCT+yILtfjXwWhPqF5vuViwQeydiL1hWzopTz8Ad4vSOefZb5E7etC5F+R7geeajBLsxYxZvsmwrd/5xdlM7xcQPYG0FGer44F5WcpUqnNvaTynHXb2IqYm9xM3uLY9E/EMCp6JezehOkF5D+hdHwt5ftu2O773upxoZ+dv+W3NpX5f7Nuaxb+XykTEROV+hXQeRntWnUg/zMtMKSzRB64BUn3LU+iki16+HyMvjRH/e/f2A/D/qnXCGNdEOvrSnE/y3DchzTd6P1gsp+18hSVo3bOtuFQW8H7Or7Rfv+vd8rJ0ivd+36tLT5zPJ9AptJRS8QivvKRZ6ILhx3Tuu0Sme1TEYtClYx9SBromzMMYwwkbTJaHJjfzMhIvHmDpqjKg2SLZ936T8hGA0EnOqXhok4R8zr7var6rlo5eR8w2ywZs+XERiFTvIw1UOnGYCAmMipoff4ynbFgFxiJmLvMnxDZbnY8qXXPvaOCHF0DcZrSairmQ9C1UTmn57HdJbFh8eTC8itf08KuDOstdW+2sapiY7FORWn2kgdwhNOZzKn6mFvL/Noz4nYpKbIg5j8ErWFvN/48EvwCjQ38AmcRenp9Sq7MB/WFu/w0AAP//AwDF/aulqC4/dAAAAABJRU5ErkJggg==</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.5.58.160/27</mdui:IPHint>
+        <mdui:DomainHint>ph-gr.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.866984,9.536721</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIJANPBvqI6uH7rMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmFhaS1sb2dpbi5waC1nci5jaDAeFw0xMjA4MDMxMDU4NDZaFw0xNTA4MDMx
+MDU4NDZaMB0xGzAZBgNVBAMTEmFhaS1sb2dpbi5waC1nci5jaDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAM6DeV57x0ntO6ngsTUgFxL7gPqK1yc4JW6Q
+Bof970j9y11C9oIIOZMWadurnqdHsvGcX+GbmEvNVI0V4u3Wibg3JU1oXRtYLzDC
+IhVErP4qn3mvq0wQ5IC8br3xQu/PZp16iiZ9YK+ipn7HIow+tAQ2bxONAxtDbrFW
+o4+f5XE7RckoUplEkGFX9B3X2iy1V7rzJt8UsjY6vZVmkLhdSu+O1zBTnTU4DTkB
+1CPnshzK5qWg5Et7CkgPzhFORXPD9tp9QpRSukVee2rHlhIy9umVTzh1M+IcZrW8
+rB0cZfvs7RpOnHtkSpEVoMANC9az9IBU8GzqGy8OmffI+vL71q8CAwEAAaNrMGkw
+SAYDVR0RBEEwP4ISYWFpLWxvZ2luLnBoLWdyLmNohilodHRwczovL2FhaS1sb2dp
+bi5waC1nci5jaC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS3jMf00nQqVvJRH7
+r+2JO7i7iuowDQYJKoZIhvcNAQEFBQADggEBACipXitm/nMRmZswt0tAl0fE81DF
+1U8Xxgh7OVK6QjVIebjckobeeV9D4JT3bF+YfZLVxl/9XIRbpBV2aYDf4TXAtN1R
+VZ/km3VDZbHImJQls8VGoJzMXXGcywQwbZg5vXcdXB1FtYWQTkor5lg0mqRAIJES
+BqBm0XGj5gO0xpZnds5cvH94w/xzfI+BDmusQvjTaYPblemangtJ+MD0yXSaHo2z
+PdZQszzV/n+v286sSXaiO/Bd6QbtIRZUZiUR/2MfwjZ+exR0nymEiSNdiKch1ZpN
+3gDJq0hd3/Em8RDzJtiui0YIJVFZdxA3+9QhvGhX0OvziPHKbsxh1mNnI1k=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ph-gr.ch/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai-login.ph-gr.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ph-gr.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDKDCCAhCgAwIBAgIJANPBvqI6uH7rMA0GCSqGSIb3DQEBBQUAMB0xGzAZBgNV
+BAMTEmFhaS1sb2dpbi5waC1nci5jaDAeFw0xMjA4MDMxMDU4NDZaFw0xNTA4MDMx
+MDU4NDZaMB0xGzAZBgNVBAMTEmFhaS1sb2dpbi5waC1nci5jaDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAM6DeV57x0ntO6ngsTUgFxL7gPqK1yc4JW6Q
+Bof970j9y11C9oIIOZMWadurnqdHsvGcX+GbmEvNVI0V4u3Wibg3JU1oXRtYLzDC
+IhVErP4qn3mvq0wQ5IC8br3xQu/PZp16iiZ9YK+ipn7HIow+tAQ2bxONAxtDbrFW
+o4+f5XE7RckoUplEkGFX9B3X2iy1V7rzJt8UsjY6vZVmkLhdSu+O1zBTnTU4DTkB
+1CPnshzK5qWg5Et7CkgPzhFORXPD9tp9QpRSukVee2rHlhIy9umVTzh1M+IcZrW8
+rB0cZfvs7RpOnHtkSpEVoMANC9az9IBU8GzqGy8OmffI+vL71q8CAwEAAaNrMGkw
+SAYDVR0RBEEwP4ISYWFpLWxvZ2luLnBoLWdyLmNohilodHRwczovL2FhaS1sb2dp
+bi5waC1nci5jaC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUS3jMf00nQqVvJRH7
+r+2JO7i7iuowDQYJKoZIhvcNAQEFBQADggEBACipXitm/nMRmZswt0tAl0fE81DF
+1U8Xxgh7OVK6QjVIebjckobeeV9D4JT3bF+YfZLVxl/9XIRbpBV2aYDf4TXAtN1R
+VZ/km3VDZbHImJQls8VGoJzMXXGcywQwbZg5vXcdXB1FtYWQTkor5lg0mqRAIJES
+BqBm0XGj5gO0xpZnds5cvH94w/xzfI+BDmusQvjTaYPblemangtJ+MD0yXSaHo2z
+PdZQszzV/n+v286sSXaiO/Bd6QbtIRZUZiUR/2MfwjZ+exR0nymEiSNdiKch1ZpN
+3gDJq0hd3/Em8RDzJtiui0YIJVFZdxA3+9QhvGhX0OvziPHKbsxh1mNnI1k=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai-login.ph-gr.ch/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai-login.ph-gr.ch/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">ph-gr.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">PHGR - Pädagogische Hochschule Graubünden</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">PHGR - University of Teacher Education Graubünden</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">PHGR - Alta Scuola Pedagogica dei Grigioni</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.ph-gr.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.ph-gr.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.ph-gr.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>AAI</GivenName>
+    <SurName>PHGR</SurName>
+    <EmailAddress>mailto:aai@ph-gr.ch</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>SWITCHaai</GivenName>
+    <SurName>Team</SurName>
+    <EmailAddress>mailto:aai@switch.ch</EmailAddress>
+    <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml b/swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml
index 3eb816ec..5e37e909 100644
--- a/swamid-interfederations-2.0/aai-logon.bfh.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.bfh.ch-idp-shibboleth.xml
@@ -4,6 +4,11 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-11T07:17:19Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor errorURL="https://it-support.bfh.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/aai-logon.fhnw.ch.xml b/swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml
index 9ae0fb66..b3630075 100644
--- a/swamid-interfederations-2.0/aai-logon.fhnw.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.fhnw.ch-idp-shibboleth.xml
@@ -4,6 +4,11 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-05T06:48:39Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor errorURL="http://www.fhnw.ch/services/business-applications/supportadressen" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/aai-logon.fhsg.ch.xml b/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml
index 9f0374c9..2f817bb6 100644
--- a/swamid-interfederations-2.0/aai-logon.fhsg.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.fhsg.ch-idp-shibboleth.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.fhsg.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-06-11T14:39:45Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-05T08:54:49Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor errorURL="http://portal.fhsg.ch/it" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
@@ -37,24 +42,23 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUE/551Fka5VCfxZWiNziJRRpSEdQwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwHhcNMTExMTAxMTUxNDQ5
-WhcNMTQxMTAxMTUxNDQ5WjAcMRowGAYDVQQDExFhYWktbG9nb24uZmhzZy5jaDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKmopa29dNq2NlZIAVsF3tjx
-tVG6BHupDp1wzYpAGLBjyLrByHL/EBFRtcgz7U0Or3AKG0zpnR/EabOM0wSGNp92
-DE5xGLHHKJJN8B9CtxCu9ewhTgqx+4xoc4SohczUzB8kZi/JoAO01Cvr8rX41a7h
-Ci5SET1ZiIqFX1qJC2UK2H/KmAjkPSN/fXSHJfkOCNC8ehKUE7nd4b5tcqa03bNV
-xKOFoh7wT1u9oQWY7TKKdem8CpQuHPoQmeMuohsezyecnpUvf18UmzRF+67/vBrO
-m9tJbUVhrv0pZyapY3135AY3eCMswF8pOt4IKFAXDDESuAXAYBQGSdBL0mdwTEMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRYWFpLWxvZ29uLmZoc2cuY2iGKGh0dHBzOi8v
-YWFpLWxvZ29uLmZoc2cuY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHBBA2d2
-gvzXzgAdQYH6V54gtUwkMA0GCSqGSIb3DQEBBQUAA4IBAQBybl04VwGusWH5nGPZ
-yWsdpF+JztkTTG26GQ6Q1lsxh6JengePKlyj6c025W4KZIyt+5GGnJM0ajuxfJAF
-K8rr4DHrSIWk9Uy1KftCVarvI5OaerfigyWcpiLqEwxqZBs+xg5OgQPvh82AHBN5
-E2pYy5nmp6uWR0ZSJ4BaEDGZrwsQ6qdGnqKqnXLq8nkWW2L7cliA7+I+XhzqSY9b
-KdGVOXBU38qRDKSyAPOO3MkITWzcVQNWm0PEv3MCXE10JTX3XEGwD/PKbSICCWO3
-BUDpYrVzuDOgWLoHLaAx4dS+gByfs/VsK6nPKVjY9lOu0HLxf21Y6jj570C+J8nc
-8/18
+MIIDJDCCAgygAwIBAgIJAJPilzxxDSFSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFhaS1sb2dvbi5maHNnLmNoMB4XDTE0MDkwNDA3NDc1NFoXDTE3MDkwMzA3
+NDc1NFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDDu7JMJ94andqk76Bv1KS2ZWWeDgrV+M1XkTK3
+ZUHWgJtzXIg9+9uQnOZel/TkDp6L+by+AGwcXod61E0uw1RbA+E1NNjYAZhr4JS/
+osFjJkz606hKYOAiv/68xQvmhi/P34U36qsKjX0Zhz2KX84j9lnEdhqQpre4nnsb
+41ykQWuQAJ5QOP0rW/BjjX+GXI+gLiORkHMtb3G34RG6NpzqSDy28wQFDDqFHSrA
+GJyGgNpg0t/gqO8zhI0nATXivoqlRoAd+U6OmUvpQEMQbC0UViv+/Iu2NWif0i2b
+NE36VFxhZSFg28pW9/Axqos+oDEA+zUlZkKz8QE5TGwtlzurAgMBAAGjaTBnMEYG
+A1UdEQQ/MD2CEWFhaS1sb2dvbi5maHNnLmNohihodHRwczovL2FhaS1sb2dvbi5m
+aHNnLmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR2uqcGmoc4uzwkZ0o2rmgb
+RlsGXTANBgkqhkiG9w0BAQUFAAOCAQEAT9ApCu7pG2zaOzhiDM5LzcQnJcDMckV5
+6q0cpTnjYB90Ff0KIVTsUUDAQ7yixqY9PchIvdzOnMsti9Yc2RyOWj9xkQPS/wR2
+ZyWmBoXBl363F4kijL6zH4BD/e28hQx5FtFj1xTASJUhZuV47VlZglsM1rWeGyxf
+cr+IxYfp7Y4/zFsPuTlCDJrCdMan00AmEEyNDD0hCjuhOCNZVolP4BRJSLusiyRp
+aKbKSwtCxelgvX/DrTHG/CPz5LGC4mO8ZdagGbPscpwxQ97gzYfNoQG0BWoKX9BM
+8EEBPaXFRM+soV0oreSVta3bE4+da2JcQYWXypXGXA2vfp1ZqqBnbA==
 						</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -76,24 +80,23 @@ BUDpYrVzuDOgWLoHLaAx4dS+gByfs/VsK6nPKVjY9lOu0HLxf21Y6jj570C+J8nc
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDLzCCAhegAwIBAgIUE/551Fka5VCfxZWiNziJRRpSEdQwDQYJKoZIhvcNAQEF
-BQAwHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwHhcNMTExMTAxMTUxNDQ5
-WhcNMTQxMTAxMTUxNDQ5WjAcMRowGAYDVQQDExFhYWktbG9nb24uZmhzZy5jaDCC
-ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKmopa29dNq2NlZIAVsF3tjx
-tVG6BHupDp1wzYpAGLBjyLrByHL/EBFRtcgz7U0Or3AKG0zpnR/EabOM0wSGNp92
-DE5xGLHHKJJN8B9CtxCu9ewhTgqx+4xoc4SohczUzB8kZi/JoAO01Cvr8rX41a7h
-Ci5SET1ZiIqFX1qJC2UK2H/KmAjkPSN/fXSHJfkOCNC8ehKUE7nd4b5tcqa03bNV
-xKOFoh7wT1u9oQWY7TKKdem8CpQuHPoQmeMuohsezyecnpUvf18UmzRF+67/vBrO
-m9tJbUVhrv0pZyapY3135AY3eCMswF8pOt4IKFAXDDESuAXAYBQGSdBL0mdwTEMC
-AwEAAaNpMGcwRgYDVR0RBD8wPYIRYWFpLWxvZ29uLmZoc2cuY2iGKGh0dHBzOi8v
-YWFpLWxvZ29uLmZoc2cuY2gvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHBBA2d2
-gvzXzgAdQYH6V54gtUwkMA0GCSqGSIb3DQEBBQUAA4IBAQBybl04VwGusWH5nGPZ
-yWsdpF+JztkTTG26GQ6Q1lsxh6JengePKlyj6c025W4KZIyt+5GGnJM0ajuxfJAF
-K8rr4DHrSIWk9Uy1KftCVarvI5OaerfigyWcpiLqEwxqZBs+xg5OgQPvh82AHBN5
-E2pYy5nmp6uWR0ZSJ4BaEDGZrwsQ6qdGnqKqnXLq8nkWW2L7cliA7+I+XhzqSY9b
-KdGVOXBU38qRDKSyAPOO3MkITWzcVQNWm0PEv3MCXE10JTX3XEGwD/PKbSICCWO3
-BUDpYrVzuDOgWLoHLaAx4dS+gByfs/VsK6nPKVjY9lOu0HLxf21Y6jj570C+J8nc
-8/18
+MIIDJDCCAgygAwIBAgIJAJPilzxxDSFSMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEWFhaS1sb2dvbi5maHNnLmNoMB4XDTE0MDkwNDA3NDc1NFoXDTE3MDkwMzA3
+NDc1NFowHDEaMBgGA1UEAxMRYWFpLWxvZ29uLmZoc2cuY2gwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDDu7JMJ94andqk76Bv1KS2ZWWeDgrV+M1XkTK3
+ZUHWgJtzXIg9+9uQnOZel/TkDp6L+by+AGwcXod61E0uw1RbA+E1NNjYAZhr4JS/
+osFjJkz606hKYOAiv/68xQvmhi/P34U36qsKjX0Zhz2KX84j9lnEdhqQpre4nnsb
+41ykQWuQAJ5QOP0rW/BjjX+GXI+gLiORkHMtb3G34RG6NpzqSDy28wQFDDqFHSrA
+GJyGgNpg0t/gqO8zhI0nATXivoqlRoAd+U6OmUvpQEMQbC0UViv+/Iu2NWif0i2b
+NE36VFxhZSFg28pW9/Axqos+oDEA+zUlZkKz8QE5TGwtlzurAgMBAAGjaTBnMEYG
+A1UdEQQ/MD2CEWFhaS1sb2dvbi5maHNnLmNohihodHRwczovL2FhaS1sb2dvbi5m
+aHNnLmNoL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR2uqcGmoc4uzwkZ0o2rmgb
+RlsGXTANBgkqhkiG9w0BAQUFAAOCAQEAT9ApCu7pG2zaOzhiDM5LzcQnJcDMckV5
+6q0cpTnjYB90Ff0KIVTsUUDAQ7yixqY9PchIvdzOnMsti9Yc2RyOWj9xkQPS/wR2
+ZyWmBoXBl363F4kijL6zH4BD/e28hQx5FtFj1xTASJUhZuV47VlZglsM1rWeGyxf
+cr+IxYfp7Y4/zFsPuTlCDJrCdMan00AmEEyNDD0hCjuhOCNZVolP4BRJSLusiyRp
+aKbKSwtCxelgvX/DrTHG/CPz5LGC4mO8ZdagGbPscpwxQ97gzYfNoQG0BWoKX9BM
+8EEBPaXFRM+soV0oreSVta3bE4+da2JcQYWXypXGXA2vfp1ZqqBnbA==
 						</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml b/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml
index c9f5e094..6e0a96e0 100644
--- a/swamid-interfederations-2.0/aai-logon.hes-so.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.hes-so.ch-idp-shibboleth.xml
@@ -4,6 +4,11 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-02-13T16:19:12Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor errorURL="https://aai-logon.hes-so.ch/idp/doc/ListeResp.html" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/aai-logon.switch.ch.xml b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
index e87d835a..48f4a875 100644
--- a/swamid-interfederations-2.0/aai-logon.switch.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.switch.ch-idp-shibboleth.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-logon.switch.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-20T13:37:28Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-22T15:43:58Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor errorURL="http://www.switch.ch/aai/contact/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/aai-logon.uni.li.xml b/swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml
index 1f3ace59..ec689dfe 100644
--- a/swamid-interfederations-2.0/aai-logon.uni.li.xml
+++ b/swamid-interfederations-2.0/aai-logon.uni.li-idp-shibboleth.xml
@@ -4,6 +4,11 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-01-09T10:10:39Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/aai-logon.wsl.ch.xml b/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
index b0d2c592..4eaba5f1 100644
--- a/swamid-interfederations-2.0/aai-logon.wsl.ch.xml
+++ b/swamid-interfederations-2.0/aai-logon.wsl.ch-idp-shibboleth.xml
@@ -4,6 +4,11 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-15T06:47:44Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor errorURL="http://helpdesk.wsl.ch" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml
index b729ca97..b729ca97 100644
--- a/swamid-interfederations-2.0/aai.rz.uni-leipzig.de.xml
+++ b/swamid-interfederations-2.0/aai.rz.uni-leipzig.de-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/aai.sztaki.hu.xml b/swamid-interfederations-2.0/aai.sztaki.hu-idp.xml
index 5ba4ba68..20e89a30 100644
--- a/swamid-interfederations-2.0/aai.sztaki.hu.xml
+++ b/swamid-interfederations-2.0/aai.sztaki.hu-idp.xml
@@ -17,6 +17,10 @@
         <mdui:GeolocationHint>geo:47.518209,19.055844</mdui:GeolocationHint>
       </mdui:DiscoHints>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="hu">MTA SZTAKI - Magyar Tudományos Akadémia Számítástechnikai és Automatizálási Kutatóintézet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Computer and Automation Research Institute, Hungarian Academy of Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">MTA SZTAKI</mdui:Description>
+        <mdui:Description xml:lang="en">MTA SZTAKI</mdui:Description>
         <mdui:Logo height="58" width="150">https://aai.sztaki.hu/logo/sztaki.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
diff --git a/swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml b/swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml
new file mode 100644
index 00000000..38f85741
--- /dev/null
+++ b/swamid-interfederations-2.0/aai.unifr.ch-idp-shibboleth.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai.unifr.ch/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-10T12:32:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <IDPSSODescriptor errorURL="http://www.unifr.ch/aai" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Freiburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Fribourg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">Université de Fribourg</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universität Freiburg</mdui:Description>
+        <mdui:Description xml:lang="en">University of Fribourg</mdui:Description>
+        <mdui:Description xml:lang="fr">Université de Fribourg</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAAZiS0dEAP8A/wD/oL2nkwAAAAlwSFlzAAALEwAACxMBAJqcGAAAAAd0SU1FB90KHwg5DseRCzwAAAIaSURBVDjLlZO9T1NRGMZ/595akF5bWuQjNrJgIguJizUEk+pIY4gkEP4L3FkM/AFCZWkZSJjLKh8TGCQgTCQyyGolBIwkeNvKxz2PQ0OlGg08yZlO3t85z/u+j7HWyhjDTSSJyxrHGMPOzg75fI7Dw0Oy2Tf4vs/i4hIrK6v4/g+mp99yfn7B/HyBhYV31D0oSVNTU0okEtra+ihAxeIXjYwMKxy+pXw+J2NQqVRSKvVYAwMvJEnWWkmSAxAKhWhqaiQS8QiHXYxx8DyP7u6HTEyM09p6FzA0NzcTjcbq7DgAqdQTQAwOvqSn5xGxWAxrRSaTYWxsDGvBGHAcF9d16xsSBIEkyfd97e9/1dnZmSTp5ORElUpFklQsFhUEgQ4ODnR0dKQgCGoWQo7jsLa2xvj4a6LRKNbC7OwsMzN51tc/4Hl3GB19RTKZpK2tDWstAMYYJFUtHB9/Z2Njg97eXvr7M8TjCXZ3P+F5HpVKmWx28rdnx6kVG2OqAKk620KhwPLyEsZAKOSyubnJ9vY2Q0PDNYAxpnYAQgAtLS2k08+Ym5sjHk8A0NX1gL6+pwRBwOrq+zrIVRlrpXK5hO/7nJ6eIomOjg4aGhr+2r7LH/x5oVwup0jktjo77yuZvKe9vc+6rhwA162SHccAwhhdOxchgHL5J75fRvqGtQEXFzcEpNPPyWYnaWxsQhLt7e3XBph/xflqZP+nX5gqPWD6ar6SAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:Logo height="60" width="90">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFoAAAA8CAYAAADmBa1FAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAGYktHRAD/AP8A/6C9p5MAAAAJcEhZcwAALiMAAC4jAXilP3YAAAAHdElNRQfdCh8INRXhQY3cAAAQRElEQVR42u2ceXxV1bXHv/vcKfeGJIwJuTcTCWFIICYQhlDqp4IQiAIBqgQUQUZl0BZxrFYqoqUCKiFU+2kFZ4SKta/VqmgVtNL3JAgqGGYfQxIGGSTJHXLPen+ce09uSLC2fe17H7jr84Gcc/be55792+v89lprr7PVqZOn5NVXX8VisQLgcjkpm1gGwCvr1lNXV0dYpk2/2Tx+/fXfc+rkKQCsVis3TZlslr3w/Iv4/X4AAoEAs2bPRCkFwN49e9m8eYtxrqCwsJC8vN5c8vL555+LO8lj/ivIL5SwFBYUGtc7p4g7OVUiZfjVxc3a3Xf3fWZZj+wc83pykkcCgYBZ9tKLL0tyRLtV5RVyOYgGhqZJ6C8iTaOgFKJaud5UwTxas/ZZ9lTtCTcz/lPq25q0Xn6JigaCKNV6n5VC6TrSGsgigDTDb9jVxQSDQWNwRBARkzKa2kVgreuXE9CgRAxgLlA4REDTUKhITFtiHhqUxsZGBg4YZN5PKdVykCJvFeLpy0GsLUFTFyhuK1oZCZQYLUSM02NHjxmaqmmttlUS+Q7Itw7gJafREsGdmnYBdYTAbtlSa0IXmDLlRuM8fM0cAGmh/arpPbh8qEPTtBAwBgDHqmsA8Hq9HDty1NQ9u9XaGmGYk+SMWTPJzOzyt39RgajLbzK09ujRo4ksQqB5OqeY+qYAUYq4hISLmg/hun/e/GfSU7sYlPFtWEsT7Vw2Gq2UYlXFSgMwTTMmshBlRA5AuA4XDIqhmMp0XLb+9S8h9lUXnTkl1F4uI6W2AowdN5aMLhncvfBuqmuPU193HpRGXFwcKR4PT658nKyuWc0aut1uzp09B0oR8Pmw2QxqSU1L5YEHH2DNM2vRFNTVNzSbENu0aUNaWppxTYT4+PjLAmglIpfXrPR/aXVEJQr0pcXRWZnZJMQnhGYmAWlyycPM0rZtAu+9/67ZcNKkyVR9saspFhKa4Kx2K55kNw8teYjevXtHEY4EuqHei7fB28zZuFD8AX+z81PHT1BTW9uqoXz08FGKh5cw59bZ3P/T+6MoN1FHk0cnkYGeCG31+/wXM6NNW1pMh0ShRFi9+im+/vrrKMotYh2hGEXF6lU4HPZmRTab7aKxDgH27q+irq6O/N4FEeac4sCBg7Rv3z4KdDMHJARcXFwb7A6Hec1qsVA0qKhVkMPK/fWpr0NBJM30FZUS3O7kqDqbQIeD9CHXefLkqQYzhICMcTrZf3BvS89QKdB1RCkG9B+EQhBluNiapjHpxkm43e4oymGOjgQ1zK+RbnarYdKwRivNXAQQpVAYMegxY0tZ8sjDUYQvRh1KhH4D+jfNdUrhdDpbttT1CLAV/Qr78sknlQZtaIrXNr6G6EEqflkRRTnsgruTU1GhaI8ABw7tIyYm5lsbFg8fyec7PzNDrPsO7qGhoYHeOXmmFaKAozVHoigTsZQlNHG0rn+H8EczehFEjIBRpPUnSvHB+5ujKIepY/Yts3A6nUjIjg5H4r5NJt0wieO1tYAi0BjAZrNis9mo+GUFe6qqjPVC4MiRw1GUiUbvokGlS446gsEgZ8+eo6VDrVpYc+3atYsi9o8CvXvXboYPG0EzezqUj6FCKQNELYh/njqUppo7JSriPJSXoS4IMEXlH7I6VMsspW/Nt4vKPzgZtqK1kTZyKIfuckt4+RcA3XyFxAQ7nNYFKE3jskmS+1dqdCjPtvnqSkQ0L0oh/1t2dJgaIjU6Kv8ah0UiYtLNAL9YQnlU/n6rQ6ApBg1NKaWRNBKVfxboC7LkQqsmhiZrJqVEWfqfk2hQ6d/N0VGJAh0FOipRoKNAR4GOyuULdMEVfdn68dZLx46ur6vHFetCRPA2eHG6nNTX1+N0OlFKES73+XxYrVZ8Pj8Ohx2LxYLP50PTNHRdJ9gYBMAR40DXdQL+AAB2hz3Uzsehg4dISU0hNjYWr9eL1WqlsbERPdiUxRrjjOHEiROcOHGS7OyuOBwOs6y+rt54cK0psae+vj7kyYIr1mXW9Xq96EEdQXA4HASDQYJB4xljYmLQNM3sm9/vpzHQCAqz38FgkCNHjuBwOEhKSjKwqK/H5XKZz+KKdVFf32AE4CKeyefz8dWhr3B73EYaxpkzZyQ9JUNERKq+rJKCvD4iIpKZniVPP/0rERFJTkoREZEZ02bK5s1bZOGChfLIkkdFRGTw966U7ZXbZf6c26R0zDiZc8tcqdxWKeUrV8ngou/L2DHjJL93gYiIuDunSMWq1ZKc5JGvDn0lU2+aKuvWvSKryitkVMlo6V84QObNmS+VlZXSKzdP5s2ZL4+veMLcIaCurl7ciW65dfYcSUvJkKefMp7PneSRH9/+Y5k///ZmOwqUjhknpaPHyqyZt8jHH2+V2+f/SErHjJVBAwfLyBHXhPrmERGRJQ8/IsOHDpdBAwdL6ZhxIiLSJ6+PlF1XJt8bOFgmXD9RAoGAWV9EJCMtU0REumZ2k7m3zpM0T7psWL9BTp48JclJHln04M/E3TlFNr2zSayG193ym0FdFx5buoz+/fqFoiFNsY9Hfv4IGalduPe+eziwbz/5BfmIErp3yyYnN5fcXrl89OFHjC4dzdSbp5Cf1yfUXPhs52fsrvqChIQEUBqBQCNz583B4/HwzttvU16xku2V22mXkMCAooH07VvQ9PphBAzKK1ayfMUysjKzmTV7JgIM+t6gFtFcEaGkZASDvz+YnJwcXnrhJW67/TbaJiRww6TJzerquk5Obi6dEjsR8Ps5d+4c1bW1bNuxDTC+vbRara3mIdbX17NqdTk+r5fa2uMsXvQQDy76KbNvmcX9D/wEi8WCFvm9tmaxoIcS0X1+H+WrVjLhurKmVzdUz2az0a59O+656x5Kx5aaIxTjdBIXH2fe73evvc6wocWUTbgegMNHvyIrK5Oe3XOorq5utkOCIE1RFwUWq5WE+HjsdgctQzE6TpcTFTEACW3b0iauzQV1FVu2fMTaNc8Z5xaN5Y8t59prRvPU06tb1PX6vHTs2IEPP/zICARZWk5hkRGL8HGsy0XZ9RN54403mTtvDufr62nfvh2vrFtPUf8i1jyzBq1t27Z4fT6WP7acO360gOLi4ebDjxhZzJjSMeihGwYjtpQYNnw4zz//ImWTykyNOLD/AJ9+uoM9e/YSFJ2RJSP43e838urG19B1nTRPOmnp6YDC7/ej60EklH6m67rJnwCnT59h+/btbP5gc/OOKcVDP1tMXq987rrnLrNs239tY9t/bmsGSmMgwMSJE/jFYz83zv1+5t82j2efW8Ndd95j9hNAdJ1jR46ye9dudu3aTXx8PBarjXvvvpcbb5hs7pJjtdn46QMPMv3m6RT0Md6283V1rFv/Mn0L+/Lc2udYcMePWXjHXYgYeOm6YFm0aNGim6fdzN69e+lb2IcFCxcAkJKaQq9euQwZOoSUlBRye+WSmNiJbt2yiY2NpX+/fqSnpzFq9CgAEhM7kZjYiU4dO5Gd3ZX0tDSys7vSvXt3OrRvT35BPkOGXMWePVXMvmUW+QX5JCYlkZPbk3bt2hHXpg1ds7uSkuLB4YjB4/HQoUN7PB4PXbp0Cb1xGmlpqSQmJjJlymTG/3AcABnp6SS0TSAxqRM5uTkm0MnJncnNzTU/Gk1MTCQzK4v8gnxcsS569+5NWloqubm5tGvfnmS3m/T0dJ56ejUWi4WZs2Zw7Fg1PXv0YOmypQDMmXsrhw4cpEtmJo88+jBKKTIy0snJyaFoUBENDQ0UDSqiX79CDh44yJ1330laemo0evdvjEf//xOv18vmD7Zgt9vI7tYNj8d9aQDt8/lwOByICH6/H4fDgdfrNXOkw8eBQACLxUIgEMBut6NCu86E+TPMsXa7HREhEAiglGphB4ft6vD9Iu3bsN2+adMmYl0uXC4XiYmdmpVH3s/r9Rq0omnY7XbzPPzsjY2N5jNaLBZsNpvZX5/Ph4hgs9mwhAyBYDBo1rHb7YY/0Eo/vF4vogtOl/O7IX3mzBlJdaeJiMiXX34pV4RsXk/nFNn68VbRdd20HafdPEM++GCzlBSXyPpXNoiIyITrymTdy+tk3rzbJDnJI8mdU+QP//EHWflkubFLWOcUGV86XkRECq7oK57OKZKc5JEzZ87ITZOnyPpXNkjZ9RMlOXQ9PbWLiIj0LxwoPbvliIjIdeOvN3cVS0/LFF3XRUTE6/WKu3OKJCe65QdXDpHTp09LcucUY1ezJI94vV55ePEScSe5JTnJIzdOmiynT5+WwoJ+IiKS1+sK45mTPHLy5Cl5449vyPRpM4ydzrrlSNWXVbJi+ePmbmfXlowydzpzJxm/8dCih77rLmFgCZkxiqYvZmOcMYwb+8Om5BpAUwqlFEuXLWXp0l8AsGXzFiaUTUB0nTVrf8Ox6sOUXFMCCm6dO4dj1Yf5y9a/AlBTU0Pljm28+ac/Eh8fj6YZnuWLL79AefkTlJaOYd8BY6exI4cPExcfx86dn7Fu/cssf3w5AwcVsW9/VTNbNtbl4ljtUd57fxMBfwCH3c7R6sO0a9+WgwcOooA58+ZyrOYIz73wbLgjIfu3gV1ffs7Vw4byUcikC29FpFk0s+/TZ06nau9uKiu3IyIsXLCQ3Xu+4GjNEYpHFP8dsQ6lRTgFxnFDfQNTp95E2fUT0TStmTfTq1cvaqtreO7Z5xlQNNB4LTUL9//kAX5w5VXU1dWhUDy1+pdkpGVy2/x5AGx87bcU5PXhhkk3cv78eXO1XdM0LBYLIFitVlY+Wc60GdMYXjycDes3hMo1NKWwXrATzvm6OjzJqdx5x52gDBrMzupOZmZXevTsAUrx4gsvMbjo+1RWVjZzvJxOJ+PHXsemd94lNzcnIlmIZgvTz/z6GXrl5DFv3hy++eYb0DTi4+Mp7NOPKZOn8l3sCc3pdOL3+fF6vbz11tskJnUyMV3y6BJqamuJCfn2kau4A4sGsvhni5kQckaCus6COxawfsMrBmgiTJ8xnTVrf8PGjRtpaGhg2bIVHK05gtfro7amtunb8wuk/ImVnDl7FhHhN79+hhY/HiFtYmM5Wn2YZSuWmc7Upzsr2fbJJ5w6ZXy1W1o6mo2vv0qXjC4tJt3yiieZMOE6Vqx4gtjYWHZ9/oVR5vOZb87kKZNZ++wz/Pa3G4mLi0N04dPtn/Knt97k7Llz30mjLYsXL17UrVs37rvnPs6ePcOvfv0rnE4n+/fto+SaEkaOHEH1sWpKSkZy4vhxevbsSceOHenaNYua6moWLFyAzWbj1KmTvP/+ZjZtepf0jHRiY2Pp0LEjI0tGsPXjvzL+h+P56tAhnnyinCuvHMzYcWM5eeIE3bp3Jy0tlfN1ddhsdvKuyKOqqoqK1asYMnQIp0+fJj0jA7vdmLAGDBzQrAP/ffiw6WQFg0FqqmsYPWYUJ06cICcnB6UUO3bs5O233qb2+HH69+tHbU0tVw25ipqaWja9swmX08WDix4gKyuTffv2U1GxmmuvvYbRY0Zx9tw5OnbowNCrh7Jjx05Gjx7FsGFX8+iSR3n3vfcYOGAAw4uHXXwntZD8D6+onOSW8ZhTAAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>192.47.244.0/22</mdui:IPHint>
+        <mdui:IPHint>192.47.248.0/23</mdui:IPHint>
+        <mdui:IPHint>134.21.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>unifr.ch</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:46.806228,7.152400</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIJAIp+DMI5Xj2FMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGFhaS51bmlmci5jaDAeFw0xNDA0MDkwNjI2MDVaFw0xNzA0MDgwNjI2MDVa
+MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALXStAT8W6nX2N3ZvU84FpTKuAmdfleTr+f1usWoKz1jnKKkayFu
+lNc39OiJIgqlh3FX1QXV39AJf3AC0OqBAhpeaONnyhdf/ZZ7zhWYbUBsL/3ilSL9
+N1sPzzxGkod0feZlAkXrse2NeZZ7n4pDEz0c59bfe7Egv5iYaaKytNgU8NLpLN9p
+SqpI9okOf7a2H/Fs9PTvTfMagi/VSNcTuKb6UMyhtbS7kSJwyjUQPC9tWyGln5/4
+N5559ice8Cv3Se9sYvBqTojDRgV8XyDtHkcDoTqJgseSLOzF647fs1hDoAZss/Yu
+gfqwPOPcvNWRgsQYfuy9K93Wv4cON8S5+9sCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
+YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUc+thXESrJ14M3LZRKwaX2rAt+kQwDQYJKoZIhvcNAQEFBQAD
+ggEBAI+oyk62mRG3tZ5cv5cNM7wAPRpZ/GLjxvM08T5UuIS2zEzMKLGNYIBQXHyV
+4ag2oaNzxaeDejks0v4ixkyT/X+uxe7H0wsHvfBUFGBIpp/F3RF1wLi1fadeQZbn
+bTS8R+Ie5ZvPjfwFLLB8C8kqp587RHcVr9N6IWAKY/2R2wfXATJ5cGrneQirgu3D
+/mKOvEvu+I1xF3b4gc+e2LL7IHhOMNbQFMRkE1+NBWlMCL/C7UqF4ZHeeZSC8CXQ
+/yx90ElnzFiImgYBLDF5a8Aa7UO8f7+hU+m2YaFbj/CNdD+XwFWbfr0va1UP0xas
+ACCNIbiIfzXCYUVLsTaQK7e25kA=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unifr.ch:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://aai.unifr.ch/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aai.unifr.ch/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai.unifr.ch/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai.unifr.ch/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifr.ch</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEDCCAfigAwIBAgIJAIp+DMI5Xj2FMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNV
+BAMTDGFhaS51bmlmci5jaDAeFw0xNDA0MDkwNjI2MDVaFw0xNzA0MDgwNjI2MDVa
+MBcxFTATBgNVBAMTDGFhaS51bmlmci5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBALXStAT8W6nX2N3ZvU84FpTKuAmdfleTr+f1usWoKz1jnKKkayFu
+lNc39OiJIgqlh3FX1QXV39AJf3AC0OqBAhpeaONnyhdf/ZZ7zhWYbUBsL/3ilSL9
+N1sPzzxGkod0feZlAkXrse2NeZZ7n4pDEz0c59bfe7Egv5iYaaKytNgU8NLpLN9p
+SqpI9okOf7a2H/Fs9PTvTfMagi/VSNcTuKb6UMyhtbS7kSJwyjUQPC9tWyGln5/4
+N5559ice8Cv3Se9sYvBqTojDRgV8XyDtHkcDoTqJgseSLOzF647fs1hDoAZss/Yu
+gfqwPOPcvNWRgsQYfuy9K93Wv4cON8S5+9sCAwEAAaNfMF0wPAYDVR0RBDUwM4IM
+YWFpLnVuaWZyLmNohiNodHRwczovL2FhaS51bmlmci5jaC9pZHAvc2hpYmJvbGV0
+aDAdBgNVHQ4EFgQUc+thXESrJ14M3LZRKwaX2rAt+kQwDQYJKoZIhvcNAQEFBQAD
+ggEBAI+oyk62mRG3tZ5cv5cNM7wAPRpZ/GLjxvM08T5UuIS2zEzMKLGNYIBQXHyV
+4ag2oaNzxaeDejks0v4ixkyT/X+uxe7H0wsHvfBUFGBIpp/F3RF1wLi1fadeQZbn
+bTS8R+Ie5ZvPjfwFLLB8C8kqp587RHcVr9N6IWAKY/2R2wfXATJ5cGrneQirgu3D
+/mKOvEvu+I1xF3b4gc+e2LL7IHhOMNbQFMRkE1+NBWlMCL/C7UqF4ZHeeZSC8CXQ
+/yx90ElnzFiImgYBLDF5a8Aa7UO8f7+hU+m2YaFbj/CNdD+XwFWbfr0va1UP0xas
+ACCNIbiIfzXCYUVLsTaQK7e25kA=
+						</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://aai.unifr.ch:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aai.unifr.ch:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">unifr.ch</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universität Freiburg</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Fribourg</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="fr">Université de Fribourg</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.unifr.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unifr.ch/</OrganizationURL>
+    <OrganizationURL xml:lang="fr">http://www.unifr.ch/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>AAI</GivenName>
+    <SurName>Support Uni Fribourg</SurName>
+    <EmailAddress>mailto:aai@unifr.ch</EmailAddress>
+    <TelephoneNumber>+4126 300 7207</TelephoneNumber>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>AAI</GivenName>
+    <SurName>Support Uni Fribourg</SurName>
+    <EmailAddress>mailto:aai@unifr.ch</EmailAddress>
+    <TelephoneNumber>+4126 300 7207</TelephoneNumber>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml
index f1a01701..f1a01701 100644
--- a/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr.xml
+++ b/swamid-interfederations-2.0/accounts.okeanos-global.grnet.gr-shibboleth.xml
diff --git a/swamid-interfederations-2.0/adfs.tue.nl.xml b/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml
index f8211026..f8211026 100644
--- a/swamid-interfederations-2.0/adfs.tue.nl.xml
+++ b/swamid-interfederations-2.0/adfs.tue.nl-adfs-services-trust.xml
diff --git a/swamid-interfederations-2.0/agata.suz.cvut.cz.xml b/swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml
index 16ec810f..0e23cee0 100644
--- a/swamid-interfederations-2.0/agata.suz.cvut.cz.xml
+++ b/swamid-interfederations-2.0/agata.suz.cvut.cz-shibboleth.xml
@@ -17,7 +17,7 @@
     <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-16T09:51:28Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml
new file mode 100644
index 00000000..02847bc8
--- /dev/null
+++ b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it-shibboleth.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://aginfra-sg.ct.infn.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-07-06T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">agINFRA Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">agINFRA Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
+        <mdui:Description xml:lang="it">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+j/MCNlE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">agINFRA Science Gateway</ServiceName>
+      <ServiceDescription xml:lang="en">The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">INFN Catania</OrganizationName>
+    <OrganizationName xml:lang="it">INFN Catania</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">agINFRA Science Gateway provided by INFN Catania</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">agINFRA Science Gateway erogato da INFN Catania</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ct.infn.it/index.php?lang=en</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.ct.infn.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Riccardo</GivenName>
+    <SurName>Rotondo</SurName>
+    <EmailAddress>riccardo.rotondo@ct.infn.it</EmailAddress>
+    <EmailAddress>riccardo.rotondo@garr.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Roberto</GivenName>
+    <SurName>Barbera</SurName>
+    <EmailAddress>roberto.barbera@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml b/swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml
deleted file mode 100644
index 980c5fd6..00000000
--- a/swamid-interfederations-2.0/aginfra-sg.ct.infn.it.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aginfra-sg.ct.infn.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-10T09:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">agINFRA Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">agINFRA Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
-        <mdui:Description xml:lang="it">This Science Gateway has been built mainly for the Virtual Research Community of the agINFRA project but it is of course open to everybody interested in agricultural sciences. The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://aginfra-sg.ct.infn.it/</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
-        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
-        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
-        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
-        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
-        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
-        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-                            VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-                            EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-                            c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-                            T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-                            3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-                            O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-                            i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-                            LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-                            TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-                            AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-                            BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-                            A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-                            IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-                            KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-                            AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-                            Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-                            ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-                            ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-                            bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-                            LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-                            ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-                            cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-                            iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-                            PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-                            n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-                            zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-                            2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-                            j/MCNlE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aginfra-sg.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">agINFRA Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">The agINFRA Science Gateway meshes-up Grid Computing and Cloud Computing enabled applications and lets users access them in an easy, transparent and ubiquitous way.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>riccardo.rotondo@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml b/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
index 7df78638..796e6c69 100644
--- a/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
+++ b/swamid-interfederations-2.0/agw-sparknet.utu.fi.xml
@@ -4,39 +4,6 @@
     <md:KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE4zCCA8ugAwIBAgIQbnMIzP8TsRk95w/HSxaw8TANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEwMTEyMzAwMDAwMFoXDTEzMTEyMjIzNTk1OVowgboxCzAJBgNV
-BAYTAkZJMQ4wDAYDVQQREwUyMDUwMDEYMBYGA1UECBMPV2VzdGVybiBGaW5sYW5k
-MQ4wDAYDVQQHEwVUdXJrdTEaMBgGA1UECRMRQXNzaXN0ZW50aW5rYXR1IDUxHDAa
-BgNVBAoTE1VuaXZlcnNpdHkgb2YgVHVya3UxGTAXBgNVBAsTEENvbXB1dGluZyBD
-ZW50cmUxHDAaBgNVBAMTE2Fndy1zcGFya25ldC51dHUuZmkwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQC/DfwsS+l2OcvB8YLJqMKLUrUc9KmEgLuCIBNh
-sy5hZDOnV7vieUzsxibSsz8LO/sqNXZu+oAJvQEbKVzglohKVpvZkXDWB4fJ7/Hk
-AXSSnKFUvA6D7NyITFHus2OuPVtWg7rOH53Hcsj7zDey1tLpt75+r9VYz+rfj7dY
-ZhBjQxjnVboDdD0KCw5SuPTYo2L+ZQit7Ede4g9KY970iSjXsPA5pFrjN1pezrse
-7MLBeqfiISwvEsmFvnRImzhnGlc1jkgK1mAxpGGFUOB3wRvlR9uQ1KjlSaFhPfUj
-V09/dG5tdEvc3bUV+3FEM+5Wv/9JMFXmfW/twfGE1cFVL5mRAgMBAAGjggFmMIIB
-YjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUpAIR
-/AL9x2BJgB91p7Z1RDOOGjowDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYB
-BAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5h
-Lm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAC
-hilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggr
-BgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYIT
-YWd3LXNwYXJrbmV0LnV0dS5maTANBgkqhkiG9w0BAQUFAAOCAQEAQ09BWmqzKH3P
-ywMfrWMAShhiowX3us9JTTJ8HLlApPWjW0feHpzvPCv86J2Ryeg+tRqtsYGAenvL
-FLqYnD65FaKos7/RrwQuxrwsDDbCk0LLVyDhlms7aOSvKRCmK1oyK9MABnraFh8e
-m3ueojjatPYaUG+ivTalv5oWuYi/Ye6GRGBlhyx2u972UqngRYnHAHCYrRzRA/l8
-VRtAw/rJTS3Yj5kDUG3LYeBH5A4myDeIHghg7n0s7A9qDtepxZFYgDzrwUusEo/a
-NbLlYF90/H/wrBP9SogebSqmAAEd7V+vMe2+W7N03f80xajbIli0+P0sEolPPgrW
-DSWPf8vQpQ==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
           <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQOWGPWke4DcPypq61jxi5UzANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTE0MDcxMDAwMDAwMFoXDTE3MDcwOTIzNTk1OVowQTEhMB8GA1UE
diff --git a/swamid-interfederations-2.0/aishib.agropolis.fr.xml b/swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.xml
index e9abb7b7..c4d8c9b6 100644
--- a/swamid-interfederations-2.0/aishib.agropolis.fr.xml
+++ b/swamid-interfederations-2.0/aishib.agropolis.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agropolis.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/aleph.svkhk.cz.xml b/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml
index 8986080a..f9ae7731 100644
--- a/swamid-interfederations-2.0/aleph.svkhk.cz.xml
+++ b/swamid-interfederations-2.0/aleph.svkhk.cz-idp-shibboleth.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://aleph.svkhk.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-09T13:46:49Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
-      </mdasrt:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-interfederations-2.0/ambre.vetagro-sup.fr.xml b/swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml
index 2484716c..00149424 100644
--- a/swamid-interfederations-2.0/ambre.vetagro-sup.fr.xml
+++ b/swamid-interfederations-2.0/ambre.vetagro-sup.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vetagro-sup.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr.xml b/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml
index 09f21771..a482e25c 100644
--- a/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr.xml
+++ b/swamid-interfederations-2.0/antimoine.insa-strasbourg.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-strasbourg.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml
new file mode 100644
index 00000000..a1296141
--- /dev/null
+++ b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-connect.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb-dev.marie.hellasgrid.gr/edugain-connect">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+    <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">EGI Applications Database (DEV - Connect)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance - Connect)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:Logo height="128" width="120">https://appdb-dev.marie.hellasgrid.gr/images/appdblogo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFHjCCBAagAwIBAgICA8swDQYJKoZIhvcNAQEFBQAwRTETMBEGCgmSJomT8ixkARkTA09SRzEYMBYGCgmSJomT8ixkARkTCFNFRS1HUklEMRQwEgYDVQQDEwtTRUUtR1JJRCBDQTAeFw0xMzEwMTcxNjEwMTdaFw0xNDA4MTMxNjEwMTdaMG4xEjAQBgoJkiaJk/IsZAEZFgJFVTETMBEGCgmSJomT8ixkARkWA0VHSTELMAkGA1UEBhMCTkwxDjAMBgNVBAoTBUhvc3RzMQ8wDQYDVQQKEwZFR0kuZXUxFTATBgNVBAMTDGFwcGRiLmVnaS5ldTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAK8aVSi+D+NoPI1mRwQGyiOVkxofhYb5ZZGICaQkT8Mu1YaxzxBUl9X94Ily/nv6jp6QfIRA11D7TOB70MoujLmRow/GOt0enkEb0XomI3wM/PiBOvZgjzlaav8R9adKK87lPEvn+LhcjBbMqoIk5C68lQ1dNtKX4G+lUlYY1dbSgPUe5RwEdM8X3EQ1lkYehiC4elDwYKlhTTODtiu7OBm2m/LsYEwWDeaA0XdUK2uv5zaaJyJ+E/NjYxDkIM75MGhS//sPYfEOzqwNm7XY2RlwJR5V47xadCXTxXz3HKuAxx7rwln+EO1bkA6QEgIJ2WLL2dERl2wuhz16QbzDfh8CAwEAAaOCAe0wggHpMAwGA1UdEwEB/wQCMAAwEQYJYIZIAYb4QgEBBAQDAgbAMA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQURbjI/ju4HYZ9M0y+hyekx2aWZCswbQYDVR0jBGYwZIAUiz2pt50yJY8/6Nlcb4vnWpSU0MGhSaRHMEUxEzARBgoJkiaJk/IsZAEZEwNPUkcxGDAWBgoJkiaJk/IsZAEZEwhTRUUtR1JJRDEUMBIGA1UEAxMLU0VFLUdSSUQgQ0GCAQAwVQYDVR0fBE4wTDBKoEigRoZEaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2Evc2VydmljZXMvY3JsL3NlZWdyaWRjYS12Mi5jcmwwbAYDVR0gBGUwYzBTBg0rBgEEAYGBAxQCAQICMEIwQAYIKwYBBQUHAgEWNGh0dHA6Ly93d3cuZ3JpZC5hdXRoLmdyL3BraS9zZWVncmlkLWNhL2RvY3VtZW50cy9jcHMwDAYKKoZIhvdMBQICATBKBgNVHRIEQzBBgRdzZWVncmlkLWNhQGdyaWQuYXV0aC5ncoYmaHR0cDovL3d3dy5ncmlkLmF1dGguZ3IvcGtpL3NlZWdyaWQtY2EwFwYDVR0RBBAwDoIMYXBwZGIuZWdpLmV1MA0GCSqGSIb3DQEBBQUAA4IBAQAXCX8H4nqRDt0UQTdFj+2rbezYFmyw4vQk/zQW+5+bBzoPAI0+/AhcPU6G5MoOTS2AUvqglpdSOWB/XUHrS9J5DFnAaQNj16VYcfMVmVx+TQctZFdAPLriq2r+mCwFAJKA44p9xJZ0nL+YTcHFiUTn2houCvFCEVhF2iMS12fxm0mCRzyCGI7x5PHCsEw2giaAJrErDkFSlIaVUyhNTatIueXfnuclx5E91KQPu/d9Uz/Zn2P6fAJ9D3OaLTscCrij/AqY36Is/93aXkf3oatIc4WvSxJah0pzMFtx7bWj+Q3XDfFXmiy/q7JXQXVs0ZurIoZ5Ngv7UqiIBS9/UEK+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-connect" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb-dev.marie.hellasgrid.gr/auth/module.php/saml/sp/saml1-acs.php/edugain-connect/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">EGI Applications Database (DEV - Connect)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace (Development Instance - Connect)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml
index 1fa73d1f..1fa73d1f 100644
--- a/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr.xml
+++ b/swamid-interfederations-2.0/appdb-dev.marie.hellasgrid.gr-edugain-sp.xml
diff --git a/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml b/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml
new file mode 100644
index 00000000..bd92e550
--- /dev/null
+++ b/swamid-interfederations-2.0/appdb.egi.eu-edugain-connect.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://appdb.egi.eu/edugain-connect">
+  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+    <mdrpi:RegistrationInfo registrationAuthority="http://aai.grnet.gr/">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://aai.grnet.gr/static/policy/policy-en-1.1.0.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="el">http://aai.grnet.gr/static/policy/policy-el-1.1.0.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">EGI Applications Database (Connect)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">EGI Software &amp; Cloud Marketplace (Connect)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.appdb.egi.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="el">https://wiki.appdb.egi.eu/main:about:terms</mdui:PrivacyStatementURL>
+        <mdui:Logo height="128" width="120">https://appdb.egi.eu/images/appdblogo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIRAIXc8Krve5VuXkhnojBEvuAwDQYJKoZIhvcNAQEFBQAwczELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGTAXBgNVBAMTEFBvc2l0aXZlU1NMIENBIDIwHhcNMTMxMDAzMDAwMDAwWhcNMTQxMDAzMjM1OTU5WjBQMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRUwEwYDVQQDEwxhcHBkYi5lZ2kuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9RMFe27ucrw5Uv2oCmfxIB2O4q/dwFNZVZmTWfiRisOyvSUtooCDneO4vhvt6h9YP7zAjPjfBA6SruBKtfXH5j3uPEEllpV4jq4mPJBo0D0P1aPq9ibbh0DrO+XRlcjjXAKYmlBZxa2oIjiFD7MgxAzf6VkTHCNDN/tGLFxCv1+/ExvPpOUZTPBkiGXkEDyJATpepFxROVoo7IZf5Azqpy3lLSMiqbTEKkQXbcW8egmP6wmMpUaNRYHtwNiU3qRVKrZw/322P2yYuFLUpCHPjTNKW4SMlhbt4RyMtO0LnIAJt9DgcMaiha2EDcaojV1fq7pFZzCg1YC6uvFG9atkxAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBSZ5EBfaxRePgXZ3dNjVPxiuPcArDAdBgNVHQ4EFgQUtxGXMez+256VFqWJT7kEz3zY5EEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYLKwYBBAGyMQECAgcwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3dy5wb3NpdGl2ZXNzbC5jb20vQ1BTMAgGBmeBDAECATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcmwwbAYIKwYBBQUHAQEEYDBeMDYGCCsGAQUFBzAChipodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTApBgNVHREEIjAgggxhcHBkYi5lZ2kuZXWCEHd3dy5hcHBkYi5lZ2kuZXUwDQYJKoZIhvcNAQEFBQADggEBAJTG+QIH44hiyl/vxEncKy6vAib3n7PbqphVmA4NDf0peKp8xdYoG23YnHG72aGsUwg9031RtN/1LqaAgb2A3JOF5of1pobqQbwPUC6mSNuXFm1cOtZR8gG5e6G3mwB9FWb0P6WK+yzsBhz3ekSziv4PgZjd1HIiSLUg1YwpWYvBIdi+MCDZVSgNmJr9QKsv+N50fcYuGYSmXOEnLNchyMUPcQzzSO/xI0JkeiQkAQ5WfCV03ykmBxSvefeJo35GMzGEIpxrQ/DgyvKIwkFtBf/ESA4ID3JN7+iZJs2XjWRgFZx5mKCwr5uY2tNmvbFvM7g1zFwOyLdlEV45Dp3d9bk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-logout.php/edugain-connect"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-connect" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml2-acs.php/edugain-connect" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://appdb.egi.eu/auth/module.php/saml/sp/saml1-acs.php/edugain-connect/artifact" index="3"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">EGI Applications Database (Connect)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">EGI Software &amp; Cloud Marketplace (Connect)</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">IASA - GRNET</md:OrganizationName>
+    <md:OrganizationName xml:lang="el">ΙΕΣΕ - ΕΔΕΤ</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Accelerating Systems and Applications - Greek Research and Technology Network</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="el">Ινστιτούτο Επιταχυντικών Συστημάτων και Εφαρμογών - Εθνικό Δίκτυο Έρευνας και Τεχνολογίας</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.iasa.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.iasa.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.grnet.gr/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="el">http://www.grnet.gr/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>mhaggel@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Marios</md:GivenName>
+    <md:SurName>Chatziangelou</md:SurName>
+    <md:EmailAddress>appdb-support@iasa.gr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/appdb.egi.eu.xml b/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml
index bf416b49..d3b4a2ca 100644
--- a/swamid-interfederations-2.0/appdb.egi.eu.xml
+++ b/swamid-interfederations-2.0/appdb.egi.eu-edugain-sp.xml
@@ -20,13 +20,20 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIRAIXc8Krve5VuXkhnojBEvuAwDQYJKoZIhvcNAQEFBQAwczELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGTAXBgNVBAMTEFBvc2l0aXZlU1NMIENBIDIwHhcNMTMxMDAzMDAwMDAwWhcNMTQxMDAzMjM1OTU5WjBQMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRUwEwYDVQQDEwxhcHBkYi5lZ2kuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9RMFe27ucrw5Uv2oCmfxIB2O4q/dwFNZVZmTWfiRisOyvSUtooCDneO4vhvt6h9YP7zAjPjfBA6SruBKtfXH5j3uPEEllpV4jq4mPJBo0D0P1aPq9ibbh0DrO+XRlcjjXAKYmlBZxa2oIjiFD7MgxAzf6VkTHCNDN/tGLFxCv1+/ExvPpOUZTPBkiGXkEDyJATpepFxROVoo7IZf5Azqpy3lLSMiqbTEKkQXbcW8egmP6wmMpUaNRYHtwNiU3qRVKrZw/322P2yYuFLUpCHPjTNKW4SMlhbt4RyMtO0LnIAJt9DgcMaiha2EDcaojV1fq7pFZzCg1YC6uvFG9atkxAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBSZ5EBfaxRePgXZ3dNjVPxiuPcArDAdBgNVHQ4EFgQUtxGXMez+256VFqWJT7kEz3zY5EEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYLKwYBBAGyMQECAgcwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3dy5wb3NpdGl2ZXNzbC5jb20vQ1BTMAgGBmeBDAECATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcmwwbAYIKwYBBQUHAQEEYDBeMDYGCCsGAQUFBzAChipodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTApBgNVHREEIjAgggxhcHBkYi5lZ2kuZXWCEHd3dy5hcHBkYi5lZ2kuZXUwDQYJKoZIhvcNAQEFBQADggEBAJTG+QIH44hiyl/vxEncKy6vAib3n7PbqphVmA4NDf0peKp8xdYoG23YnHG72aGsUwg9031RtN/1LqaAgb2A3JOF5of1pobqQbwPUC6mSNuXFm1cOtZR8gG5e6G3mwB9FWb0P6WK+yzsBhz3ekSziv4PgZjd1HIiSLUg1YwpWYvBIdi+MCDZVSgNmJr9QKsv+N50fcYuGYSmXOEnLNchyMUPcQzzSO/xI0JkeiQkAQ5WfCV03ykmBxSvefeJo35GMzGEIpxrQ/DgyvKIwkFtBf/ESA4ID3JN7+iZJs2XjWRgFZx5mKCwr5uY2tNmvbFvM7g1zFwOyLdlEV45Dp3d9bk=</ds:X509Certificate>
+          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo>
         <ds:X509Data>
+          <ds:X509Certificate>MIID9TCCAt2gAwIBAgIJAIXaE7tbXMMCMA0GCSqGSIb3DQEBBQUAMIGQMQswCQYDVQQGEwJHUjEPMA0GA1UECAwGR3JlZWNlMQ8wDQYDVQQHDAZBdGhlbnMxDTALBgNVBAoMBElBU0ExEzARBgNVBAsMCkFwcERCL0lBU0ExFTATBgNVBAMMDGFwcGRiLmVnaS5ldTEkMCIGCSqGSIb3DQEJARYVYXBwZGItc3VwcG9ydEBpYXNhLmdyMB4XDTE0MTAyMTE2Mjc0N1oXDTI0MTAyMDE2Mjc0N1owgZAxCzAJBgNVBAYTAkdSMQ8wDQYDVQQIDAZHcmVlY2UxDzANBgNVBAcMBkF0aGVuczENMAsGA1UECgwESUFTQTETMBEGA1UECwwKQXBwREIvSUFTQTEVMBMGA1UEAwwMYXBwZGIuZWdpLmV1MSQwIgYJKoZIhvcNAQkBFhVhcHBkYi1zdXBwb3J0QGlhc2EuZ3IwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD9cPAvFySX3f0rcBymgZ1uiW8xH4oo+E76USeAWBb5uext1yZiV6dM4lAw/s/rxiNV23yaY3T4ELVxe/84jkftxhoMQfP+TgqgGFpldwivdRWpnJs9FiYnd92OabOWNKYQDzx1eqIP1nqOwUiMNtbHH7kGDbkAelxP5eNwCrvk/UNX+Fp0vW7QXAdEQAzRahyC1i4VwgSEVfitLMTtAR3JZKybHhKr5tTK8oPO00pSj6L4TB9mBZB8LtR3RpyWgQlrMIIvd0upST24B5atYNW+J33Gmcu2jhhpDdQJ+QaFl/6j9Ye1aJFa1ysvwz6b+VsK3pvi2lpHGcCn9LjHF9ALAgMBAAGjUDBOMB0GA1UdDgQWBBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAfBgNVHSMEGDAWgBQ7jcFObUqRcZQDJ11fOuWBVFR2rTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAPCzRBbiyVZnrO9YxU8VWhzMrQLpAYwcNygGy9emPXwR2iygauIoi7f5MYe5e+BekC57CSxASPCa1431+OgoUNBYROzeasUfXpT5ofFeOH3ciJXMkUbO9E36/S5icbBeMHW60EJoNAhihzVYDtqmbKH6Xfjo6eqH8X745S4yYBLlRvSRYWxxLlAS9Q3ODel7a8L5zzwLSSmbHywkmlton/paeUqku5nSSPs0sO3JIMQoRqH3Mne+CSP6jxrAJVNdhthpKltLtlWB8IZamVhUjGIK3OsF77Vxk3WktY+KwlpgNHnWAXqT9KGCWaZMesDSrXe/sszcgi6Su1WPg8NNTZ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
           <ds:X509Certificate>MIIE+TCCA+GgAwIBAgIRAIXc8Krve5VuXkhnojBEvuAwDQYJKoZIhvcNAQEFBQAwczELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4GA1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxGTAXBgNVBAMTEFBvc2l0aXZlU1NMIENBIDIwHhcNMTMxMDAzMDAwMDAwWhcNMTQxMDAzMjM1OTU5WjBQMSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxFDASBgNVBAsTC1Bvc2l0aXZlU1NMMRUwEwYDVQQDEwxhcHBkYi5lZ2kuZXUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC9RMFe27ucrw5Uv2oCmfxIB2O4q/dwFNZVZmTWfiRisOyvSUtooCDneO4vhvt6h9YP7zAjPjfBA6SruBKtfXH5j3uPEEllpV4jq4mPJBo0D0P1aPq9ibbh0DrO+XRlcjjXAKYmlBZxa2oIjiFD7MgxAzf6VkTHCNDN/tGLFxCv1+/ExvPpOUZTPBkiGXkEDyJATpepFxROVoo7IZf5Azqpy3lLSMiqbTEKkQXbcW8egmP6wmMpUaNRYHtwNiU3qRVKrZw/322P2yYuFLUpCHPjTNKW4SMlhbt4RyMtO0LnIAJt9DgcMaiha2EDcaojV1fq7pFZzCg1YC6uvFG9atkxAgMBAAGjggGpMIIBpTAfBgNVHSMEGDAWgBSZ5EBfaxRePgXZ3dNjVPxiuPcArDAdBgNVHQ4EFgQUtxGXMez+256VFqWJT7kEz3zY5EEwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMFAGA1UdIARJMEcwOwYLKwYBBAGyMQECAgcwLDAqBggrBgEFBQcCARYeaHR0cDovL3d3dy5wb3NpdGl2ZXNzbC5jb20vQ1BTMAgGBmeBDAECATA7BgNVHR8ENDAyMDCgLqAshipodHRwOi8vY3JsLmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcmwwbAYIKwYBBQUHAQEEYDBeMDYGCCsGAQUFBzAChipodHRwOi8vY3J0LmNvbW9kb2NhLmNvbS9Qb3NpdGl2ZVNTTENBMi5jcnQwJAYIKwYBBQUHMAGGGGh0dHA6Ly9vY3NwLmNvbW9kb2NhLmNvbTApBgNVHREEIjAgggxhcHBkYi5lZ2kuZXWCEHd3dy5hcHBkYi5lZ2kuZXUwDQYJKoZIhvcNAQEFBQADggEBAJTG+QIH44hiyl/vxEncKy6vAib3n7PbqphVmA4NDf0peKp8xdYoG23YnHG72aGsUwg9031RtN/1LqaAgb2A3JOF5of1pobqQbwPUC6mSNuXFm1cOtZR8gG5e6G3mwB9FWb0P6WK+yzsBhz3ekSziv4PgZjd1HIiSLUg1YwpWYvBIdi+MCDZVSgNmJr9QKsv+N50fcYuGYSmXOEnLNchyMUPcQzzSO/xI0JkeiQkAQ5WfCV03ykmBxSvefeJo35GMzGEIpxrQ/DgyvKIwkFtBf/ESA4ID3JN7+iZJs2XjWRgFZx5mKCwr5uY2tNmvbFvM7g1zFwOyLdlEV45Dp3d9bk=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml b/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml
new file mode 100644
index 00000000..f544de23
--- /dev/null
+++ b/swamid-interfederations-2.0/applications.eu-decide.eu-shibboleth.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://applications.eu-decide.eu/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">DECIDE Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">DECIDE Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows to access and use the applications of the DECIDE project
+                        which provides neurologists and physicians with software tools for the computer-aided
+                        extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
+                        medical images.
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il
+                        progetto europeo DECIDE che ha come obiettivo quello di fornire a medici ed analisti tool software per
+                        l'individuazione di marker per l'Alzheimer e la schizzofrenia in immagini mediche
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
+2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
+W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">DECIDE Science Gateway</ServiceName>
+      <ServiceDescription xml:lang="en">This service allows to access and use the applications of the DECIDE project
+                    which provides neurologists and physicians with software tools for the computer-aided
+                    extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
+                    medical images.
+                </ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">COMETA Consortium</OrganizationName>
+    <OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">COMETA</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Marco</GivenName>
+    <SurName>Fargetta</SurName>
+    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Riccardo</GivenName>
+    <SurName>Rotondo</SurName>
+    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Giuseppe</GivenName>
+    <SurName>Platania</SurName>
+    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Carlo</GivenName>
+    <SurName>Rocca</SurName>
+    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Roberto</GivenName>
+    <SurName>Barbera</SurName>
+    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eu-decide.eu.xml b/swamid-interfederations-2.0/applications.eu-decide.eu.xml
deleted file mode 100644
index 25176f17..00000000
--- a/swamid-interfederations-2.0/applications.eu-decide.eu.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eu-decide.eu/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-21T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">DECIDE Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">DECIDE Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows to access and use the applications of the DECIDE project
-                        which provides neurologists and physicians with software tools for the computer-aided
-                        extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
-                        medical images.
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il
-                        progetto europeo DECIDE che ha come obiettivo quello di fornire a medici ed analisti tool software per
-                        l'individuazione di marker per l'Alzheimer e la schizzofrenia in immagini mediche
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eu-decide.eu/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eu-decide.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">DECIDE Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service allows to access and use the applications of the DECIDE project
-                    which provides neurologists and physicians with software tools for the computer-aided
-                    extraction of diagnostic markers for Alzheimer's disease and schizophrenia from
-                    medical images.
-                </md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">DECIDE Science Gateway provided by COMETA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">DECIDE Science Gateway erogato da COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml b/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml
new file mode 100644
index 00000000..4a183f96
--- /dev/null
+++ b/swamid-interfederations-2.0/applications.eumedgrid.eu-shibboleth.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://applications.eumedgrid.eu/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">EUMEDGRID Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">EUMEDGRID Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service provides information for Grid users, Application developers and
+                        Grid site administrators. It is mainly devoted to the people involved in the
+                        EUMEDGRID-Support project but many pages are of general interest
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
+                        di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
+                        EUMEDGRID-Support ma molte informazioni sono di interesse generale
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eumedgrid.eu/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eumedgrid.eu/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
+2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
+W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">EUMEDGRID Science Gateway</ServiceName>
+      <ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
+                    Grid site administrators. It is mainly devoted to the people involved in the
+                    EUMEDGRID-Support project but many pages are of general interes
+                </ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">COMETA Consortium</OrganizationName>
+    <OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">COMETA</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Marco</GivenName>
+    <SurName>Fargetta</SurName>
+    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Riccardo</GivenName>
+    <SurName>Rotondo</SurName>
+    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Giuseppe</GivenName>
+    <SurName>Platania</SurName>
+    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Carlo</GivenName>
+    <SurName>Rocca</SurName>
+    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Roberto</GivenName>
+    <SurName>Barbera</SurName>
+    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/applications.eumedgrid.eu.xml b/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
deleted file mode 100644
index dfcbfd8c..00000000
--- a/swamid-interfederations-2.0/applications.eumedgrid.eu.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://applications.eumedgrid.eu/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-21T16:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">EUMEDGRID Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">EUMEDGRID Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service provides information for Grid users, Application developers and
-                        Grid site administrators. It is mainly devoted to the people involved in the
-                        EUMEDGRID-Support project but many pages are of general interest
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
-                        di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
-                        EUMEDGRID-Support ma molte informazioni sono di interesse generale
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://applications.eumedgrid.eu/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://applications.eumedgrid.eu/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://applications.eumedgrid.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">EUMEDGRID Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
-                    Grid site administrators. It is mainly devoted to the people involved in the
-                    EUMEDGRID-Support project but many pages are of general interes
-                </md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">EUMEDGRID Science Gateway provided by COMETA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">EUMEDGRID Science Gateway erogato da COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/apu.uepb.edu.br.xml b/swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml
index f7a5f88c..f7a5f88c 100644
--- a/swamid-interfederations-2.0/apu.uepb.edu.br.xml
+++ b/swamid-interfederations-2.0/apu.uepb.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/araripe.uece.br.xml b/swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml
index 64c471ad..64c471ad 100644
--- a/swamid-interfederations-2.0/araripe.uece.br.xml
+++ b/swamid-interfederations-2.0/araripe.uece.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/arauto.fapesp.br.xml b/swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml
index f10b2c9f..f10b2c9f 100644
--- a/swamid-interfederations-2.0/arauto.fapesp.br.xml
+++ b/swamid-interfederations-2.0/arauto.fapesp.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/atlases.muni.cz-shibboleth.xml b/swamid-interfederations-2.0/atlases.muni.cz-shibboleth.xml
new file mode 100644
index 00000000..a385fe38
--- /dev/null
+++ b/swamid-interfederations-2.0/atlases.muni.cz-shibboleth.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://atlases.muni.cz/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgILAQAAAAABID3xVZIwDQYJKoZIhvcNAQEFBQAwajEjMCEGA1UECxMaT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0ExEzARBgNVBAoTCkdsb2JhbFNpZ24xLjAsBgNVBAMTJUdsb2JhbFNpZ24gT3JnYW5pemF0aW9uIFZhbGlkYXRpb24gQ0EwHhcNMDkwMzI1MTMwNTE0WhcNMTIwNTA5MDcwNzU3WjCBgzELMAkGA1UEBhMCREsxETAPBgNVBAgTCE9kZW5zZSBNMREwDwYDVQQHEwhPZGVuc2UgTTEbMBkGA1UECxMSV0FZRiAtIFNlY3JldGFyaWF0MR0wGwYDVQQKExRTeWRkYW5zayBVbml2ZXJzaXRldDESMBAGA1UEAxQJKi53YXlmLmRrMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDBsuiyO84OVwkKR0TL6w8viWV4jMg+Jy7LgiEtYfHdnVBCvdM9XJJetS0MiJtulBH4/4ZWrfeGeHgLPvSjp6FiRdI1nDg/33ofc0TdNytxX4tBCzvxM0C4yCCaEXda+tqXJmGua+mVubMhS8kizHjL+s7A8xUqXoEFqOMHtgqoAQIDAQABo4IBdjCCAXIwHwYDVR0jBBgwFoAUfW0q7Garp1E2qwJp8XCPxFkLmh8wSQYIKwYBBQUHAQEEPTA7MDkGCCsGAQUFBzAChi1odHRwOi8vc2VjdXJlLmdsb2JhbHNpZ24ubmV0L2NhY2VydC9vcmd2MS5jcnQwPwYDVR0fBDgwNjA0oDKgMIYuaHR0cDovL2NybC5nbG9iYWxzaWduLm5ldC9Pcmdhbml6YXRpb25WYWwxLmNybDAdBgNVHQ4EFgQUvlkjTc0iuzcvi752QgktLT01obgwCQYDVR0TBAIwADAOBgNVHQ8BAf8EBAMCBaAwKQYDVR0lBCIwIAYIKwYBBQUHAwEGCCsGAQUFBwMCBgorBgEEAYI3CgMDMEsGA1UdIAREMEIwQAYJKwYBBAGgMgEUMDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2xvYmFsc2lnbi5uZXQvcmVwb3NpdG9yeS8wEQYJYIZIAYb4QgEBBAQDAgbAMA0GCSqGSIb3DQEBBQUAA4IBAQCKPVJYHjKOrzWtjPBTEJOwIzE0wSIcA+9+GNR5Pvk+6OTf2QTUDDHpXiiIEcYPL1kN/BEvA+N2y+7qyI5MlL7DNIu9clx1lcqhXiQ0lWcu7Bmb7VNPKq5WS1W81GhbZrO6BJtsQctU6odDXMoORay7FxnaxGHOaJlCSQDgT7QrRhzyd80X8NxrSV25byCTb31du8xoO+WagnqAp6xbKs6IsESDw2r/i3rLOXbL37B7lnbjcLC963xN6j7+kiyqiCjvrP0GLfSV4/FN9i9hWrdMlcbnvr23yz5Jflc1oFPtJx7GZqtV0uTijGxCr+aRaUzBPqc3kyavHJcCsn5TcL1t</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://atlases.muni.cz/Shibboleth.sso/SLO/POST"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atlases.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Pathology Images</md:ServiceName>
+      <md:ServiceName xml:lang="da">Patologi-atlasser</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to provide access to the three atlases: (1) Dermatopathology, (2) Fetal and Neonatal Pathology, (3) Pathology for Pre-graduate Students of Medicine. The atlases may serve as sources of teaching material for pre-graduate as well as postgraduate students of pathology</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">give adgang til tre atlasser: (1) Dermato-patologi, (2) Foster- og neonatal patologi, (3) Patologi for medicinstuderende. Atlasserne kan bruges som undervisningsmateriale for patologistuderende</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml b/swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml
new file mode 100644
index 00000000..6448e387
--- /dev/null
+++ b/swamid-interfederations-2.0/atrium.in2p3.fr-sp.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://atrium.in2p3.fr/sp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-03-25T10:38:59Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">IN2P3 - Atrium - Gestion documentaire</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">IN2P3 - Atrium - Gestion documentaire
+basé sur le logiciel Nuxeo</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDEDCCAfigAwIBAgIJAMGXFtpKBnHgMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2F0cml1bS5pbjJwMy5mcjAeFw0xNDEwMTcwOTAzMTRaFw0yNDEwMTQwOTAz
+MTRaMBoxGDAWBgNVBAMTD2F0cml1bS5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANImZiGFAvKe8IsYWOo7/O3W9eakTCoNgmbUDnoW+EZt
+2MPRyxnYTm0+FIpFSi4V9QG0r/VI1WIH4jj09SvgVogIdCJY2BiJybZNzVGPLJFL
+3G6cJ/7G5Uc5FcLxLfp6b99IEb3kbcNlrNqcGaFNnFOyjHw9ByqIWAff5SBTUxsI
+tWWPXlOMMboZV/8JFbc2zpIfa+60Cn5xhkqY+7kYhmTXDFeFDIyffa9LR76300nV
+0bQ12SkrOiXw5stqTAX7xRK2/K7zfu1I4y0iQIBxQdmEMwVWUfk+Wo/eEZ6WG6YB
+96IGKwIUmbGCoYKWBQ4DSF329Z3K+9l36TVTxWObI+ECAwEAAaNZMFcwNgYDVR0R
+BC8wLYIPYXRyaXVtLmluMnAzLmZyhhpodHRwczovL2F0cml1bS5pbjJwMy5mci9z
+cDAdBgNVHQ4EFgQUX9KcNb++3ZK/lDgl92aqw9tThskwDQYJKoZIhvcNAQEFBQAD
+ggEBAMsAC/6QERa7FH8vlfRR7mRtFhzDzMaY7oZ8ZIH8ovtBWyEj5/5SQYgUEWcR
+xZ1JE/GKZn95Wxl7S0pp4vM+q+KjENuI+wDhxnC90xUUbwbnRFVB6GNUdpaZ0+KB
+F3684EGWKGiKv2tRX4M2BpFgNPfPppOWkIxD99G0Cesq5Ait1uVUWSdeIsq12v/q
+tBoVWbIwEBRt+bnZl3QDOsVQPcvje1aGHiGiYqsmFAEZoYQ5MEqq+wt/cINZsmIJ
+Xguic2EJqr1Ei4Q2DE91SVuoZVpApQM+R1BOMXC97H5rRU14BOR/Op38xAf9em1l
+yniZ5+JeJC4Wvu7wo3LF9QPfcJg=
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDEDCCAfigAwIBAgIJAMGXFtpKBnHgMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2F0cml1bS5pbjJwMy5mcjAeFw0xNDEwMTcwOTAzMTRaFw0yNDEwMTQwOTAz
+MTRaMBoxGDAWBgNVBAMTD2F0cml1bS5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANImZiGFAvKe8IsYWOo7/O3W9eakTCoNgmbUDnoW+EZt
+2MPRyxnYTm0+FIpFSi4V9QG0r/VI1WIH4jj09SvgVogIdCJY2BiJybZNzVGPLJFL
+3G6cJ/7G5Uc5FcLxLfp6b99IEb3kbcNlrNqcGaFNnFOyjHw9ByqIWAff5SBTUxsI
+tWWPXlOMMboZV/8JFbc2zpIfa+60Cn5xhkqY+7kYhmTXDFeFDIyffa9LR76300nV
+0bQ12SkrOiXw5stqTAX7xRK2/K7zfu1I4y0iQIBxQdmEMwVWUfk+Wo/eEZ6WG6YB
+96IGKwIUmbGCoYKWBQ4DSF329Z3K+9l36TVTxWObI+ECAwEAAaNZMFcwNgYDVR0R
+BC8wLYIPYXRyaXVtLmluMnAzLmZyhhpodHRwczovL2F0cml1bS5pbjJwMy5mci9z
+cDAdBgNVHQ4EFgQUX9KcNb++3ZK/lDgl92aqw9tThskwDQYJKoZIhvcNAQEFBQAD
+ggEBAMsAC/6QERa7FH8vlfRR7mRtFhzDzMaY7oZ8ZIH8ovtBWyEj5/5SQYgUEWcR
+xZ1JE/GKZn95Wxl7S0pp4vM+q+KjENuI+wDhxnC90xUUbwbnRFVB6GNUdpaZ0+KB
+F3684EGWKGiKv2tRX4M2BpFgNPfPppOWkIxD99G0Cesq5Ait1uVUWSdeIsq12v/q
+tBoVWbIwEBRt+bnZl3QDOsVQPcvje1aGHiGiYqsmFAEZoYQ5MEqq+wt/cINZsmIJ
+Xguic2EJqr1Ei4Q2DE91SVuoZVpApQM+R1BOMXC97H5rRU14BOR/Op38xAf9em1l
+yniZ5+JeJC4Wvu7wo3LF9QPfcJg=
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://atrium.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://atrium.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="fr">IN2P3 - Atrium - Gestion documentaire</ServiceName>
+      <ServiceDescription xml:lang="fr">IN2P3 - Atrium - Gestion documentaire
+basé sur le logiciel Nuxeo</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">rouet@in2p3.fr</saml:AttributeValue>
+      </RequestedAttribute>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CNRS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Jean-René Rouet</SurName>
+    <EmailAddress>rouet@in2p3.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Foudil Brétel</SurName>
+    <EmailAddress>foudil.bretel@cc.in2p3.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/aai-viewer.switch.ch.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml
index 5fd6438f..bebdbace 100644
--- a/swamid-interfederations-2.0/aai-viewer.switch.ch.xml
+++ b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-interfederation-test-shibboleth.xml
@@ -1,132 +1,69 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://aai-viewer.switch.ch/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://attribute-viewer.aai.switch.ch/interfederation-test/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2012-11-28T13:42:36Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-15T07:30:03Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor errorURL="http://www.switch.ch/aai/support/help" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Attributes Viewer</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">AAI Attributes Viewer</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</mdui:Description>
-        <mdui:Description xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</mdui:Description>
+        <mdui:DisplayName xml:lang="en">AAI Viewer Interfederation Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service is used to test the interfederation readiness of SWITCHaai Identity Providers.</mdui:Description>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
         <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://aai-viewer.switch.ch/interfederation-test/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://aai-viewer.switch.ch/interfederation-test/privacy-statement.html</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDLDCCAhSgAwIBAgIJAMFY1Mdz9NHKMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFGFhaS12aWV3ZXIuc3dpdGNoLmNoMB4XDTExMDcyNTExNDkyN1oXDTE0MDcy
-NDExNDkyN1owHzEdMBsGA1UEAxMUYWFpLXZpZXdlci5zd2l0Y2guY2gwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTAMxt4JA8xURwcDSfv8orb4luix+4
-bSsn2Vap1V22UZZ/5JLm6OuCqvRHu94zdw03jsFDCfeWD1JGFm0W+vQ4f0PHe3XE
-hnOWY2+kpkXt5N699BtlJC5Usb25l2txWmKwyqNL66MwTh5qpAd+HelpH+WwzMCS
-OGLbe37dRBnORkUMAOrCAtxxXqGd1TCzFipT5GU0As4IqmMkWTx6K+lBwe8+pzZv
-UL8A/+dtrsnUSLZ/Iw5CSyIVniKAzjcru7J/JTBkINd95maSls5g/Dlbur/3Do1e
-wy0PlSEJkas+oTONIufcAv8a6+FNx0umT/U2oHd6+htIyuRFWccTMFx7AgMBAAGj
-azBpMEgGA1UdEQRBMD+CFGFhaS12aWV3ZXIuc3dpdGNoLmNohidodHRwczovL2Fh
-aS12aWV3ZXIuc3dpdGNoLmNoL3NoaWJib2xldGgwHQYDVR0OBBYEFLnVlSgmE86I
-ENpKibTOKkuooKgnMA0GCSqGSIb3DQEBBQUAA4IBAQACmRIU2iF+1qIzdSZw1gC+
-sqsXGgXWk9bkxTK07B/j5H7uVEnBZUdbuj712lRtQd1nlBBQIeCK56wohwMzCXZx
-7bEMtfcQ8pdAvX+ZhpLBmKNS7PtadUeH34rvqa8w98RyXmlUjVZjux1T5qqVHs53
-JtCwqFapEqLiYfoEVC6hAHx/ZpUU1nRH8UJH5K+3GRnzdUgZ77Z+3ImqzM9pif2l
-F+j60QJys1mYvcl0ZxvURuOEixge4yBYtB4Zi3iUqZaXrjgci2jYU3vmvwE0pnbv
-d1JnLxNKVaHsK7hbON4ohIuPa/mSkFHYOChI6vM3iO7mPo5N5H6R8DuH/v+oPV2o
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFmDCCBICgAwIBAgIUfKxmfUy8KrHcq8mHRCrVpYNJjhkwDQYJKoZIhvcNAQEF
-BQAwazELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxHzAd
-BgNVBAsTFnd3dy5xdW92YWRpc2dsb2JhbC5jb20xIDAeBgNVBAMTF1F1b1ZhZGlz
-IEdsb2JhbCBTU0wgSUNBMB4XDTEyMTExMjEzMjUzNFoXDTE0MTExMjEzMjUzNFow
-gdMxEzARBgsrBgEEAYI3PAIBAxMCQ0gxFTATBgsrBgEEAYI3PAIBAhMEQmVybjEd
-MBsGA1UEDxMUUHJpdmF0ZSBPcmdhbml6YXRpb24xGzAZBgNVBAUTEkNILTAzNS43
-LjAwMS4yNzgtOTELMAkGA1UEBhMCQ0gxEDAOBgNVBAgTB1p1ZXJpY2gxEDAOBgNV
-BAcTB1p1ZXJpY2gxDzANBgNVBAoTBlNXSVRDSDEnMCUGA1UEAxMeYXR0cmlidXRl
-LXZpZXdlci5hYWkuc3dpdGNoLmNoMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEA5kUbUOvI58i3QBK/1mk/w+ob9ABfl3zrROcshAH2nyYp3bXB0OUTtWRD
-cD2U/0Is8QW+1mktBoKa+Rw7422hjG2EvfpwHtCKfjamBGQLAzi+1jZKdDw2GMXM
-5j7ZTBCaAh8orfTQojk6+YxQSMR6ynekwNH/Y8H8sVGsoc5ZktTEiAkFFmS1fsvR
-EKa44d9hoE7rqf5LMxc3gACi/c9yxvDreGvd8ZbWt2lq1ti14w4x3HoSAx0iyXmL
-zuRhrxchpb4PspNwSMHODRH/sbVYF6TGapxUEKeS7LrUVmWSZOzN5jdXajHqPlX6
-xsGcyN5YSkaycKg61ZEoCDtGKvw8UwIDAQABo4IByTCCAcUwdAYIKwYBBQUHAQEE
-aDBmMCoGCCsGAQUFBzABhh5odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20w
-OAYIKwYBBQUHMAKGLGh0dHA6Ly90cnVzdC5xdW92YWRpc2dsb2JhbC5jb20vcXZz
-c2xpY2EuY3J0MFEGA1UdIARKMEgwRgYMKwYBBAG+WAACZAECMDYwNAYIKwYBBQUH
-AgEWKGh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL3JlcG9zaXRvcnkwUQYD
-VR0RBEowSIIeYXR0cmlidXRlLXZpZXdlci5hYWkuc3dpdGNoLmNoghBhdi5hYWku
-c3dpdGNoLmNoghRhYWktdmlld2VyLnN3aXRjaC5jaDALBgNVHQ8EBAMCBaAwHQYD
-VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMB8GA1UdIwQYMBaAFDJNoU/q8K6Z
-tu6bByyECBFQi+J+MDsGA1UdHwQ0MDIwMKAuoCyGKmh0dHA6Ly9jcmwucXVvdmFk
-aXNnbG9iYWwuY29tL3F2c3NsaWNhLmNybDAdBgNVHQ4EFgQUhzmwLKgLTsjUgspI
-CynFmJRxteUwDQYJKoZIhvcNAQEFBQADggEBAHtc5+1yEvv4FHPvYHI7QYGOaC8H
-F8hJUoTEl0RLJU/OAXW4zJlwZYCpH3YtLpkvfpau9T67VU6/9XVH32pBR5boAXmx
-AobGZL1Abioful3Bjbe/rnlQ+70lCcpxxNZXV/XUByHV9KOUBGw4cVA1ys6hwCD0
-w0u+mWE7XbF8GQzs0WDn7Qx7T/+h+593He8Bv+YgNKO7asFXy/BpK0TJpyF4iKgJ
-+TwojPuCMW8FCuygXjz1PYykSSyq7EBPv5vHFa+2IE8k8aJAu+KJxJo7cfWEydbN
-/Uxm5UrhF2xgLbva4FuhunvodQMz+eFIo35mq/wjbdzjdexBKQ43G/E1CvI=
+MIIDazCCAlOgAwIBAgIJAInsS/34xVwWMA0GCSqGSIb3DQEBBQUAMCkxJzAlBgNV
+BAMTHmF0dHJpYnV0ZS12aWV3ZXIuYWFpLnN3aXRjaC5jaDAeFw0xNDA1MTQxNDQ4
+MzVaFw0xNzA1MTMxNDQ4MzVaMCkxJzAlBgNVBAMTHmF0dHJpYnV0ZS12aWV3ZXIu
+YWFpLnN3aXRjaC5jaDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMYE
+foYKQreiAh1ULU3g5YxUJeU3HHOk3AfWEKj2fQTA9UpPk2GIlXapEoAnbE4qpOoO
++LR4HEijEXlOdB8DIFIr+7r/lp0yIqM4rF9PIw+yz+bvUgnjLzAy+38QmQsrW1Zn
+xoJs+2tZ0JQ3HZMlGQsDXfJvhfwl5awgbyyKFq5BCIVI8NYqBsj8dbToh/cKJK5L
+7LyPxcU4nqQEgWBLD4ZOdcbTvjRb4EQuMeZL22iYPKIhk+7kLBO3riPP4QZiI8Kv
+bNeLjwbYXCEJ3GfWdIgIwEireu4f4gP6r1ZSegflyYyi4A4XFm56BF9gdyTsjp2Y
+vYAXlQLTMlJPsanyLdUCAwEAAaOBlTCBkjBxBgNVHREEajBogh5hdHRyaWJ1dGUt
+dmlld2VyLmFhaS5zd2l0Y2guY2iGRmh0dHBzOi8vYXR0cmlidXRlLXZpZXdlci5h
+YWkuc3dpdGNoLmNoL2ludGVyZmVkZXJhdGlvbi10ZXN0L3NoaWJib2xldGgwHQYD
+VR0OBBYEFKtMQ76UJ2imKPdoMOiGDQ7EgSfQMA0GCSqGSIb3DQEBBQUAA4IBAQB6
+lHFWlu87yTXTUpr5DTOcaXgsXqaguQBve9QWj39sylbbdNe7qlhfrkP4J4Y1Ye8G
+cQMM3yvHPOqX2yVIwc9lf/mwyhS3EYKS9A6xlGZBfWVAwIV193Lqyj9JgQAFsZV9
+i0w4/AIfJPTTPNNvBoXyLSGNjiDgddcOPbFpvcXmc2huQgafnpPUpHRvzftSqQct
+iJHJIIW6oKr6j3x3iEdvfCgxvjC97Cz2eSxYbaGrO2eBoqWZd46bgtCXE3ODksGX
+DfJWmpOBDWhAdKUZ7CAl9fCH4ztaREeTDK6z0WU3U3T8Q8BBV/jbFeav+tOqMhNH
+jCyyjtF4f+udUgUZm2Jt
 						</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/POST" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/POST-SimpleSign" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/Artifact" index="5"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/Artifact" index="7"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML2/ECP" index="8"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML2/ECP" index="10"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML/POST" index="11"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/POST" index="12"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML/POST" index="13"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://aai-viewer.switch.ch/Shibboleth.sso/SAML/Artifact" index="14"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="15"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://av.aai.switch.ch/Shibboleth.sso/SAML/Artifact" index="16"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://attribute-viewer.aai.switch.ch/interfederation-test/Shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
-      <ServiceName xml:lang="de">Attributes Viewer</ServiceName>
-      <ServiceName xml:lang="en">AAI Attributes Viewer</ServiceName>
-      <ServiceDescription xml:lang="de">Zeigt zu Test und Informationszwecken alle Attribute eines Benutzers.</ServiceDescription>
-      <ServiceDescription xml:lang="en">Displays all available attributes of a user for debugging and informational purposes.</ServiceDescription>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <ServiceName xml:lang="en">AAI Viewer Interfederation Test</ServiceName>
+      <ServiceDescription xml:lang="en">This service is used to test the interfederation readiness of SWITCHaai Identity Providers.</ServiceDescription>
       <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="homePostalAddress" Name="urn:oid:0.9.2342.19200300.100.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="homePhone" Name="urn:oid:0.9.2342.19200300.100.1.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="employeeNumber" Name="urn:oid:2.16.840.1.113730.3.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonAssurance" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="primaryGroupID" Name="urn:oid:1.3.6.1.4.1.7165.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="isMemberOf" Name="urn:oid:1.3.6.1.4.1.5923.1.5.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
@@ -145,13 +82,13 @@ w0u+mWE7XbF8GQzs0WDn7Qx7T/+h+593He8Bv+YgNKO7asFXy/BpK0TJpyF4iKgJ
     <OrganizationURL xml:lang="it">http://www.switch.ch/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="support">
-    <GivenName>SWITCHaai</GivenName>
+    <GivenName>AAI</GivenName>
     <SurName>Team</SurName>
     <EmailAddress>mailto:aai@switch.ch</EmailAddress>
     <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
   </ContactPerson>
   <ContactPerson contactType="technical">
-    <GivenName>SWITCHaai</GivenName>
+    <GivenName>AAI</GivenName>
     <SurName>Team</SurName>
     <EmailAddress>mailto:aai@switch.ch</EmailAddress>
     <TelephoneNumber>+41 44 268 15 05</TelephoneNumber>
diff --git a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml
index 1ff79ed9..1ff79ed9 100644
--- a/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch.xml
+++ b/swamid-interfederations-2.0/attribute-viewer.aai.switch.ch-shibboleth.xml
diff --git a/swamid-interfederations-2.0/auth.agrosupdijon.fr.xml b/swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml
index b1e24976..24cd2eb7 100644
--- a/swamid-interfederations-2.0/auth.agrosupdijon.fr.xml
+++ b/swamid-interfederations-2.0/auth.agrosupdijon.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agrosupdijon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/auth.crous-versailles.fr.xml b/swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml
index 0db5197b..b8848a37 100644
--- a/swamid-interfederations-2.0/auth.crous-versailles.fr.xml
+++ b/swamid-interfederations-2.0/auth.crous-versailles.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-versailles.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/auth.mines-paristech.fr.xml b/swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml
index d1b55a8c..1f18af9d 100644
--- a/swamid-interfederations-2.0/auth.mines-paristech.fr.xml
+++ b/swamid-interfederations-2.0/auth.mines-paristech.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-paristech.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/auth.services.bmj.com.xml b/swamid-interfederations-2.0/auth.services.bmj.com-auth.xml
index ea781fce..ea781fce 100644
--- a/swamid-interfederations-2.0/auth.services.bmj.com.xml
+++ b/swamid-interfederations-2.0/auth.services.bmj.com-auth.xml
diff --git a/swamid-interfederations-2.0/auth.u-pec.fr.xml b/swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml
index 363cf58d..5b1a09d9 100644
--- a/swamid-interfederations-2.0/auth.u-pec.fr.xml
+++ b/swamid-interfederations-2.0/auth.u-pec.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-pec.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/auth.univ-paris-diderot.fr.xml b/swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml
index f806297f..70b4ffdd 100644
--- a/swamid-interfederations-2.0/auth.univ-paris-diderot.fr.xml
+++ b/swamid-interfederations-2.0/auth.univ-paris-diderot.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris-diderot.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/auth.univ-pau.fr.xml b/swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml
index 5593b96c..a4260064 100644
--- a/swamid-interfederations-2.0/auth.univ-pau.fr.xml
+++ b/swamid-interfederations-2.0/auth.univ-pau.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-pau.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -37,39 +37,6 @@ U2avjI5AfKIKKFQYpjP1qpGGUNecL4Bw28IOM+JyrH4T6CmGgq8=
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEnjCCA4agAwIBAgIRAJA9ZFuHhuGQAAnTwzMko8YwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDAyMjMwMDAwMDBaFw0xMzAyMjIyMzU5NTlaMHgxCzAJBgNV
-BAYTAkZSMQwwCgYDVQQHEwNQYXUxMjAwBgNVBAoMKVVuaXZlcnNpdMOpIGRlIFBh
-dSBldCBkZXMgcGF5cyBkZSBsJ0Fkb3VyMQwwCgYDVQQLEwNDUkkxGTAXBgNVBAMT
-EGF1dGgudW5pdi1wYXUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQCc0Iytl3JZMw09sJt4OdWO6wBFQ/ndJCMJrMAvJuGHN/gbS8ji6DzemNlLWmRx
-5uA3WOHqKpFm1lY0IJcL7uP5/nhZ2EBJ7nYHlZjwM+M+TIHaVgRZVtEBCuiuCvc1
-6DG1oKitutodC1+4I0P0uv0LjLl6/YmmNdK36kwHxbDJh0qsu5/IvBj1fY5Jt+vv
-qZbJm++37T/tfquivK9BzVdmMmTDhU5BgaDH8MGJjpmm3w37/FPtAH9/Ec3fYCpw
-uLWJCGPWBFTFS/YSObTOQw0e2MywPvH/jlhIgRrQ4bdSsgNwmLagj9EDo1WYxsPx
-9Uq8ew/dgP8sU6H4zl/3RoHhAgMBAAGjggFjMIIBXzAfBgNVHSMEGDAWgBQMvZNo
-DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUx5kwP4wSMc7IcwLTrxdQRpvDTYow
-DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
-AwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQYXV0aC51bml2LXBhdS5mcjAN
-BgkqhkiG9w0BAQUFAAOCAQEAgo8xHmEk2y4YQ3B9GcnRFnivkiqplDUUPthv+ah3
-2uTS2bLMSbndKCdYizA3P+1FfpEEh+JT1i7ml/wVmgziIm5pvkdzfvIqq+LqAmxr
-iE7GZGGnFYdt2SXyF5H5wPavr+PiVVGSy6fyi5eNfwlM8rCATrmP9592P2Xs2+af
-goQOsaR4PJhYaAz2W0U2sy9Za+gQOhNiKlPLs2A1c4pzHKBmcoQA4HK4exJEt/7F
-PNEVGaLma2kStlOZ5ATX1WPjyMDTq4Aab+SfzX4GWoqG/WfiGh79fv4VkLRUg9Q+
-ZiclFSu4G5swGiUE+hKFwuADVfSHvSzLlGQmMGR3lxJTCw==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://auth.univ-pau.fr/idp/profile/SAML2/POST/SSO"/>
diff --git a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml
index ef926099..ef926099 100644
--- a/swamid-interfederations-2.0/beta.shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/beta.shib.manchester.ac.uk-shibboleth.xml
diff --git a/swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml b/swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml
new file mode 100644
index 00000000..7047dcaa
--- /dev/null
+++ b/swamid-interfederations-2.0/bodportal.geant.net-autobahn-gui.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://bodportal.geant.net/autobahn-gui">
+  <!--
+		This is an autobahn-gui SP for Delivery of Advanced Network Technology to Europe Limited.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-17T13:37:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">BoD Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKjCCAhKgAwIBAgIJAJDmGErGOKVvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2JvZHBvcnRhbC5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDE1WhcNMTcwNDEx
+						MTUxMDE1WjAeMRwwGgYDVQQDExNib2Rwb3J0YWwuZ2VhbnQubmV0MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx+u+ncMfh9UiMVWMm38eNH38kSQxGs53
+						YrgmXl2bJWx1cbDseJ28IIKa3xyR7kIDdGBSKgR9/+dcqmA0jitnQNkc0AxWO/SE
+						Ft9NXOWGPt8db1BuFD2DKtNnaqL5pxUFvv8ZvVtThf0cTWtbJXr9Fqscavh67Xs5
+						h8ZVV/PKJkWzI+MwNNZA4zY/XmlWgFj0JyOoNjKRj0CYdbAO9nxjDvglZBaBZhTL
+						yUFPKFK9PYhvCDGidE6vntyN0IerZR5CVZ4UVB4RpnxhbZJKz2ahDGYDMd7ALOGl
+						XVgbVZIEy1UaWSVw85hB3YolynSIDgQGMikPkm9Ob/p9MNqDSyzpyQIDAQABo2sw
+						aTBIBgNVHREEQTA/ghNib2Rwb3J0YWwuZ2VhbnQubmV0hihodHRwczovL2JvZHBv
+						cnRhbC5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQWBBSYqysjUZVqc/9I
+						LTMJw82mQm3zsTANBgkqhkiG9w0BAQUFAAOCAQEAh6tU+wzIMqNY47LypNVtdyZY
+						lLCWA5zLnspGrAZoHkiQWgD9ci7J/WBswCdrs/lSJ170u+CiBulzCNgp3c+z2mlq
+						6snJQNApKtE7JOOXXm7QiBmIeKycfmtkznSAfjQGjlfpIY/qmEPTljJQrj1cl0nH
+						7mHxBTgN/YlZj2H7XQZRQZMw5Y63exLyOzD38kGxt+dUUi07cGHenGHs7y7aPKZi
+						dTpN+ziSFq2kMwKJikMGPFrs84/iYCJxedloJqCXljGD5SMq4k5E4m36LpOyhduX
+						5Xv78mo22p+fa22GBf1a6s/flNWU8+CrOWGHHGO3mvNuS0wMHid3D5dSEk8cLw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKjCCAhKgAwIBAgIJAJDmGErGOKVvMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+						BAMTE2JvZHBvcnRhbC5nZWFudC5uZXQwHhcNMTQwNDExMTUxMDE1WhcNMTcwNDEx
+						MTUxMDE1WjAeMRwwGgYDVQQDExNib2Rwb3J0YWwuZ2VhbnQubmV0MIIBIjANBgkq
+						hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx+u+ncMfh9UiMVWMm38eNH38kSQxGs53
+						YrgmXl2bJWx1cbDseJ28IIKa3xyR7kIDdGBSKgR9/+dcqmA0jitnQNkc0AxWO/SE
+						Ft9NXOWGPt8db1BuFD2DKtNnaqL5pxUFvv8ZvVtThf0cTWtbJXr9Fqscavh67Xs5
+						h8ZVV/PKJkWzI+MwNNZA4zY/XmlWgFj0JyOoNjKRj0CYdbAO9nxjDvglZBaBZhTL
+						yUFPKFK9PYhvCDGidE6vntyN0IerZR5CVZ4UVB4RpnxhbZJKz2ahDGYDMd7ALOGl
+						XVgbVZIEy1UaWSVw85hB3YolynSIDgQGMikPkm9Ob/p9MNqDSyzpyQIDAQABo2sw
+						aTBIBgNVHREEQTA/ghNib2Rwb3J0YWwuZ2VhbnQubmV0hihodHRwczovL2JvZHBv
+						cnRhbC5nZWFudC5uZXQvYXV0b2JhaG4tZ3VpMB0GA1UdDgQWBBSYqysjUZVqc/9I
+						LTMJw82mQm3zsTANBgkqhkiG9w0BAQUFAAOCAQEAh6tU+wzIMqNY47LypNVtdyZY
+						lLCWA5zLnspGrAZoHkiQWgD9ci7J/WBswCdrs/lSJ170u+CiBulzCNgp3c+z2mlq
+						6snJQNApKtE7JOOXXm7QiBmIeKycfmtkznSAfjQGjlfpIY/qmEPTljJQrj1cl0nH
+						7mHxBTgN/YlZj2H7XQZRQZMw5Y63exLyOzD38kGxt+dUUi07cGHenGHs7y7aPKZi
+						dTpN+ziSFq2kMwKJikMGPFrs84/iYCJxedloJqCXljGD5SMq4k5E4m36LpOyhduX
+						5Xv78mo22p+fa22GBf1a6s/flNWU8+CrOWGHHGO3mvNuS0wMHid3D5dSEk8cLw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://bodportal.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://bodportal.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://bodportal.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://bodportal.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">BoD Portal</ServiceName>
+      <ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.dante.net</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <Company>DANTE IT Support</Company>
+    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>DANTE IT</Company>
+    <EmailAddress>mailto:it@dante.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/box-idp.nordu.net.xml b/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 9b3c0675..0ce9e58e 100644
--- a/swamid-interfederations-2.0/box-idp.nordu.net.xml
+++ b/swamid-interfederations-2.0/box-idp.nordu.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -9,7 +9,6 @@
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/nren-service</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/butare.ifrn.edu.br.xml b/swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml
index fa6c2748..fa6c2748 100644
--- a/swamid-interfederations-2.0/butare.ifrn.edu.br.xml
+++ b/swamid-interfederations-2.0/butare.ifrn.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml
index 3c0cb550..3c0cb550 100644
--- a/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe-gateway.ifce.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe-idp.ufc.br.xml b/swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml
index b62100cf..b62100cf 100644
--- a/swamid-interfederations-2.0/cafe-idp.ufc.br.xml
+++ b/swamid-interfederations-2.0/cafe-idp.ufc.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.accamargo.org.br.xml b/swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml
index 386da33f..386da33f 100644
--- a/swamid-interfederations-2.0/cafe.accamargo.org.br.xml
+++ b/swamid-interfederations-2.0/cafe.accamargo.org.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.fucape.br.xml b/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml
index abbd0cb3..abbd0cb3 100644
--- a/swamid-interfederations-2.0/cafe.fucape.br.xml
+++ b/swamid-interfederations-2.0/cafe.fucape.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml b/swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml
index 89b475f9..89b475f9 100644
--- a/swamid-interfederations-2.0/cafe.iec.pa.gov.br.xml
+++ b/swamid-interfederations-2.0/cafe.iec.pa.gov.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ifb.edu.br.xml b/swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml
index 50809762..50809762 100644
--- a/swamid-interfederations-2.0/cafe.ifb.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifb.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ifes.edu.br.xml b/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml
index c3ce14ad..c3ce14ad 100644
--- a/swamid-interfederations-2.0/cafe.ifes.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifes.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ifg.edu.br.xml b/swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml
index d6790d73..d6790d73 100644
--- a/swamid-interfederations-2.0/cafe.ifg.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifg.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml b/swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml
index 27e156ac..27e156ac 100644
--- a/swamid-interfederations-2.0/cafe.ifnmg.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifnmg.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ifpa.edu.br.xml b/swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml
index 11855095..11855095 100644
--- a/swamid-interfederations-2.0/cafe.ifpa.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifpa.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ifro.edu.br.xml b/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml
index 615bce45..615bce45 100644
--- a/swamid-interfederations-2.0/cafe.ifro.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifro.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml b/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml
index caf05827..caf05827 100644
--- a/swamid-interfederations-2.0/cafe.ifrs.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifrs.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml b/swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml
index b2ed9c51..b2ed9c51 100644
--- a/swamid-interfederations-2.0/cafe.ifsp.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ifsp.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.on.br.xml b/swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml
index 39978e74..39978e74 100644
--- a/swamid-interfederations-2.0/cafe.on.br.xml
+++ b/swamid-interfederations-2.0/cafe.on.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.pucminas.br.xml b/swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml
index 9c5524b4..9c5524b4 100644
--- a/swamid-interfederations-2.0/cafe.pucminas.br.xml
+++ b/swamid-interfederations-2.0/cafe.pucminas.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.sti.uff.br.xml b/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml
index 1acc37e4..1acc37e4 100644
--- a/swamid-interfederations-2.0/cafe.sti.uff.br.xml
+++ b/swamid-interfederations-2.0/cafe.sti.uff.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.udesc.br.xml b/swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.xml
index 09904ac8..09904ac8 100644
--- a/swamid-interfederations-2.0/cafe.udesc.br.xml
+++ b/swamid-interfederations-2.0/cafe.udesc.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.uesb.br.xml b/swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.xml
index 5e9c8c17..5e9c8c17 100644
--- a/swamid-interfederations-2.0/cafe.uesb.br.xml
+++ b/swamid-interfederations-2.0/cafe.uesb.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.uesc.br.xml b/swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.xml
index ae1e5cb2..ae1e5cb2 100644
--- a/swamid-interfederations-2.0/cafe.uesc.br.xml
+++ b/swamid-interfederations-2.0/cafe.uesc.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ufba.br.xml b/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml
index 244a589f..244a589f 100644
--- a/swamid-interfederations-2.0/cafe.ufba.br.xml
+++ b/swamid-interfederations-2.0/cafe.ufba.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ufop.br.xml b/swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml
index 2aed2eb4..2aed2eb4 100644
--- a/swamid-interfederations-2.0/cafe.ufop.br.xml
+++ b/swamid-interfederations-2.0/cafe.ufop.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.ufra.edu.br.xml b/swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml
index 8c37c66c..8c37c66c 100644
--- a/swamid-interfederations-2.0/cafe.ufra.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.ufra.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.unicentro.br.xml b/swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml
index 8960bf5d..8960bf5d 100644
--- a/swamid-interfederations-2.0/cafe.unicentro.br.xml
+++ b/swamid-interfederations-2.0/cafe.unicentro.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.unifap.br.xml b/swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml
index 75eb65ad..75eb65ad 100644
--- a/swamid-interfederations-2.0/cafe.unifap.br.xml
+++ b/swamid-interfederations-2.0/cafe.unifap.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.unifran.br.xml b/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml
index e3907784..e3907784 100644
--- a/swamid-interfederations-2.0/cafe.unifran.br.xml
+++ b/swamid-interfederations-2.0/cafe.unifran.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.unisc.br.xml b/swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.xml
index 66d7227f..66d7227f 100644
--- a/swamid-interfederations-2.0/cafe.unisc.br.xml
+++ b/swamid-interfederations-2.0/cafe.unisc.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.upf.br.xml b/swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml
index 5717c51b..5717c51b 100644
--- a/swamid-interfederations-2.0/cafe.upf.br.xml
+++ b/swamid-interfederations-2.0/cafe.upf.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe.uscs.edu.br.xml b/swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.xml
index d0810370..d0810370 100644
--- a/swamid-interfederations-2.0/cafe.uscs.edu.br.xml
+++ b/swamid-interfederations-2.0/cafe.uscs.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe01.unicamp.br.xml b/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml
index 9118b5d6..9118b5d6 100644
--- a/swamid-interfederations-2.0/cafe01.unicamp.br.xml
+++ b/swamid-interfederations-2.0/cafe01.unicamp.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafe1.ufes.br.xml b/swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml
index b12be60b..b12be60b 100644
--- a/swamid-interfederations-2.0/cafe1.ufes.br.xml
+++ b/swamid-interfederations-2.0/cafe1.ufes.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafernp.insa.gov.br.xml b/swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml
index d7c242e2..d7c242e2 100644
--- a/swamid-interfederations-2.0/cafernp.insa.gov.br.xml
+++ b/swamid-interfederations-2.0/cafernp.insa.gov.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cafetools.ufpi.br.xml b/swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml
index f3684dde..f3684dde 100644
--- a/swamid-interfederations-2.0/cafetools.ufpi.br.xml
+++ b/swamid-interfederations-2.0/cafetools.ufpi.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/capuccino.iff.edu.br.xml b/swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml
index 23d2cca4..23d2cca4 100644
--- a/swamid-interfederations-2.0/capuccino.iff.edu.br.xml
+++ b/swamid-interfederations-2.0/capuccino.iff.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml b/swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml
index 603aae3e..603aae3e 100644
--- a/swamid-interfederations-2.0/capuccino.info.ufrn.br.xml
+++ b/swamid-interfederations-2.0/capuccino.info.ufrn.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/cas.ac-martinique.fr.xml b/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml
index 6ec43d3f..90e2a700 100644
--- a/swamid-interfederations-2.0/cas.ac-martinique.fr.xml
+++ b/swamid-interfederations-2.0/cas.ac-martinique.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-martinique.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/cas.crous-lyon.fr.xml b/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
index 6cebc036..3667afee 100644
--- a/swamid-interfederations-2.0/cas.crous-lyon.fr.xml
+++ b/swamid-interfederations-2.0/cas.crous-lyon.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-lyon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/cas.cuni.cz.xml b/swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml
index 5fdc0303..3b9699b7 100644
--- a/swamid-interfederations-2.0/cas.cuni.cz.xml
+++ b/swamid-interfederations-2.0/cas.cuni.cz-idp-shibboleth.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://cas.cuni.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:24:17Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/cas.educagri.fr.xml b/swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml
index 9e7b90d4..97476642 100644
--- a/swamid-interfederations-2.0/cas.educagri.fr.xml
+++ b/swamid-interfederations-2.0/cas.educagri.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">educagri.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/cas.ent-etrs.net.xml b/swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml
index 88ef79e8..5c61963f 100644
--- a/swamid-interfederations-2.0/cas.ent-etrs.net.xml
+++ b/swamid-interfederations-2.0/cas.ent-etrs.net-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ent-etrs.net</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr.xml b/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml
index 021f65be..fcaf9a1a 100644
--- a/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr.xml
+++ b/swamid-interfederations-2.0/cas.st-cyr.terre.defense.gouv.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">st-cyr.terre.defense.gouv.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/cerbere2.mines-douai.fr.xml b/swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml
index ba850116..b71b6486 100644
--- a/swamid-interfederations-2.0/cerbere2.mines-douai.fr.xml
+++ b/swamid-interfederations-2.0/cerbere2.mines-douai.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-douai.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/cern.ch.xml b/swamid-interfederations-2.0/cern.ch-login.xml
index 6a4da73f..6a4da73f 100644
--- a/swamid-interfederations-2.0/cern.ch.xml
+++ b/swamid-interfederations-2.0/cern.ch-login.xml
diff --git a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml b/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
index ef5c0ea6..ef5c0ea6 100644
--- a/swamid-interfederations-2.0/clarin.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/clarin.ids-mannheim.de-shibboleth.xml
diff --git a/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
new file mode 100644
index 00000000..41b19c73
--- /dev/null
+++ b/swamid-interfederations-2.0/clarin.oeaw.ac.at-shibboleth.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://clarin.oeaw.ac.at/shibboleth">
+  <md:Extensions>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2014-01-23T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">CLARIN Centre Vienna</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">CLARIN Centre Vienna</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</mdui:Description>
+        <mdui:Description xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://clarin.oeaw.ac.at/ccv/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://clarin.oeaw.ac.at/ccv/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDBjCCAe6gAwIBAgIJAI3rKBVKUcUJMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+BAMTFWNsYXJpbi5hcnoub2Vhdy5hYy5hdDAeFw0xNDAxMjAxNDU3MThaFw0yNDAx
+MTgxNDU3MThaMCAxHjAcBgNVBAMTFWNsYXJpbi5hcnoub2Vhdy5hYy5hdDCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMJ8B6WyydvbvIHJ1Cb34h8838G5
+JItPpmJC+D/K+6MI3YiydVKKlhaGh/GqcWcz0Qw30W7WYilUZ5IkzZA12QY1CF1g
+cJPNUmYibzP3sAZ9KrvaCEMxlseoldh0yc+8Q8eplQH9id4u5G+J8SvTBejt261y
+ATb6pIANsRQkOLMvxtq7/NrEnAmZQOM5obsshHxLlXlJ0qixakaYXWKCIuUUOEFY
+FT13vhWrUC4BWW0OGimoR1cBnyEJtS9kRNWQ85+03VVVvLk9AssoHWxOJVJ7HE1m
+5/xgMrmpOv1vbqDKDljrY19zheNOoFr3RdaSCb1Eh8lWCNigUgOwK8Mm7VECAwEA
+AaNDMEEwIAYDVR0RBBkwF4IVY2xhcmluLmFyei5vZWF3LmFjLmF0MB0GA1UdDgQW
+BBQ6IH3aND4GFYEEgrR0IKf/d4QEcDANBgkqhkiG9w0BAQUFAAOCAQEAhdcxQ+7/
+1WYPCTVz2HOk8J3eM3ZJylGdTnfgNDDGkBo0CGmyiulX8m+nimBKh7UNMkRkU8cH
+NUldSGR70wi0iQlx7t868V5pmkqxnaDu4+lo1QU59s5c7MRJXZ6OcbKB57O/d5l+
++kX3/YW9WAQkmwcyVWDbcmk4DZK5kqqTk+u3fS48cLqai5YVcj8pDDoUx6/ZkwDv
+Yqvva2v4+vhzX9SW3QyiChOgFo9sP/UD1U8JAZG0sds5ugwjwiXPPB41hwHdbdEj
+QZRW2NR0HHMFp0FZeSziXOeaap21wc/W1Nk7wpRI7jYdzLRJHmzhvWz95p0WSnt+
+rI8v6OTvibpLrg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/POST" index="5"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://clarin.oeaw.ac.at/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <md:AttributeConsumingService index="1">
+      <md:ServiceName xml:lang="en">CLARIN Centre Vienna / Language Resources Portal</md:ServiceName>
+      <md:ServiceDescription xml:lang="de">Ein Repositorium für Archivieren und Publizieren von Sprachressourcen und Technologien und andere Dienste für digitale Geisteswissenschaften.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">A repository for depositing and publishing of language resources and technology and other infrastructure services for digital humanities.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie, Österreichische Akademie der Wissenschaften</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Institute for Corpus Linguistics und Text Technology, Austrian Academy of Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Institut für Corpuslinguistik und Texttechnologie</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Institute for Corpus Linguistics und Text Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.oeaw.ac.at/icltt</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Matej</md:GivenName>
+    <md:SurName>Durco</md:SurName>
+    <md:EmailAddress>matej.durco@oeaw.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Karlheinz</md:GivenName>
+    <md:SurName>Mörth</md:SurName>
+    <md:EmailAddress>karlheinz.moerth@oeaw.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>ICLTT-tech</md:GivenName>
+    <md:SurName>Office</md:SurName>
+    <md:EmailAddress>icltt-tech@oeaw.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Akademie-Rechenzentrum</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>helpdesk@oeaw.ac.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/clarino.uib.no.xml b/swamid-interfederations-2.0/clarino.uib.no-.xml
index 03ed1317..03ed1317 100644
--- a/swamid-interfederations-2.0/clarino.uib.no.xml
+++ b/swamid-interfederations-2.0/clarino.uib.no-.xml
diff --git a/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml b/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml
deleted file mode 100644
index dbe77c4e..00000000
--- a/swamid-interfederations-2.0/cloudidp1.canarie.ca.xml
+++ /dev/null
@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://cloudidp1.canarie.ca/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.canarie.ca" registrationInstant="2013-03-25T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-http://www.canarie.ca/templates/services/docs/CAF_join_en.pdf
-</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor errorURL="https://cloudidp1.canarie.ca/identity/feedback.htm" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">cloudidp1.canarie.ca</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CANARIE Fournisseur nuagique d'identité</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">CANARIE Cloud Identity Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CANARIE - CAF Canada's Advanced Research and Innovation Network </mdui:Description>
-        <mdui:Description xml:lang="fr">CANARIE - CAF-FCA Le réseau évolué de recherche et d'innovation du Canada </mdui:Description>
-        <mdui:InformationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</mdui:InformationURL>
-      </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DomainHint>canarie.ca</mdui:DomainHint>
-      </mdui:DiscoHints>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSjCCAjICCQCmkqQ0nApLQzANBgkqhkiG9w0BAQUFADBnMR0wGwYDVQQDDBRj
-bG91ZGlkcDEuY2FuYXJpZS5jYTEbMBkGA1UECgwSQ2FuYXJpZSBGZWRlcmF0aW9u
-MQswCQYDVQQGEwJDQTELMAkGA1UECAwCT04xDzANBgNVBAcMBk90dGF3YTAeFw0x
-MzAyMjYxMDM2MTJaFw0xNDAyMjYxMDM2MTJaMGcxHTAbBgNVBAMMFGNsb3VkaWRw
-MS5jYW5hcmllLmNhMRswGQYDVQQKDBJDYW5hcmllIEZlZGVyYXRpb24xCzAJBgNV
-BAYTAkNBMQswCQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQbo4L3ZJ29BmswAzMZNQXzpvsdUR8laZaDn
-q1UjYN0XmUC4zE9QWc7LYxPjubkH9SzRkTVTYMVSCFo0Ja40hXIQBSQ+oE9Em2BN
-HV2qsBHvynbnj3/8bcbG0T9GCdCIobRy2pRcpGaUvkiDrilnwKG7r3alGTeiPRwI
-7zD+Hx32+NaAb4OrdxWwKrRyagWuTdIboR+FkS03St0Pc/Wa5Y5ZsyWVETtVEO0Z
-0MC7bsZWy34Wz0+7TQvJ3YUw3+PVf36AgwcxKkHWIaf1g8NRCJ9Vg3SnGT6Ecbo1
-kV+P/0qjtHonVwp8lQb6nD5OcnWsoxRArsrRwZ/rGGQXXVyYeQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQA8BuR3/QCpFRsYs6wIWi5N4naU3MXdP7Rbg+GzEnJD9j7d
-ltHmQoFIHOpgLmlYpiJjhwJvY4FE++2FCxeYCzGDcoZJnavs5ZiYjjw+AdRlyG7D
-VkkjnmRW7d+iJIMH2olC5O57wwxSQb1FON9KU2c7EjbhrWUJx4RfJy1O8jPMA0XC
-KL4ynk0Gqiuf5X4ll8scRVv2sWP7Zh8a5O09Q6Teghc8VBlitkhVl7Z9Ylle6IHt
-/GajqsEZjDVbsn3fjdIFZJSuUq/q8+TpRzBqOMB4yFAXrGKXcrcQwR721Ol+SDOj
-HOB2BJCb3Ue9NzqIlgXpyc2LpPt2RRlYaJm45zod</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cloudidp1.canarie.ca:9443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cloudidp1.canarie.ca:9443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://cloudidp1.canarie.ca/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://cloudidp1.canarie.ca/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">cloudidp1.canarie.ca</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSjCCAjICCQCmkqQ0nApLQzANBgkqhkiG9w0BAQUFADBnMR0wGwYDVQQDDBRj
-bG91ZGlkcDEuY2FuYXJpZS5jYTEbMBkGA1UECgwSQ2FuYXJpZSBGZWRlcmF0aW9u
-MQswCQYDVQQGEwJDQTELMAkGA1UECAwCT04xDzANBgNVBAcMBk90dGF3YTAeFw0x
-MzAyMjYxMDM2MTJaFw0xNDAyMjYxMDM2MTJaMGcxHTAbBgNVBAMMFGNsb3VkaWRw
-MS5jYW5hcmllLmNhMRswGQYDVQQKDBJDYW5hcmllIEZlZGVyYXRpb24xCzAJBgNV
-BAYTAkNBMQswCQYDVQQIDAJPTjEPMA0GA1UEBwwGT3R0YXdhMIIBIjANBgkqhkiG
-9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoQbo4L3ZJ29BmswAzMZNQXzpvsdUR8laZaDn
-q1UjYN0XmUC4zE9QWc7LYxPjubkH9SzRkTVTYMVSCFo0Ja40hXIQBSQ+oE9Em2BN
-HV2qsBHvynbnj3/8bcbG0T9GCdCIobRy2pRcpGaUvkiDrilnwKG7r3alGTeiPRwI
-7zD+Hx32+NaAb4OrdxWwKrRyagWuTdIboR+FkS03St0Pc/Wa5Y5ZsyWVETtVEO0Z
-0MC7bsZWy34Wz0+7TQvJ3YUw3+PVf36AgwcxKkHWIaf1g8NRCJ9Vg3SnGT6Ecbo1
-kV+P/0qjtHonVwp8lQb6nD5OcnWsoxRArsrRwZ/rGGQXXVyYeQIDAQABMA0GCSqG
-SIb3DQEBBQUAA4IBAQA8BuR3/QCpFRsYs6wIWi5N4naU3MXdP7Rbg+GzEnJD9j7d
-ltHmQoFIHOpgLmlYpiJjhwJvY4FE++2FCxeYCzGDcoZJnavs5ZiYjjw+AdRlyG7D
-VkkjnmRW7d+iJIMH2olC5O57wwxSQb1FON9KU2c7EjbhrWUJx4RfJy1O8jPMA0XC
-KL4ynk0Gqiuf5X4ll8scRVv2sWP7Zh8a5O09Q6Teghc8VBlitkhVl7Z9Ylle6IHt
-/GajqsEZjDVbsn3fjdIFZJSuUq/q8+TpRzBqOMB4yFAXrGKXcrcQwR721Ol+SDOj
-HOB2BJCb3Ue9NzqIlgXpyc2LpPt2RRlYaJm45zod</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://cloudidp1.canarie.ca:9443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://cloudidp1.canarie.ca:9443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CANARIE</OrganizationName>
-    <OrganizationName xml:lang="fr">CANARIE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CANARIE - CAF Cloud IdP - Canada's Advanced Research and Innovation Network</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">
-CANARIE - CAF-FCA - Fournisseur nuagique d'identité - Le réseau évolué de recherche et d'innovation du Canada
-</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.canarie.ca/en/about/aboutus</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.canarie.ca/fr/a-propos/quinoussommes</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Network Operations Center</SurName>
-    <EmailAddress>noc@canarie.ca</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/colreg.de.dariah.eu.xml b/swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml
index c8a89781..c8a89781 100644
--- a/swamid-interfederations-2.0/colreg.de.dariah.eu.xml
+++ b/swamid-interfederations-2.0/colreg.de.dariah.eu-colreg.xml
diff --git a/swamid-interfederations-2.0/community.ja.net.xml b/swamid-interfederations-2.0/community.ja.net-shibboleth.xml
index 1bd9eebb..1bd9eebb 100644
--- a/swamid-interfederations-2.0/community.ja.net.xml
+++ b/swamid-interfederations-2.0/community.ja.net-shibboleth.xml
diff --git a/swamid-interfederations-2.0/connect-beta.sunet.se.xml b/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
index ac3be1a1..ac3be1a1 100644
--- a/swamid-interfederations-2.0/connect-beta.sunet.se.xml
+++ b/swamid-interfederations-2.0/connect-beta.sunet.se-shibboleth.xml
diff --git a/swamid-interfederations-2.0/connect.sunet.se.xml b/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
index b2f84347..b2f84347 100644
--- a/swamid-interfederations-2.0/connect.sunet.se.xml
+++ b/swamid-interfederations-2.0/connect.sunet.se-shibboleth.xml
diff --git a/swamid-interfederations-2.0/core.uwap.org.xml b/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 8039d387..8039d387 100644
--- a/swamid-interfederations-2.0/core.uwap.org.xml
+++ b/swamid-interfederations-2.0/core.uwap.org-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml b/swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml
new file mode 100644
index 00000000..54f35092
--- /dev/null
+++ b/swamid-interfederations-2.0/customers.myunidays.com-shibboleth.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://customers.myunidays.com/shibboleth">
+  <!--
+		This is a "UNiDAYS - Perks of Student Life - Customers" Shibboleth SP for MYUNiDAYS Limited.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2011-09-16T17:03:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://customers.myunidays.com/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://customers.myunidays.com/Shibboleth.sso/Login" index="1"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://customers.myunidays.com/Shibboleth.sso/Login" index="2"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://customers.myunidays.com/Shibboleth.sso/Login"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://customers.myunidays.com/Shibboleth.sso/WAYF/UKFederation"/>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://customers.myunidays.com/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://customers.myunidays.com/Shibboleth.sso/DS" index="3"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNiDAYS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Delivering online student discount and promotions from the biggest retailers for free to students.</mdui:Description>
+        <mdui:Logo height="100" width="300">https://d2hltel0toual2.cloudfront.net/images/wayf/logo_300x100px.png</mdui:Logo>
+        <mdui:Logo height="16" width="80">https://d2hltel0toual2.cloudfront.net/images/wayf/logo_80x16px.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDKDCCAhACCQC8EjoQK/aL7jANBgkqhkiG9w0BAQUFADBWMQswCQYDVQQGEwJH
+						QjETMBEGA1UECBMKU29tZS1TdGF0ZTEQMA4GA1UEChMHVW5pRGF5czEgMB4GA1UE
+						AxMXY3VzdG9tZXJzLm15dW5pZGF5cy5jb20wHhcNMTIwMzIwMDk0NzUyWhcNMzIw
+						MzE1MDk0NzUyWjBWMQswCQYDVQQGEwJHQjETMBEGA1UECBMKU29tZS1TdGF0ZTEQ
+						MA4GA1UEChMHVW5pRGF5czEgMB4GA1UEAxMXY3VzdG9tZXJzLm15dW5pZGF5cy5j
+						b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCwMJfrb7y+eVIjMnMj
+						KQEaWZWX9omtsMmrkxgOAEO5snjni2OJfWShhGmTKpBHClE8AmomOdDr3grEW6Nd
+						5J0+yDh21A7bW6cdaxpwvr2FRZGaIkJFob0Lh7pnH59UIwfeO36fEUa/QfVWafZJ
+						JeWZe4gKcdI+ndY0tMvK4m/pMcO6rxy4AwsJdvxM0bE9R3WNlB8lgcxmbP4pjoZC
+						B29buyOS5/CmFzbA5IffwyJcyk+8dHVF7tbZ0CyjjOsXIrjCryUzsqDOdBLt5yup
+						n6BcBzob6bU8AMojnVT10NCxOWqL+O9i1VScJ/dzyiDbR05iWDa2VQ+/Ya9UpD4d
+						Pl5bAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAKp/yt95eag2/oZdvxaIWLzjljEd
+						lZdlxzZVSXgI67Ci+RhBp+jrBAgNrk/2QxEtau8t54Ufy4hxCFh4o/YvQ3F/Rmaz
+						t7jz51Xj4/DeQ0Y/b5Kb+8MaZF8ZCNseU8Fd92c1Io+sAPQPtFqgR+kzxMOQAWET
+						L/IOUn+DhRh434WBVEciLUduGIpP+sI3gaszurWQIJslPrxOEf+X9aDjOSvLqJvw
+						jPsDxBi12zyperdHQgdNr6Jbd1h110XCpJzwCGXElxlNd+Z3R/sMW0wn7lCLYQA7
+						xmBjp1ntxjW8jWQiW/3pb5t/HODL79ntP17sTv4kT8EURtMRgYxttfreDdg=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://customers.myunidays.com/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customers.myunidays.com/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://customers.myunidays.com/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://customers.myunidays.com/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://customers.myunidays.com/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">MYUNiDAYS Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UNiDAYS - Perks of Student Life - Customers</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.myunidays.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Andrew</GivenName>
+    <SurName>Bullock</SurName>
+    <EmailAddress>mailto:andrew@myunidays.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Andrew</GivenName>
+    <SurName>Bullock</SurName>
+    <EmailAddress>mailto:andrew@myunidays.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/de.dariah.eu.xml b/swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml
index 1f116991..1f116991 100644
--- a/swamid-interfederations-2.0/de.dariah.eu.xml
+++ b/swamid-interfederations-2.0/de.dariah.eu-shibboleth.xml
diff --git a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml b/swamid-interfederations-2.0/dev.emeraldinsight.com-entity.xml
index 803bf9de..803bf9de 100644
--- a/swamid-interfederations-2.0/dev.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/dev.emeraldinsight.com-entity.xml
diff --git a/swamid-interfederations-2.0/dev1.redclara.net.xml b/swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml
index 7f922f13..c2f139ff 100644
--- a/swamid-interfederations-2.0/dev1.redclara.net.xml
+++ b/swamid-interfederations-2.0/dev1.redclara.net-shibboleth.xml
@@ -22,52 +22,88 @@ http://cofre.reuna.cl/index.php/es/reglas-federacion
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>200.0.206.45</ds:KeyName>
+        <ds:KeyName>dev1.redclara.net</ds:KeyName>
+        <ds:KeyName>redclara.net</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=200.0.206.45,C=UY,ST=Montevideo,O=Red Clara</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFjCCAf4CCQCfJK8DwZ2R6DANBgkqhkiG9w0BAQUFADBNMRIwEAYDVQQKEwlS
-ZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJBgNVBAYTAlVZMRUwEwYD
-VQQDEwwyMDAuMC4yMDYuNDUwHhcNMTIwNjIxMTkwODI3WhcNMTQwNjIxMTkwODI3
-WjBNMRIwEAYDVQQKEwlSZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJ
-BgNVBAYTAlVZMRUwEwYDVQQDEwwyMDAuMC4yMDYuNDUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDKdBxbh2K3ngU3foWWHsVqrJ/cKjw4L5jLwmk6qdj9
-XB/otv821IkaDZvByWuyXNKnAzsPhQf3zFxrxEUuMaIkicocBqgccuSjo6PMP16F
-iXgre8mClioOSk9yJ8g0yc7g8bAU1fK3adPu0lJ7cPzgVSnfrKj/9XKGIm7osRgU
-mbjq3Dbu5b3kBAAnmIxiFIAQgPI54G56/0HRuj4WK6xRmS/XDMsYK5rGpvRDsXyn
-8RXst/NYLbUWidloCnqbZQuONcD01jYdz5Jg2ewm4M7fatvUGjIsubUD+M5wiqIz
-3qoHv51AKxfVkGfhcJ7h9Qk4nrdwFPOHAURpDikQhDz/AgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAIVCSoO1PhqT5uuVZ5aSjv2lbsVLe5vKofdMGGt6733+P/uAd/M7
-sC2o/1A1G/B8nBAcmf6ixxXhC80xP1/X6mOZMndlodR7EQ3kiaK4PK8axyj8YybG
-BIc0FWfyTey5CbreQ4+Ki7VtWRyreGO0dr3vuw4EiSWElRLhI1B3Lo0Bk2JJ67QK
-IgrPMUrUh5jJAlp3jX/RvuvxEc1ARN4pLRAKzBkDhVrgCTULlWJEWaDG6b9wMRqT
-kkpXOppmeF9MhHCi7jx9rpC9rStCqtrx9OR8nV47HJuXbPG/IXZsJtjMtFC494yN
-ZbqhKmJYNXHT9wwPSukVuZtX44gDv8HIuws=
+          <ds:X509SubjectName>emailAddress=webmaster@redclara.net,CN=dev1.redclara.net,C=CO,description=QPUmXyZ3gm091N6p</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGWzCCBUOgAwIBAgIDEL2nMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTI2MjMxMTM2
+WhcNMTUwNTI4MTI0NTI3WjBrMRkwFwYDVQQNExBRUFVtWHlaM2dtMDkxTjZwMQsw
+CQYDVQQGEwJDTzEaMBgGA1UEAxMRZGV2MS5yZWRjbGFyYS5uZXQxJTAjBgkqhkiG
+9w0BCQEWFndlYm1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDbnJsFWPS0QzTxLy/QljN+fdU69hUiChmyPx8c6asT0cy+
+daDvHXpRqTZXB7DuZdd4B8JVCdSth52/oyBpgQpIhF19bpzvVNmyBtS0Xp6w5NN7
+GfIoEA8MGO4H9VdUNio1sJLUTE8a/J33DJdk1RkH5ucJLYdK0nph1yasusWHnSBJ
+VOC3Ea9Hv/yJxoSlHrOs0Sr4UxucVTmgQSU7Wd/0Mq86cHXJ1/lOaWl4+VwbBGXt
+CTCTpUBIHJa8ufH9kyAMtLb4gCXCR48aWIF18SaM8J5/HgXABpwKuVePUqg4TTkU
+c0SSy1gpFA7IKhW4e8jODE89UrEpaLBi+/ke1Ba7AgMBAAGjggLkMIIC4DAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUYk4lJIBf4VCDLPFliL5UPeZFtlswHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI
+98xkLu8OLEUwKgYDVR0RBCMwIYIRZGV2MS5yZWRjbGFyYS5uZXSCDHJlZGNsYXJh
+Lm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3AQID
+MIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5
+LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2Nv
+cmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2Yg
+dGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGlu
+dGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0
+eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFy
+dHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUF
+BzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2ZXIv
+Y2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1
+Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0
+YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBADsAzhJo+3OBmR08KLDzjjJY
+cuTq6CMwo8j6PELtWnr97Dr4TBcWXTRPXkXGnWERfKqOEhPAgsbkitcQV6/kF3wg
+r75AanfGFXEperOnsACBtiHf7MExrtlZRP1VmktJha6wJwSo4r8BX1YVcNoLUxre
+5AVtbXzVouJwK+nTzeiUGJg+nw0unobLasACKJeTVfmSjBGjtavax0u2nPNNHwiG
+cXDDrP+n+KWYguTeN55pKswkK7N0ow76p1/SgqYtsubspQYP/rLIECOwGo0vxwgA
++9mTyRFXs+eBLhsogDkCQFvEalTpa/7Ac0gRCeUI5Dw4JozFo+eqGV5lrJAiMh8=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>200.0.206.45</ds:KeyName>
+        <ds:KeyName>dev1.redclara.net</ds:KeyName>
+        <ds:KeyName>redclara.net</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=200.0.206.45,C=UY,ST=Montevideo,O=Red Clara</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDFjCCAf4CCQCfJK8DwZ2R6DANBgkqhkiG9w0BAQUFADBNMRIwEAYDVQQKEwlS
-ZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJBgNVBAYTAlVZMRUwEwYD
-VQQDEwwyMDAuMC4yMDYuNDUwHhcNMTIwNjIxMTkwODI3WhcNMTQwNjIxMTkwODI3
-WjBNMRIwEAYDVQQKEwlSZWQgQ2xhcmExEzARBgNVBAgTCk1vbnRldmlkZW8xCzAJ
-BgNVBAYTAlVZMRUwEwYDVQQDEwwyMDAuMC4yMDYuNDUwggEiMA0GCSqGSIb3DQEB
-AQUAA4IBDwAwggEKAoIBAQDKdBxbh2K3ngU3foWWHsVqrJ/cKjw4L5jLwmk6qdj9
-XB/otv821IkaDZvByWuyXNKnAzsPhQf3zFxrxEUuMaIkicocBqgccuSjo6PMP16F
-iXgre8mClioOSk9yJ8g0yc7g8bAU1fK3adPu0lJ7cPzgVSnfrKj/9XKGIm7osRgU
-mbjq3Dbu5b3kBAAnmIxiFIAQgPI54G56/0HRuj4WK6xRmS/XDMsYK5rGpvRDsXyn
-8RXst/NYLbUWidloCnqbZQuONcD01jYdz5Jg2ewm4M7fatvUGjIsubUD+M5wiqIz
-3qoHv51AKxfVkGfhcJ7h9Qk4nrdwFPOHAURpDikQhDz/AgMBAAEwDQYJKoZIhvcN
-AQEFBQADggEBAIVCSoO1PhqT5uuVZ5aSjv2lbsVLe5vKofdMGGt6733+P/uAd/M7
-sC2o/1A1G/B8nBAcmf6ixxXhC80xP1/X6mOZMndlodR7EQ3kiaK4PK8axyj8YybG
-BIc0FWfyTey5CbreQ4+Ki7VtWRyreGO0dr3vuw4EiSWElRLhI1B3Lo0Bk2JJ67QK
-IgrPMUrUh5jJAlp3jX/RvuvxEc1ARN4pLRAKzBkDhVrgCTULlWJEWaDG6b9wMRqT
-kkpXOppmeF9MhHCi7jx9rpC9rStCqtrx9OR8nV47HJuXbPG/IXZsJtjMtFC494yN
-ZbqhKmJYNXHT9wwPSukVuZtX44gDv8HIuws=
+          <ds:X509SubjectName>emailAddress=webmaster@redclara.net,CN=dev1.redclara.net,C=CO,description=QPUmXyZ3gm091N6p</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGWzCCBUOgAwIBAgIDEL2nMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTI2MjMxMTM2
+WhcNMTUwNTI4MTI0NTI3WjBrMRkwFwYDVQQNExBRUFVtWHlaM2dtMDkxTjZwMQsw
+CQYDVQQGEwJDTzEaMBgGA1UEAxMRZGV2MS5yZWRjbGFyYS5uZXQxJTAjBgkqhkiG
+9w0BCQEWFndlYm1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDbnJsFWPS0QzTxLy/QljN+fdU69hUiChmyPx8c6asT0cy+
+daDvHXpRqTZXB7DuZdd4B8JVCdSth52/oyBpgQpIhF19bpzvVNmyBtS0Xp6w5NN7
+GfIoEA8MGO4H9VdUNio1sJLUTE8a/J33DJdk1RkH5ucJLYdK0nph1yasusWHnSBJ
+VOC3Ea9Hv/yJxoSlHrOs0Sr4UxucVTmgQSU7Wd/0Mq86cHXJ1/lOaWl4+VwbBGXt
+CTCTpUBIHJa8ufH9kyAMtLb4gCXCR48aWIF18SaM8J5/HgXABpwKuVePUqg4TTkU
+c0SSy1gpFA7IKhW4e8jODE89UrEpaLBi+/ke1Ba7AgMBAAGjggLkMIIC4DAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUYk4lJIBf4VCDLPFliL5UPeZFtlswHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI
+98xkLu8OLEUwKgYDVR0RBCMwIYIRZGV2MS5yZWRjbGFyYS5uZXSCDHJlZGNsYXJh
+Lm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3AQID
+MIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9saWN5
+LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBhY2Nv
+cmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMgb2Yg
+dGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhlIGlu
+dGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBwYXJ0
+eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5zdGFy
+dHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsGAQUF
+BzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2ZXIv
+Y2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRzL3N1
+Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3LnN0
+YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBADsAzhJo+3OBmR08KLDzjjJY
+cuTq6CMwo8j6PELtWnr97Dr4TBcWXTRPXkXGnWERfKqOEhPAgsbkitcQV6/kF3wg
+r75AanfGFXEperOnsACBtiHf7MExrtlZRP1VmktJha6wJwSo4r8BX1YVcNoLUxre
+5AVtbXzVouJwK+nTzeiUGJg+nw0unobLasACKJeTVfmSjBGjtavax0u2nPNNHwiG
+cXDDrP+n+KWYguTeN55pKswkK7N0ow76p1/SgqYtsubspQYP/rLIECOwGo0vxwgA
++9mTyRFXs+eBLhsogDkCQFvEalTpa/7Ac0gRCeUI5Dw4JozFo+eqGV5lrJAiMh8=
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/dev2.dariah.eu.xml b/swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml
index 1a2ed256..1a2ed256 100644
--- a/swamid-interfederations-2.0/dev2.dariah.eu.xml
+++ b/swamid-interfederations-2.0/dev2.dariah.eu-shibboleth.xml
diff --git a/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml
index 03f072ae..03f072ae 100644
--- a/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br.xml
+++ b/swamid-interfederations-2.0/dimorus.intranet.ifrj.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml b/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml
index d6920763..40531cb7 100644
--- a/swamid-interfederations-2.0/doccom.iml.unibe.ch.xml
+++ b/swamid-interfederations-2.0/doccom.iml.unibe.ch-shibboleth.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://doccom.iml.unibe.ch/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-04-10T10:46:52Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-08T10:55:32Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
@@ -82,13 +82,7 @@ FLSCieH5zHtHuRj8cSafaBgJoQvFTOkZoD8D8N9CcCIKBUQleyBNpRBIfc0=
   <ContactPerson contactType="technical">
     <GivenName>Hahn</GivenName>
     <SurName>Axel</SurName>
-    <EmailAddress>mailto:axel.hahn@iml.unibe.ch</EmailAddress>
-    <TelephoneNumber>+41 31 632 2512</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Salzmann</GivenName>
-    <SurName>Matthias</SurName>
-    <EmailAddress>mailto:matthias.salzmann@iml.unibe</EmailAddress>
-    <TelephoneNumber>+41 31 632 2512</TelephoneNumber>
+    <EmailAddress>mailto:sysadmin@iml.unibe.ch</EmailAddress>
+    <TelephoneNumber>+41 031 631 58 53</TelephoneNumber>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/doit.swisdom.org.xml b/swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml
index 9a7b4c9c..9a7b4c9c 100644
--- a/swamid-interfederations-2.0/doit.swisdom.org.xml
+++ b/swamid-interfederations-2.0/doit.swisdom.org-shibboleth.xml
diff --git a/swamid-interfederations-2.0/dourado.ufs.br.xml b/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml
index ac0f9de0..ac0f9de0 100644
--- a/swamid-interfederations-2.0/dourado.ufs.br.xml
+++ b/swamid-interfederations-2.0/dourado.ufs.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/e-localcourses.unibo.it.xml b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
index 994d2985..193acefb 100644
--- a/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
+++ b/swamid-interfederations-2.0/e-localcourses.unibo.it.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://e-localcourses.unibo.it">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://e-localcourses.unibo.it">
+  <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-02-17T11:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">
                     https://www.idem.garr.it/idem-metadata-registration-practice-statement
                 </mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
       <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">E-LOCAL courses of languages and cultures.</mdui:DisplayName>
         <mdui:DisplayName xml:lang="it">Corsi E-LOCAL di lingue e culture.</mdui:DisplayName>
@@ -19,54 +19,53 @@
         <mdui:PrivacyStatementURL xml:lang="en">https://e-localcourses.unibo.it/mod/resource/view.php?id=289</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="it">https://e-localcourses.unibo.it/mod/resource/view.php?id=290</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://e-localcourses.unibo.it/Shibboleth.sso/UniboAuth"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://e-localcourses.unibo.it/Shibboleth.sso/UniboAuth"/>
+    </Extensions>
+    <KeyDescriptor>
       <ds:KeyInfo>
-        <ds:KeyName>e-localcourses.unibo.it</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=e-localcourses.unibo.it</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDDDCCAfSgAwIBAgIJAJQYlu3GGLHwMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
-                            BAMTF2UtbG9jYWxjb3Vyc2VzLnVuaWJvLml0MB4XDTEzMDkzMDE1MzU1NVoXDTE4
-                            MDkyOTE1MzU1NVowIjEgMB4GA1UEAxMXZS1sb2NhbGNvdXJzZXMudW5pYm8uaXQw
-                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWEo6p5B59kOr233RKoan
-                            vSs7+6MP9DMeLgFE2IGbhiTtr8E9FAvCw2lWB1Xew5GHzQ1rVZl9DHQB3xYj3K1b
-                            vQ6ZTsgITqh65VJHtNguLWezB98rl8LkxPRP0iUH1BLfoL4Dg9BPm/PIxUCv0+Bf
-                            Hl5G8aLzSrdTnrd7tAIw8aLsy0At/5v5ShlU8KcM4K5mqrCS7SSZ7micIp6IFQkH
-                            L6Ctqu8u9NznYvhEBmtz7N/z4CIk2yUTx7zjwPs68Ke79T/rAbvuAb8dTSwrgKDq
-                            MtTR9Romp57roAfS60NH8fVOs+wsGD/q36fV7Gd98SsP9nmHwf1z+dlt6VXSA+Px
-                            AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2UtbG9jYWxjb3Vyc2VzLnVuaWJvLml0MB0G
-                            A1UdDgQWBBT+SDB/78eV3AEQ1vDdZeTY+VBHQDANBgkqhkiG9w0BAQUFAAOCAQEA
-                            hTIVSita3rHPnKHeMKo17BjlrAZWihiAqKQe8WYxlkH/84FC3ZX0Y9U5rP41bYEV
-                            AjWaF22S1/zbVIxexnYLSiClxRykeEF/wsvFlDmLWSNaPFU8lEwlRUWPg3QOQOX0
-                            cX4GWkWRbeqjJNk9glo03imCXd6b8YVFJS5TxWTSzpzRrNkS3RMGRGKNZENWbyI5
-                            breUwiWdYuGgtTg4LZAjpb/ZygN0jF9b53lmKFpUEWXKblRluTcQQCss5Y8/Q82O
-                            XV33ikbzfFfZt6+Vl/jpXoforcFOpiiAbgKIsBnd95VtuBsBvRl+pzh3xdA2YQXS
-                            VrUi/sMWebysPZ53w+Pc5Q==
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDDDCCAfSgAwIBAgIJAJQYlu3GGLHwMA0GCSqGSIb3DQEBBQUAMCIxIDAeBgNV
+BAMTF2UtbG9jYWxjb3Vyc2VzLnVuaWJvLml0MB4XDTEzMDkzMDE1MzU1NVoXDTE4
+MDkyOTE1MzU1NVowIjEgMB4GA1UEAxMXZS1sb2NhbGNvdXJzZXMudW5pYm8uaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDAWEo6p5B59kOr233RKoan
+vSs7+6MP9DMeLgFE2IGbhiTtr8E9FAvCw2lWB1Xew5GHzQ1rVZl9DHQB3xYj3K1b
+vQ6ZTsgITqh65VJHtNguLWezB98rl8LkxPRP0iUH1BLfoL4Dg9BPm/PIxUCv0+Bf
+Hl5G8aLzSrdTnrd7tAIw8aLsy0At/5v5ShlU8KcM4K5mqrCS7SSZ7micIp6IFQkH
+L6Ctqu8u9NznYvhEBmtz7N/z4CIk2yUTx7zjwPs68Ke79T/rAbvuAb8dTSwrgKDq
+MtTR9Romp57roAfS60NH8fVOs+wsGD/q36fV7Gd98SsP9nmHwf1z+dlt6VXSA+Px
+AgMBAAGjRTBDMCIGA1UdEQQbMBmCF2UtbG9jYWxjb3Vyc2VzLnVuaWJvLml0MB0G
+A1UdDgQWBBT+SDB/78eV3AEQ1vDdZeTY+VBHQDANBgkqhkiG9w0BAQUFAAOCAQEA
+hTIVSita3rHPnKHeMKo17BjlrAZWihiAqKQe8WYxlkH/84FC3ZX0Y9U5rP41bYEV
+AjWaF22S1/zbVIxexnYLSiClxRykeEF/wsvFlDmLWSNaPFU8lEwlRUWPg3QOQOX0
+cX4GWkWRbeqjJNk9glo03imCXd6b8YVFJS5TxWTSzpzRrNkS3RMGRGKNZENWbyI5
+breUwiWdYuGgtTg4LZAjpb/ZygN0jF9b53lmKFpUEWXKblRluTcQQCss5Y8/Q82O
+XV33ikbzfFfZt6+Vl/jpXoforcFOpiiAbgKIsBnd95VtuBsBvRl+pzh3xdA2YQXS
+VrUi/sMWebysPZ53w+Pc5Q==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">&gt;E-LOCAL courses of languages and cultures.</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Language and culture courses of Dutch, Finnish, Hungarian, Italian, Polish and Portuguese.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute xmlns="urn:oasis:names:tc:SAML:2.0:metadata" FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Bologna</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università di Bologna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">E-LOCAL courses of languages and cultures provided by University of Bologna</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Corsi E-LOCAL di lingue e culture erogato da Università di Bologna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unibo.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unibo.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>cesia-sso-support@unibo.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SLO/Redirect"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://e-localcourses.unibo.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">&gt;E-LOCAL courses of languages and cultures.</ServiceName>
+      <ServiceDescription xml:lang="en">Language and culture courses of Dutch, Finnish, Hungarian, Italian, Polish and Portuguese.</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Bologna</OrganizationName>
+    <OrganizationName xml:lang="it">Università di Bologna</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">E-LOCAL courses of languages and cultures provided by University of Bologna</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Corsi E-LOCAL di lingue e culture erogato da Università di Bologna</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unibo.it</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.unibo.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>cesia-sso-support@unibo.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/e5.onthehub.com.xml b/swamid-interfederations-2.0/e5.onthehub.com.xml
index 48b68c2b..8f554887 100644
--- a/swamid-interfederations-2.0/e5.onthehub.com.xml
+++ b/swamid-interfederations-2.0/e5.onthehub.com.xml
@@ -8,7 +8,6 @@
       <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://www.swamid.se/category/eu-adequate-protection</samla:AttributeValue>
         <samla:AttributeValue>http://www.swamid.se/category/research-and-education</samla:AttributeValue>
-        <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
diff --git a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml
new file mode 100644
index 00000000..186861f5
--- /dev/null
+++ b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it-shibboleth.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://earthserver-sg.consorzio-cometa.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-04-11T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">EarthServer Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">EarthServer Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo EarthServer che ha come obiettivo quello di fornire a ricercatori sui problemi della terra e degli astri tool l'accesso senza limiti ad un mix di dati provenienti da diverse sorgenti, con differenti dimensione e spazio-temporali, basati su open standards.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://earthserver-sg.consorzio-cometa.it/service</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+j/MCNlE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">EarthServer Science Gateway</ServiceName>
+      <ServiceDescription xml:lang="en">This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Consorzio COMETA</OrganizationName>
+    <OrganizationName xml:lang="it">Consorzio COMETA</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Earth Server Science Gateway provided by Consorzio COMETA</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Earth Server Science Gateway erogato da Consorzio COMETA</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/en/home</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Riccardo</GivenName>
+    <SurName>Bruno</SurName>
+    <EmailAddress>riccardo.bruno@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Roberto</GivenName>
+    <SurName>Barbera</SurName>
+    <EmailAddress>roberto.barbera@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml b/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml
deleted file mode 100644
index 74b03511..00000000
--- a/swamid-interfederations-2.0/earthserver-sg.consorzio-cometa.it.xml
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://earthserver-sg.consorzio-cometa.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-10T09:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">
-                        EarthServer Science Gateway
-                    </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">
-                        EarthServer Science Gateway
-                    </mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo EarthServer che ha come obiettivo quello di fornire a ricercatori sui problemi della terra e degli astri tool l'accesso senza limiti ad un mix di dati provenienti da diverse sorgenti, con differenti dimensione e spazio-temporali, basati su open standards.
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
-        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
-        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
-        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
-        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
-        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
-        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-                            VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-                            EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-                            c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-                            T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-                            3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-                            O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-                            i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-                            LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-                            TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-                            AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-                            BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-                            A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-                            IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-                            KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-                            AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-                            Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-                            ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-                            ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-                            bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-                            LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-                            ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-                            cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-                            iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-                            PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-                            n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-                            zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-                            2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-                            j/MCNlE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">EarthServer Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">
-                    This service allows to use on a Grid infrastructure the applications of the EarthServer project which provides Earth and planetary science researchers with tools to achieve barrier-free "mix and match" access to multi-source, any-size, multi-dimensional spatio-temporal data based on open standards.
-                </md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Bruno</md:SurName>
-    <md:EmailAddress>mailto:riccardo.bruno@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de.xml b/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml
index b26e8eab..f3f2241a 100644
--- a/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de.xml
+++ b/swamid-interfederations-2.0/easydb.geschkult.fu-berlin.de-shibboleth.xml
@@ -1,5 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://easydb.geschkult.fu-berlin.de/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-21T05:40:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -97,12 +103,21 @@ DrH/2UPUl2lUMBXA64UsRXgFovJd0H/EXzNJhEdFsrRUOQLx+GzD
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
     <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Artifact"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST" index="1"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/Artifact" index="3"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="4"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML/POST" index="5"/>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://easydb.geschkult.fu-berlin.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">EasyDB (Digitale Diathek) an der FU Berlin</ServiceName>
+      <ServiceName xml:lang="en">EasyDB (Digitale Diathek) an der FU Berlin</ServiceName>
+      <ServiceDescription xml:lang="de">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</ServiceDescription>
+      <ServiceDescription xml:lang="en">EasyDB ist die gemeinsame Bilddatenbank der archäologischen und die kunsthistorischen Fächer des Fachbereich Geschichts- und Kulturwissenschaften der Freien Universität Berlin. Sie bietet Zugriff auf derzeit 250.000 Bilder für Forschung und Lehre.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="de">e5</OrganizationName>
@@ -127,4 +142,9 @@ DrH/2UPUl2lUMBXA64UsRXgFovJd0H/EXzNJhEdFsrRUOQLx+GzD
     <SurName>Posel</SurName>
     <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
   </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Johannes</GivenName>
+    <SurName>Posel</SurName>
+    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml b/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml
new file mode 100644
index 00000000..f4f2da82
--- /dev/null
+++ b/swamid-interfederations-2.0/ecsg.dch-rp.eu-shibboleth.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://ecsg.dch-rp.eu/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-06-10T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">
+                        e-Culture Science Gateway
+                    </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">
+                        e-Culture Science Gateway
+                    </mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo DCH-RP che ha come obiettivo quello di fornire strumenti per la memo
+                        rizzazione ed il mantenimento del patrimonio culturale
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+j/MCNlE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">e-Culture Science Gateway</ServiceName>
+      <ServiceDescription xml:lang="en">
+                    This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
+                </ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">INFN Catania</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">INFN Catania</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ct.infn.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Marco</GivenName>
+    <SurName>Fargetta</SurName>
+    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Roberto</GivenName>
+    <SurName>Barbera</SurName>
+    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ecsg.dch-rp.eu.xml b/swamid-interfederations-2.0/ecsg.dch-rp.eu.xml
deleted file mode 100644
index 5a9d82db..00000000
--- a/swamid-interfederations-2.0/ecsg.dch-rp.eu.xml
+++ /dev/null
@@ -1,114 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ecsg.dch-rp.eu/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-06-10T11:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">
-                        e-Culture Science Gateway
-                    </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">
-                        e-Culture Science Gateway
-                    </mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi sviluppati per il progetto europeo DCH-RP che ha come obiettivo quello di fornire strumenti per la memo
-                        rizzazione ed il mantenimento del patrimonio culturale
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://earthserver-sg.consorzio-cometa.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
-        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
-        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
-        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
-        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
-        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
-        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-                            VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-                            EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-                            c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-                            T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-                            3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-                            O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-                            i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-                            LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-                            TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-                            AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-                            BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-                            A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-                            IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-                            KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-                            AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-                            Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-                            ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-                            ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-                            bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-                            LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-                            ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-                            cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-                            iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-                            PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-                            n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-                            zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-                            2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-                            j/MCNlE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ecsg.dch-rp.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">e-Culture Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">
-                    This service allows to use on a Grid infrastructure the applications of the DCH-RP Project which provides tools to store and preserve digital cultural heritage.
-                </md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edev.cesnet.cz.xml b/swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml
index 296a0a6e..30d0e153 100644
--- a/swamid-interfederations-2.0/edev.cesnet.cz.xml
+++ b/swamid-interfederations-2.0/edev.cesnet.cz-sp-shibboleth.xml
@@ -1,15 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edev.cesnet.cz/sp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-10-10T20:28:16Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <mdasrt:AttributeValue>http://eduid.cz/uri/sp-group/clarin</mdasrt:AttributeValue>
-      </mdasrt:Attribute>
-    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
     <md:Extensions>
diff --git a/swamid-interfederations-2.0/educonf-directory.geant.net.xml b/swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml
index 81a6c4ea..81a6c4ea 100644
--- a/swamid-interfederations-2.0/educonf-directory.geant.net.xml
+++ b/swamid-interfederations-2.0/educonf-directory.geant.net-simplesaml-module.php-saml-sp-metadata.php-eduCONF.xml
diff --git a/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..7c5d0466
--- /dev/null
+++ b/swamid-interfederations-2.0/edugain-group.cesnet.cz-idp-shibboleth.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://edugain-group.cesnet.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-23T11:20:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edugain-group.cesnet.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">eduGAIN Group AA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">eduGAIN Group AA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Attribute Authority for eduGAIN Group Sevice.</mdui:Description>
+        <mdui:Description xml:lang="cs">Atributová autorita pro službu eduGAIN skupiny.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://perun.cesnet.cz/apps/edugain-group/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://perun.cesnet.cz/apps/edugain-group/</mdui:InformationURL>
+        <mdui:Logo height="87" width="293">https://perun.cesnet.cz/web/img/logo_color_shades.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEqTCCA5GgAwIBAgIRAKTDcyjAM5LIjbwt/gIRhBMwDQYJKoZIhvcNAQELBQAw
+ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
+CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
+IENBIDIwHhcNMTQxMDIxMDAwMDAwWhcNMTcxMDIwMjM1OTU5WjBFMSEwHwYDVQQL
+ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxIDAeBgNVBAMTF2VkdWdhaW4tZ3Jv
+dXAuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7h40
+7VUKwoW/zRyupdmroy6rSeb0t2szy683Ac8zJbFQT7lMEE4LEpBF40CxitQN4zkq
+6rZ1avCDfgUA5UOCqDRsDZiVhVZVHTUsewOWnA4I5cI38oKsi7Ai9eSTmgcWVaeS
+EjluoKZW2ycVmABMGLbOLo1odikKDCmXniNZLYRbXH6mGQrZ4bWYW6vXyGJJAyu7
+i5oJIYXv9G6Ok9PZe/nfs2vlU7D3sUFjBOGeTAarwtDdpEb+MzznB+Y49tF6u9f+
+2LWAVV7cQakXx6RATzcbkNcfCV21z9M4UCzQUbMPYfmkT2MT104L9kOcPIWGdA8z
+x0TdmOaFHJHLhqRjLwIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUW9CKHJoyW+C1
+3ZZUG+GGKLD9tr0wHQYDVR0OBBYEFPxW7rdUfjv3tljZIZesDtk45SGsMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NM
+Q0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRw
+Oi8vb2NzcC51c2VydHJ1c3QuY29tMCIGA1UdEQQbMBmCF2VkdWdhaW4tZ3JvdXAu
+Y2VzbmV0LmN6MA0GCSqGSIb3DQEBCwUAA4IBAQA8oL553U23dlBWyYfRp1HzcDSy
+tl/UlWh8FSjUi9CIrCkIzfjUgwZeAYOTTQ/Hszl8EtxxdY3WPqDmtm5VkL8KyMqk
+Pnndn1ebFpK5vLjI1304TNRsR4iZU9/ntNREeaSVzAA135kSnfz+F3KiDMpmnjkB
+58KT0EUE/YEv8hAOyZpOAt/cXwkkKUvlcArIrexXGhFDG5S6Iy9KHzDJ9fJDbAcn
+fmkgS5Dai/VEkvtdEN4d2BpXZHCC8EGPQQLU6ajpoe+P+ls7oLfM5B+rH9/EBHXJ
+cU/I3dCI+bvdo7O6bNqXqahLqhpBXuEaFFzDuT+6kbx8N9SRf0urvUNlejHQ
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://edugain-group.cesnet.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://edugain-group.cesnet.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CESNET</OrganizationName>
+    <OrganizationName xml:lang="cs">CESNET</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">CESNET z.s.p.o.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cesnet.cz/?lang=en</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Michal</GivenName>
+    <SurName>Prochazka</SurName>
+    <EmailAddress>michalp@ics.muni.cz</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Slávek</GivenName>
+    <SurName>Licehammer</SurName>
+    <EmailAddress>slavek@ics.muni.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/edugate.heanet.ie.xml b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
index 2698019e..cea1453e 100644
--- a/swamid-interfederations-2.0/edugate.heanet.ie.xml
+++ b/swamid-interfederations-2.0/edugate.heanet.ie-shibboleth.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.heanet.ie/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.heanet.ie/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
   </md:Extensions>
   <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://edugate.heanet.ie/Shibboleth.sso/DS" index="0"/>
-      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edugate.heanet.ie/Shibboleth.sso/DS"/>
-      <mdui:UIInfo>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://edugate.heanet.ie/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://edugate.heanet.ie/Shibboleth.sso/DS" index="0"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Edugate Resource Registry</mdui:DisplayName>
         <mdui:Description xml:lang="en">The Edugate Resource Registry website is a central administration tool for managing the Edugate federation and additional bilateral relationships. This website also serves 
 The website will process your userid, name and email address to authorise access. Further data is used for the Whoami section of the website for troubleshooting purposes only and this additional data is not retained after you logout/leave the site.</mdui:Description>
-        <mdui:Logo height="108" width="306">https://edugate.heanet.ie/rr3/logos/edugate.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://edugate.heanet.ie/rr3</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">https://edugate.heanet.ie/rr3/p/page/privacy</mdui:PrivacyStatementURL>
+        <mdui:Logo height="108" width="306">https://edugate.heanet.ie/rr3/logos/edugate.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIFbjCCA1YCCQCB0T3DNIZANDANBgkqhkiG9w0BAQUFADB5MQswCQYDVQQGEwJJ
@@ -55,7 +55,7 @@ UBY=
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/POST" index="1"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/Artifact" index="6"/>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://edugate.heanet.ie/Shibboleth.sso/SAML2/ECP" index="8"/>
     <md:AttributeConsumingService index="0">
@@ -89,6 +89,10 @@ The website will process your userid, name and email address to authorise access
       <md:RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="commonName" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="RCSidNumber" Name="urn:oid:1.2.840.113556.1.8000.2092.3.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="awsRoles" Name="https://aws.amazon.com/SAML/Attributes/Role" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="awsRoleSessionName" Name="https://aws.amazon.com/SAML/Attributes/RoleSessionName" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sAMAccountName" Name="urn:oid:1.2.840.113556.1.4.221" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/edugate.itb.ie.xml b/swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml
index 589213e8..01964839 100644
--- a/swamid-interfederations-2.0/edugate.itb.ie.xml
+++ b/swamid-interfederations-2.0/edugate.itb.ie-idp-shibboleth.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.itb.ie/idp/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://edugate.itb.ie/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2011-03-08T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-03-08T00:00:00Z"/>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">itb.ie</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itb.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Institute of Technology Blanchardstown</mdui:DisplayName>
-        <mdui:Logo height="65" width="235">https://edugate.heanet.ie/rr3/logos/itb.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.itb.ie</mdui:InformationURL>
+        <mdui:Logo height="65" width="235">https://edugate.heanet.ie/rr3/logos/itb.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:53.40572644015631,-6.378046274185181</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIDIzCCAgugAwIBAgIUWE0VPYPdB8l/5af8W6PkkZDYFm4wDQYJKoZIhvcNAQEF
diff --git a/swamid-interfederations-2.0/eduspot.ens-cachan.fr.xml b/swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml
index f17d0701..395be891 100644
--- a/swamid-interfederations-2.0/eduspot.ens-cachan.fr.xml
+++ b/swamid-interfederations-2.0/eduspot.ens-cachan.fr-authsaml2-metadata.xml
@@ -16,24 +16,31 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-					      MIIDTDCCAjQCCQCR6CZCuHxqRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJG
-UjErMCkGA1UEChMiRUNPTEUgTk9STUFMRSBTVVBFUklFVVJFIERFIENBQ0hBTjEM
-MAoGA1UECxMDRFNJMR4wHAYDVQQDExVlZHVzcG90LmVucy1jYWNoYW4uZnIwHhcN
-MTQwNDE0MTIzNjI4WhcNMTUwNDE0MTIzNjI4WjBoMQswCQYDVQQGEwJGUjErMCkG
-A1UEChMiRUNPTEUgTk9STUFMRSBTVVBFUklFVVJFIERFIENBQ0hBTjEMMAoGA1UE
-CxMDRFNJMR4wHAYDVQQDExVlZHVzcG90LmVucy1jYWNoYW4uZnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaN/r/9eegiIWfM7W+cBepylzyQKasGNVV
-pOGqQtClO+RDnHw1e+VjLofvQkCrkXqO0Yk2+3fFluaVEKefRhz87KkfCwqmmMVv
-N7QPL7wdjefp7z0QQQd500er/lWzNEZ16noFKNAKIVQ7L8nwEID2szf2o7lwiHUM
-I0/WYrcHtglX+KFiKCajf8lMQHQlnLvrODzBvZPuY+hcjyPMet8C77jsQs9KcBa/
-WOZ0XHwpfP6qSedCp1feHWNG/6H/ngPhFH+Yfh8dCYvnf8evL+WKL+b2L22s009K
-6pGpup0ZJaS2UbMblHeOCRf9kfT6peLwcOawPi9M7W68vSBtNd4DAgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAAm4J2729rV0T1ZHR7GhruA+x8Kt0SXeXwvng8Zuaijz
-NSNK9Ej3j9Y/NRYKPTPAm2fGCrbbr89lZ+0680b6ZqicZU2c4juHe0u5/5zN1wmV
-h98Us4F37tUL4aT6fvi+FTJUkeHR3ZV/wGkdbzTLWqKqVQ8POO8Q55DZEjIrFiq3
-LmIbOYK8bfdAZTc2XWVsU1bNQyJMY6Qiu2mA1VTc61b5gUI94RmMpfEP0hl7DBgh
-KIz/GZRjl9UB3x6EEgmPi+ihRwPs/tQORLZpaS9pyqdPzrH3NuP/iVO5Dv/D7Ss9
-U3vIxlLV3X9ESLFrZiZgFRyKOqQOri3RHniJ7Yt9v+k=
+					      MIIEpDCCA4ygAwIBAgIQeTFgbQWRlGanItIwtJ/w0jANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMTcwMDAwMDBaFw0xNzEwMTYyMzU5NTlaMEMxITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVZWR1c3BvdC5lbnMt
+Y2FjaGFuLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNjLcYRU
+VIYvwbFG89dp+n0NMsDR6SrHZ/AMit0airV2ReNm1H+Wcuq0UGQKLsrhytQsL3vK
+lgBCbUi2LbIFlPubTIBx8pNoH8AkBcOyfg1kiN2yJ4z+gaqjoy+gp7zChSKhga3D
+LsIkAfBK2hKiw+t1Cod/LCgbeBdGKnB4gDTZScYf8r3rSIyE1mtDI93VJfsMHkKD
+j3WOmhAnoT1KDXFHI1utdUwyM/u2nGgAjgupEbDTAOfx/N56/yUkR88Q22itXKdS
+Er3v66gp0CJluEPUFTmmCCdklnv12rFR16hrgm/fiZWyj6z9BtRQUW6cC35fDtmq
+9CMXI8aYdpMTEwIDAQABo4IBcTCCAW0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
+G+GGKLD9tr0wHQYDVR0OBBYEFHeYAb+69vprObDtE1PM63PWKio0MA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
+LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
+cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
+b2NzcC51c2VydHJ1c3QuY29tMCAGA1UdEQQZMBeCFWVkdXNwb3QuZW5zLWNhY2hh
+bi5mcjANBgkqhkiG9w0BAQsFAAOCAQEANOYe63FGB6CrqW/Hl8uRbBrJsYHnzknp
+h6NjKRuvnzeOOOrDVW75T3//6AepZzJ0k1ZzzYIYJ0crBavEEo9L5AvwMPvs7mYw
+RAUTEMhGTm/nYQct1jwbCgNKCDgYuydZUcixtiq3LXz1SglHXGNhg+SLGCGXrHrJ
+JxuaneWu5FgReUB3EDUC0bCrM9nx2cHitLtox3aXU/fhiPXCEkP2HV4DnjLu3fBJ
+S5gBayfEa2U6VDzvwdEk71Pw3PKsdEl7f9N5mp3rpjvr36r5TH5LXhbk0utRGo7u
+yn+WFioypXnVKl7dgWzQsVdGI4NnnsfGgmah+vJMEtRPPnBtjRrV3A==
 					    </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -42,6 +49,39 @@ U3vIxlLV3X9ESLFrZiZgFRyKOqQOri3RHniJ7Yt9v+k=
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+					      MIIEpDCCA4ygAwIBAgIQeTFgbQWRlGanItIwtJ/w0jANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMTcwMDAwMDBaFw0xNzEwMTYyMzU5NTlaMEMxITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVZWR1c3BvdC5lbnMt
+Y2FjaGFuLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuNjLcYRU
+VIYvwbFG89dp+n0NMsDR6SrHZ/AMit0airV2ReNm1H+Wcuq0UGQKLsrhytQsL3vK
+lgBCbUi2LbIFlPubTIBx8pNoH8AkBcOyfg1kiN2yJ4z+gaqjoy+gp7zChSKhga3D
+LsIkAfBK2hKiw+t1Cod/LCgbeBdGKnB4gDTZScYf8r3rSIyE1mtDI93VJfsMHkKD
+j3WOmhAnoT1KDXFHI1utdUwyM/u2nGgAjgupEbDTAOfx/N56/yUkR88Q22itXKdS
+Er3v66gp0CJluEPUFTmmCCdklnv12rFR16hrgm/fiZWyj6z9BtRQUW6cC35fDtmq
+9CMXI8aYdpMTEwIDAQABo4IBcTCCAW0wHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZU
+G+GGKLD9tr0wHQYDVR0OBBYEFHeYAb+69vprObDtE1PM63PWKio0MA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0Ey
+LmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNl
+cnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8v
+b2NzcC51c2VydHJ1c3QuY29tMCAGA1UdEQQZMBeCFWVkdXNwb3QuZW5zLWNhY2hh
+bi5mcjANBgkqhkiG9w0BAQsFAAOCAQEANOYe63FGB6CrqW/Hl8uRbBrJsYHnzknp
+h6NjKRuvnzeOOOrDVW75T3//6AepZzJ0k1ZzzYIYJ0crBavEEo9L5AvwMPvs7mYw
+RAUTEMhGTm/nYQct1jwbCgNKCDgYuydZUcixtiq3LXz1SglHXGNhg+SLGCGXrHrJ
+JxuaneWu5FgReUB3EDUC0bCrM9nx2cHitLtox3aXU/fhiPXCEkP2HV4DnjLu3fBJ
+S5gBayfEa2U6VDzvwdEk71Pw3PKsdEl7f9N5mp3rpjvr36r5TH5LXhbk0utRGo7u
+yn+WFioypXnVKl7dgWzQsVdGI4NnnsfGgmah+vJMEtRPPnBtjRrV3A==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDTDCCAjQCCQCR6CZCuHxqRDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJG
 UjErMCkGA1UEChMiRUNPTEUgTk9STUFMRSBTVVBFUklFVVJFIERFIENBQ0hBTjEM
 MAoGA1UECxMDRFNJMR4wHAYDVQQDExVlZHVzcG90LmVucy1jYWNoYW4uZnIwHhcN
@@ -64,31 +104,6 @@ U3vIxlLV3X9ESLFrZiZgFRyKOqQOri3RHniJ7Yt9v+k=
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIDIzCCAgugAwIBAgIJANUBoick1pDpMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNV
-BAoTCkVudHJvdXZlcnQwHhcNMTAxMjE0MTUzMzAyWhcNMTEwMTEzMTUzMzAyWjAV
-MRMwEQYDVQQKEwpFbnRyb3V2ZXJ0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-CgKCAQEAvxFkfPdndlGgQPDZgFGXbrNAc/79PULZBuNdWFHDD9P5hNhZn9Kqm4Cp
-06Pe/A6u+g5wLnYvbZQcFCgfQAEzziJtb3J55OOlB7iMEI/T2AX2WzrUH8QT8NGh
-ABONKU2Gg4XiyeXNhH5R7zdHlUwcWq3ZwNbtbY0TVc+n665EbrfV/59xihSqsoFr
-kmBLH0CoepUXtAzA7WDYn8AzusIuMx3n8844pJwgxhTB7Gjuboptlz9Hri8JRdXi
-VT9OS9Wt69ubcNoM6zuKASmtm48UuGnhj8v6XwvbjKZrL9kA+xf8ziazZfvvw/VG
-Tm+IVFYB7d1x457jY5zjjXJvNysoowIDAQABo3YwdDAdBgNVHQ4EFgQUeF8ePnu0
-fcAK50iBQDgAhHkOu8kwRQYDVR0jBD4wPIAUeF8ePnu0fcAK50iBQDgAhHkOu8mh
-GaQXMBUxEzARBgNVBAoTCkVudHJvdXZlcnSCCQDVAaInJNaQ6TAMBgNVHRMEBTAD
-AQH/MA0GCSqGSIb3DQEBBQUAA4IBAQAy8l3GhUtpPHx0FxzbRHVaaUSgMwYKGPhE
-IdGhqekKUJIx8et4xpEMFBl5XQjBNq/mp5vO3SPb2h2PVSks7xWnG3cvEkqJSOeo
-fEEhkqnM45b2MH1S5uxp4i8UilPG6kmQiXU2rEUBdRk9xnRWos7epVivTSIv1Ncp
-lG6l41SXp6YgIb2ToT+rOKdIGIQuGDlzeR88fDxWEU0vEujZv/v1PE1YOV0xKjTT
-JumlBc6IViKhJeo1wiBBrVRIIkKKevHKQzteK8pWm9CYWculxT26TZ4VWzGbo06j
-o2zbumirrLLqnt1gmBDvDvlOwC/zAAyL4chbz66eQHTiIYZZvYgy
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduspot.ens-cachan.fr/authsaml2/singleSignOnPost" index="1"/>
     <AttributeConsumingService index="0">
       <ServiceName xml:lang="fr">ENS de Cachan - Portail Eduspot</ServiceName>
diff --git a/swamid-interfederations-2.0/egiswamid.egi.kth.se.xml b/swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml
index e645d46d..e645d46d 100644
--- a/swamid-interfederations-2.0/egiswamid.egi.kth.se.xml
+++ b/swamid-interfederations-2.0/egiswamid.egi.kth.se-shibboleth.xml
diff --git a/swamid-interfederations-2.0/eliot.isae.fr.xml b/swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml
index 230021f2..55d01891 100644
--- a/swamid-interfederations-2.0/eliot.isae.fr.xml
+++ b/swamid-interfederations-2.0/eliot.isae.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isae.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml b/swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml
index d3a50b79..d3a50b79 100644
--- a/swamid-interfederations-2.0/encecafe.ibge.gov.br.xml
+++ b/swamid-interfederations-2.0/encecafe.ibge.gov.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml b/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
deleted file mode 100644
index 5bffe413..00000000
--- a/swamid-interfederations-2.0/engine.jacson.jiscadvance.biz.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://engine.jacson.jiscadvance.biz/authentication/sp/metadata">
-  <!--
-		This is a JACSoN OpenConext SP for the JISC Services Management Company Ltd.
-	-->
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-11-16T10:06:35Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:Description xml:lang="en">JACSoN OpenConext SSO Proxy</mdui:Description>
-        <mdui:Description xml:lang="nl">JACSoN OpenConext SSO Proxy</mdui:Description>
-        <mdui:DisplayName xml:lang="en">JACSoN OpenConext Engine</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="nl">JACSoN OpenConext Engine</mdui:DisplayName>
-        <mdui:Logo height="96" width="96">https://static.jacson.jiscadvance.biz/media/conext_logo.png</mdui:Logo>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYzCCAkugAwIBAgIJAOVBPNcsTdLgMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
-						BAMMC0VuZ2luZUJsb2NrMREwDwYDVQQLDAhTZXJ2aWNlczEQMA4GA1UECgwHU1VS
-						Rm5ldDELMAkGA1UEBhMCTkwwHhcNMTIxMDA0MTAxMTEyWhcNMjIxMDA0MTAxMTEy
-						WjBIMRQwEgYDVQQDDAtFbmdpbmVCbG9jazERMA8GA1UECwwIU2VydmljZXMxEDAO
-						BgNVBAoMB1NVUkZuZXQxCzAJBgNVBAYTAk5MMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAywC71qqd4be2BjFRnn1tCfg+zQHH7wD3AwYE3iLyXa65fYrf
-						wuMVXTPUoyEAZEkjDdrdp5M1lxFEjfa5kqkzScVz4b9fAWZKLPPFjnc9rZgg+SWk
-						ExE/Fo5oNw092MqdM4GpwNxYKD4IYEiu1YM34dvsvqZFH/CcK26CSks/vQMwcDPf
-						uprcw4xA/EBH0OwW7nFaTJJ3EjHilrkDblRZRVgm4lLErIUS2u6wUC88uyYH0SlI
-						xYsG5qJkpjEL4bd09sxLFqPZobxTfjU6BDgolqi7cg2MJXXDvOAz5hcvBdkEG59b
-						xSHH8pyuXfQvUBfPFdjyzxhwkZ9vLxaOQvd0KwIDAQABo1AwTjAdBgNVHQ4EFgQU
-						jZbLsyTu6LNRFs2wisIS1T9PkKIwHwYDVR0jBBgwFoAUjZbLsyTu6LNRFs2wisIS
-						1T9PkKIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAIybyLh8blWnS
-						/aKOONYrNItE/RxNvQ28Ed4twP8ybVD8y3dEMB4j3lpNaYyia8AEEzOmUb8yDLeB
-						gOJ4WPWQI738YJZT3i0CqBH+Cyt1tOYZHqFGYS791dHYGofjetZokkLQT7ftlqpa
-						chcc7jMkdAI8a1mB/ED424oYm2s0shMHdDB858uovU1c9EfUPMQM8aeZ2sVOAp2a
-						3buBTb6QsqgDzc4jUQODmfFU4RYsSJ0oS3t2uvVb6j/DAp5JSjQ7vLZqvHD4be40
-						cuU0RLj5Z0nR6vvjOHTRqTN1cvamgcPEniaWCQd3sJ1wXlLloruoxHmHPAKnlqk+
-						toH/x3TW0g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-						MIIDYzCCAkugAwIBAgIJAOVBPNcsTdLgMA0GCSqGSIb3DQEBBQUAMEgxFDASBgNV
-						BAMMC0VuZ2luZUJsb2NrMREwDwYDVQQLDAhTZXJ2aWNlczEQMA4GA1UECgwHU1VS
-						Rm5ldDELMAkGA1UEBhMCTkwwHhcNMTIxMDA0MTAxMTEyWhcNMjIxMDA0MTAxMTEy
-						WjBIMRQwEgYDVQQDDAtFbmdpbmVCbG9jazERMA8GA1UECwwIU2VydmljZXMxEDAO
-						BgNVBAoMB1NVUkZuZXQxCzAJBgNVBAYTAk5MMIIBIjANBgkqhkiG9w0BAQEFAAOC
-						AQ8AMIIBCgKCAQEAywC71qqd4be2BjFRnn1tCfg+zQHH7wD3AwYE3iLyXa65fYrf
-						wuMVXTPUoyEAZEkjDdrdp5M1lxFEjfa5kqkzScVz4b9fAWZKLPPFjnc9rZgg+SWk
-						ExE/Fo5oNw092MqdM4GpwNxYKD4IYEiu1YM34dvsvqZFH/CcK26CSks/vQMwcDPf
-						uprcw4xA/EBH0OwW7nFaTJJ3EjHilrkDblRZRVgm4lLErIUS2u6wUC88uyYH0SlI
-						xYsG5qJkpjEL4bd09sxLFqPZobxTfjU6BDgolqi7cg2MJXXDvOAz5hcvBdkEG59b
-						xSHH8pyuXfQvUBfPFdjyzxhwkZ9vLxaOQvd0KwIDAQABo1AwTjAdBgNVHQ4EFgQU
-						jZbLsyTu6LNRFs2wisIS1T9PkKIwHwYDVR0jBBgwFoAUjZbLsyTu6LNRFs2wisIS
-						1T9PkKIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAIybyLh8blWnS
-						/aKOONYrNItE/RxNvQ28Ed4twP8ybVD8y3dEMB4j3lpNaYyia8AEEzOmUb8yDLeB
-						gOJ4WPWQI738YJZT3i0CqBH+Cyt1tOYZHqFGYS791dHYGofjetZokkLQT7ftlqpa
-						chcc7jMkdAI8a1mB/ED424oYm2s0shMHdDB858uovU1c9EfUPMQM8aeZ2sVOAp2a
-						3buBTb6QsqgDzc4jUQODmfFU4RYsSJ0oS3t2uvVb6j/DAp5JSjQ7vLZqvHD4be40
-						cuU0RLj5Z0nR6vvjOHTRqTN1cvamgcPEniaWCQd3sJ1wXlLloruoxHmHPAKnlqk+
-						toH/x3TW0g==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-1_5"/>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:unspecified</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.jacson.jiscadvance.biz/authentication/sp/consume-assertion" index="0"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">JACSoN OpenConext Engine</ServiceName>
-      <ServiceName xml:lang="nl">JACSoN OpenConext Engine</ServiceName>
-      <ServiceDescription xml:lang="en">JACSoN OpenConext SSO Proxy</ServiceDescription>
-      <ServiceDescription xml:lang="nl">JACSoN OpenConext SSO Proxy</ServiceDescription>
-      <RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">JISC Services Management Company Ltd</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">JACSoN OpenConext Engine</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.jiscadvance.ac.uk/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Carl</GivenName>
-    <SurName>Vincent</SurName>
-    <EmailAddress>mailto:carl.vincent@newcastle.ac.uk</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Sander</GivenName>
-    <SurName>Van der Waal</SurName>
-    <EmailAddress>mailto:sander.vanderwaal@jiscadvance.ac.uk</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/engine.surfconext.nl.xml b/swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml
index 6c92123c..aafa566b 100644
--- a/swamid-interfederations-2.0/engine.surfconext.nl.xml
+++ b/swamid-interfederations-2.0/engine.surfconext.nl-authentication-sp-metadata.xml
@@ -8,61 +8,57 @@
   <md:SPSSODescriptor WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="nl">SURFconext</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">SURFconext</mdui:DisplayName>
-        <mdui:Description xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die
-                    nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende
-                    aanbieders te combineren.</mdui:Description>
-        <mdui:Description xml:lang="en">SURFconext is a collaboration infrastructure that
-                    creates new opportunities to collaborate online based on a combination of
-                    applications from different providers.</mdui:Description>
-        <mdui:Logo height="100" width="186">http://www.surfnet.nl/SURFnet%20imagebank/Logos/logo_surfconext_themasite.png</mdui:Logo>
+        <mdui:DisplayName xml:lang="nl">SURFconext | SURFnet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">SURFconext | SURFnet</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende aanbieders te combineren.</mdui:Description>
+        <mdui:Description xml:lang="en">SURFconext is a collaboration infrastructure that creates new opportunities to collaborate online based on a combination of applications from different providers.</mdui:Description>
+        <mdui:Logo height="44" width="108">https://static.surfconext.nl/media/idp/surfnet.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDyzCCArOgAwIBAgIJAMzixtXMUH1NMA0GCSqGSIb3DQEBBQUAMHwxCzAJBgNV
-                        BAYTAk5MMRAwDgYDVQQIDAdVdHJlY2h0MRAwDgYDVQQHDAdVdHJlY2h0MRUwEwYD
-                        VQQKDAxTVVJGbmV0IEIuVi4xEzARBgNVBAsMClNVUkZjb25leHQxHTAbBgNVBAMM
-                        FGVuZ2luZS5zdXJmY29uZXh0Lm5sMB4XDTExMDEyNDEwMTg1N1oXDTIxMDEyMzEw
-                        MTg1N1owfDELMAkGA1UEBhMCTkwxEDAOBgNVBAgMB1V0cmVjaHQxEDAOBgNVBAcM
-                        B1V0cmVjaHQxFTATBgNVBAoMDFNVUkZuZXQgQi5WLjETMBEGA1UECwwKU1VSRmNv
-                        bmV4dDEdMBsGA1UEAwwUZW5naW5lLnN1cmZjb25leHQubmwwggEiMA0GCSqGSIb3
-                        DQEBAQUAA4IBDwAwggEKAoIBAQDMJ6v+f3owS3KR5IXSil+3XFwGvCVeYx3jDOFK
-                        AnwvXlDpTu+t730b8/spHtlopyJVAlb6qBIPN7R4TGTLqiu0zebYsYx/PtqCk5cb
-                        u9qs3h+p2BBoTXVwXA/ZYi0tqtxp04hcNrRj1TAgLyC0S+KASTF+zzccAcjTBid5
-                        EMioo+YllgSEobWJ4X33XVRqNrikAPDsNmDrdKUi257JSO2xhVIG5lbtmDaL5ORC
-                        D56oRmVdp7VQTEQ3Yass8J5Rn+Ub6WmRBYeG+KzFBvtyBput2o0/gvtJn9L+NWeD
-                        B0LyUPaUYG/X4GF14FcmFQfz7I5jBCNHtPcLJbPYbZKQNhz/AgMBAAGjUDBOMB0G
-                        A1UdDgQWBBS9QqP8gtMM6nm4oYzNbgqhEDP1aDAfBgNVHSMEGDAWgBS9QqP8gtMM
-                        6nm4oYzNbgqhEDP1aDAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4IBAQBH
-                        2qyYwLwesIOxUTj+NJ0VXRBDH8VecNLiUUs9Np4x8A0pxLvlNnv5TdJAruEg1LSV
-                        mAqqPUdAB2m7CKDeUVM9cwOB7vqelV2GNgOfevXi+DZRMffyyE8qyIcnTqvDOgcR
-                        8qGTPSVT+SIsOkV9bYrjltrbnal7cJermsA8SC5w/pjLaOHI1xIZHquZzymWoN3Z
-                        fz2CQg2r5o+AURYd74GrHhHqVa9VrdWtcimB+vTQQihoLt8YciehpJjOMpx2D66e
-                        FfpC8ix31RRdjAVIo1y33h1yU3gEHePDbOthZE+lpXi2WJqO85H85LqJOtgn2WPI
-                        3P2Tx32Cq1WXCYkxLaPI </ds:X509Certificate>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
+VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
+A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
+DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
+Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
+dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
+VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
+MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
+efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
+HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
+TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
+n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
+4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
+MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
+FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
+9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
+UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
+7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
+MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://engine.surfconext.nl/authentication/sp/consume-assertion" index="0"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="nl">SURFconext | SURFnet</md:ServiceName>
-      <md:ServiceName xml:lang="en">SURFconext | SURFnet</md:ServiceName>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="nl">SURFconext - Engine | SURFnet</md:ServiceName>
+      <md:ServiceName xml:lang="en">SURFconext - Engine | SURFnet</md:ServiceName>
       <md:ServiceDescription xml:lang="nl">SURFconext is een samenwerkingsinfrastructuur die nieuwe vormen van samenwerken mogelijk maakt door diensten van verschillende aanbieders te combineren.</md:ServiceDescription>
       <md:ServiceDescription xml:lang="en">SURFconext is a collaboration infrastructure that creates new opportunities to collaborate online based on a combination of applications from different providers.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="urn:mace:terena.org:attribute-def:schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
       <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
     </md:AttributeConsumingService>
   </md:SPSSODescriptor>
   <md:Organization>
diff --git a/swamid-interfederations-2.0/epoq.compilatio.net.xml b/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
index 5da20dd1..8547dc84 100644
--- a/swamid-interfederations-2.0/epoq.compilatio.net.xml
+++ b/swamid-interfederations-2.0/epoq.compilatio.net-shibboleth.xml
@@ -97,7 +97,7 @@ v6m7bak466pL1Vevz4zJrf1D/GO7tuEr1UKaACEO7dN9s48BIszFS876vdltnwqo
       <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
       <RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
diff --git a/swamid-interfederations-2.0/febe.ufpe.br.xml b/swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.xml
index abda1089..abda1089 100644
--- a/swamid-interfederations-2.0/febe.ufpe.br.xml
+++ b/swamid-interfederations-2.0/febe.ufpe.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr.xml b/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml
index 8fd88e88..0be8dc23 100644
--- a/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr.xml
+++ b/swamid-interfederations-2.0/fed.id.univ-bordeaux.fr-idp_ubx-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-bordeaux.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..32c20597
--- /dev/null
+++ b/swamid-interfederations-2.0/fede.supelec.fr-idp-shibboleth.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fede.supelec.fr/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-25T17:00:08Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">supelec.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Supélec</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Teachers, Researchers, Staff, Students</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Supélec</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Enseignants, Chercheurs, Personnels, Etudiants</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDKDCCAhCgAwIBAgIVAJM8CQeFJc3xn6Z1VQJmlIUprCAEMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjAeFw0xNDEwMTYwOTUxNTla
+Fw0zNDEwMTYwOTUxNTlaMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUgXB50hjGYdLKHZxLSCPztkFuA
+WtNJocV4c/4dZGMjAiarkeiaWkQ6h+NrsCj5qoYeXekfkVHw+1G2+NbhB0miUnxh
+ex1Y5FJ+7Fet31zqk9whwmU6WbpwCCQRPWj/52qSciK66rZyFlqMnID33MWOR6hW
+86VtXZwWjBl2QmQuqFzHQ0aZU7ihUGW6YyodXc/GA8u72AEgzg74NiUgR9ewHsjW
+3d6rDhq6TOuOVpqfxNWZEdnw5qdIz8RhHKHh3W5fHv5xIp0meruvhv6mmXv7NltA
+S0mVt4iCe4MLcTRBtNtIkA8FvdwHnmfFdrwiZvxt7PW3JbPp27JJ5Ozl7fECAwEA
+AaNlMGMwHQYDVR0OBBYEFJaRXAI+mqD0ehgvH9spPnE6a5AxMEIGA1UdEQQ7MDmC
+D2ZlZGUuc3VwZWxlYy5mcoYmaHR0cHM6Ly9mZWRlLnN1cGVsZWMuZnIvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAGSd2uPxo+hqnAQjN1fAlVr24vO0
++PHkWq5/LD836eb8UWgCvlGB1/D5fQZzvszShofbnnBYA3sT/ZA32uQeCnn2JcXD
+Ggl9/kBDXaLe4sDFRvEmme/5aacES06cuHVQOfo1geiU9b0BWZfQ+PhIs7zMD6lW
+oG7DQC+PuWokOA53MCcMZFGkx9Jc7WYE/mDDUwktRKyKdmWkhBhPqX9WG9TiVjQ8
+4es7yiwOGihNdSw+Fo57loP3CpPYNpbirQy38W98qv2UNRabSrnRG26Pnr6Olitl
+0Mk7i7JvwcZoVBdgutFiM5YhZNH2Lm01vGPdFTeoUvatALsHf2c43PtH/PM=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDJzCCAg+gAwIBAgIUI3GVT0U51zI/+zqt7XjPQwAliqIwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMB4XDTE0MDYxOTA5MzUxOVoX
+DTM0MDYxOTA5MzUxOVowGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp4mY5iMIDfdfYOaZfhJ8f1cGJWtW
+nmOqq4X/dpvqIIDS99IpWCL3bDg5v8XtTtywfIdrAStQKiTSW5OXYMvuMpZwQzdX
+lz2b0huK+9h+wK4sEr/VvedRaxR41d2EWCgKRNglSSC8d0je5ohwKBXkdqiscbTN
+/5qRqVR1QPpWRJN0HlLIvE1J0Geb5RRsBtciWMSLAlRxfWKCqFgBZVzL8WlqF624
+cioE1U6K+TUnNXDoZxWdf/Ynn/9VC634ud1KectCNb2dRJO6ywwh4z+Zdd6gVKxu
+YBXngIYRgXdWFfCkhBj1Tj3TaDLkKaKRSZejotINWXUHIrFO0RA0KjWI/QIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9mZWRlLnN1cGVsZWMuZnKGJmh0dHBzOi8vZmVkZS5z
+dXBlbGVjLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRNa4jLphWoCFgrx/Pa
+OM2r2uMx5zANBgkqhkiG9w0BAQUFAAOCAQEAGfZyDAr7cL5vT+7jigc0oYdjfPQ+
+CG8shDpjTOwWjRXThxLX32IUhYPF0mZ+EvrCQdyg01CTE2bkMpcDilnDpsmMOoRo
+p820ReMScYoFNB/nQio21BR1Galps7TdErp8XFNvgwbPW6YdFpqXYxAFNm5wWnxz
+u9dm0M2dMSEe1xgJjYRaU2H/BN5qyGuoyM4K0maM8AHOS9iBnRzuzcZQ7WUWA1JP
+VgWhf5jRP9RPKVQUQOLb036aw3uZ51fSvN/ceCPq5ibwqUEHw9gikRWchPerrYnR
+eDUxLltLVzLhUUNHbW5A2MlBwDFMqCWhZy8vqCJFdLUkTAFhRuJ/VVyYzA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fede.supelec.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fede.supelec.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fede.supelec.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">supelec.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDKDCCAhCgAwIBAgIVAJM8CQeFJc3xn6Z1VQJmlIUprCAEMA0GCSqGSIb3DQEB
+BQUAMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjAeFw0xNDEwMTYwOTUxNTla
+Fw0zNDEwMTYwOTUxNTlaMBoxGDAWBgNVBAMMD2ZlZGUuc3VwZWxlYy5mcjCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJUgXB50hjGYdLKHZxLSCPztkFuA
+WtNJocV4c/4dZGMjAiarkeiaWkQ6h+NrsCj5qoYeXekfkVHw+1G2+NbhB0miUnxh
+ex1Y5FJ+7Fet31zqk9whwmU6WbpwCCQRPWj/52qSciK66rZyFlqMnID33MWOR6hW
+86VtXZwWjBl2QmQuqFzHQ0aZU7ihUGW6YyodXc/GA8u72AEgzg74NiUgR9ewHsjW
+3d6rDhq6TOuOVpqfxNWZEdnw5qdIz8RhHKHh3W5fHv5xIp0meruvhv6mmXv7NltA
+S0mVt4iCe4MLcTRBtNtIkA8FvdwHnmfFdrwiZvxt7PW3JbPp27JJ5Ozl7fECAwEA
+AaNlMGMwHQYDVR0OBBYEFJaRXAI+mqD0ehgvH9spPnE6a5AxMEIGA1UdEQQ7MDmC
+D2ZlZGUuc3VwZWxlYy5mcoYmaHR0cHM6Ly9mZWRlLnN1cGVsZWMuZnIvaWRwL3No
+aWJib2xldGgwDQYJKoZIhvcNAQEFBQADggEBAGSd2uPxo+hqnAQjN1fAlVr24vO0
++PHkWq5/LD836eb8UWgCvlGB1/D5fQZzvszShofbnnBYA3sT/ZA32uQeCnn2JcXD
+Ggl9/kBDXaLe4sDFRvEmme/5aacES06cuHVQOfo1geiU9b0BWZfQ+PhIs7zMD6lW
+oG7DQC+PuWokOA53MCcMZFGkx9Jc7WYE/mDDUwktRKyKdmWkhBhPqX9WG9TiVjQ8
+4es7yiwOGihNdSw+Fo57loP3CpPYNpbirQy38W98qv2UNRabSrnRG26Pnr6Olitl
+0Mk7i7JvwcZoVBdgutFiM5YhZNH2Lm01vGPdFTeoUvatALsHf2c43PtH/PM=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDJzCCAg+gAwIBAgIUI3GVT0U51zI/+zqt7XjPQwAliqIwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMB4XDTE0MDYxOTA5MzUxOVoX
+DTM0MDYxOTA5MzUxOVowGjEYMBYGA1UEAxMPZmVkZS5zdXBlbGVjLmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAp4mY5iMIDfdfYOaZfhJ8f1cGJWtW
+nmOqq4X/dpvqIIDS99IpWCL3bDg5v8XtTtywfIdrAStQKiTSW5OXYMvuMpZwQzdX
+lz2b0huK+9h+wK4sEr/VvedRaxR41d2EWCgKRNglSSC8d0je5ohwKBXkdqiscbTN
+/5qRqVR1QPpWRJN0HlLIvE1J0Geb5RRsBtciWMSLAlRxfWKCqFgBZVzL8WlqF624
+cioE1U6K+TUnNXDoZxWdf/Ynn/9VC634ud1KectCNb2dRJO6ywwh4z+Zdd6gVKxu
+YBXngIYRgXdWFfCkhBj1Tj3TaDLkKaKRSZejotINWXUHIrFO0RA0KjWI/QIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9mZWRlLnN1cGVsZWMuZnKGJmh0dHBzOi8vZmVkZS5z
+dXBlbGVjLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRNa4jLphWoCFgrx/Pa
+OM2r2uMx5zANBgkqhkiG9w0BAQUFAAOCAQEAGfZyDAr7cL5vT+7jigc0oYdjfPQ+
+CG8shDpjTOwWjRXThxLX32IUhYPF0mZ+EvrCQdyg01CTE2bkMpcDilnDpsmMOoRo
+p820ReMScYoFNB/nQio21BR1Galps7TdErp8XFNvgwbPW6YdFpqXYxAFNm5wWnxz
+u9dm0M2dMSEe1xgJjYRaU2H/BN5qyGuoyM4K0maM8AHOS9iBnRzuzcZQ7WUWA1JP
+VgWhf5jRP9RPKVQUQOLb036aw3uZ51fSvN/ceCPq5ibwqUEHw9gikRWchPerrYnR
+eDUxLltLVzLhUUNHbW5A2MlBwDFMqCWhZy8vqCJFdLUkTAFhRuJ/VVyYzA==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://fede.supelec.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Supélec</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Supélec</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">www.supelec.fr</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Laura NEGRE</SurName>
+    <EmailAddress>laura.negre@supelec.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Thibault LE MEUR</SurName>
+    <EmailAddress>thibault.lemeur@supelec.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federacao.ifpi.edu.br.xml b/swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml
index fc607d71..fc607d71 100644
--- a/swamid-interfederations-2.0/federacao.ifpi.edu.br.xml
+++ b/swamid-interfederations-2.0/federacao.ifpi.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/federacao.uvanet.br.xml b/swamid-interfederations-2.0/federacao.uvanet.br.xml
deleted file mode 100644
index 32d2d6ac..00000000
--- a/swamid-interfederations-2.0/federacao.uvanet.br.xml
+++ /dev/null
@@ -1,116 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://federacao.uvanet.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">uvanet.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UVA - Universidade Estadual Vale do Acarau</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UVA - Universidade Estadual Vale do Acarau</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.uvanet.br</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.uvanet.br</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxMzAxBgNVBAoTKlVWQSAtIFVu
-aXZlcnNpZGFkZSBFc3RhZHVhbCBWYWxlIGRvIEFjYXJhdTExMC8GA1UECxMoTlRJ
-IC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEeMBwGCSqGSIb3
-DQEJARYPYWRtaW5AdXZhbmV0LmJyMQ8wDQYDVQQHEwZTb2JyYWwxDjAMBgNVBAgT
-BUNlYXJhMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTZmVkZXJhY2FvLnV2YW5ldC5i
-cjAeFw0xMTA4MTgxMjU4MzlaFw0xNDA4MTcxMjU4MzlaMIHUMTMwMQYDVQQKEypV
-VkEgLSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgVmFsZSBkbyBBY2FyYXUxMTAvBgNV
-BAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8xHjAc
-BgkqhkiG9w0BCQEWD2FkbWluQHV2YW5ldC5icjEPMA0GA1UEBxMGU29icmFsMQ4w
-DAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2ZlZGVyYWNhby51
-dmFuZXQuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDX9eLXkZRs
-QEScuMQFE6Ymg9X8J/W692L3znagWfnz7RWI/ApoAZX2rkVZfYqz6xYG1HyLGXJJ
-fhGPH14IqUQJEABAKmZ+6TV0AbhFwOEGlFZepqq6jzP4IzRN0GeYjm6l4HaRfaaS
-oHjZ22YTiTbDOiCTWJcvw4lV7EUwqPztoLLJw9ls9PY7E0girnJ4i/FoW3LkksyS
-n0u7FUUciLDmPLEVi9iUhzyFW/wYGYSikEH3I1oyx+wjc69P7V1l+3BK/6VBii1H
-V4QKbITQAOXlCo9m/p+inJNO6E/kg8qtmpit6H1er8pqDpN7iXlS8NvnX63SHBGq
-6mw66PajU1/FAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAMSBhQfPNQOrbPbGtN0F
-WNBGGSNUfkdesvTV9tHBbWgpSIn4EIYDN5rNK8q3iQj9i2WQF531zIp5fOV+R2ZN
-V+5XLkulhtj/gjEnog5/TJ7tzMtUQhEF600HlWXE4o4ixXYpMzMwB4p02I/f+I9O
-pPpZnB0vYkjX9QtejNHcFQf69lOWqdboQZp7FKFAHY3sQLcLgNXW0MMYeMGqKSVj
-mjCYyILaA11HhjJuKlxDQctcDJdDr1svJd069WwqV6nKR4j9UphwIo35zvAQfFHY
-KVSCl0NbXTjhxHNeopXycIvzjwNFcxypw2Ub+zHK2AvNvkL4BpE8NtuV5fpIXsAg
-zPE=
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.uvanet.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.uvanet.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://federacao.uvanet.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federacao.uvanet.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federacao.uvanet.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federacao.uvanet.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">uvanet.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIEHjCCAwYCAQAwDQYJKoZIhvcNAQEFBQAwgdQxMzAxBgNVBAoTKlVWQSAtIFVu
-aXZlcnNpZGFkZSBFc3RhZHVhbCBWYWxlIGRvIEFjYXJhdTExMC8GA1UECxMoTlRJ
-IC0gTnVjbGVvIGRlIFRlY25vbG9naWEgZGEgSW5mb3JtYWNhbzEeMBwGCSqGSIb3
-DQEJARYPYWRtaW5AdXZhbmV0LmJyMQ8wDQYDVQQHEwZTb2JyYWwxDjAMBgNVBAgT
-BUNlYXJhMQswCQYDVQQGEwJCUjEcMBoGA1UEAxMTZmVkZXJhY2FvLnV2YW5ldC5i
-cjAeFw0xMTA4MTgxMjU4MzlaFw0xNDA4MTcxMjU4MzlaMIHUMTMwMQYDVQQKEypV
-VkEgLSBVbml2ZXJzaWRhZGUgRXN0YWR1YWwgVmFsZSBkbyBBY2FyYXUxMTAvBgNV
-BAsTKE5USSAtIE51Y2xlbyBkZSBUZWNub2xvZ2lhIGRhIEluZm9ybWFjYW8xHjAc
-BgkqhkiG9w0BCQEWD2FkbWluQHV2YW5ldC5icjEPMA0GA1UEBxMGU29icmFsMQ4w
-DAYDVQQIEwVDZWFyYTELMAkGA1UEBhMCQlIxHDAaBgNVBAMTE2ZlZGVyYWNhby51
-dmFuZXQuYnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDX9eLXkZRs
-QEScuMQFE6Ymg9X8J/W692L3znagWfnz7RWI/ApoAZX2rkVZfYqz6xYG1HyLGXJJ
-fhGPH14IqUQJEABAKmZ+6TV0AbhFwOEGlFZepqq6jzP4IzRN0GeYjm6l4HaRfaaS
-oHjZ22YTiTbDOiCTWJcvw4lV7EUwqPztoLLJw9ls9PY7E0girnJ4i/FoW3LkksyS
-n0u7FUUciLDmPLEVi9iUhzyFW/wYGYSikEH3I1oyx+wjc69P7V1l+3BK/6VBii1H
-V4QKbITQAOXlCo9m/p+inJNO6E/kg8qtmpit6H1er8pqDpN7iXlS8NvnX63SHBGq
-6mw66PajU1/FAgMBAAEwDQYJKoZIhvcNAQEFBQADggEBAMSBhQfPNQOrbPbGtN0F
-WNBGGSNUfkdesvTV9tHBbWgpSIn4EIYDN5rNK8q3iQj9i2WQF531zIp5fOV+R2ZN
-V+5XLkulhtj/gjEnog5/TJ7tzMtUQhEF600HlWXE4o4ixXYpMzMwB4p02I/f+I9O
-pPpZnB0vYkjX9QtejNHcFQf69lOWqdboQZp7FKFAHY3sQLcLgNXW0MMYeMGqKSVj
-mjCYyILaA11HhjJuKlxDQctcDJdDr1svJd069WwqV6nKR4j9UphwIo35zvAQfFHY
-KVSCl0NbXTjhxHNeopXycIvzjwNFcxypw2Ub+zHK2AvNvkL4BpE8NtuV5fpIXsAg
-zPE=
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://federacao.uvanet.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federacao.uvanet.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UVA - Universidade Estadual Vale do Acarau</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UVA - Universidade Estadual Vale do Acarau</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UVA - Universidade Estadual Vale do Acarau</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uvanet.br</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.uvanet.br</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Antonio Kleyson Prado Pereira</SurName>
-    <EmailAddress>kleyson.prado@uvanet.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation-identite.univ-paris13.fr.xml b/swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml
index 904a7345..0d9e1251 100644
--- a/swamid-interfederations-2.0/federation-identite.univ-paris13.fr.xml
+++ b/swamid-interfederations-2.0/federation-identite.univ-paris13.fr-idp-shibboleth.xml
@@ -5,12 +5,14 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris13.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University Paris 13</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Members of University Paris 13 (Students, Teaching staff, Researchers and Administrative and Technical staff)</mdui:Description>
         <mdui:DisplayName xml:lang="fr">Université Paris 13</mdui:DisplayName>
-        <mdui:Description xml:lang="fr">Personnes membres de l'Université Paris 13 (Personnels, Enseignants, Enseignants-Chercheurs, Chercheurs).</mdui:Description>
+        <mdui:Description xml:lang="fr">Personnes membres de l'Université Paris 13 (Etudiants, Personnels, Enseignants, Enseignants-Chercheurs, Chercheurs).</mdui:Description>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/federation.agrocampus-ouest.fr.xml b/swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml
index d580d19b..472e3e32 100644
--- a/swamid-interfederations-2.0/federation.agrocampus-ouest.fr.xml
+++ b/swamid-interfederations-2.0/federation.agrocampus-ouest.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agrocampus-ouest.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/federation.bretagne.iufm.fr.xml b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
index 5db75285..01579065 100644
--- a/swamid-interfederations-2.0/federation.bretagne.iufm.fr.xml
+++ b/swamid-interfederations-2.0/federation.bretagne.iufm.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bretagne.iufm.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..aaa760ea
--- /dev/null
+++ b/swamid-interfederations-2.0/federation.crous-lille.fr-idp-shibboleth.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://federation.crous-lille.fr/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-02T15:28:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-lille.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Lille</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Staffs</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">CROUS Lille</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEgDCCA2igAwIBAgIRAOe2cWAZ40jrksSS84mgafQwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA5MjUwMDAwMDBaFw0xNjEyMzEyMzU5NTlaMEcxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEiMCAGA1UEAxMZZmVkZXJhdGlv
+bi5jcm91cy1saWxsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+ANnI5vHZtv9EG1YcpR+Lu0i2zEHwg9REfT60TKOuRZ4uGEO5HkPz0EZk//g5ANrL
+E/wM6Dc+FzWERy1FIrDEve8rPcSfWjOnei32N0+xmWb470gkXHMHa768JZgYYKPT
+YQtw2w3mO2K6xPSVSgcGp0cToCgeN3Zmj7OjnP1d8FRXQNZfkNbGeTkcE14zTGvn
+il9gGSg6eLp4n+AhzzFqVrsh7nhjDQUVGYSS13gc3QqrbvzhgVA3ezUhuTSf6a2Q
+Ayc/aZ+fsPc2lqBxAN5+CXE+F8hZ2EwT4lS9tPyC9LMmkG6Z/5p2LxjiWD9BAmPs
+8PpBgiv2PQDYpEiImOr7cg8CAwEAAaOCAXYwggFyMB8GA1UdIwQYMBaAFAy9k2gM
+896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQA6VUfnc6ew1jN4PWrQ88BPAFhLzAO
+BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJAYDVR0RBB0wG4IZZmVkZXJhdGlv
+bi5jcm91cy1saWxsZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAIgY+7c4wkrbZpY3o
+iGyUJ13AjbqyUReqedYEhOC7a6/QfR+AvhSpsig+qPHGz6ouGx7AbSagW3cUvN9Y
+XKAEMvaZDTvgXldQma8/KHxls7sRAKa/xj52C7KJPNynjZCtry3Ibaf/XVG2436/
+qA1F99mmPzg1kwJTnKvUUpWxazcipfKPxw9diYudxPUSxVKS+k1TCynaP40T5r+F
+Zu+ubcxq2fxvr9Hg44hUNPmDGZUE7UFMb97y2oVl/Wt9M6Uv85P593e9GHh9RO98
+rIzZ+UPSX0Y5lkCcEuqMR9FoY/Hs4jGsVBMrwmWGZJGMM2PlT9xIcY2cCqeKu2E/
+Lfrh4A==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.crous-lille.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.crous-lille.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.crous-lille.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CROUS Lille</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CROUS Lille</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>informatique@crous-lille.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/federation.esiee.fr.xml b/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml
index 87fd91d2..d32faf0c 100644
--- a/swamid-interfederations-2.0/federation.esiee.fr.xml
+++ b/swamid-interfederations-2.0/federation.esiee.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">esiee.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">edu.esiee.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/federation.ined.fr.xml b/swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml
index aa2cc8e6..0a38db53 100644
--- a/swamid-interfederations-2.0/federation.ined.fr.xml
+++ b/swamid-interfederations-2.0/federation.ined.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ined.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/federation.sciences-po.fr.xml b/swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml
index 0a11189d..b15d793a 100644
--- a/swamid-interfederations-2.0/federation.sciences-po.fr.xml
+++ b/swamid-interfederations-2.0/federation.sciences-po.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciences-po.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciences-po.org</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/federation.u-pem.fr.xml b/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml
index 687b286b..2cc78d45 100644
--- a/swamid-interfederations-2.0/federation.u-pem.fr.xml
+++ b/swamid-interfederations-2.0/federation.u-pem.fr-idp-shibboleth.xml
@@ -5,9 +5,12 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-pem.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-mlv.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umlv.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etud.u-pem.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Paris-Est Marne-la-Vallée University</mdui:DisplayName>
         <mdui:Description xml:lang="en">Every university member</mdui:Description>
diff --git a/swamid-interfederations-2.0/federation.unimes.fr.xml b/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml
index 72d32985..46998bc3 100644
--- a/swamid-interfederations-2.0/federation.unimes.fr.xml
+++ b/swamid-interfederations-2.0/federation.unimes.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimes.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -19,6 +19,38 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+					      MIIEdTCCA12gAwIBAgIQA+x4/gpIpc75aHTaD2HjdjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTAyMzAwMDAwMFoXDTE1MTIwOTIzNTk1OVowTDELMAkGA1UE
+BhMCRlIxHjAcBgNVBAoMFVVuaXZlcnNpdMOpIGRlIE7Drm1lczEdMBsGA1UEAxMU
+ZmVkZXJhdGlvbi51bmltZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDfE7PieWyEg8LeR53J/lE/B59bPXfHLEO+uLd3OBC8jTGkIRWvaqPgM1Gk
+lCzK/efmA1s11KncwGOTvJJJPeWFAOisznFMbNfhI1tPSYDIxlULXQBEnTCy9eUm
+JV2zo3MvCVFw1vJPXgyA7m4KsMu39meUuhK6emBfv0vz1Kh8eABMDR/c945d0TXP
+XCizQ9I3SyU/zVJ18XcaniaZ777mjNaNmT3ZJhqj85cSRQNBH1nAT4/GeLUMuyv1
+5ymGq0ytEhp8QKcWfwRvU5InOQlG17R8z7BxXtJbuvuaG7kk7UO8TJ4bHNU+14T9
+EqCKaalydIILjRBNfwe8fZ6b+ohvAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQM
+vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU720AGcrCuWMx7XX5CLNo5qGm
+JyswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZmVkZXJhdGlvbi51bmlt
+ZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBAJJRjU+uJplLJdi4qKubLFQv61lnWLMg
+w3IbQ2icm7u9dEUNIY2nXj8a2nBn6svWzNyPlvipHhEbj/KWkQPwmEIQWSBXz8aK
+cRG0kNEqEvrpkLVFakNWzm/T6pEh6VhRiu85LMQeMHo2zrFGOo92b/OY9NGq+nyX
+8kDchVM7wj/JlMU57UuZ7hCRsE/T+GgghBgCoU1u9Way8ker6s6DvPv38jgOT7/P
+cMz63qOCn2FWBpvJL1ykjw+vu4cL8NXdo51ZgYG+03hcb3lBFv5f3Y2y7Pitgy+K
+R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEpDCCA4ygAwIBAgIQL1M6BUXb9ey/N5UwsW6q8zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTA5MTExOTAwMDAwMFoXDTEyMTExODIzNTk1OVowezELMAkGA1UE
@@ -62,6 +94,38 @@ xqaW8/4VYHjxNTVZ2KxsKKVL1ykc/9Gk5YAITiyKeWFjYhP17R9+Cw==
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+					      MIIEdTCCA12gAwIBAgIQA+x4/gpIpc75aHTaD2HjdjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTAyMzAwMDAwMFoXDTE1MTIwOTIzNTk1OVowTDELMAkGA1UE
+BhMCRlIxHjAcBgNVBAoMFVVuaXZlcnNpdMOpIGRlIE7Drm1lczEdMBsGA1UEAxMU
+ZmVkZXJhdGlvbi51bmltZXMuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDfE7PieWyEg8LeR53J/lE/B59bPXfHLEO+uLd3OBC8jTGkIRWvaqPgM1Gk
+lCzK/efmA1s11KncwGOTvJJJPeWFAOisznFMbNfhI1tPSYDIxlULXQBEnTCy9eUm
+JV2zo3MvCVFw1vJPXgyA7m4KsMu39meUuhK6emBfv0vz1Kh8eABMDR/c945d0TXP
+XCizQ9I3SyU/zVJ18XcaniaZ777mjNaNmT3ZJhqj85cSRQNBH1nAT4/GeLUMuyv1
+5ymGq0ytEhp8QKcWfwRvU5InOQlG17R8z7BxXtJbuvuaG7kk7UO8TJ4bHNU+14T9
+EqCKaalydIILjRBNfwe8fZ6b+ohvAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQM
+vZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU720AGcrCuWMx7XX5CLNo5qGm
+JyswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYB
+BQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwHwYDVR0RBBgwFoIUZmVkZXJhdGlvbi51bmlt
+ZXMuZnIwDQYJKoZIhvcNAQEFBQADggEBAJJRjU+uJplLJdi4qKubLFQv61lnWLMg
+w3IbQ2icm7u9dEUNIY2nXj8a2nBn6svWzNyPlvipHhEbj/KWkQPwmEIQWSBXz8aK
+cRG0kNEqEvrpkLVFakNWzm/T6pEh6VhRiu85LMQeMHo2zrFGOo92b/OY9NGq+nyX
+8kDchVM7wj/JlMU57UuZ7hCRsE/T+GgghBgCoU1u9Way8ker6s6DvPv38jgOT7/P
+cMz63qOCn2FWBpvJL1ykjw+vu4cL8NXdo51ZgYG+03hcb3lBFv5f3Y2y7Pitgy+K
+R2jCO9a/ZWDePkmPnf1zmgyJ+twxhYqPwTbGDoNozxNNLsXQLOPNSaU=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIEpDCCA4ygAwIBAgIQL1M6BUXb9ey/N5UwsW6q8zANBgkqhkiG9w0BAQUFADA2
 MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
 U1NMIENBMB4XDTA5MTExOTAwMDAwMFoXDTEyMTExODIzNTk1OVowezELMAkGA1UE
diff --git a/swamid-interfederations-2.0/federation.upf.pf.xml b/swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml
index e38a7299..55b0e7eb 100644
--- a/swamid-interfederations-2.0/federation.upf.pf.xml
+++ b/swamid-interfederations-2.0/federation.upf.pf-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upf.pf</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/federation.utbm.fr.xml b/swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml
index 7c4512d8..46ff9b7d 100644
--- a/swamid-interfederations-2.0/federation.utbm.fr.xml
+++ b/swamid-interfederations-2.0/federation.utbm.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utbm.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/federation2.univ-brest.fr.xml b/swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml
index 6b1f7ee3..7e3fe7a1 100644
--- a/swamid-interfederations-2.0/federation2.univ-brest.fr.xml
+++ b/swamid-interfederations-2.0/federation2.univ-brest.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-brest.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/federation2.univ-perp.fr.xml b/swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml
index c8d4b606..528adfd9 100644
--- a/swamid-interfederations-2.0/federation2.univ-perp.fr.xml
+++ b/swamid-interfederations-2.0/federation2.univ-perp.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-perp.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/federationrenater.univ-montp2.fr.xml b/swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml
index 9a49873f..0549127d 100644
--- a/swamid-interfederations-2.0/federationrenater.univ-montp2.fr.xml
+++ b/swamid-interfederations-2.0/federationrenater.univ-montp2.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp2.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/filesender.cesnet.cz.xml b/swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml
index 24b4760f..642874c9 100644
--- a/swamid-interfederations-2.0/filesender.cesnet.cz.xml
+++ b/swamid-interfederations-2.0/filesender.cesnet.cz-saml-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.cesnet.cz/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-11-04T10:27:36Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/filesender.du1.cesnet.cz.xml b/swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml
index 9e0684cb..64f64ad0 100644
--- a/swamid-interfederations-2.0/filesender.du1.cesnet.cz.xml
+++ b/swamid-interfederations-2.0/filesender.du1.cesnet.cz-saml-sp.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://filesender.du1.cesnet.cz/saml/sp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-09-01T17:40:43Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/filesender.redclara.net.xml b/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 4373f63c..84cbe8c5 100644
--- a/swamid-interfederations-2.0/filesender.redclara.net.xml
+++ b/swamid-interfederations-2.0/filesender.redclara.net-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
@@ -21,7 +21,7 @@ http://cofre.reuna.cl/index.php/es/reglas-federacion
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIGaDCCBVCgAwIBAgIDCodyMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTI4MDY1NjQ5WhcNMTQwNTI5MDg1MzAyWjByMRkwFwYDVQQNExBRWDFLYTh3UDc5bFJ6QkNEMQswCQYDVQQGEwJDTDEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvBHl9Ppk+y5kNDUSDxAyULKM+CS14u+ctyPD2+AZ15GhorCL73HNspAd+tOMMVnhBhGX7vY4TQkfIXEBb/vstWGxXS9rj2jb7E4X2GSJkSOAumwb80GP8GzqQUe/y4zs9Eb0hh43aRaeQpIGJCzUaZcXJeUyUBu+KZx4DzpLbWDI+5Jb/xJoAeYqsImYzUPSUAF1e4FUStOVI+JvyquwGiS8/LCF2wazeXm9Q49eCAAEnAgcSL5m2o7Qf88KRsYBfd4rbCL6cU8+i0Z04fM5AJ+d7dpO3ZNfMcp79J6xvUzWCxpeI7+vJgo4+cT1VUKRlg2pvK/Zh7YfjCJTja60+wIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFBR/zQl4gwQI406e6SlxLpGMIAiDMB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAB5T2hptu3z02m6ni90BZ8vj6jtPlw7x+f71/jL5f7HKqNQTQXWzqTtHXEruQs213J8YnVtBkrlRqotHmHRE2IbhKVbhNr+ZK10gkaHHyZTerQGTMFFHGVm8PpQNG6PQXDESV+PTuPI0vLzgvrtyJXVvQSyxxN2XO4L5q0ER9g+u5YDY6Ms51inH/qLhS3VIpMYpDo8e8eJpytqg5VCaR9FkVbEue37P2VYyR93q2G+4YifovZ313IUAJWt7eL4mQFVcHt09p83DdE7p/ixNuGi9Y0LGa+a3YSR0sOxUuTR12R97gVFuSUzUMlicmdxb6qKuN67K84gLic0tZqo8yd
+          <ds:X509Certificate>MIIGaDCCBVCgAwIBAgIDEIKWMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTE1MDA0MzAyWhcNMTUwNTE1MTgwODE3WjByMRkwFwYDVQQNExB2UDFocXA2bjY3UW1sdFBPMQswCQYDVQQGEwJDTzEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArbFVPRwCKFgp3JOvxyxpu+G3ebIaVappz4YkrFc10tvKdIoVaMVQPRvZB13RPGMm2R1avgKlM7keUKOHxgTk9jsN42y4sOcwe+MH2BHKVVIIWSUGqJPa67jEOr6qUzqJEa5nran9BsZek0LIyyuaHXiDph2+3fEElRiiIbTj4Jxmb36zkvYAacrPNbUVShy99lqRDXyCwj6KF3n7sPLIZFnqHabA54OJPUw6Z15rGvhLpmuyvrcmnivgKXjWT5ebItfBcy+u4Xkq6rgfAeJANN4oZnV2WQTjR9g4eAil6Gmkxec+NtQuwvsPB3X8HYtEX5VjeVo3oJ45KqxVgD/F1QIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFDAOdKKMb+RgNebeSjlbBNJc32Q5MB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAo0NqRJtzIEGJRodYzwOteBMpjamboDuWM5p+VG7YEHkJFvTrjaRCG+4bucQruojQGgQCP9VAa7iDKpM5axJcBgM/ud5lKMGnECo44t4MGdavIvFVlc1CpDs9gLuniseWdbb+fhXGhoXDtC++fx8Det9SoknpmvlCgoWUJnSetjgo10SG5Zk3DTPh1A8XJUsoYsnqBB6DJ97NdLXMu6hug54NQX1KGLf8DVu58bV3B022e0KEg7VWbMCUE5LTp88tlBJoiSU40uUhsc4xR7OYKiW2CxDmwqP/w1KBcwTQYcjZVJGt0lv79yhplQrfPK5mJjQY+//LYYQRr0/BFJ8UW
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -29,7 +29,7 @@ http://cofre.reuna.cl/index.php/es/reglas-federacion
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIGaDCCBVCgAwIBAgIDCodyMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTI4MDY1NjQ5WhcNMTQwNTI5MDg1MzAyWjByMRkwFwYDVQQNExBRWDFLYTh3UDc5bFJ6QkNEMQswCQYDVQQGEwJDTDEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvBHl9Ppk+y5kNDUSDxAyULKM+CS14u+ctyPD2+AZ15GhorCL73HNspAd+tOMMVnhBhGX7vY4TQkfIXEBb/vstWGxXS9rj2jb7E4X2GSJkSOAumwb80GP8GzqQUe/y4zs9Eb0hh43aRaeQpIGJCzUaZcXJeUyUBu+KZx4DzpLbWDI+5Jb/xJoAeYqsImYzUPSUAF1e4FUStOVI+JvyquwGiS8/LCF2wazeXm9Q49eCAAEnAgcSL5m2o7Qf88KRsYBfd4rbCL6cU8+i0Z04fM5AJ+d7dpO3ZNfMcp79J6xvUzWCxpeI7+vJgo4+cT1VUKRlg2pvK/Zh7YfjCJTja60+wIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFBR/zQl4gwQI406e6SlxLpGMIAiDMB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAB5T2hptu3z02m6ni90BZ8vj6jtPlw7x+f71/jL5f7HKqNQTQXWzqTtHXEruQs213J8YnVtBkrlRqotHmHRE2IbhKVbhNr+ZK10gkaHHyZTerQGTMFFHGVm8PpQNG6PQXDESV+PTuPI0vLzgvrtyJXVvQSyxxN2XO4L5q0ER9g+u5YDY6Ms51inH/qLhS3VIpMYpDo8e8eJpytqg5VCaR9FkVbEue37P2VYyR93q2G+4YifovZ313IUAJWt7eL4mQFVcHt09p83DdE7p/ixNuGi9Y0LGa+a3YSR0sOxUuTR12R97gVFuSUzUMlicmdxb6qKuN67K84gLic0tZqo8yd
+          <ds:X509Certificate>MIIGaDCCBVCgAwIBAgIDEIKWMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTE1MDA0MzAyWhcNMTUwNTE1MTgwODE3WjByMRkwFwYDVQQNExB2UDFocXA2bjY3UW1sdFBPMQswCQYDVQQGEwJDTzEgMB4GA1UEAxMXZmlsZXNlbmRlci5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArbFVPRwCKFgp3JOvxyxpu+G3ebIaVappz4YkrFc10tvKdIoVaMVQPRvZB13RPGMm2R1avgKlM7keUKOHxgTk9jsN42y4sOcwe+MH2BHKVVIIWSUGqJPa67jEOr6qUzqJEa5nran9BsZek0LIyyuaHXiDph2+3fEElRiiIbTj4Jxmb36zkvYAacrPNbUVShy99lqRDXyCwj6KF3n7sPLIZFnqHabA54OJPUw6Z15rGvhLpmuyvrcmnivgKXjWT5ebItfBcy+u4Xkq6rgfAeJANN4oZnV2WQTjR9g4eAil6Gmkxec+NtQuwvsPB3X8HYtEX5VjeVo3oJ45KqxVgD/F1QIDAQABo4IC6jCCAuYwCQYDVR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0OBBYEFDAOdKKMb+RgNebeSjlbBNJc32Q5MB8GA1UdIwQYMBaAFOtCNNCYsKuf9BtrCPfMZC7vDixFMDAGA1UdEQQpMCeCF2ZpbGVzZW5kZXIucmVkY2xhcmEubmV0ggxyZWRjbGFyYS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwECAzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGljeS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24gQXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNjb3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9mIHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBpbnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFydHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3RhcnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEFBQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVyL2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9zdWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5zdGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAo0NqRJtzIEGJRodYzwOteBMpjamboDuWM5p+VG7YEHkJFvTrjaRCG+4bucQruojQGgQCP9VAa7iDKpM5axJcBgM/ud5lKMGnECo44t4MGdavIvFVlc1CpDs9gLuniseWdbb+fhXGhoXDtC++fx8Det9SoknpmvlCgoWUJnSetjgo10SG5Zk3DTPh1A8XJUsoYsnqBB6DJ97NdLXMu6hug54NQX1KGLf8DVu58bV3B022e0KEg7VWbMCUE5LTp88tlBJoiSU40uUhsc4xR7OYKiW2CxDmwqP/w1KBcwTQYcjZVJGt0lv79yhplQrfPK5mJjQY+//LYYQRr0/BFJ8UW
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml b/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml
new file mode 100644
index 00000000..a871ae87
--- /dev/null
+++ b/swamid-interfederations-2.0/fim-hn-02-idp.orion.education.fr.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fim-hn-02-idp.orion.education.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-07T09:43:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">education.gouv.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-orleans-tours.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">orion.education.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">FRENCH DEPARTMENT OF EDUCATION - HUB HN02</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Employees of french department of education</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">MINISTERE DE L'EDUCATION NATIONALE - HUB HN02</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnel enseignant, non enseignant et scolaire de l'éducation nationale</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIGCDCCA/CgAwIBAgIQcg8ekp3qju7yFn9efv+bjTANBgkqhkiG9w0BAQUFADBxMQswCQYDVQQG
+EwJGUjEvMC0GA1UEChMmTWluaXN0ZXJlIGVkdWNhdGlvbiBuYXRpb25hbGUgKE1FTkVTUikxFDAS
+BgNVBAsTCzExMCAwNDMgMDE1MRswGQYDVQQDExJBQyBJbmZyYXN0cnVjdHVyZXMwHhcNMTQwNjAz
+MDkwMDUyWhcNMTYwNjAzMDkwMDUyWjCBkjELMAkGA1UEBhMCRlIxLzAtBgNVBAoTJk1pbmlzdGVy
+ZSBFZHVjYXRpb24gTmF0aW9uYWxlIChNRU5FU1IpMRQwEgYDVQQLEwsxMTAgMDQzIDAxNTEjMCEG
+A1UECxMaQ2VudHJlIE5hdGlvbmFsIGRlIFNlcnZpY2UxFzAVBgNVBAMTDmZzLXBobS1naWQtMS4w
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyplBIXFUapQgLMiL0wrEzFNYodsuIwdg
+tLfelo0uyiLmiG1teQ4/A7glwhPAuKjPj7dSEbQcw3F70ACUn+eu6z+qoFmmKLKDFNQgE6A58lsO
+yu7PoQInNaQPguyh/M1lUdvSWWqEipXblrLk0D/cDPrn3ieYk2l1QNsvD6s5cAfuw2KyjUrAYIGe
+Fz6yKFeu7W6VBjX3uG9KUPbtAw0Eh/rJW+nJZ3h3++i427jbfNZR0A88pL2omut3+r4REYAHE/xX
+KkHj8kpADhztAXlIqbu6o8s901FV0RmSXp9h6Ddqwu4LrDbrzf3QMfDRtHqtdq/2tXWWfk1VSsaT
+GGFGyQIDAQABo4IBeDCCAXQwSwYIKwYBBQUHAQEEPzA9MDsGCCsGAQUFBzAChi9odHRwOi8vd3d3
+LmlnYy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNydDAfBgNVHSMEGDAWgBS+OCJ/ckap
+1oQVn9XIKH9cswIgyzAaBgNVHSAEEzARMA8GDSsGAQQBgZ5mRQEBBAEwgaoGA1UdHwSBojCBnzCB
+nKCBmaCBloYwaHR0cDovL2NybDEuaWdjLmVkdWNhdGlvbi5mci9JbmZyYXN0cnVjdHVyZXMuY3Js
+hjBodHRwOi8vY3JsMi5pZ2MuZWR1Y2F0aW9uLmZyL0luZnJhc3RydWN0dXJlcy5jcmyGMGh0dHA6
+Ly9jcmwzLmlnYy5lZHVjYXRpb24uZnIvSW5mcmFzdHJ1Y3R1cmVzLmNybDATBgNVHSUEDDAKBggr
+BgEFBQcDATAOBgNVHQ8BAf8EBAMCBaAwFgYDVR0OBA8EDUFVVE9fR0VORVJBVEUwDQYJKoZIhvcN
+AQEFBQADggIBADtUXZmogUZLbB9EQfIpMBBsE2D1EibJdx1leRdnxgH8dr6AuL6NzMBmOIcegISd
+76sXKESJ8Lf2R/ubA03gNILSduygi0POt02lRqzew2zmpd+qMAaa5t4QaWiUeuesdiQ3apHRa58L
+5cEksQ5g8O6ZL21VqHD4PMtnsES5uyVriDniwUbyXRvLNJy3iHPChwVGwpmtzyhw94s7vcFhuHGr
+BzZ7xqAgircBLGDFVvvtnfvowbMwD02lFbPBeTb52FSAhOMouTMjfLaB/BJ+/Bf6zgpB9GWDQ2lk
+yGsbxAXUpUsnervXd7tBG5jjLUm7z2lq+LPuP37fifskeuWwAE+t9hDud0vOl3Qrpfwl1EY9tfXR
+O63bDGvVB7v7rNOhFRAZQZIviqoSf47SUVKvfJOPekoaULk3o24UzBiH/1tSgx1j0Vsgp2CskBl8
+DWVWlAwhKl1opyRNGyRqgGYMf6P0ZhwuL+iSK23tV7bGPT88Z24SxR7aoj6iKON1L2X+YoGXNgi2
+9MFyYqmVEqb68vHgEcQt0qLmUeWgQdwkKAOh+ArsL2VDf/1buKJHlnNkUe65PIc2fvEvhuzRGuC2
+iMR3P/Jy7hd/GHmThaVaWYRSSJ8jMHbr6GwHH17MQaE1JkjB1+poFz5oKv0pMnHxQyqKu76Vr0vn
+u3Uio5jQe/vo
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://fim-hn-02-idp.orion.education.fr/sso/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">MINISTERE DE L'EDUCATION NATIONALE - HUB HN02</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">MINISTERE DE L'EDUCATION NATIONALE - HUB HN02</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>pole-hebergement@ac-orleans-tours.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
new file mode 100644
index 00000000..b382d797
--- /dev/null
+++ b/swamid-interfederations-2.0/fire.rettorato.unito.it-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://fire.rettorato.unito.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">YouBlog</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">YouBlog</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio permette previa autenticazione, di creare uno o più blog, inserire articoli e commenti, inviare messaggi privati agli autori dei blog. E' uno spazio di interazione, un modo per stare (virtualmente) insieme agli altri e per esprimere liberamente la propria creatività, la propria opinione sui più svariati argomenti e un ambiente di interazione che può diventare strumento di collaborazione nell’ambito delle attività istituzionali.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.serviziweb.unito.it/youblog</mdui:InformationURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEjTCCA3WgAwIBAgIRALMOFHysegGUCjSEYcftmJowDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MTYwMDAwMDBaFw0xNzA0MTUyMzU5NTlaMEExITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTc2Vydml6aXdl
+Yi51bml0by5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO3e9ULQ
+7Jx4dvGUcStS+blvUigQrfOGh7RUZYWEV71pBHazp8ajnNCCw1gfSi3iF2PSEC1Q
+OFZnhivkLmgJ3GaiAtaIMWb9zhjDV9ILfaKdwHZ6p9Fzb54M7qFNDn0iIJyCNCbe
+wAxyyNPx8mKnQn3KfHfiGCMi73X+u1XDiJLSXTvaOcd6rRJ3ol7335mH6eK+VN1X
+dDJJcIBaUGrhCwSt5zis0n1CH07OdXcbeC62kbxUVQxf7QzgECPsld/E4/bbCNSh
+74i82A6AlKKvAkzd8P/LMDKVjlaok89erKuWQoSWusWSaGegmig34D4/0Mh/m0B6
+kxKnR3QUP4jOCvsCAwEAAaOCAYkwggGFMB8GA1UdIwQYMBaAFAy9k2gM896ro0lr
+KzdXR+qQ47ntMB0GA1UdDgQWBBQIiUxAEj/RAjyl0nYAsamjHHQmbDAOBgNVHQ8B
+Af8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYB
+BQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0f
+BDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xD
+QS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDov
+L29jc3AudGNzLnRlcmVuYS5vcmcwNwYDVR0RBDAwLoITc2Vydml6aXdlYi51bml0
+by5pdIIXd3d3LnNlcnZpeml3ZWIudW5pdG8uaXQwDQYJKoZIhvcNAQEFBQADggEB
+ACDeDzqAHJ6FEj6VnX2+MqsnG5qdbfO8f+WDbEUtX1uQEskLl52A6C7fOhUvwb+z
+P1T+LD5OxEDWFOfDuMjOY8p+eqbXjL8Pj6B2c6QVJZoDVI6AJAQdRckAZJepzdzV
+mRwkKgxoOhhJGR/rpzuTjRxQbZugh7iVKKnMPSF52O1hibTJosYRGFyM4ICpo8Yf
+n5E1tth8U9DKoCTXE3pKxiqfWXpJW5cFX2MZcVdo5GTqe9dvelwx93iAdmioJ3RZ
+b0FyxAbrdFq2jGEYvXtRAfJXs04jIpBoJ/0oJyllaZCH4pYM5icvdoQx6vPs53t7
+rzXp6dkn7WJjKlafzxTRso8=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/SOAP"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/POST" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">YouBlog</ServiceName>
+      <ServiceDescription xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Università degli Studi di Torino</OrganizationName>
+    <OrganizationName xml:lang="it">Università degli Studi di Torino</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">YouBlog provided by Università degli Studi di Torino</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">YouBlog erogato da Università degli Studi di Torino</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unito.it/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.unito.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>sewi-id@unito.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <EmailAddress>sewi-id@unito.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml b/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
deleted file mode 100644
index 9848bbd5..00000000
--- a/swamid-interfederations-2.0/fire.rettorato.unito.it.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fire.rettorato.unito.it/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">YouBlog</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">YouBlog</mdui:DisplayName>
-        <mdui:Description xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio permette previa autenticazione, di creare uno o più blog, inserire articoli e commenti, inviare messaggi privati agli autori dei blog. E' uno spazio di interazione, un modo per stare (virtualmente) insieme agli altri e per esprimere liberamente la propria creatività, la propria opinione sui più svariati argomenti e un ambiente di interazione che può diventare strumento di collaborazione nell’ambito delle attività istituzionali.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://www.serviziweb.unito.it/youblog</mdui:InformationURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEmTCCA4GgAwIBAgIRAJ1SDn1K6/XkRV070chIBJswDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMTA1MzEwMDAwMDBaFw0xNDA1MzAyMzU5NTlaMFcxCzAJBgNV
-                            BAYTAklUMSowKAYDVQQKDCFVbml2ZXJzaXTDoCBkZWdsaSBTdHVkaSBkaSBUb3Jp
-                            bm8xHDAaBgNVBAMTE3NlcnZpeml3ZWIudW5pdG8uaXQwggEiMA0GCSqGSIb3DQEB
-                            AQUAA4IBDwAwggEKAoIBAQCkR8/1ia78SrXo2BUwW/x7MFZoWhndhTrxa9RN6LLr
-                            RpLYZOZcH6nByQphxTfVOSkDLs3WJeFc2K7gCRqkpqlPTAm9OeE6Wcno6hhNjxY5
-                            NxWHm53FqUT4WF0Gq9XchBduW1xYJqJMHJW9seehiwaBgdhIewpHKyABf02yE3El
-                            nUmcVVJ7lujPxhn+iqts36Zv4cPQlhu1aMsFfep1DPqY3xo/bn4wM6ikKZpyVBZL
-                            4BVQn6WxHdflUXS7jjvkRXccz5Fb002jZP2ciyNDqZrLvc+ykRTaGbfv2+CD+1ik
-                            pCl5eVA8sM9j7OoD2qo0Hwqg72xdcZsXixxR9kItAKhlAgMBAAGjggF/MIIBezAf
-                            BgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU/kRemvBq
-                            DKxXn7Lf1JA5x4cQGEswDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYD
-                            VR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGy
-                            MQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9y
-                            Zy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilo
-                            dHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEF
-                            BQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwNwYDVR0RBDAwLoITc2Vy
-                            dml6aXdlYi51bml0by5pdIIXd3d3LnNlcnZpeml3ZWIudW5pdG8uaXQwDQYJKoZI
-                            hvcNAQEFBQADggEBADuNAc7xfGwb6H7Z5InKCocT/KqAD0as8oc7vjzLTIWKbrt/
-                            RZQ7QuFHuE6obQ7AhVUYaqWNqCTzErUvabGAYl8oe0tAPNiKSZ+GxLt4OkNacdE+
-                            FoYBP+DAB8H/BaZhUicXRJDxhxjxrGvqpvUl6BzK5aZEsK+un1ID4lBfb3CFHpQW
-                            4fX5uvhpk6cgXniW7oK6iUypnQisJQZsCXbCnoxVSGt1dvz3HeN1+54uYUyKcmp6
-                            wDTCNv5dHkAAUyiItyHFctIOgWocjGH+LYNfnSZChgF49Tjj0o+j/av6yu26pQvj
-                            BUULpqM3xZG1Zi261ZLtbXQz0AKsk7OnPBSDDI0=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/NIM/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.serviziweb.unito.it/youblog/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">YouBlog</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">The system after authentication, allow to create one or more blogs, articles and add comments, send private messages to the authors of the blog. It 'a space of interaction, a way to be (virtually) with the other and freely express their creativity, their opinions on various topics and environment interaction that could become a tool for collaboration in institutional activities.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Università degli Studi di Torino</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Torino</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">YouBlog provided by Università degli Studi di Torino</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">YouBlog erogato da Università degli Studi di Torino</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unito.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unito.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>sewi-id@unito.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>sewi-id@unito.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fod.geant.net.xml b/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
index e24e6552..e24e6552 100644
--- a/swamid-interfederations-2.0/fod.geant.net.xml
+++ b/swamid-interfederations-2.0/fod.geant.net-shibboleth.xml
diff --git a/swamid-interfederations-2.0/foodl.org.xml b/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
index ba803cd9..ba803cd9 100644
--- a/swamid-interfederations-2.0/foodl.org.xml
+++ b/swamid-interfederations-2.0/foodl.org-simplesaml-module.php-saml-sp-metadata.php-saml.xml
diff --git a/swamid-interfederations-2.0/forge.switch.ch.xml b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
index bbf5b688..d25a467a 100644
--- a/swamid-interfederations-2.0/forge.switch.ch.xml
+++ b/swamid-interfederations-2.0/forge.switch.ch-shibboleth.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://forge.switch.ch/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-06-14T15:40:06Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-27T15:54:56Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol">
     <Extensions>
@@ -12,6 +17,7 @@
         <mdui:Description xml:lang="en">Serves as project development and but tracking platform for SWITCH projects</mdui:Description>
         <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAACF0RVh0U29mdHdhcmUAR3JhcGhpY0NvbnZlcnRlciAoSW50ZWwpd4f6GQAAAZJJREFUeJyUk08og2Ecx5+SHNSW/DtQlHKg1MhByjIpLRNx0NZKk0kbbSStHXZdHOVP4bCi5swuXNxQLjiN5UBNc1AzbeR936/39zz7c7B/Dt+e31PP9/P8ft/3eRkARpKPnVDuQsjsy1W2kA8skKwM8tEsEH8tG5QDqEZpqZILdgblbB34+igJygG2RrlRWqsXcqi1pwXKdaAoJLehtk99kJa1wkxrupb9OihPl3lBf6kqiPLg3ThER3BVCRDl8/aI4oC0lFhYGOyiG9nTKIAECjqzQZdMmVqnEbBaAfi0gLeaQ6grGrkkIPqexJjFi+E+PSZGTDANGjHQq8dQdz8CPndhY+Q5hjnPPlirGazDBta5CNakrrVmmGybiETj+UegG3cOz8Gap4V6FgSgYRLthhXcP7zkDzH1/cONmjYrP8xNXXZea9Q6dHELOlPwM1pX98BqxoWRpLZep5uHf/cEic9UwceULaZc22LetGj+eCJZ/lOmYBgzwDizAQrw3z+T2x/E1U24bGNGvwAAAP//AwCkGcs+iePLFQAAAABJRU5ErkJggg==</mdui:Logo>
         <mdui:Logo height="60" width="80">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAFAAAAA8CAIAAAB+RarbAAAC0GlDQ1BJQ0NQcm9maWxlAAB4nI2Uz0sUYRjHv7ONGChBYGZ7iKFDSKhMFmVE5a6/2LRtWX+UEsTs7Lu7k7Oz08zsmiIRXjpm0T0qDx76Azx46JSXwsAsAuluUUSCl5LteWfG3RHtxwsz83mfH9/ned/hfYEaWTFNPSQBecOxkn1R6fromFT7ESEcQR3CqFNU24wkEgOgwWOxa2y+h8C/K617+/866tK2mgeE/UDoR5rZKrDvF9kLWWoEELlew4RjOsT3OFue/THnlMfzrn0o2UW8SHxANS0e/5q4Q80paaBGJG7JBmJSAc7rRdXv5yA99cwYHqTvcerpLrN7fBZm0kp3P3Eb8ec06+7hmsTzGa03RtxMz1rG6h32WDihObEhj0Mjhh4f8LnJSMWv+pqi6UST2/p2abBn235LuZwgDhMnxwv9PKaRcjunckPXPBb0qVxX3Od3VjHJ6x6jmDlTd/8X9RZ6hVHoYNBg0NuAhCT6EEUrTFgoIEMejSI0sjI3xiK2Mb5npI5EgCXyr1POuptzG0XK5lkjiMYx01JRkOQP8ld5VX4qz8lfZsPF5qpnxrqpqcsPvpMur7yt63v9njx9lepGyKsjS9Z8ZU12oNNAdxljNlxV4jXY/fhmYJUsUKkVKVdp3K1Ucn02vSOBan/aPYpdml5sqtZaFRdurNQvTe/Yq8KuVbHKqnbOq3HBfCYeFU+KMbFDPAdJvCR2ihfFbpqdFwcqGcOkomHCVbKhUJaBSfKaO/6ZFwvvrLmjoY8ZzNJUiZ//hFXIaDoLHNF/uP9z8HvFo7Ei8MIGDp+u2jaS7h0iNC5Xbc4V4MI3ug/eVm3NdB4OPQEWzqhFq+RLC8IbimZ3HD7pKpiTlpbNOVK7LJ+VInQlMSlmqG0tkqLrkuuyJYvZzCqxdBvszKl2T6WedqXmU7m8Qeev9hGw9bBc/vmsXN56Tj2sAS/138C8/UXN/ALEAAAJI2lUWHRYTUw6Y29tLmFkb2JlLnhtcAAAAAAAPD94cGFja2V0IGJlZ2luPSLvu78iIGlkPSJXNU0wTXBDZWhpSHpyZVN6TlRjemtjOWQiPz4KPHg6eG1wbWV0YSB4bWxuczp4PSJhZG9iZTpuczptZXRhLyIgeDp4bXB0az0iWE1QIENvcmUgNC40LjAiPgogICA8cmRmOlJERiB4bWxuczpyZGY9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkvMDIvMjItcmRmLXN5bnRheC1ucyMiPgogICAgICA8cmRmOkRlc2NyaXB0aW9uIHJkZjphYm91dD0iIi8+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIAogICAgICAgICAgICAgICAgICAgICAgICAgICAKPD94cGFja2V0IGVuZD0idyI/Pqfd9JIAAAAhdEVYdFNvZnR3YXJlAEdyYXBoaWNDb252ZXJ0ZXIgKEludGVsKXeH+hkAAAaRSURBVHic7JZpUFNXFMf92A+dsR8ECrQ6Fq2tlVVELVQEZLNaoSwV1FEsy6CMuyJhFRAQQiAJEBCIiCigaAUFFARZlE0EAReoiiCgLGUnJIQktyc8GpKXSPnUzjzefzKZ9+4979z7u/fcc+4StMi05P+ewH8tEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FDMyZnLpT/Nzl+FXbgykObmw719TopLKe3hHoEolE2bkN9NTy8XGe9Me37zUHUQu7P4pt0EgHqo5EnRUy7qd56CkLteXBo0AovJRZc7f4BdbTNzAenfgwKqEkGn6sUkZKGS3pYRSrlMoqjaAX5z94Ie3mz/Z+WkrZbs/LtgdT7VzZ9m7snPxnXN60xIA/LUjOqCoqb5UnnOTykzKrwLMM8NgEz9krfc2WsF0uKY4elxzg535J35q63opa19gJBtl5jUqavuysGmlfj2rffrb8hBclR/xSehrRl6G+JpnRXuUg2lL0Oh8ep/gCw12xHt7XsZ62t31We1iWzizrPYnmTqyVm4MNdtC270uycmaZOcZFJpTMrphAeJ5e9K1RqJFNrL27GNXBnf2LS7LGjyFup7N4U9MSKj3LqFMhufLAg8McGHfpGm8ZYFjdlZuCi8tbBQKhxLS98y/tbRfcz2RjA8MCw+uHvlFpdyfP3f58tU99eSliqaOSkzJD8UZR2kZ0yw4JhdgmGNsxvHxzsE6hSARbxOXxebzpzu4hLbMLjNRyWBRogR8YY2aFZa/U1wcw2RVDIxyJY5hkes4TNV3/ipo3EmCDn6O9z+cpBDa2Y6rrBcgAw/Js+ZU5OsbFWZ8Nu+PpcwN7rn/2/iv9QL/IfGkD4FfXjzhmswOlrUGjnTIf1zMR7QvUXYW94YBxTtaZRsRcfCjfFRxzD7rGJ3i49o6uQY3NwUlXZp1zuPwN8wEz8MBGtnSIXtzugSBmpI/KmdC8FRuDnrd+lLahJtd4WpqipxHSjSLOAErUQAVukpZ5gCFTiIGTFAAHUAuM7ZmSDZcItjS/5Pnr9n7J64bt0ZSIO/IexiemTOzjVHX9ZYAhXcHuuRy/llfUUv30XW1jR/PLnvc9w9NSEQ7q6hleaxJ+8ESmSCiSNA6M8K/QqIjbK20pqAwRMVTRYNscMF8MfJiieIe1tl1QuMOB1AITxzh5YJy4XP6mnTG/n8x80tQJk5f8IAGVVLZt3hmjrOkrAwzKvd8CWcHQhg5faptH6phH/mASbr47obahQ9p1fNojFR2/4oq5fMgXoJrCXNHU+JwRcDJVURlF+sP5Qrp3RNMsgqYI2D+qwHQBwLDDP9nSVxmG6lqIZ65jESl+mHkGllWGIV/rB+KB0Uz5gS+HRyY/9o3CIamsfQvwkEVhcyQ2E5wpM8d4C6cEKGNYy+PG3qD99ujV5TlHxUdErFVorGuhwDM7HK0opAOphaaO8QsB3riDdjTg1sDgRO/AWG//GPbfNzDW+qYP1gK/w4+ftDe2dPOnhThHUCchMw8OT0g33n3wUlnbDytRsEZ7j988tssCXd2AuEPi7v5mxFAV1DFwruY/w5/a4aDoQghI4MG1Q6KGip2V24C9cmbOsE+4gjM8PDq51V4uSytr+ULuhj6cNTO1HIBh2XCDOR1K17WIgliorn+nph+SwWCgBGVUFwMrgHKdEVsP8YYWDoyFtMKkFRp7/3vjMMi0uHZILlBZvPxmvc2WpTAFwFhZUsMlLbhvrDYKrW2QqSucSf5vnmmmDnHSIY2pvun9CoMgmM2ew+lwbRBn8gJXxNJAzWmIoYKa2PID/2tI0xQB3y9rVdMLyLhZh2uvqn+33CAoPq1SFnjBZamza8h6byKcctdTWYd8bnh4Z3ucybZwZsEqZN1ukPeCZkr0lzr+yw3OQYYXvw+9RqxvEF0FXdsmvnLICS4VRjb0Q/9UdWlBSK/dGhadWCrfBWsNdxuYBlwEYVZwC4KJ7TuSsXZrOOSRrg/DmBmEtJ5V1OlP3LRg3GXrKDLA4gmPcJipFbqWkUpaFGUtP0jFTofTG5q75F1ggqJ14NhVmM1cRqlnirKtUXuRQnswOxH0R2xyuXwXHJn9RzOu5yleWaFQlHuv5TvjMCVNioq2n9I6CgQ5hMOQVJzDfcHz7PWLGdXyn4+N847637Q5kIwHXiQigYkuEpjoIoGJLhKY6CKBiS4SmOgigYkuEpjoIoGJLhKY6CKBia5FB/w3AAAA//8DABFh2N/+esWhAAAAAElFTkSuQmCC</mdui:Logo>
+        <mdui:InformationURL xml:lang="en">https://forge.switch.ch/</mdui:InformationURL>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
diff --git a/swamid-interfederations-2.0/fortbildung.unibas.ch.xml b/swamid-interfederations-2.0/fortbildung.unibas.ch.xml
deleted file mode 100644
index d910aaa1..00000000
--- a/swamid-interfederations-2.0/fortbildung.unibas.ch.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://fortbildung.unibas.ch/Shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2005-09-01T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Basel</mdui:DisplayName>
-        <mdui:Description xml:lang="en">further education</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDMDCCAhigAwIBAgIJANnJ1QgP58F1MA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
-BAMTFWZvcnRiaWxkdW5nLnVuaWJhcy5jaDAeFw0xNDA2MTAxNDEyMjZaFw0xNzA2
-MDkxNDEyMjZaMCAxHjAcBgNVBAMTFWZvcnRiaWxkdW5nLnVuaWJhcy5jaDCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALuIQhaIRM/rhOAKHV9Cu1DwU9K5
-p+YhOMDJx+mv8ggp3F2pc/nw/wiPjAc9OhMqDHVMrs6IaQWdy31DvZ9PxLqmZJlD
-bf/7cVEEWai/lqAoymkac13Bcgc1PgF4fTChCV0F9PyEWRgLwVrBetDpvPr/dkNo
-q9dSKA1mrjRIrOMxWRzv/WR7+zrwuj6ZUiZ2WPrRX7RoieYTYBov2iw9f7osSqT6
-tP5313J93O/KyGwU3bS++BtxDG6aWbIqrMt/xVskozFwVhxdFW944590g0aDYwNj
-hDwZhBB1IWdDAjGw2To12uSfvnUAX9zYHxds3meALvh9LhX9ct7u9F+YdWsCAwEA
-AaNtMGswSgYDVR0RBEMwQYIVZm9ydGJpbGR1bmcudW5pYmFzLmNohihodHRwczov
-L2ZvcnRiaWxkdW5nLnVuaWJhcy5jaC9TaGliYm9sZXRoMB0GA1UdDgQWBBQApJtP
-47MI9o8mbn92AZsHMCXYhDANBgkqhkiG9w0BAQUFAAOCAQEAecHA6G5GBABAdw+9
-FQFinTCDdi9ChOTYhdcv89wx7H8C/o5bG2NKyNYx3JiZuOjgo/4LOp1saiKH+2UY
-yG/uwXTy6GbBKJAkB2NQYIhTkoqKBzOavUvP8i7UymeTzvpfzKuTWNLDRyYhISt7
-6CaLblLHxmlD9PZ5K8hKczEG59E5EcJlEe8L1Nw7MkRFtJwHH+g/JeK4reEbBQqK
-03O00gs2IkRJqKn1ZFmN/xHOjpuqlAEwWAH4Qwj5Ji2wpHhsc8OuYqgr0tmcfri7
-sUHK7oavc8VVHlRMjbCexdPiLH1VU6x0h9ME/s3GAjzbh1dothnjIrZoeDqfyzoU
-VV1F+A==
-
-						</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fortbildung.unibas.ch/Shibboleth.sso/SAML2/POST" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fortbildung.unibas.ch/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://fortbildung.unibas.ch/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <AttributeConsumingService index="1">
-      <ServiceName xml:lang="en">University Basel</ServiceName>
-      <ServiceDescription xml:lang="en">further education</ServiceDescription>
-      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </AttributeConsumingService>
-  </SPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">unibas.ch</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Universität Basel</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">University of Basel</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="fr">Université de Bâle</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.unibas.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.unibas.ch/</OrganizationURL>
-    <OrganizationURL xml:lang="fr">http://www.unibas.ch/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="support">
-    <GivenName>Viviane</GivenName>
-    <SurName>Cantaluppi</SurName>
-    <EmailAddress>mailto:v.cantaluppi@jcssoft.ch</EmailAddress>
-    <TelephoneNumber>+41617069830</TelephoneNumber>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Pascal</GivenName>
-    <SurName>Cantaluppi</SurName>
-    <EmailAddress>mailto:p.cantaluppi@jcssoft.ch</EmailAddress>
-    <TelephoneNumber>+41617069830</TelephoneNumber>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..142351b9
--- /dev/null
+++ b/swamid-interfederations-2.0/fs-elcira-srv01.dir.garr.it-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/metadata.php/default-sp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-15T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Filesender for ELCIRA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Filesender per ELCIRA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">FileSender ELCIRA by GARR is a secure way to share big files with everybody!</mdui:Description>
+        <mdui:Description xml:lang="it">FileSender ELCIRA da GARR è un modo sicuro di condividere grossi file con tutti!</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://fs-elcira-srv01.dir.garr.it/elcira/index.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://fs-elcira-srv01.dir.garr.it/elcira/index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://fs-elcira-srv01.dir.garr.it/elcira/privacy_en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://fs-elcira-srv01.dir.garr.it/elcira/privacy_it.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://primo-login.garrbox.garr.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://primo-login.garrbox.garr.it/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIJAO2pE5Vwv7FYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIuZ2Fyci5pdDAeFw0xNDAxMTYwOTU4MDZa
+Fw0zNDAxMTEwOTU4MDZaMCYxJDAiBgNVBAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIu
+Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANqr3aW47/9U
+URqjOL6HmX1aZ4+5UGQ/CT0PcYJ2GibpuNms31QIEtm6PqRAQ/r3Qc7V4wDclat2
+ww0SfKDT2NxRBah8QagbVxVVwWPFBFu4uvmbehz8jCahq5zia0hBlrR/Y0VgWj0Z
+7HKo7rfUyOhNRU0VxkesatjSqls8e1LxnNHTEM22aLbvrgcwSvX/XvNUclvA+edd
+OzCpWUQb4HJtDFAA0fKmbGueE45vwdvTpyVx1BL2N4PZpsDm5TdTEEr6zsMLtOFX
++Dq7V9wWTYvILX8i5VaeVnZBH9a1Ou95fy2D+ZDlt+nnDJWo3Wqkr92lvV87oFA+
+0O4TBp4Wx3MCAwEAAaNQME4wHQYDVR0OBBYEFLJde/JWquiDiJENwGPkXggyxJSy
+MB8GA1UdIwQYMBaAFLJde/JWquiDiJENwGPkXggyxJSyMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAL/MIhivMBtcl6mGu2V+JppTsgLfGdrQ7YPBVNr1
+4RKxQjhLUfOY8UXji0aIUHmXXJBRQ3aYtu/n93S5lTMT4iX1bdugLDEL4UWUXgey
+8Ag7LUT8NNXnfoJ5eWcvxX8ijMw1h9I4J9NLosipIOIunRDBvt2YZHqWz6HE6zLk
+PWgsJBLXOn8WzFUQILgE58UNB8FRyszfjwQaMZxbr450A7MLzoocoHruvtyGmU/b
+u+8MvFPZtUgqakjD/z7nC7Xb8sLzvLIl2ImMzcnNvh3w25+kDZiDyhs/HpuLyWp0
+Q1BGI7m2w2Bezwz70P9B1CA26dzfKrAkCDGytwKMtiUwEB4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIJAO2pE5Vwv7FYMA0GCSqGSIb3DQEBBQUAMCYxJDAiBgNV
+BAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIuZ2Fyci5pdDAeFw0xNDAxMTYwOTU4MDZa
+Fw0zNDAxMTEwOTU4MDZaMCYxJDAiBgNVBAMMG2ZzLWVsY2lyYS1zcnYwMS5kaXIu
+Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANqr3aW47/9U
+URqjOL6HmX1aZ4+5UGQ/CT0PcYJ2GibpuNms31QIEtm6PqRAQ/r3Qc7V4wDclat2
+ww0SfKDT2NxRBah8QagbVxVVwWPFBFu4uvmbehz8jCahq5zia0hBlrR/Y0VgWj0Z
+7HKo7rfUyOhNRU0VxkesatjSqls8e1LxnNHTEM22aLbvrgcwSvX/XvNUclvA+edd
+OzCpWUQb4HJtDFAA0fKmbGueE45vwdvTpyVx1BL2N4PZpsDm5TdTEEr6zsMLtOFX
++Dq7V9wWTYvILX8i5VaeVnZBH9a1Ou95fy2D+ZDlt+nnDJWo3Wqkr92lvV87oFA+
+0O4TBp4Wx3MCAwEAAaNQME4wHQYDVR0OBBYEFLJde/JWquiDiJENwGPkXggyxJSy
+MB8GA1UdIwQYMBaAFLJde/JWquiDiJENwGPkXggyxJSyMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQEFBQADggEBAL/MIhivMBtcl6mGu2V+JppTsgLfGdrQ7YPBVNr1
+4RKxQjhLUfOY8UXji0aIUHmXXJBRQ3aYtu/n93S5lTMT4iX1bdugLDEL4UWUXgey
+8Ag7LUT8NNXnfoJ5eWcvxX8ijMw1h9I4J9NLosipIOIunRDBvt2YZHqWz6HE6zLk
+PWgsJBLXOn8WzFUQILgE58UNB8FRyszfjwQaMZxbr450A7MLzoocoHruvtyGmU/b
+u+8MvFPZtUgqakjD/z7nC7Xb8sLzvLIl2ImMzcnNvh3w25+kDZiDyhs/HpuLyWp0
+Q1BGI7m2w2Bezwz70P9B1CA26dzfKrAkCDGytwKMtiUwEB4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://fs-elcira-srv01.dir.garr.it/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="it">Filesender erogato da GARR per il progetto ELCIRA</ServiceName>
+      <ServiceName xml:lang="en">Filesender provided by GARR for the ELCIRA project</ServiceName>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Consortium GARR</OrganizationName>
+    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">La rete italiana dell'universitàe della ricerca</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">The Italian Academic and Research Network</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Administrator</GivenName>
+    <SurName>GARR</SurName>
+    <EmailAddress>grid-tech@garr.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
new file mode 100644
index 00000000..40e8b13c
--- /dev/null
+++ b/swamid-interfederations-2.0/fse.eduuni.fi-adfs-services-trust.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="http://fse.eduuni.fi/adfs/services/trust">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Eduuni-työtilat</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eduuni-workspaces</mdui:DisplayName>
+        <mdui:Description xml:lang="fi">Eduuni-työtilat on opetus- ja kulttuuriministeriön toimialan yhteinen sähköisen työskentelyn ja verkostoitumisen alusta.</mdui:Description>
+        <mdui:Description xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking in the branch of the Ministry of Education and Culture.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="sv">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="fi">http://www.eduuni.fi/Eduuni-tietosuojaseloste.pdf</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGBjCCBO6gAwIBAgIEC+2O9DANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCRkkxEDAOBgNV
+BAgTB0ZpbmxhbmQxITAfBgNVBAoTGFZhZXN0b3Jla2lzdGVyaWtlc2t1cyBDQTEaMBgGA1UECxMR
+UGFsdmVsdXZhcm1lbnRlZXQxJTAjBgNVBAMTHFZSSyBDQSBmb3IgU2VydmljZSBQcm92aWRlcnMw
+HhcNMTMwODA2MDYwMDAwWhcNMTUwODA2MjA1OTAwWjB0MQswCQYDVQQGEwJGSTEQMA4GA1UECBMH
+VXVzaW1hYTERMA8GA1UEBxMISGVsc2lua2kxKDAmBgNVBAoMH09wZXR1cy0gamEga3VsdHR1dXJp
+bWluaXN0ZXJpw7YxFjAUBgNVBAMTDWZzZS5lZHV1bmkuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQCVpaflafuK/FqgOIhrEHiCYysm6LexEQRoPMQy4QyOuTGdnJwQShDVZS2TwxMl
+2V/MweIjUOU67y212bHabkYml6pK74ZfwaCmrJMNvYQIlWLfDt8Q5Y9Yxju0JiD3WWvh6fqAYRVn
+B2l/zU0ZXRSayY6RVM2VAbk0L+8hDiNCiRm3to/y6CI8U0Wb3hmX6/oGWsV555Vz3iHZpu+mPlnP
+2njQQTkgKMlUwK7Ds+BGZNBCIeeYoXTHZkMcr4vgc7PDgjsfHqA2jwhQs4geN3szH8ykTmi6F62t
+NAASH6dmKm6jjrXxms88P8cynUv9GBNKrwTORr0lOHtKU2wRFDtPAgMBAAGjggKMMIICiDAMBgNV
+HRMBAf8EAjAAMIHVBgNVHSAEgc0wgcowCAYGBACPegEDMIG9BgkqgXaEBQEKBAEwga8wgYQGCCsG
+AQUFBwICMHgadlZhcm1lbm5lcG9saXRpaWtrYSBvbiBzYWF0YXZpbGxhIC0gQ2VydGlmaWthdCBw
+b2xpY3kgZmlubnMgLSBDZXJ0aWZpY2F0ZSBwb2xpY3kgaXMgYXZhaWxhYmxlIGh0dHA6Ly93d3cu
+ZmluZWlkLmZpL2NwczMwJgYIKwYBBQUHAgEWGmh0dHA6Ly93d3cuZmluZWlkLmZpL2NwczMvMD8G
+CCsGAQUFBwEBBDMwMTAvBggrBgEFBQcwAoYjaHR0cDovL3Byb3h5LmZpbmVpZC5maS9jYS92cmtz
+cC5jcnQwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNV
+HSMEGDAWgBQYNf0kF+5fwkVxbmsZvebuAfU68jCB7wYDVR0fBIHnMIHkMCugKaAnhiVodHRwOi8v
+cHJveHkuZmluZWlkLmZpL2NybC92cmtzcGMuY3JsMIG0oIGxoIGuhoGrbGRhcDovL2xkYXAuZmlu
+ZWlkLmZpOjM4OS9jbiUzZFZSSyUyMENBJTIwZm9yJTIwU2VydmljZSUyMFByb3ZpZGVycyxvdSUz
+ZFBhbHZlbHV2YXJtZW50ZWV0LG8lM2RWYWVzdG9yZWtpc3RlcmlrZXNrdXMlMjBDQSxkbWROYW1l
+JTNkRklORUlELGMlM2RGST9jZXJ0aWZpY2F0ZVJldm9jYXRpb25MaXN0MB0GA1UdDgQWBBSRO2u7
+JPphRe+0kglWmXOdqBprtzANBgkqhkiG9w0BAQUFAAOCAQEAHiFYA/0WHT8MQzBG03EIP22QiRBr
+R4/t203GC0iEnIGQIQ0oupxXakkZgffBVmycKEvg/BnKhgihfBgYKwohCSfgSK4m6BWWS0Ps0Rwj
+FQ1NeCIjRgTp8wdYsGm0rrCoADOjv+8iS6gt6p+MWNXf/04MAkfwcBGX4d9sGzdMEfAAmpUxGsZz
+f6B9o0oFSEWv2qL5Zq0WY9AbEIizSiOukr8cSS9C6AkG+C9+v+Vb1mheyQWbPf8y9zq0OkDekY2O
+e16sDOehPpDU5+eovgud9EmYTgmzhLl8LF0G8o4RBnqFhASYXweVpZ6bRiK/bthf1tNASYGLoQtl
+An5aXL3c9Q==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://fse.eduuni.fi/adfs/ls/"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://fse.eduuni.fi/adfs/ls/" index="1" isDefault="true"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Eduuni-tyotilat</md:ServiceName>
+      <md:ServiceName xml:lang="en">Eduuni-workspaces</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Eduuni-tyotilat on opetus- ja kulttuuriministerion toimialan yhteinen sahkoisen tyoskentelyn ja verkostoitumisen alusta.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">Eduuni-workspaces is a shared platform for collaboration and networking in the branch of the Ministry of Education and Culture.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonScopedAffiliation"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganizationType"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CSC - IT Center for Science Ltd.</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.csc.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.csc.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Saarikoski</md:SurName>
+    <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Toni</md:GivenName>
+    <md:SurName>Sormunen</md:SurName>
+    <md:EmailAddress>mailto:asiakaspalvelu@eduuni.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ghgtool.grnet.gr.xml b/swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml
index 7c660dbf..7c660dbf 100644
--- a/swamid-interfederations-2.0/ghgtool.grnet.gr.xml
+++ b/swamid-interfederations-2.0/ghgtool.grnet.gr-shibboleth.xml
diff --git a/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml
new file mode 100644
index 00000000..f021d599
--- /dev/null
+++ b/swamid-interfederations-2.0/gisela-gw.ct.infn.it-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://gisela-gw.ct.infn.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-30T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">GISELA Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">GISELA Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service provides information for Grid users, Application developers and
+                        Grid site administrators. It is mainly devoted to the people involved in the
+                        GISELA project but many pages are of general interest
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
+                        di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
+                        GISELA ma molte informazioni sono di interesse generale
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
+2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
+W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">GISELA Science Gateway</ServiceName>
+      <ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
+                    Grid site administrators. It is mainly devoted to the people involved in the
+                    GISELA project but many pages are of general interest
+                </ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</OrganizationName>
+    <OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">INFN Catania</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">INFN Catania</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Marco</GivenName>
+    <SurName>Fargetta</SurName>
+    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Riccardo</GivenName>
+    <SurName>Rotondo</SurName>
+    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Diego</GivenName>
+    <SurName>Scardaci</SurName>
+    <EmailAddress>mailto:diego.scardaci@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Roberto</GivenName>
+    <SurName>Barbera</SurName>
+    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml b/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
deleted file mode 100644
index d6fcb2ed..00000000
--- a/swamid-interfederations-2.0/gisela-gw.ct.infn.it.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gisela-gw.ct.infn.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-21T17:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">GISELA Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">GISELA Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service provides information for Grid users, Application developers and
-                        Grid site administrators. It is mainly devoted to the people involved in the
-                        GISELA project but many pages are of general interest
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio fornisce informazioni per utenti Grid, sviluppatori ed amministratori
-                        di siti Grid. Esso è principalmente indirizzato alle persone coinvolte nel progetto europeo
-                        GISELA ma molte informazioni sono di interesse generale
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gisela-gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">GISELA Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service provides information for Grid users, Application developers and
-                    Grid site administrators. It is mainly devoted to the people involved in the
-                    GISELA project but many pages are of general interest
-                </md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">GISELA Science Gateway provided by INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">GISELA Science Gateway erogato da INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Diego</md:GivenName>
-    <md:SurName>Scardaci</md:SurName>
-    <md:EmailAddress>mailto:diego.scardaci@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml b/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
new file mode 100644
index 00000000..b7c82fa4
--- /dev/null
+++ b/swamid-interfederations-2.0/gitlab-dev.in2p3.fr-sp.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gitlab-dev.in2p3.fr/sp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-08T17:43:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IN2P3 - Gitlab dev</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">IN2P3 - Gitlab dev</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gitlab-dev.in2p3.fr/about/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDIDCCAgigAwIBAgIJAMq3CLil3CmcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2dpdGxhYi1kZXYuaW4ycDMuZnIwHhcNMTQxMDE3MDkwMTIyWhcNMjQxMDE0
+MDkwMTIyWjAeMRwwGgYDVQQDExNnaXRsYWItZGV2LmluMnAzLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH82rDfD9niEHMAZXa6gHOxNkW4XSKv7
+7DtPOQ2Ft0z6eYkYrgCIadDx0btS8fCiTINg90OUbjYrrHvStbdWD2hKKOM5OAeo
+xQMRec+yZ93IDt67hrsDo8dqA8eBM+MicwmQbw3pHwQ4pQ73i6/ly3jTK+Iz/UQQ
+06jjuNKmVX7IXA75OFckM7jopUvZ1TuCrA0vg2L14qqp7zkuO3MP8pkX8CwRW1iV
+P0VaFOvztkIxMWT7Amacigqk16msg4M/swnrs5el6j97CAK5VJ/RD/OSvm61GjZF
+kbMPA1W2CRBVqF4+9J7YCOAbt00maZZeoXQPiLtfO1oOYKHBPslzrwIDAQABo2Ew
+XzA+BgNVHREENzA1ghNnaXRsYWItZGV2LmluMnAzLmZyhh5odHRwczovL2dpdGxh
+Yi1kZXYuaW4ycDMuZnIvc3AwHQYDVR0OBBYEFCusYwwMg6gWFnDUd31Yb+blT7lA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBebrDXws3zc1y+MulOe0B17GO68qdSbAaQkNuj
+sBkhPgP+ie1gqlgTvgpT5lO115K8o7ePcqnZ1CiHg1/Q7uyyKj2XX3JaXZkUrGvH
+THNe8fYK+oRCoPth6Zpbho7MKITdjVwIOHhNh5xSsLm5ylvy5JCFyJxcv7QxMJ9L
+0HgVAHcaKrKDVRL2RqhpurBM+IRkepzQzoQuGAadDNnhHHsXvykwztVLWbiEfPLr
+f6D2GT5SNdfCzWafeUc9DseD43+58AMau3h2sBJbmVhkc4gW+2b2r010q67f4uJE
+BoZyB+cmraisCTXvHKNw8Jc97GlS9L5soe6vlTUh50RlVt24
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDIDCCAgigAwIBAgIJAMq3CLil3CmcMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE2dpdGxhYi1kZXYuaW4ycDMuZnIwHhcNMTQxMDE3MDkwMTIyWhcNMjQxMDE0
+MDkwMTIyWjAeMRwwGgYDVQQDExNnaXRsYWItZGV2LmluMnAzLmZyMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzH82rDfD9niEHMAZXa6gHOxNkW4XSKv7
+7DtPOQ2Ft0z6eYkYrgCIadDx0btS8fCiTINg90OUbjYrrHvStbdWD2hKKOM5OAeo
+xQMRec+yZ93IDt67hrsDo8dqA8eBM+MicwmQbw3pHwQ4pQ73i6/ly3jTK+Iz/UQQ
+06jjuNKmVX7IXA75OFckM7jopUvZ1TuCrA0vg2L14qqp7zkuO3MP8pkX8CwRW1iV
+P0VaFOvztkIxMWT7Amacigqk16msg4M/swnrs5el6j97CAK5VJ/RD/OSvm61GjZF
+kbMPA1W2CRBVqF4+9J7YCOAbt00maZZeoXQPiLtfO1oOYKHBPslzrwIDAQABo2Ew
+XzA+BgNVHREENzA1ghNnaXRsYWItZGV2LmluMnAzLmZyhh5odHRwczovL2dpdGxh
+Yi1kZXYuaW4ycDMuZnIvc3AwHQYDVR0OBBYEFCusYwwMg6gWFnDUd31Yb+blT7lA
+MA0GCSqGSIb3DQEBBQUAA4IBAQBebrDXws3zc1y+MulOe0B17GO68qdSbAaQkNuj
+sBkhPgP+ie1gqlgTvgpT5lO115K8o7ePcqnZ1CiHg1/Q7uyyKj2XX3JaXZkUrGvH
+THNe8fYK+oRCoPth6Zpbho7MKITdjVwIOHhNh5xSsLm5ylvy5JCFyJxcv7QxMJ9L
+0HgVAHcaKrKDVRL2RqhpurBM+IRkepzQzoQuGAadDNnhHHsXvykwztVLWbiEfPLr
+f6D2GT5SNdfCzWafeUc9DseD43+58AMau3h2sBJbmVhkc4gW+2b2r010q67f4uJE
+BoZyB+cmraisCTXvHKNw8Jc97GlS9L5soe6vlTUh50RlVt24
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab-dev.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="fr">IN2P3 - Gitlab dev</ServiceName>
+      <ServiceName xml:lang="en">IN2P3 - Gitlab dev</ServiceName>
+      <ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs (instance de test).</ServiceDescription>
+      <ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates (test instance).</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CNRS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>webmaster@in2p3.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml b/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml
new file mode 100644
index 00000000..5ce093c0
--- /dev/null
+++ b/swamid-interfederations-2.0/gitlab.in2p3.fr-sp.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gitlab.in2p3.fr/sp">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-07T17:38:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IN2P3 - Gitlab</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">IN2P3 - Gitlab</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gitlab.in2p3.fr/about/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDEDCCAfigAwIBAgIJAN4P422/DAqiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2dpdGxhYi5pbjJwMy5mcjAeFw0xNDEwMTcwOTAyMjZaFw0yNDEwMTQwOTAy
+MjZaMBoxGDAWBgNVBAMTD2dpdGxhYi5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALc/8+ereTIUyTcBF7sxZGfRdkl2qGOav3hWPPkrRQd6
+wVsgTFS1IrjSAM+v8SUZXCQmEuCiK11RR4hiGo7jt/mHcorD0I5N/b8PHsYLiBVX
++rw29uP31ufcvKRKgga0KzYFOjer090e0YNt/h2ybPDJWOCSOsOmfYSgiWuVAq2X
+BnEyswPm9t/TvxQLH+UEFwweyNqVi59XxFICfIBqCJ7O+NfEI+x8uNfr++sjkYVJ
+YybukhEftB8pUDC4iBT+S31YT8vO+u1WMakuETm4N2t6Vi1oCzdTwExfDFeT9ptH
+ZbEkyQ6jK+kVmxYx3jeWZAPlT4yTfLDqEyoJ2d1J1skCAwEAAaNZMFcwNgYDVR0R
+BC8wLYIPZ2l0bGFiLmluMnAzLmZyhhpodHRwczovL2dpdGxhYi5pbjJwMy5mci9z
+cDAdBgNVHQ4EFgQUubCjI0lAVt2nFgU1JGBhOPkiAr8wDQYJKoZIhvcNAQEFBQAD
+ggEBAKzgpHdu8MHO6AmnA6fgbXWLXj+CIcLRGj9yzsyJanRkH1PLetl8QHqcFFDI
+23CYC6DctR6BsjqBW2vFD2sXOqznbp7/yEtkGGjNbFyPrUf9HsDYbUwXPeSF2dbF
+ytVhSgqHurk+LzuoWQtr5ZaidBiv4+G8RtwvMhxM1jvwSng6waF1IpEemDzAubAL
+egooHKMFutA/QLDwwxnNkVFYY0smKOyPGnpTqe2UMDi7k3UB4LqhckWHqZZdBKA7
+nLSPF5+mIbnSL49lmtebY1RDsJOGi17cgKdExkh5+GLBm+A7FWj+uIEE5Rw9tFqW
+iFJVpavS2JG8mIKKAznQiZvqphE=
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDEDCCAfigAwIBAgIJAN4P422/DAqiMA0GCSqGSIb3DQEBBQUAMBoxGDAWBgNV
+BAMTD2dpdGxhYi5pbjJwMy5mcjAeFw0xNDEwMTcwOTAyMjZaFw0yNDEwMTQwOTAy
+MjZaMBoxGDAWBgNVBAMTD2dpdGxhYi5pbjJwMy5mcjCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBALc/8+ereTIUyTcBF7sxZGfRdkl2qGOav3hWPPkrRQd6
+wVsgTFS1IrjSAM+v8SUZXCQmEuCiK11RR4hiGo7jt/mHcorD0I5N/b8PHsYLiBVX
++rw29uP31ufcvKRKgga0KzYFOjer090e0YNt/h2ybPDJWOCSOsOmfYSgiWuVAq2X
+BnEyswPm9t/TvxQLH+UEFwweyNqVi59XxFICfIBqCJ7O+NfEI+x8uNfr++sjkYVJ
+YybukhEftB8pUDC4iBT+S31YT8vO+u1WMakuETm4N2t6Vi1oCzdTwExfDFeT9ptH
+ZbEkyQ6jK+kVmxYx3jeWZAPlT4yTfLDqEyoJ2d1J1skCAwEAAaNZMFcwNgYDVR0R
+BC8wLYIPZ2l0bGFiLmluMnAzLmZyhhpodHRwczovL2dpdGxhYi5pbjJwMy5mci9z
+cDAdBgNVHQ4EFgQUubCjI0lAVt2nFgU1JGBhOPkiAr8wDQYJKoZIhvcNAQEFBQAD
+ggEBAKzgpHdu8MHO6AmnA6fgbXWLXj+CIcLRGj9yzsyJanRkH1PLetl8QHqcFFDI
+23CYC6DctR6BsjqBW2vFD2sXOqznbp7/yEtkGGjNbFyPrUf9HsDYbUwXPeSF2dbF
+ytVhSgqHurk+LzuoWQtr5ZaidBiv4+G8RtwvMhxM1jvwSng6waF1IpEemDzAubAL
+egooHKMFutA/QLDwwxnNkVFYY0smKOyPGnpTqe2UMDi7k3UB4LqhckWHqZZdBKA7
+nLSPF5+mIbnSL49lmtebY1RDsJOGi17cgKdExkh5+GLBm+A7FWj+uIEE5Rw9tFqW
+iFJVpavS2JG8mIKKAznQiZvqphE=
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gitlab.in2p3.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="fr">IN2P3 - Gitlab</ServiceName>
+      <ServiceName xml:lang="en">IN2P3 - Gitlab</ServiceName>
+      <ServiceDescription xml:lang="fr">Hébergement git collaboratif à l'usage des personnels IN2P3 et de leurs collaborateurs.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Git collaborative hosting intended for IN2P3 staff and their associates.</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CNRS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>webmaster@in2p3.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gn-vho.grnet.gr.xml b/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
index 7f47d056..7f47d056 100644
--- a/swamid-interfederations-2.0/gn-vho.grnet.gr.xml
+++ b/swamid-interfederations-2.0/gn-vho.grnet.gr-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml b/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml
new file mode 100644
index 00000000..8c15440d
--- /dev/null
+++ b/swamid-interfederations-2.0/groupes.france-bioinformatique.fr-sympa.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://groupes.france-bioinformatique.fr/sympa">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-20T12:00:53Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Group service for the French Institute of BioInformatics</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Group service for the French Institute of BioInformatics :
+-mailing lists
+-wikis
+-surveys
+-meeting scheduler</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
+-listes de diffusions
+-wikis
+-sondages
+-planification de réunion</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEKjCCAxKgAwIBAgIJAI2rvCn3oTieMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
+BAYTAkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZv
+cm1hdGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1
+ZS5mcjAeFw0xNDEwMjAwOTEyMzdaFw0zNDEwMTUwOTEyMzdaMGsxCzAJBgNVBAYT
+AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
+dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHjwFnlwrpydxosra2C
+A5wxUhpAShLUknop3e1B4K+x2aIXvbN6sChUkOLV/JKhhH52BMBZwI4qr/tv6ego
+BU6pnhYhWO8QtKKXyvox5NRbgeCX3CI8pQ5PJtWc++pOjq/10v4koBfbJcogsMGc
+3B/khJK4tmKHFvcEngRiwhaHVL4MPO65rYyjisg5Tr6EuDGW1xGD5ETHe1aliLyQ
+uIqN3Pirmqb8h32OlPkqQ/A2jzkYx9sTX2cEgSFFGL3Docr2bB7ie+GuiDgcnm5h
+YyQ5Ej1Of1jjOGF4UcSUKCLphukAbQyswRLqzYNr8No4JzY6ZcL/tSS32wfNG6BV
+7ZECAwEAAaOB0DCBzTAdBgNVHQ4EFgQUGAA0QcYlCVagyA/JmGcP9vm336EwgZ0G
+A1UdIwSBlTCBkoAUGAA0QcYlCVagyA/JmGcP9vm336Ghb6RtMGsxCzAJBgNVBAYT
+AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
+dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
+coIJAI2rvCn3oTieMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALrL
+S1BIC0tCkQx5G+ZnI9BGlHMeeqQqd9faGOFPtcyrrl6sUwMj8b1aNrJMICPxnwPG
+3Z9qjLOfihRz96pxhaxI7HYOuv987xRqD2l/ubkz/NF3l8A+k+hNSwILhwR0vjTo
+HSfX+jCW8FBrLlsgSkCv2xxE6Liwl+VcEczBYfMbBffD0kXPDo4KdY/zxs5dHYDI
+bLYBU/O/n+4v/kcj1VwwHX2/Lc40lLAQUe6cN+red1ELmJ7J6afTr5ru6vwG4P0g
+oQoGFWdszAsq/gim7srIxz4+yb9/vCqwQBMxNZEi8522QbhrrC24R+rAeTFjbF1H
+SoGk3gs42M20S05utsA=
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEKjCCAxKgAwIBAgIJAI2rvCn3oTieMA0GCSqGSIb3DQEBBQUAMGsxCzAJBgNV
+BAYTAkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZv
+cm1hdGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1
+ZS5mcjAeFw0xNDEwMjAwOTEyMzdaFw0zNDEwMTUwOTEyMzdaMGsxCzAJBgNVBAYT
+AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
+dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANHjwFnlwrpydxosra2C
+A5wxUhpAShLUknop3e1B4K+x2aIXvbN6sChUkOLV/JKhhH52BMBZwI4qr/tv6ego
+BU6pnhYhWO8QtKKXyvox5NRbgeCX3CI8pQ5PJtWc++pOjq/10v4koBfbJcogsMGc
+3B/khJK4tmKHFvcEngRiwhaHVL4MPO65rYyjisg5Tr6EuDGW1xGD5ETHe1aliLyQ
+uIqN3Pirmqb8h32OlPkqQ/A2jzkYx9sTX2cEgSFFGL3Docr2bB7ie+GuiDgcnm5h
+YyQ5Ej1Of1jjOGF4UcSUKCLphukAbQyswRLqzYNr8No4JzY6ZcL/tSS32wfNG6BV
+7ZECAwEAAaOB0DCBzTAdBgNVHQ4EFgQUGAA0QcYlCVagyA/JmGcP9vm336EwgZ0G
+A1UdIwSBlTCBkoAUGAA0QcYlCVagyA/JmGcP9vm336Ghb6RtMGsxCzAJBgNVBAYT
+AkZSMTAwLgYDVQQKDCdJbnN0aXR1dCBGcmFuw4PCp2FpcyBkZSBCaW9pbmZvcm1h
+dGlxdWUxKjAoBgNVBAMTIWdyb3VwZXMuZnJhbmNlLWJpb2luZm9ybWF0aXF1ZS5m
+coIJAI2rvCn3oTieMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBALrL
+S1BIC0tCkQx5G+ZnI9BGlHMeeqQqd9faGOFPtcyrrl6sUwMj8b1aNrJMICPxnwPG
+3Z9qjLOfihRz96pxhaxI7HYOuv987xRqD2l/ubkz/NF3l8A+k+hNSwILhwR0vjTo
+HSfX+jCW8FBrLlsgSkCv2xxE6Liwl+VcEczBYfMbBffD0kXPDo4KdY/zxs5dHYDI
+bLYBU/O/n+4v/kcj1VwwHX2/Lc40lLAQUe6cN+red1ELmJ7J6afTr5ru6vwG4P0g
+oQoGFWdszAsq/gim7srIxz4+yb9/vCqwQBMxNZEi8522QbhrrC24R+rAeTFjbF1H
+SoGk3gs42M20S05utsA=
+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://groupes.france-bioinformatique.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://groupes.france-bioinformatique.fr/sympa/sso_login/federation_cru/Shibboleth.sso/SAML/POST" index="5"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique</ServiceName>
+      <ServiceName xml:lang="en">Group service for the French Institute of BioInformatics</ServiceName>
+      <ServiceDescription xml:lang="fr">Service de groupes de l'Institut Français de BioInformatique : 
+-listes de diffusions
+-wikis
+-sondages
+-planification de réunion</ServiceDescription>
+      <ServiceDescription xml:lang="en">Group service for the French Institute of BioInformatics :
+-mailing lists
+-wikis
+-surveys
+-meeting scheduler</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">RENATER</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>support@renater.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
new file mode 100644
index 00000000..05dfd141
--- /dev/null
+++ b/swamid-interfederations-2.0/gw-astronomy.org-lists-shibboleth-sp.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/lists/shibboleth-sp">
+  <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+    <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw-astronomy.org/lists/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community List Server</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community list server used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/lists/sp-info.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/lists/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
+ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
+BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
+dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTA0MjkxNzI0MTJaFw0yMTA0
+MjgxNzI0MTJaMGoxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
+FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFzAV
+BgNVBAMTDmd1ZXN0LmxpZ28ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApxrDaMIRCnagFhhjD4rY47JBOHKjA4IS6EG1MvqG6kMXm73ZdYRhRraQ
+onVmFMUPPlkR5zTlok+qvb+Iy58s6PqguQe0Tz3eEnfRlVqLaXniKNGxkef5pXFY
+hndYXzkfeoclycdYZGwu12ANoG5wjADhYcWEuiyJKprfWXF/msa65rkczuMd5WFw
+lde6hnpZTXa6FaeYb1Hi8Me36pHFCU3DfhARdup7DQ4t3QDEttQY1mn/pnY6vd2o
+oa/jmL1iHkJbTDT6+EWhk/3XdrC1tfo1VKQ+B4RebTyzRY8Wsgn3CAyAz9K5nA7w
+aYBOYhK26Z6envlE+vXviDI89J/C7QIDAQABo4HqMIHnMAwGA1UdEwEB/wQCMAAw
+DgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZ
+BgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6gLKAqhihodHRw
+Oi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8GA1UdIwQYMBaA
+FFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDEGA1UdEQQqMCiCDmd1ZXN0LmxpZ28ub3Jn
+gRZzY290dC5rb3JhbmRhQGxpZ28ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBXTyxj
+WEiIQ4kG8I9ujY9AssDMi63g9m4AT7uAm6mbNJVRaYkYVy7lnRi227fBjIXr8rku
+gfUhzwRULi9OUuY5eO713iB/urMn3mysch9R6heciYGzccnn5nN3gWrUN3kZ0AWd
+XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
+6Lnu58KItVKI+8w7FepUsXIdF6pHRLevhzW7d61QZ5iW8o2qW0TG24RDY4JJE45m
+y6qIv7HErgRcZZrxupRI6NfHLBxJx22n8rBD7gmVoCLXkAftIKQZ8pBKF4c74ErF
+xWUYS9G3JfMMW9UY
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/lists/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Gravitational Wave Astronomy Community List Server</ServiceName>
+      <ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community list server used to support collaboration across astronomy and astrophysics projects.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uwm.edu/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Scott Koranda</GivenName>
+    <EmailAddress>scott.koranda@ligo.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Warren Anderson</GivenName>
+    <EmailAddress>warren.anderson@ligo.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Chris Spadanuda</GivenName>
+    <EmailAddress>cspada@uwm.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>UWM CGCA Help</GivenName>
+    <EmailAddress>uwm-help@gravity.phys.uwm.edu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml b/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
new file mode 100644
index 00000000..e4b21227
--- /dev/null
+++ b/swamid-interfederations-2.0/gw-astronomy.org-shibboleth-sp.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw-astronomy.org/shibboleth-sp">
+  <Extensions xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi">
+    <mdrpi:RegistrationInfo registrationAuthority="https://incommon.org"/>
+    <mdattr:EntityAttributes>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw-astronomy.org/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Gravitational Wave Astronomy Community Registry</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/sp_info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://gw-astronomy.org/registry/pages/public/privacy_info</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEWDCCA0CgAwIBAgIBPjANBgkqhkiG9w0BAQUFADCBhzETMBEGCgmSJomT8ixk
+ARkWA29yZzEUMBIGCgmSJomT8ixkARkWBGxpZ28xDTALBgNVBAoTBExJR08xIDAe
+BgNVBAsTF0NlcnRpZmljYXRlIEF1dGhvcml0aWVzMRUwEwYDVQQLEwxXZWIgU2Vy
+dmljZXMxEjAQBgNVBAMTCUxJR08gQ0EgMTAeFw0xMTA0MjkxNzI0MTJaFw0yMTA0
+MjgxNzI0MTJaMGoxEzARBgoJkiaJk/IsZAEZFgNvcmcxFDASBgoJkiaJk/IsZAEZ
+FgRsaWdvMQ0wCwYDVQQKEwRMSUdPMRUwEwYDVQQLEwxXZWIgU2VydmljZXMxFzAV
+BgNVBAMTDmd1ZXN0LmxpZ28ub3JnMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApxrDaMIRCnagFhhjD4rY47JBOHKjA4IS6EG1MvqG6kMXm73ZdYRhRraQ
+onVmFMUPPlkR5zTlok+qvb+Iy58s6PqguQe0Tz3eEnfRlVqLaXniKNGxkef5pXFY
+hndYXzkfeoclycdYZGwu12ANoG5wjADhYcWEuiyJKprfWXF/msa65rkczuMd5WFw
+lde6hnpZTXa6FaeYb1Hi8Me36pHFCU3DfhARdup7DQ4t3QDEttQY1mn/pnY6vd2o
+oa/jmL1iHkJbTDT6+EWhk/3XdrC1tfo1VKQ+B4RebTyzRY8Wsgn3CAyAz9K5nA7w
+aYBOYhK26Z6envlE+vXviDI89J/C7QIDAQABo4HqMIHnMAwGA1UdEwEB/wQCMAAw
+DgYDVR0PAQH/BAQDAgSwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAZ
+BgNVHSAEEjAQMA4GDCsGAQQBgfpGAgECATA5BgNVHR8EMjAwMC6gLKAqhihodHRw
+Oi8vY2EubGlnby5vcmcvNTQxNDA0YzMvNTQxNDA0YzMuY3JsMB8GA1UdIwQYMBaA
+FFJu3Xuqb4VcCCLTl5+tfyNWHmrRMDEGA1UdEQQqMCiCDmd1ZXN0LmxpZ28ub3Jn
+gRZzY290dC5rb3JhbmRhQGxpZ28ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBXTyxj
+WEiIQ4kG8I9ujY9AssDMi63g9m4AT7uAm6mbNJVRaYkYVy7lnRi227fBjIXr8rku
+gfUhzwRULi9OUuY5eO713iB/urMn3mysch9R6heciYGzccnn5nN3gWrUN3kZ0AWd
+XaIE5G8rZOACTDp7SCVyNH1eZNkk6apK9LJgblo44XppU8gZk1OIzBzeknCuZhGz
+6Lnu58KItVKI+8w7FepUsXIdF6pHRLevhzW7d61QZ5iW8o2qW0TG24RDY4JJE45m
+y6qIv7HErgRcZZrxupRI6NfHLBxJx22n8rBD7gmVoCLXkAftIKQZ8pBKF4c74ErF
+xWUYS9G3JfMMW9UY
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <md:AssertionConsumerService xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw-astronomy.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Gravitational Wave Astronomy Community Registry</ServiceName>
+      <ServiceDescription xml:lang="en">Gravitational Wave Astronomy Community Registry used to support collaboration across astronomy and astrophysics projects.</ServiceDescription>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:mace:dir:attribute-def:displayName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:mace:dir:attribute-def:eduPersonPrincipalName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:mace:dir:attribute-def:givenName" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:mace:dir:attribute-def:mail" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:mace:dir:attribute-def:sn" NameFormat="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Wisconsin-Milwaukee</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uwm.edu/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Scott Koranda</GivenName>
+    <EmailAddress>skoranda@uwm.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>UWM CGCA Help</GivenName>
+    <EmailAddress>uwm-help@gravity.phys.uwm.edu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Chris Spadanuda</GivenName>
+    <EmailAddress>cspada@uwm.edu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw-astronomy.org.xml b/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
index 4b36f849..4b36f849 100644
--- a/swamid-interfederations-2.0/gw-astronomy.org.xml
+++ b/swamid-interfederations-2.0/gw-astronomy.org-wiki-shibboleth-sp.xml
diff --git a/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
new file mode 100644
index 00000000..38ad7b19
--- /dev/null
+++ b/swamid-interfederations-2.0/gw.ct.infn.it-shibboleth.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://gw.ct.infn.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-03T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">INFN Science Gateway to IGI</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">INFN Science Gateway to IGI</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio fornisce accesso ad un insieme di applicazioni ed use case su Grid alla comunità italiana di Gri</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gw.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
+2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
+W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Science Gateway to IGI </ServiceName>
+      <ServiceDescription xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</OrganizationName>
+    <OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Science Gateway to IGI provided by INFN Catania</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Science Gateway to IGI erogato da INFN Catania</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Marco</GivenName>
+    <SurName>Fargetta</SurName>
+    <EmailAddress>marco.fargetta@ct.infn.it</EmailAddress>
+    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Riccardo</GivenName>
+    <SurName>Rotondo</SurName>
+    <EmailAddress>riccardo.rotondo@ct.infn.it</EmailAddress>
+    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Giuseppe</GivenName>
+    <SurName>Platania</SurName>
+    <EmailAddress>giuseppe.platania@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Carlo</GivenName>
+    <SurName>Rocca</SurName>
+    <EmailAddress>carlo.rocca@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Roberto</GivenName>
+    <SurName>Barbera</SurName>
+    <EmailAddress>roberto.barbera@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/gw.ct.infn.it.xml b/swamid-interfederations-2.0/gw.ct.infn.it.xml
deleted file mode 100644
index 268cf664..00000000
--- a/swamid-interfederations-2.0/gw.ct.infn.it.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://gw.ct.infn.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-02T17:20:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">INFN Science Gateway to IGI</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">INFN Science Gateway to IGI</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio fornisce accesso ad un insieme di applicazioni ed use case su Grid alla comunità italiana di Gri</mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://gw.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://gw.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://gw.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Science Gateway to IGI </md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service provides access to several Grid applications and use case to the Italian Grid community</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Science Gateway to IGI provided by INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Science Gateway to IGI erogato da INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..4fd30a12
--- /dev/null
+++ b/swamid-interfederations-2.0/haka.saimia.fi-idp-shibboleth.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://haka.saimia.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">saimia.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
+OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDd2/hlBilgIQxoFsVWQ4RqpUdfIKhpIh+36HJzA6IpUvjf
+KjTPplQVQbEAUF7BgLX0nmMcjnehPP4r7MFsq6BtGrSo867rNaKovyjkKq1cNJ5I
+DC2zK8Q5NrTiI80Mi3+JdQCSeYBiIPmrlz1dkKZTOp2fVhhb6EKCo/tbAlWnROCs
+sh1NDoW2a8nI7xlrB6VyBEvRNaFL6JX8nVxUuL+SqjXkOiFJDElHq097Q7/wDEPi
+BIOpqT9jGC8VaV1lKmmLcUQMHSKxLnEuky/nhkm1fqW/DCOjLqj1JkFSp3Mq/6yY
+ooys2nCTC7vSJXZdTmYDcTjTBkNcI/kjfAPFRSpxAgMBAAGjYzBhMEAGA1UdEQQ5
+MDeCDmhha2Euc2FpbWlhLmZphiVodHRwczovL2hha2Euc2FpbWlhLmZpL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBRRrt/+bZxLw1Xr8XLLszoxN/7ySTANBgkqhkiG
+9w0BAQUFAAOCAQEAYk78PGssKXk/pJDAWNoo3GW7D0kJtcDKffr5YeRDfz0AuPQD
+1SzsZFT7neyjZF9tOkzb1s9qMKJIUqMZPbyZCiXzt6+csXkSRl6UUzY/Wvf8NS6M
+0dj8QU6ony6SspdxU9ZGKq/RWwmcuCX8RJweg4Vq+X1PmFQV8JmDA+816EUX85ht
+E0AuFvgJ1F0sEbvX0R3pEPpin3hQKYtH0SdzPqiddCVCO4QwKzX1pod8lbLt4J7G
+2W+i5q2zvgodt4ULB676EyyD6wMlVMNgnraDv3aFR0GMEishohgRAGcQ6QKktS5D
+PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://haka.saimia.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://haka.saimia.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://haka.saimia.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">saimia.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDGDCCAgCgAwIBAgIJANwd5owYiwIAMA0GCSqGSIb3DQEBBQUAMBkxFzAVBgNV
+BAMTDmhha2Euc2FpbWlhLmZpMB4XDTE0MDQxNDA3MzM1OFoXDTE3MDQxMzA3MzM1
+OFowGTEXMBUGA1UEAxMOaGFrYS5zYWltaWEuZmkwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDd2/hlBilgIQxoFsVWQ4RqpUdfIKhpIh+36HJzA6IpUvjf
+KjTPplQVQbEAUF7BgLX0nmMcjnehPP4r7MFsq6BtGrSo867rNaKovyjkKq1cNJ5I
+DC2zK8Q5NrTiI80Mi3+JdQCSeYBiIPmrlz1dkKZTOp2fVhhb6EKCo/tbAlWnROCs
+sh1NDoW2a8nI7xlrB6VyBEvRNaFL6JX8nVxUuL+SqjXkOiFJDElHq097Q7/wDEPi
+BIOpqT9jGC8VaV1lKmmLcUQMHSKxLnEuky/nhkm1fqW/DCOjLqj1JkFSp3Mq/6yY
+ooys2nCTC7vSJXZdTmYDcTjTBkNcI/kjfAPFRSpxAgMBAAGjYzBhMEAGA1UdEQQ5
+MDeCDmhha2Euc2FpbWlhLmZphiVodHRwczovL2hha2Euc2FpbWlhLmZpL2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBRRrt/+bZxLw1Xr8XLLszoxN/7ySTANBgkqhkiG
+9w0BAQUFAAOCAQEAYk78PGssKXk/pJDAWNoo3GW7D0kJtcDKffr5YeRDfz0AuPQD
+1SzsZFT7neyjZF9tOkzb1s9qMKJIUqMZPbyZCiXzt6+csXkSRl6UUzY/Wvf8NS6M
+0dj8QU6ony6SspdxU9ZGKq/RWwmcuCX8RJweg4Vq+X1PmFQV8JmDA+816EUX85ht
+E0AuFvgJ1F0sEbvX0R3pEPpin3hQKYtH0SdzPqiddCVCO4QwKzX1pod8lbLt4J7G
+2W+i5q2zvgodt4ULB676EyyD6wMlVMNgnraDv3aFR0GMEishohgRAGcQ6QKktS5D
+PWVldxxCqWr2dfoIUAlsgi/mVd7ifABx15cXzA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://haka.saimia.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://haka.saimia.fi/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Saimaan ammattikorkeakoulu</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Yrkehögskola Saimaa</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Saimaan ammattikorkeakoulu</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Saimaa University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Yrkehögskola Saimaa</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.saimia.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.saimia.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.saimia.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Ilpo</md:GivenName>
+    <md:SurName>Olkkonen</md:SurName>
+    <md:EmailAddress>mailto:ilpo.olkkonen@saimia.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Saimaan amk</md:GivenName>
+    <md:SurName>IT-palvelut</md:SurName>
+    <md:EmailAddress>mailto:haka-admin@saimia.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Saimaan amk</md:GivenName>
+    <md:SurName>IT-palvelut</md:SurName>
+    <md:EmailAddress>mailto:haka@saimia.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml b/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
new file mode 100644
index 00000000..e3c978d6
--- /dev/null
+++ b/swamid-interfederations-2.0/halfback.cnaf.infn.it-casshib-app2.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://halfback.cnaf.infn.it/casshib/app2">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-07-04T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">IGI Grid Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal/Federation-info</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEhzCCA2+gAwIBAgIQYJH5E+/63l61Qiby7wHhYjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDYyNTAwMDAwMFoXDTE1MDYyNTIzNTk1OVowXTELMAkGA1UE
+BhMCSVQxLjAsBgNVBAoTJUlzdGl0dXRvIE5hemlvbmFsZSBkaSBGaXNpY2EgTnVj
+bGVhcmUxHjAcBgNVBAMTFWhhbGZiYWNrLmNuYWYuaW5mbi5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAOH0IRtQc7utWIumhJaEwwBdovpOu3eUH3X5
+DK7/OaQYHpo2+E1tnoHdG1JU+QgZocacuw3oJz74tGdknUsvDj9MCdp2lGYLpPW9
+p4WMK5+ElpVFjLcKdxndPNME8SF0nOcRoM9aMQhpOSnSLX3Ybeov/MO0dT9iVVmW
+KAau3hSeUZ2renaL/oQp+bK3+EoYImYV/5R1rkpTTf0brmaQg3GBdxADnAdwFBgG
+Y93qnKsYQjPsOg7ik7kf0jUSrITGo7rgLHvkElm4ySG01jOOtfw4AoglUppUan2x
+hlHYWrUhdqzNV2uasqHP3t7EA4tITv8IrgJj3k2coinPbB9s1mUCAwEAAaOCAWgw
+ggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTz
+kh/WAe7TMeep782t7Dy4EX8J/DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
+ghVoYWxmYmFjay5jbmFmLmluZm4uaXQwDQYJKoZIhvcNAQEFBQADggEBAHW8TsHv
+D7EM9iMprOIH+5VeRSh0cYEdttX033scsifCFCArRJvhofIkR/1F23DIWRnc8//4
+7MKSrLoC9PNeIjXa6anC3O9IZNCeBxb9UEcRvPW3Yc1wEe4ATp1aR8EXtH3G2Sef
+EELgyGnKzScgkUSGIbgf9P05XOyok0RuKWTHDvYNHr/GW/NW5optwXz6apDDE2mX
+icFWqRortYglbk+s6VO0hcYN6ORR5UBgOR6VULrT9r6mDQykItMVhBgt4peAeOss
++6acaFTdJZHMD+Z3KkvA7yfD4IWulPnTaT+o1n7X1V6oAEVHn6SfpuBeP+wXeu+f
+yVxNpwv+OOJLtns=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Artifact"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/SOAP"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/POST" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">IGI Grid Portal provided by INFN</ServiceName>
+      <ServiceDescription xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="localityName" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Istituto Nazionale di Fisica Nucleare</OrganizationName>
+    <OrganizationName xml:lang="en">Istituto Nazionale di Fisica Nucleare</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">IGI Grid Portal erogato da INFN</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">IGI Grid Portal provided by INFN</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.infn.it</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.infn.it/indexen.php</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>igi-portal-admin@lists.italiangrid.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml b/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml
deleted file mode 100644
index 235d4d14..00000000
--- a/swamid-interfederations-2.0/halfback.cnaf.infn.it.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://halfback.cnaf.infn.it/casshib/app2">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-10-23T09:45:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">IGI Grid Portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://wiki.italiangrid.it/IGIPortal/Federation-info</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>halfback.cnaf.infn.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=halfback.cnaf.infn.it,O=Istituto Nazionale di Fisica Nucleare,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEhzCCA2+gAwIBAgIQYJH5E+/63l61Qiby7wHhYjANBgkqhkiG9w0BAQUFADA2
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-                            U1NMIENBMB4XDTEyMDYyNTAwMDAwMFoXDTE1MDYyNTIzNTk1OVowXTELMAkGA1UE
-                            BhMCSVQxLjAsBgNVBAoTJUlzdGl0dXRvIE5hemlvbmFsZSBkaSBGaXNpY2EgTnVj
-                            bGVhcmUxHjAcBgNVBAMTFWhhbGZiYWNrLmNuYWYuaW5mbi5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAOH0IRtQc7utWIumhJaEwwBdovpOu3eUH3X5
-                            DK7/OaQYHpo2+E1tnoHdG1JU+QgZocacuw3oJz74tGdknUsvDj9MCdp2lGYLpPW9
-                            p4WMK5+ElpVFjLcKdxndPNME8SF0nOcRoM9aMQhpOSnSLX3Ybeov/MO0dT9iVVmW
-                            KAau3hSeUZ2renaL/oQp+bK3+EoYImYV/5R1rkpTTf0brmaQg3GBdxADnAdwFBgG
-                            Y93qnKsYQjPsOg7ik7kf0jUSrITGo7rgLHvkElm4ySG01jOOtfw4AoglUppUan2x
-                            hlHYWrUhdqzNV2uasqHP3t7EA4tITv8IrgJj3k2coinPbB9s1mUCAwEAAaOCAWgw
-                            ggFkMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBTz
-                            kh/WAe7TMeep782t7Dy4EX8J/DAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
-                            ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
-                            BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
-                            bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
-                            MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
-                            CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAX
-                            ghVoYWxmYmFjay5jbmFmLmluZm4uaXQwDQYJKoZIhvcNAQEFBQADggEBAHW8TsHv
-                            D7EM9iMprOIH+5VeRSh0cYEdttX033scsifCFCArRJvhofIkR/1F23DIWRnc8//4
-                            7MKSrLoC9PNeIjXa6anC3O9IZNCeBxb9UEcRvPW3Yc1wEe4ATp1aR8EXtH3G2Sef
-                            EELgyGnKzScgkUSGIbgf9P05XOyok0RuKWTHDvYNHr/GW/NW5optwXz6apDDE2mX
-                            icFWqRortYglbk+s6VO0hcYN6ORR5UBgOR6VULrT9r6mDQykItMVhBgt4peAeOss
-                            +6acaFTdJZHMD+Z3KkvA7yfD4IWulPnTaT+o1n7X1V6oAEVHn6SfpuBeP+wXeu+f
-                            yVxNpwv+OOJLtns=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Artifact"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SLO/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/NIM/SOAP"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML/POST" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/Artifact" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/ECP" index="9"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST" index="10"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://halfback.cnaf.infn.it/casshib/shib/app2/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">IGI Grid Portal provided by INFN</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">IGI is the Italian Grid infrastructure, run for the benefit of the research and education communities in Italy and worldwide</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="localityName" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="it">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Istituto Nazionale di Fisica Nucleare</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="it">IGI Grid Portal erogato da INFN</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">IGI Grid Portal provided by INFN</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="it">http://www.infn.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.infn.it/indexen.php</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>igi-portal-admin@lists.italiangrid.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/hbidp.hb.se.xml b/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
index 95642b0f..95642b0f 100644
--- a/swamid-interfederations-2.0/hbidp.hb.se.xml
+++ b/swamid-interfederations-2.0/hbidp.hb.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/homeproj.cesnet.cz.xml b/swamid-interfederations-2.0/homeproj.cesnet.cz.xml
deleted file mode 100644
index 64b36ac8..00000000
--- a/swamid-interfederations-2.0/homeproj.cesnet.cz.xml
+++ /dev/null
@@ -1,187 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://homeproj.cesnet.cz/sp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor AuthnRequestsSigned="1" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://homeproj.cesnet.cz/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">homeproj.cesnet.cz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">homeproj.cesnet.cz</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CESNETs repository and colaboration server.</mdui:Description>
-        <mdui:Description xml:lang="cs">CESNETi repozitar a kolaborativni server.</mdui:Description>
-      </mdui:UIInfo>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIRAPmFxcaH7//BneN4XQLF6/QwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDA2MTcwMDAwMDBaFw0xMzA2MTYyMzU5NTlaMDsxCzAJBgNV
-BAYTAkNaMQ8wDQYDVQQKEwZDRVNORVQxGzAZBgNVBAMTEmhvbWVwcm9qLmNlc25l
-dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9mEv9sT/gctkA+
-46DGs37LwePuU2Kci717IlyyBwj/m6Z3TLbQnRbWg2JIkcKxBr4KGM4F7HugamGs
-sHZqlW83W29bmoeCc4GxrUk/ilp1hfU5pDCYc2VlqxGcI5RiuAL+HjO4zY0u213M
-zhyQ8hafCYF4keDMbSCr+QsSjK4ffMvN9la75JMxNWTOI7LmA7Zddy2Wp8WxYyF9
-saoj4/oZAoQQmeqdwxd7UXkZXmhUq+DWH9csNX6CgT0bEgl0ceph8y8fFQKEDb0G
-Mj464xKiE9bEyOZjLP1mhYgJmZ5KJuDF/VA7FmJc03r1TiQ3oUInorsL6EUVpour
-YZ0AENECAwEAAaOCAWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBT5kuzyfLmgWQPzUHV0Xa+DeQ3GTDAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAdBgNVHREEFjAUghJob21lcHJvai5jZXNuZXQuY3owDQYJKoZIhvcNAQEF
-BQADggEBAD0bRuPv3EZK0qZbANcOPpxXmi/a1Bfo8tuosQs6EuPvPKfPEi4s0nr1
-Fg46hZW0csonglMsxH3cbA0ZwehwWBZn4zYYKIph271Ne4fM8VwEAYW6P3xBxI+k
-S5MM7trK2O5huAHm0+7253Ma2luKJ9y8zSyotHh6CtZ1yTWt/BZRkmQKg067167M
-SD+D5Gi/fMYF7OwfEYfVAAV+qjGgquZHwpstFzd4YtpcejX9rfLg/VsNMZv2HbAN
-nbs3Yo3jtGvgf5E+frLhlvVGXoVH3f8M7B+QmRsMEYDtAGxBn+vCA81wyFHl2YIi
-K1S9YPh9zuhkjLIqJukO/GbQDyMZpOo=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>homeproj-ng.cesnet.cz</ds:KeyName>
-        <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQWQRSmw3VFnRkwQ7GwFczsDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExODAwMDAwMFoXDTE2MDExODIzNTk1OVowOzELMAkGA1UE
-BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSaG9tZXByb2ouY2VzbmV0
-LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5jC/vA/pNrHbIn/N
-YYyV8ir/ZWdsx1PhlPhuy0VdKTWkv47pu7xLHdcdjLiN4O2i2LL3IjdChQYHG+pe
-ih9ow2sNP8jJOLUMkpaezcCULSJ334IgH/H4eZtOHVqXB2ycP1DO7lK+cxgl0Kis
-rrw8ntSf4L6Cv3tTMUBBwQ2uZVmFndoAYR8hVQox+2rR0OwZ0wGtpcU3UaIPfgYR
-1sSW6rO9GbzazrkiEBmNAqd4YA5ArRWBxUSIQdpaAGfhTp7ZLDsgcHVLiLQvKMmq
-CGBS7fvdtN70Tm3/p5L+qcUSL6tVp+KPejTzKSFd6OxUyEVCLmYEA7P8wXGtwQ08
-ObuX6QIDAQABo4IBfDCCAXgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-ue0wHQYDVR0OBBYEFMaHVqZHBUkiSv+8pzj4jnaJhAxHMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
-BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
-Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
-BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
-b3JnMDQGA1UdEQQtMCuCEmhvbWVwcm9qLmNlc25ldC5jeoIVaG9tZXByb2otbmcu
-Y2VzbmV0LmN6MA0GCSqGSIb3DQEBBQUAA4IBAQBUkkwUrLVcS2PtUndgvLEaglea
-idhdLIAyMdHn6JbhSlHy1vQIi3ZrW+2bIHAuLtjFiM+S2pC8JOtkxTFDLqVk3B/q
-a0afZGvJ8ADMdwJhMTLFoGswvskn7QsGDJvlhm5wUXxh/MSK7DYzfEeSInfKtYHv
-/lVDr86yhWPKsAnutCITg3Y9Sq9xT+OBlLoNqMBGoY3qV6OxdGWaQ3FUf5x0U8RD
-mlhbeVMv9Ux/N4Ji5GjfZ8QcO6cjmMVjsE24R9XHOX3hdcH2Ou622mC+XJ1/SzN5
-UHGuWn2tXixcUxwXgp/go90sJTeTDbBJQhG4kKEquAdCnAxO1DZN23GVn1w3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEYzCCA0ugAwIBAgIRAPmFxcaH7//BneN4XQLF6/QwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDA2MTcwMDAwMDBaFw0xMzA2MTYyMzU5NTlaMDsxCzAJBgNV
-BAYTAkNaMQ8wDQYDVQQKEwZDRVNORVQxGzAZBgNVBAMTEmhvbWVwcm9qLmNlc25l
-dC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJ9mEv9sT/gctkA+
-46DGs37LwePuU2Kci717IlyyBwj/m6Z3TLbQnRbWg2JIkcKxBr4KGM4F7HugamGs
-sHZqlW83W29bmoeCc4GxrUk/ilp1hfU5pDCYc2VlqxGcI5RiuAL+HjO4zY0u213M
-zhyQ8hafCYF4keDMbSCr+QsSjK4ffMvN9la75JMxNWTOI7LmA7Zddy2Wp8WxYyF9
-saoj4/oZAoQQmeqdwxd7UXkZXmhUq+DWH9csNX6CgT0bEgl0ceph8y8fFQKEDb0G
-Mj464xKiE9bEyOZjLP1mhYgJmZ5KJuDF/VA7FmJc03r1TiQ3oUInorsL6EUVpour
-YZ0AENECAwEAAaOCAWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
-47ntMB0GA1UdDgQWBBT5kuzyfLmgWQPzUHV0Xa+DeQ3GTDAOBgNVHQ8BAf8EBAMC
-BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
-GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
-Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
-AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
-RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
-Lm9yZzAdBgNVHREEFjAUghJob21lcHJvai5jZXNuZXQuY3owDQYJKoZIhvcNAQEF
-BQADggEBAD0bRuPv3EZK0qZbANcOPpxXmi/a1Bfo8tuosQs6EuPvPKfPEi4s0nr1
-Fg46hZW0csonglMsxH3cbA0ZwehwWBZn4zYYKIph271Ne4fM8VwEAYW6P3xBxI+k
-S5MM7trK2O5huAHm0+7253Ma2luKJ9y8zSyotHh6CtZ1yTWt/BZRkmQKg067167M
-SD+D5Gi/fMYF7OwfEYfVAAV+qjGgquZHwpstFzd4YtpcejX9rfLg/VsNMZv2HbAN
-nbs3Yo3jtGvgf5E+frLhlvVGXoVH3f8M7B+QmRsMEYDtAGxBn+vCA81wyFHl2YIi
-K1S9YPh9zuhkjLIqJukO/GbQDyMZpOo=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>homeproj-ng.cesnet.cz</ds:KeyName>
-        <ds:KeyName>homeproj.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=homeproj.cesnet.cz,O=CESNET,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQWQRSmw3VFnRkwQ7GwFczsDANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMDExODAwMDAwMFoXDTE2MDExODIzNTk1OVowOzELMAkGA1UE
-BhMCQ1oxDzANBgNVBAoTBkNFU05FVDEbMBkGA1UEAxMSaG9tZXByb2ouY2VzbmV0
-LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5jC/vA/pNrHbIn/N
-YYyV8ir/ZWdsx1PhlPhuy0VdKTWkv47pu7xLHdcdjLiN4O2i2LL3IjdChQYHG+pe
-ih9ow2sNP8jJOLUMkpaezcCULSJ334IgH/H4eZtOHVqXB2ycP1DO7lK+cxgl0Kis
-rrw8ntSf4L6Cv3tTMUBBwQ2uZVmFndoAYR8hVQox+2rR0OwZ0wGtpcU3UaIPfgYR
-1sSW6rO9GbzazrkiEBmNAqd4YA5ArRWBxUSIQdpaAGfhTp7ZLDsgcHVLiLQvKMmq
-CGBS7fvdtN70Tm3/p5L+qcUSL6tVp+KPejTzKSFd6OxUyEVCLmYEA7P8wXGtwQ08
-ObuX6QIDAQABo4IBfDCCAXgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-ue0wHQYDVR0OBBYEFMaHVqZHBUkiSv+8pzj4jnaJhAxHMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAY
-BgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6
-Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEB
-BGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJF
-TkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEu
-b3JnMDQGA1UdEQQtMCuCEmhvbWVwcm9qLmNlc25ldC5jeoIVaG9tZXByb2otbmcu
-Y2VzbmV0LmN6MA0GCSqGSIb3DQEBBQUAA4IBAQBUkkwUrLVcS2PtUndgvLEaglea
-idhdLIAyMdHn6JbhSlHy1vQIi3ZrW+2bIHAuLtjFiM+S2pC8JOtkxTFDLqVk3B/q
-a0afZGvJ8ADMdwJhMTLFoGswvskn7QsGDJvlhm5wUXxh/MSK7DYzfEeSInfKtYHv
-/lVDr86yhWPKsAnutCITg3Y9Sq9xT+OBlLoNqMBGoY3qV6OxdGWaQ3FUf5x0U8RD
-mlhbeVMv9Ux/N4Ji5GjfZ8QcO6cjmMVjsE24R9XHOX3hdcH2Ou622mC+XJ1/SzN5
-UHGuWn2tXixcUxwXgp/go90sJTeTDbBJQhG4kKEquAdCnAxO1DZN23GVn1w3
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://homeproj.cesnet.cz/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="en">CESNET</OrganizationName>
-    <OrganizationDisplayName xml:lang="cs">CESNET</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">CESNET</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cesnet.cz/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Jan</GivenName>
-    <SurName>Mach</SurName>
-    <EmailAddress>jan.mach@cesnet.cz</EmailAddress>
-  </ContactPerson>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <GivenName>Jan</GivenName>
-    <SurName>Ruzicka</SurName>
-    <EmailAddress>janru@cesnet.cz</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/iam.cf.ac.uk.xml b/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml
index e3f54037..e3f54037 100644
--- a/swamid-interfederations-2.0/iam.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/iam.cf.ac.uk-sp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/id.auf.org.xml b/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
index c95e2fb2..fe458a96 100644
--- a/swamid-interfederations-2.0/id.auf.org.xml
+++ b/swamid-interfederations-2.0/id.auf.org-idp-saml2-metadata.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">auf.org</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/id.ucly.fr.xml b/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml
index 9258371f..716813bc 100644
--- a/swamid-interfederations-2.0/id.ucly.fr.xml
+++ b/swamid-interfederations-2.0/id.ucly.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ucly.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/id.vse.cz.xml b/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml
index f9e82a45..e4e77ef2 100644
--- a/swamid-interfederations-2.0/id.vse.cz.xml
+++ b/swamid-interfederations-2.0/id.vse.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2012-01-18T18:57:08Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
@@ -19,50 +24,13 @@
         <mdui:Description xml:lang="cs">Poskytovatel identit (IdP) pro Vysokou školu ekonomickou v Praze.</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.vse.cz/english/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="cs">http://www.vse.cz/</mdui:InformationURL>
+        <mdui:Logo height="132" width="132">https://www2.eduid.cz/idp-loga/vse.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIFeTCCBGGgAwIBAgIRAKpU35QOH88wl+SzyHySIsswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTEyMDkwMDAwMDBaFw0xMjEyMDgyMzU5NTlaME4xCzAJBgNV
-BAYTAkNaMSswKQYDVQQKDCJWeXNva8OhIMWha29sYSBla29ub21pY2vDoSB2IFBy
-YXplMRIwEAYDVQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQC6kapfLd+7SkIRHfvQT4q2vlP6pF9FOQY9ugoj2GRLRZUnnS7u7iwj
-07Y7ou/iORv38KEAAnDVmV706NtqD3nV8Ylx+ZueLrHQzMursJi244CzwpjBrdQV
-tB4R+2FRg40u1dE53JwSwt0U8/m9ldK9Jl5X7BmD99zD+2Yze7L/n/MD6ePi/kFj
-oA4boG+CR3icNoP94bfrCJfDAMS7cFSjahhGRwMpllrzRFksZeIh9WfFbXADCmfI
-hK2a27B7W2L+Zy01PrXrp25VmHr1fRY4oyF7P3RfV8hMQYzFOvjm3p071KP5R1Ty
-Xzg6BUsOKz72UqaQFdFugREdLzKD8neU8klSbfwsDP/juBXP//sX5Tmy9uqGvuu4
-whqG46A3PGZM5OSIHQIomegUnEOZxzC/7R+vOUXBqQlmpb5PHktcsP5li42YrTNI
-n4TJKWAJ0LTEbzp7jpGB0wKWhRQG5+8Rl7Jy150U70Mp7Mt2xQJ0eb1fBjdJ+RaS
-f5FoGD9qYc2wNFAgbmn7KXtauk20+7mglpY8iHSQU3g7s5c0Mfp+bdF+g2hFxgV4
-ktBPk77QLaIAzp/LUT7YRd2fYfkPtU+FbhEiUhr6ShnfcTc7vqSldStmxyMnSmLc
-nAAlptf4LUEeTZMp5G8PVaIRKzgR75ra2JV5p/7Ly2pcDNtPLfAcNwIDAQABo4IB
-aDCCAWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
-FBDc10Bz+5lbkZAuFLO42eYQ7NDHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
-CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZ
-MBeCCWlkLnZzZS5jeoIKaWRwLnZzZS5jejANBgkqhkiG9w0BAQUFAAOCAQEAac/1
-SJIV2T4xTn9i6mmTl687tc53epK0ueOcQYIPOLPMgxH8vpJdwVoUIV79Wt7WM+n3
-3VSmxcEOciDXfZ4qU3XkihVENBReoIAmTxfFpovxjn8lXgxFFQRKfhzVmrJ+zopa
-NGHExZKSwYhwag0/eqkGWRKE66gm2+55jNi+f6XBHLv8MnqMJHmiagSOSTJddaoJ
-xb58EZkiWAqEod2pkfMFZllxRxQc9NT0AorjYyGB/X2bOCnMJpU0E/5mtliTFsT/
-lvoGQh2aycaAH5w55+lSscTvI7xdZpCa85p/av3xhv7XJmWhoGsRPPipYaGgWS7f
-iiF7bmvAPKF6y23wHA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 MIIEpDCCAowCCQCHTyuMkLIypDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlp
 ZC52c2UuY3owHhcNMTQwNzAzMTIxMjQ3WhcNMjQwNjMwMTIxMjQ3WjAUMRIwEAYD
 VQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDA
@@ -110,44 +78,6 @@ YQ64+nivdRsScVzeuMXntKwi7OYEp9k2pif+9Zt1Jwhr8J4arLgdGA==
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIFeTCCBGGgAwIBAgIRAKpU35QOH88wl+SzyHySIsswDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0wOTEyMDkwMDAwMDBaFw0xMjEyMDgyMzU5NTlaME4xCzAJBgNV
-BAYTAkNaMSswKQYDVQQKDCJWeXNva8OhIMWha29sYSBla29ub21pY2vDoSB2IFBy
-YXplMRIwEAYDVQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAw
-ggIKAoICAQC6kapfLd+7SkIRHfvQT4q2vlP6pF9FOQY9ugoj2GRLRZUnnS7u7iwj
-07Y7ou/iORv38KEAAnDVmV706NtqD3nV8Ylx+ZueLrHQzMursJi244CzwpjBrdQV
-tB4R+2FRg40u1dE53JwSwt0U8/m9ldK9Jl5X7BmD99zD+2Yze7L/n/MD6ePi/kFj
-oA4boG+CR3icNoP94bfrCJfDAMS7cFSjahhGRwMpllrzRFksZeIh9WfFbXADCmfI
-hK2a27B7W2L+Zy01PrXrp25VmHr1fRY4oyF7P3RfV8hMQYzFOvjm3p071KP5R1Ty
-Xzg6BUsOKz72UqaQFdFugREdLzKD8neU8klSbfwsDP/juBXP//sX5Tmy9uqGvuu4
-whqG46A3PGZM5OSIHQIomegUnEOZxzC/7R+vOUXBqQlmpb5PHktcsP5li42YrTNI
-n4TJKWAJ0LTEbzp7jpGB0wKWhRQG5+8Rl7Jy150U70Mp7Mt2xQJ0eb1fBjdJ+RaS
-f5FoGD9qYc2wNFAgbmn7KXtauk20+7mglpY8iHSQU3g7s5c0Mfp+bdF+g2hFxgV4
-ktBPk77QLaIAzp/LUT7YRd2fYfkPtU+FbhEiUhr6ShnfcTc7vqSldStmxyMnSmLc
-nAAlptf4LUEeTZMp5G8PVaIRKzgR75ra2JV5p/7Ly2pcDNtPLfAcNwIDAQABo4IB
-aDCCAWQwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYE
-FBDc10Bz+5lbkZAuFLO42eYQ7NDHMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8E
-AjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0G
-CysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEF
-BQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQw
-JgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZ
-MBeCCWlkLnZzZS5jeoIKaWRwLnZzZS5jejANBgkqhkiG9w0BAQUFAAOCAQEAac/1
-SJIV2T4xTn9i6mmTl687tc53epK0ueOcQYIPOLPMgxH8vpJdwVoUIV79Wt7WM+n3
-3VSmxcEOciDXfZ4qU3XkihVENBReoIAmTxfFpovxjn8lXgxFFQRKfhzVmrJ+zopa
-NGHExZKSwYhwag0/eqkGWRKE66gm2+55jNi+f6XBHLv8MnqMJHmiagSOSTJddaoJ
-xb58EZkiWAqEod2pkfMFZllxRxQc9NT0AorjYyGB/X2bOCnMJpU0E/5mtliTFsT/
-lvoGQh2aycaAH5w55+lSscTvI7xdZpCa85p/av3xhv7XJmWhoGsRPPipYaGgWS7f
-iiF7bmvAPKF6y23wHA==
-					</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 MIIEpDCCAowCCQCHTyuMkLIypDANBgkqhkiG9w0BAQUFADAUMRIwEAYDVQQDEwlp
 ZC52c2UuY3owHhcNMTQwNzAzMTIxMjQ3WhcNMjQwNjMwMTIxMjQ3WjAUMRIwEAYD
 VQQDEwlpZC52c2UuY3owggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDA
diff --git a/swamid-interfederations-2.0/idem.ced.inaf.it.xml b/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
index 7a0370b0..78d12180 100644
--- a/swamid-interfederations-2.0/idem.ced.inaf.it.xml
+++ b/swamid-interfederations-2.0/idem.ced.inaf.it-idp-shibboleth.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idem.ced.inaf.it/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idem.ced.inaf.it/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-03-18T15:45:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-03-22T15:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -24,7 +24,25 @@
     <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEFBQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFaFw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDuLeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/FeDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kncFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMBAAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRlbS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twivL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRaje20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFXE2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDpV8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHsS7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw= </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFa
+Fw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD
+2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDu
+LeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/F
+eDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6
+rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kn
+cFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRl
+bS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twi
+vL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs
+3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRa
+je20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFX
+E2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDp
+V8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHs
+S7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -46,7 +64,25 @@
     <KeyDescriptor>
       <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEFBQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFaFw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDuLeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/FeDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kncFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMBAAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRlbS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twivL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRaje20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFXE2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDpV8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHsS7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw= </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDKzCCAhOgAwIBAgIUC8sYEfq/qhT3iv/2z9PwJsH/ZLgwDQYJKoZIhvcNAQEF
+BQAwGzEZMBcGA1UEAxMQaWRlbS5jZWQuaW5hZi5pdDAeFw0xMDEwMDgxMzExNTFa
+Fw0zMDEwMDgxMzExNTFaMBsxGTAXBgNVBAMTEGlkZW0uY2VkLmluYWYuaXQwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEbHJhnfBE+5sri7Pw8QW6xscD
+2mDzd9WaDDzQMBVXljRzjxZ81/DeqFnwVdMFdZHM+ipUFGIUlmc21AtC+6rrSvDu
+LeYL/5F7JRu9LxAT7GRrQS3dkJkDC3QzGC3BW9SQO8hoXir2QqE5bwkTBy0F8V/F
+eDq8c9cPFd1HlnO7D2K7An3OMI/hkZWOx41e0Vdsr1nUTcnLnLeZ/JXRMfFO8mD6
+rTCLq0XWZA2oRUd1QKeINLk8ERZqfp9MYh0pjfFFlFyFuWKafQtPV1lb+BKua4kn
+cFCn6QS7BpyAb6UGy84ag2Qk/2JumjZqzxfJ+L7mbuogOO+gt+JNuiZbsA2DAgMB
+AAGjZzBlMEQGA1UdEQQ9MDuCEGlkZW0uY2VkLmluYWYuaXSGJ2h0dHBzOi8vaWRl
+bS5jZWQuaW5hZi5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUypTVjZYa6twi
+vL+dwAqyQszxAZ4wDQYJKoZIhvcNAQEFBQADggEBAEiu9EK1DdBA6V8ZuszZnYLs
+3v983CaxOcMYv8rgAUavlI+hGa/1MPCDgmNsMHjfOvG3aBelwkCK302u+veFwQRa
+je20+UOa2xpYLGaZ8HTEU0qEEip4VHoWHBxLCdfIlBhf5sziVpWdZCwF968QHoFX
+E2fGE0imJGT9OzsZ54C/426VfH8SyiWeQjDkKGPfju5l/DtSKO4p74p2Ak8tTTDp
+V8mh1c6bJCaBrl4PCK/jZeIs+czIeWW5QvizGnIgDlBzXzaXHpkn66jLhzzO3cHs
+S7SNwUd0JmQ3xk5iZ/fzodAp/nzAOXGdcESNdtkrvaOKuVdg112uD1XR/rA4Jmw=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
diff --git a/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
new file mode 100644
index 00000000..3288b012
--- /dev/null
+++ b/swamid-interfederations-2.0/idem.univpm.it-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idem.univpm.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">univpm.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Universita' Politecnica delle Marche</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Universita' Politecnica delle Marche</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for "UnivPM = Universita' Politecnica delle Marche" users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti della "UnivPM = Universita' Politecnica delel Marche"</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idem.univpm.it/index_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idem.univpm.it/index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idem.univpm.it/attributes-released.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idem.univpm.it/attributi-rilasciati.html</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
+DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
+ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
+GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
+bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
+7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
+U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
+dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
+BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
+PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
+dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
+Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
+5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
+ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.univpm.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.univpm.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.univpm.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.univpm.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">univpm.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
+DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
+ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
+GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
+bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
+7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
+U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
+dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
+BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
+PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
+dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
+Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
+5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
+ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Universita' Politecnica delle Marche</OrganizationName>
+    <OrganizationName xml:lang="it">Universita' Politecnica delle Marche</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Universita' Politecnica delle Marche</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Universita' Politecnica delle Marche</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.univpm.it/English/Engine/RAServePG.php/P/25001ENG0101/L/0</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.univpm.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>idem-help@univpm.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idem.univpm.it.xml b/swamid-interfederations-2.0/idem.univpm.it.xml
deleted file mode 100644
index 160499f1..00000000
--- a/swamid-interfederations-2.0/idem.univpm.it.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idem.univpm.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-08-06T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univpm.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Universita' Politecnica delle Marche</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Universita' Politecnica delle Marche</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for "UnivPM = Universita' Politecnica delle Marche" users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti della "UnivPM = Universita' Politecnica delel Marche"</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idem.univpm.it/index_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idem.univpm.it/index.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idem.univpm.it/attributes-released.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idem.univpm.it/attributi-rilasciati.html</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idem.univpm.it/logo/16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idem.univpm.it/logo/60x80.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
-                            BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
-                            DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
-                            CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
-                            ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
-                            GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
-                            bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
-                            7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
-                            U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
-                            YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
-                            dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
-                            BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
-                            PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
-                            dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
-                            Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
-                            5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
-                            ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idem.univpm.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idem.univpm.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idem.univpm.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idem.univpm.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univpm.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDJDCCAgygAwIBAgIVAJRPddpXPFSzRqSfPdrn/IFdufKtMA0GCSqGSIb3DQEB
-                            BQUAMBkxFzAVBgNVBAMTDmlkZW0udW5pdnBtLml0MB4XDTEzMDgyNzA4Mjk1MVoX
-                            DTE2MDgyNzA4Mjk1MVowGTEXMBUGA1UEAxMOaWRlbS51bml2cG0uaXQwggEiMA0G
-                            CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrVLl1s2FWb4lmcg+qOwTW/SfzsEEK
-                            ozdQMTP66NHa/cNfGsIfnJsilNPRXedR7zCdtWzAQ81XZ8Yi0fwUjo3C1tEoNcaH
-                            GM1asCRUu1jYjGfT72weUEzHHlU+QlGzhlm6mcI9tAU9CJfB3CMwPYotrlufWHTQ
-                            bbKwNTBHS+9bmICLeSy7P6SqJOyCTqsU7FqF2B3nW7aLwRba7X5u3T1gUyAUYmjW
-                            7Ej8fTh9IYpCC2tCYgjYy99R9eF3RePUx2znbR8/Kap6fA0OgjN4DuM265HsLXgp
-                            U9te4k04BcxbFJ6K81yRGGE5qrhowJGvSbcv8qLEP0LKtuK3/RaInmGNAgMBAAGj
-                            YzBhMEAGA1UdEQQ5MDeCDmlkZW0udW5pdnBtLml0hiVodHRwczovL2lkZW0udW5p
-                            dnBtLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRv4qE5cJdI0tWc0PcoXfKY
-                            BG4YFDANBgkqhkiG9w0BAQUFAAOCAQEAXVsfjXIBRoEQ3AMcYlOcQ5lggDuHFdcB
-                            PDxVUzYlTDEyxhr4G0Nr/QjyQepInZneIKpSIiQTLN7iWaVz8CTTn5aiphMzF0hb
-                            dghLRtKuft4+M4ke7dEod8Xdu2vNFCoA9fdS44ycClWo7KlNmEdCKVsSK5UX8CRL
-                            Ri+HTOO6KSAFxhAfOXVwcaZNst4vTyClGjVeGpV/HxG+5bCBsZOLHE8O2IH0tmjX
-                            5jpMJJwEvEo9wG4E08QNP09bTRA9VrhdsvTOBnQtgj+ni0EfOJ2T88Y1SmgRJgpz
-                            ggqcHGSwpbNvAB4pbdMeCIdrPoaW3eZX3trf8/hnZOVxwVsXJey0nQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idem.univpm.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idem.univpm.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Universita' Politecnica delle Marche</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Universita' Politecnica delle Marche</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Universita' Politecnica delle Marche</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Universita' Politecnica delle Marche</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.univpm.it/English/Engine/RAServePG.php/P/25001ENG0101/L/0</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.univpm.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>idem-help@univpm.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idemfero.units.it.xml b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
index e471f5b5..0240064e 100644
--- a/swamid-interfederations-2.0/idemfero.units.it.xml
+++ b/swamid-interfederations-2.0/idemfero.units.it-idp-shibboleth.xml
@@ -1,27 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idemfero.units.it/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idemfero.units.it/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-10-09T08:30:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-11T15:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">units.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">ds.units.it</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">University of Trieste IdP</mdui:DisplayName>
         <mdui:DisplayName xml:lang="it">Università di Trieste IdP</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for University of Trieste members</mdui:Description>
         <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Trieste</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://international.units.it/</mdui:InformationURL>
         <mdui:InformationURL xml:lang="it">http://www.units.it/</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idemfero.units.it/unilogo/sigillo16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idemfero.units.it/unilogo/sigillo16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idemfero.units.it/unilogo/sigillo60x80.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1MzgwNFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtSSGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKBBJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IGFMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Orh9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczovL2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZPuEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtYLWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiyaQYbJQ== </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1Mzgw
+NFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/
+DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtS
+SGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKB
+BJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IG
+FMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Or
+h9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczov
+L2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh
+1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZP
+uEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+
+85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM
+05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044
+Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtY
+LWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiy
+aQYbJQ==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -36,21 +59,32 @@
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">units.it</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ds.units.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Trieste AA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Trieste AA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attribute Authority for University of Trieste members</mdui:Description>
-        <mdui:Description xml:lang="it">Attribute Authority per gli utenti dell'Università di Trieste</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://international.units.it/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.units.it/</mdui:InformationURL>
-      </mdui:UIInfo>
+      <shibmd:Scope regexp="false">units.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">ds.units.it</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1MzgwNFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtSSGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKBBJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IGFMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Orh9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczovL2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZPuEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtYLWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiyaQYbJQ== </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAIPn0rci7ca2nc6Pd0a8kS35GFVlMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkZW1mZXJvLnVuaXRzLml0MB4XDTExMDYzMDE1Mzgw
+NFoXDTMxMDYzMDE1MzgwNFowHDEaMBgGA1UEAxMRaWRlbWZlcm8udW5pdHMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDm2d1TVod551/AHgSkFZa/
+DgfKePtHqC88H9qlcDGhhZfdhN1KCubG7H2sY1awLQ3HwonlfyCN+FjxL15jiTtS
+SGM3bE9tb8p6NoryPTtPSiF4JZraE5Y8PnWN7i49QhhOY/dzsYGUGzKWY8GzSaKB
+BJAA+XXbj2l6s/6Ksj/ii7KGjt/opcJ5rBE0+ttDanuC0w8upUAL29rQ5Yx6n7IG
+FMI7PS2W1IeKrU0Fm93ujdm3Itx9L+5bmd/WQyJInXt9DWQXBhek3oh5ZCK+H7Or
+h9Sk4ld8BxFlgsw96xjVX246jTCBgGcCOlRRW9d21tYmCEn/ew4JVtHHRktnblD3
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkZW1mZXJvLnVuaXRzLml0hihodHRwczov
+L2lkZW1mZXJvLnVuaXRzLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQDNZRh
+1OdCXmX7+5k2XwRmfMQ4iDANBgkqhkiG9w0BAQUFAAOCAQEASeWVPZ+W5q+LxyZP
+uEpGw+uysbNIBbpxglKfli3QX9MQrBOG1S1Y5gQ5Rsi26ipWidgEORbX6mUKtax+
+85NYvi3faIcbLMf87Xbxmn+oYMv/ksfeoevZAkLPXb6DLNjoOEV2UbQuz/03o9bM
+05QJuuY1K9ioCMat4+WZ3XvLxNoKZwRLtERV5Ibr+ffOu1WhXkdoW1PX6K12p044
+Ia4SBEhy9t8ZxoAe2sSE8TTww+wGzJ48+2Ek/Lr/JTCbT1wj3QGvN3vbE++aLrtY
+LWrKlDzFIKXv9Tk8LNWWOGxbRhw3x2OymWGfU9gDlQs0mAWuEKsjr3iUrsDGkkiy
+aQYbJQ==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
diff --git a/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr.xml b/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml
index 2e8df66a..ad202d24 100644
--- a/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr.xml
+++ b/swamid-interfederations-2.0/ident-shib.ensc-rennes.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensc-rennes.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr.xml b/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml
index 507dbb4e..981bb99d 100644
--- a/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr.xml
+++ b/swamid-interfederations-2.0/ident-shib.sciencespo-rennes.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo-rennes.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/ident.ensta-bretagne.fr.xml b/swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml
index 046ec696..819dec8e 100644
--- a/swamid-interfederations-2.0/ident.ensta-bretagne.fr.xml
+++ b/swamid-interfederations-2.0/ident.ensta-bretagne.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensta-bretagne.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/ident.ensta.fr.xml b/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml
index 2832e973..1c3bc01a 100644
--- a/swamid-interfederations-2.0/ident.ensta.fr.xml
+++ b/swamid-interfederations-2.0/ident.ensta.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensta.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/ident.groupe-esa.com.xml b/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
index 16062005..94774269 100644
--- a/swamid-interfederations-2.0/ident.groupe-esa.com.xml
+++ b/swamid-interfederations-2.0/ident.groupe-esa.com-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groupe-esa.com</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">groupe-esa.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/identites.ec-lyon.fr.xml b/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
index 347ac555..67e2c238 100644
--- a/swamid-interfederations-2.0/identites.ec-lyon.fr.xml
+++ b/swamid-interfederations-2.0/identites.ec-lyon.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-lyon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/identites.enim.fr.xml b/swamid-interfederations-2.0/identites.enim.fr-idp-.xml
index 77e6237d..00f44c5e 100644
--- a/swamid-interfederations-2.0/identites.enim.fr.xml
+++ b/swamid-interfederations-2.0/identites.enim.fr-idp-.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enim.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/identites.ensea.fr.xml b/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml
index 5e7964fe..eb5e80cc 100644
--- a/swamid-interfederations-2.0/identites.ensea.fr.xml
+++ b/swamid-interfederations-2.0/identites.ensea.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensea.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/identities.univ-jfc.fr.xml b/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml
index 0fdc0c0c..98ba24c2 100644
--- a/swamid-interfederations-2.0/identities.univ-jfc.fr.xml
+++ b/swamid-interfederations-2.0/identities.univ-jfc.fr-idp-prod.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-jfc.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/identity.mdh.se.xml b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
index 85b949d5..85b949d5 100644
--- a/swamid-interfederations-2.0/identity.mdh.se.xml
+++ b/swamid-interfederations-2.0/identity.mdh.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml b/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml
new file mode 100644
index 00000000..8f2088b9
--- /dev/null
+++ b/swamid-interfederations-2.0/identity.unamur.be-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://identity.unamur.be/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unamur.be</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fr">Universite de Namur</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Namur</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Le personnel et les etudiants de l'Universite de Namur - Belgique</mdui:Description>
+        <mdui:Description xml:lang="en">Staff and students from the University of Namur - Belgium</mdui:Description>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:IPHint>138.48.0.0/16</mdui:IPHint>
+        <mdui:IPHint>2001:6a8:3900::/64</mdui:IPHint>
+        <mdui:DomainHint>unamur.be</mdui:DomainHint>
+        <mdui:GeolocationHint>50.466101,4.860253</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMzCCAhugAwIBAgIUOFEO17meQZ7yZbR00GFaaEZCBIUwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJlMB4XDTE0MTAwMTExMzAz
+MloXDTM0MTAwMTExMzAzMlowHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoBOrnhzyOHqWdf3eka1y
+4cQ9PU9DgvGVBKPkBVy8N3vNXrFQIgMbObDS1l9eYYuvyY+hHAPucMS0i1OdP2Aj
+Ev/UE4gx4z2hiXwQb/ne1cdwJ0hocacKwoj8U7VjOcVmb6jkj8iQ+cf4xVm8g4tH
+rdYJ44FWWzyTbhJqdsh7LlxLBl7OiXNib9Mdmgc0/yR21q4z6Gfzq9lAL8n0Qol2
+oa32RWvsOdbvUsfHGH+MzcmI7KENiz/ppbrgmKDqpfWX9RNNDzE4RIDqt4Vh40Is
+EjAuizxuaWGGuGE/aPxdUji6xUB18USEE7/yMm6PGfgsibwxBmFGBiUq8qrS7sH0
+CwIDAQABo2swaTAdBgNVHQ4EFgQUY7BxMDAhCKPAsUtkHiqjikltMpAwSAYDVR0R
+BEEwP4ISaWRlbnRpdHkudW5hbXVyLmJlhilodHRwczovL2lkZW50aXR5LnVuYW11
+ci5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAjoKO8E/Geoa1
+6W+nbLFir4Fm6k9SW4cJW3Wabnf5yC7M5Qf7CDPQOmt/dC/IwKHLfkMu/AfmbOEe
+8GmK3mrqWZEAU/R7vg/AbiX9ci0PGOeSg1Zg4TE1Gl+vDCx47gBsqNJk/j09EJ0E
+QQrqWCW9oHfWcjENvvErtwTKuYhGV/8BdQNDd9D+ji40xn2JVLhnTyeyCpVYAGFh
+Piz6aamOjjjdutjif20mGC2CWwQOF754FFmYl9Zy11PlcKtxmU8h3rMUO+L6u6jp
+bvVxLwAnn3hdXccfJDUwVmmmeK4ePR3brG0NPafaCdQdFYvSci45kcjQ2bnT13CG
+sAFHfgCexQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://identity.unamur.be/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://identity.unamur.be/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://identity.unamur.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://identity.unamur.be/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unamur.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMzCCAhugAwIBAgIUOFEO17meQZ7yZbR00GFaaEZCBIUwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJlMB4XDTE0MTAwMTExMzAz
+MloXDTM0MTAwMTExMzAzMlowHTEbMBkGA1UEAwwSaWRlbnRpdHkudW5hbXVyLmJl
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoBOrnhzyOHqWdf3eka1y
+4cQ9PU9DgvGVBKPkBVy8N3vNXrFQIgMbObDS1l9eYYuvyY+hHAPucMS0i1OdP2Aj
+Ev/UE4gx4z2hiXwQb/ne1cdwJ0hocacKwoj8U7VjOcVmb6jkj8iQ+cf4xVm8g4tH
+rdYJ44FWWzyTbhJqdsh7LlxLBl7OiXNib9Mdmgc0/yR21q4z6Gfzq9lAL8n0Qol2
+oa32RWvsOdbvUsfHGH+MzcmI7KENiz/ppbrgmKDqpfWX9RNNDzE4RIDqt4Vh40Is
+EjAuizxuaWGGuGE/aPxdUji6xUB18USEE7/yMm6PGfgsibwxBmFGBiUq8qrS7sH0
+CwIDAQABo2swaTAdBgNVHQ4EFgQUY7BxMDAhCKPAsUtkHiqjikltMpAwSAYDVR0R
+BEEwP4ISaWRlbnRpdHkudW5hbXVyLmJlhilodHRwczovL2lkZW50aXR5LnVuYW11
+ci5iZS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAjoKO8E/Geoa1
+6W+nbLFir4Fm6k9SW4cJW3Wabnf5yC7M5Qf7CDPQOmt/dC/IwKHLfkMu/AfmbOEe
+8GmK3mrqWZEAU/R7vg/AbiX9ci0PGOeSg1Zg4TE1Gl+vDCx47gBsqNJk/j09EJ0E
+QQrqWCW9oHfWcjENvvErtwTKuYhGV/8BdQNDd9D+ji40xn2JVLhnTyeyCpVYAGFh
+Piz6aamOjjjdutjif20mGC2CWwQOF754FFmYl9Zy11PlcKtxmU8h3rMUO+L6u6jp
+bvVxLwAnn3hdXccfJDUwVmmmeK4ePR3brG0NPafaCdQdFYvSci45kcjQ2bnT13CG
+sAFHfgCexQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://identity.unamur.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://identity.unamur.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">
+	UNamur
+	</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">
+	Universite de Namur
+	</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">
+	http://www.unamur.be
+	</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical Support</GivenName>
+    <SurName>Technical Support</SurName>
+    <EmailAddress>siu-serveurs@unamur.be</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml b/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml
new file mode 100644
index 00000000..fb12e583
--- /dev/null
+++ b/swamid-interfederations-2.0/idm.ics.muni.cz-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idm.ics.muni.cz/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-21T14:42:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <md:Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://idm.ics.muni.cz/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://idm.ics.muni.cz/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Masaryk University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Masarykova univerzita</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Perun instance for Masaryk University</mdui:Description>
+        <mdui:Description xml:lang="cs">Instance Peruna pro Masarykovu universitu</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.muni.cz/?lang=en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.muni.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idm.ics.muni.cz</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idm.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
+          <ds:X509Certificate>MIIEmTCCA4GgAwIBAgIRAKRhaOceRup4iuzxkYsqJbowDQYJKoZIhvcNAQELBQAw
+ZDELMAkGA1UEBhMCTkwxFjAUBgNVBAgTDU5vb3JkLUhvbGxhbmQxEjAQBgNVBAcT
+CUFtc3RlcmRhbTEPMA0GA1UEChMGVEVSRU5BMRgwFgYDVQQDEw9URVJFTkEgU1NM
+IENBIDIwHhcNMTQxMDIxMDAwMDAwWhcNMTcxMDIwMjM1OTU5WjA9MSEwHwYDVQQL
+ExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxGDAWBgNVBAMTD2lkbS5pY3MubXVu
+aS5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALm+U00en5+mxTGj
+oF1vryCcv7o8RHQcSVZpeQlNiGq7FBSzcP0RZ33iX52JpVKJNCWIl2PIusZSdfSZ
+Ja6uJuhVor3LA7BmwqcK24SPI7yokqFy2CCSpgWZw91F+KVTg09GEX1x+ocVF/1H
+skSWnCcJlaKsI2yN2j5xfzdyNFo7XFoxucG24/u+qpSIjw9mS+wJM+TRQjZTehPu
+9ZIP6M7j5ao6bxUWS2dh9GaSszSQGGX+6KLM2qFlUqJ1x8hqLdpnRhxleTVSTAD5
+E9/BdL+Gxu/NW/SM3f/7RxllWqDoUaNV9PpM+1VTUjJaBUpVm55m5mV7k25Trj/W
+KAXvjg8CAwEAAaOCAWswggFnMB8GA1UdIwQYMBaAFFvQihyaMlvgtd2WVBvhhiiw
+/ba9MB0GA1UdDgQWBBSLh7sZxQLN+1gVj1CcDggq4Ql1/DAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+IgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAv
+oC2gK4YpaHR0cDovL2NybC51c2VydHJ1c3QuY29tL1RFUkVOQVNTTENBMi5jcmww
+bAYIKwYBBQUHAQEEYDBeMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnVzZXJ0cnVz
+dC5jb20vVEVSRU5BU1NMQ0EyLmNydDAlBggrBgEFBQcwAYYZaHR0cDovL29jc3Au
+dXNlcnRydXN0LmNvbTAaBgNVHREEEzARgg9pZG0uaWNzLm11bmkuY3owDQYJKoZI
+hvcNAQELBQADggEBAIptaltbQyIAUiB9nlTHs0xlUa0aTxTwHyhWiHRqa5pbqJ8n
+h2qxi3aNXBM30qzftnXaZvQUyaqW3poFBd2Rw5RJ5dh++z9b20kXVnmN/IyBzGf4
+s4Q5EE0iIZw3KARUqSb0PG3gCtiYeV+SXsnehxvUvaYNNyR8mZ0zUUd+WcHWvazN
+8VFAm3TNxwz92EWGnNvx9p2hHcMbR0Cix4TpxP9cLUwu9m1+am1U+WJkhNMkFoP5
+ZiAG5ldQnA9iQom961Uf1+ltceQpYFkfdgfrmsHMUDyC1Jv25LvFpmZoC7B4Q7cA
+lcxWfmThtT8p0FyfFUzHnFRAn89yyXWWZEhNpe4=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idm.ics.muni.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/SOAP"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/Redirect"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/POST"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idm.ics.muni.cz/Shibboleth.sso/SLO/Artifact"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML/POST" index="4"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://idm.ics.muni.cz/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Perun instance for Masaryk University</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Identity and access management system for Masaryk University</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
+    <OrganizationName xml:lang="cs">Masarykova univerzita</OrganizationName>
+    <OrganizationName xml:lang="en">Masaryk University</OrganizationName>
+    <OrganizationDisplayName xml:lang="cs">Masarykova univerzita</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Masaryk University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="cs">http://www.muni.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</OrganizationURL>
+  </Organization>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <GivenName>Slavek</GivenName>
+    <SurName>Licehammer</SurName>
+    <EmailAddress>perun@cesnet.cz</EmailAddress>
+  </ContactPerson>
+  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="administrative">
+    <GivenName>Michal</GivenName>
+    <SurName>Prochazka</SurName>
+    <EmailAddress>perun@cesnet.cz</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml
index d70e3b88..d70e3b88 100644
--- a/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br.xml
+++ b/swamid-interfederations-2.0/idp-cafe.ifrr.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp-cafe.unir.br.xml b/swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml
index b5b2c5ca..b5b2c5ca 100644
--- a/swamid-interfederations-2.0/idp-cafe.unir.br.xml
+++ b/swamid-interfederations-2.0/idp-cafe.unir.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..32185c29
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-css.irccs.garr.it-idp-shibboleth.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-css.irccs.garr.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:29Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">operapadrepio.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider di IRCCS Casa Sollievo della Sofferenza</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.operapadrepio.it/it/ricerca-scientifica/news-ricerca-scientifica/97-news-ricerca-scientifica/3719.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.operapadrepio.it/it/ricerca-scientifica/news-ricerca-scientifica/109-generali/3759.html</mdui:InformationURL>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.operapadrepio.it/it/privacy-policy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.operapadrepio.it/en/109-generali/3760.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
+NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
+YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
+OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
+1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
+ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
+8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
+3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
+Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
+aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
+AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
+yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
+wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
+f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
+YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
+PeaxmS3Lw5E/7cnXkOo1qLnfhg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-css.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">operapadrepio.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
+BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
+NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
+YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
+OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
+1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
+ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
+8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
+3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
+Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
+aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
+AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
+yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
+wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
+f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
+YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
+PeaxmS3Lw5E/7cnXkOo1qLnfhg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</OrganizationName>
+    <OrganizationName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.operapadrepio.it</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.operapadrepio.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>idpcloud-service@garr.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml
deleted file mode 100644
index fd2c2a23..00000000
--- a/swamid-interfederations-2.0/idp-css.irccs.garr.it.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-css.irccs.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:29Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider of IRCCS Casa Sollievo della Sofferenza Research Hospital</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider di IRCCS Casa Sollievo della Sofferenza</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp-css.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idp-css.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-css.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp-css.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp-css.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
-                            BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
-                            NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
-                            YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
-                            OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
-                            1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
-                            ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
-                            8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
-                            3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
-                            Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
-                            aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
-                            MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
-                            AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
-                            yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
-                            wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
-                            f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
-                            YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
-                            PeaxmS3Lw5E/7cnXkOo1qLnfhg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-css.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-css.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">operapadrepio.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDPzCCAiegAwIBAgIUatdmXg8WrEt1In2rF4jLwoE2ExUwDQYJKoZIhvcNAQEF
-                            BQAwIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5nYXJyLml0MB4XDTEzMTIwOTEz
-                            NDYyMVoXDTMzMTIwOTEzNDYyMVowIDEeMBwGA1UEAxMVaWRwLWNzcy5pcmNjcy5n
-                            YXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3VFhN4BK8bGv
-                            OpfsmnkMKK1K64/Ref079D7hERL/AnLWBH3xTR8cXdYmm0zqUIHL224b6WQAa1kx
-                            1jCrBseoyK/D16PwzmuKaZBtvnXq4hdEonm8jXT4mJnRJpkJtlsBzqxi5c0KdXiC
-                            ijcHBlgqLDR8wZOBJV1tIN8VyEPkiFtm7W1oabFSzJRBfWgQ40Ku4qvRmcSbcYke
-                            8DbcRQS1HULWC4Erxx6hR9I9epkWc2ubd4MiYH2HMlrV35IJR2AcoP753rJ+HpLb
-                            3kr3//8eOEaK0pD52RuRQbo7tYOwS0aINmnEmKrJt18udKmb45XN3Ntw0j+u0peV
-                            Latd8xQt6wIDAQABo3EwbzBOBgNVHREERzBFghVpZHAtY3NzLmlyY2NzLmdhcnIu
-                            aXSGLGh0dHBzOi8vaWRwLWNzcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRo
-                            MB0GA1UdDgQWBBT/nCGumeHDpDhV5xEzXsEzK3YdFDANBgkqhkiG9w0BAQUFAAOC
-                            AQEAQrLhSycAVaJvvN4rIhxlZhYMi24tJIG27nMqg5aCnUbwsH97g4fyRC/PJrAU
-                            yLsvni9innZWp9btFrpZUXSVZTvVB2Kk+Q670m7VKEkPkOyXaWI22M3OeLNQAHs6
-                            wshwq6xuRHQV9Al7Ksa3VRYO6xXOGa0L7anouGijzpatNQa7FXlHvriVrWI8MJAf
-                            f85zy1/DrY7aUkXNokxppZUuH70Fu+znNoV9+Yhis8SAETCkWgUjBgqXJgL91/U8
-                            YPWByb6q+2Zn18fmie++zEPRItO9JpXGetGuOGEAHHnaQoxNn0UgXTqvwxngVDWY
-                            PeaxmS3Lw5E/7cnXkOo1qLnfhg==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-css.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IRCCS Casa Sollievo della Sofferenza Research Hospital</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">IRCCS Casa Sollievo della Sofferenza</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.operapadrepio.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.operapadrepio.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>idpcloud-service@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml
index 7d61df0b..7d61df0b 100644
--- a/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-dev.cardiff.ac.uk-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..0c26fbe2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-dgnocchi.irccs.garr.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:14Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">dongnocchi.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Fondazione Don Carlo Gnocchi Onlus users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti della Fondazione Don Carlo Gnocchi Onlus</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
+BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
+MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
+aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
+9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
+blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
+66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
+oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
+zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
+Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
+cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
+y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
+qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
+6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
+hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
+fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
+MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">dongnocchi.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
+BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
+MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
+aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
+9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
+blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
+66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
+oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
+zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
+Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
+cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
+y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
+qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
+6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
+hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
+fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
+MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationName>
+    <OrganizationName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.dongnocchi.it/documenti/eng/index_eng.htm</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.dongnocchi.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>mailto:idpcloud-service@garr.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml
deleted file mode 100644
index 621a9573..00000000
--- a/swamid-interfederations-2.0/idp-dgnocchi.irccs.garr.it.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-dgnocchi.irccs.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-03-12T12:15:14Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Fondazione Don Carlo Gnocchi Onlus users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti della Fondazione Don Carlo Gnocchi Onlus</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/info.html</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">https://idp-dgnocchi.irccs.garr.it/idp/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
-                            BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
-                            MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
-                            aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-                            AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
-                            9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
-                            blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
-                            66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
-                            oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
-                            zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
-                            Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
-                            cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
-                            y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
-                            qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
-                            6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
-                            hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
-                            fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
-                            MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-dgnocchi.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dongnocchi.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDUzCCAjugAwIBAgIUP1k5hfSRuNvbFEuq697H3+caJKQwDQYJKoZIhvcNAQEF
-                            BQAwJTEjMCEGA1UEAxMaaWRwLWRnbm9jY2hpLmlyY2NzLmdhcnIuaXQwHhcNMTMx
-                            MTI4MTQ0NTI3WhcNMzMxMTI4MTQ0NTI3WjAlMSMwIQYDVQQDExppZHAtZGdub2Nj
-                            aGkuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-                            AJcayGTp5Elhk5nXeuntBEg2r0Le/6nIsQG8FgkNf+qggXSHNVWxhFvw3EblGttY
-                            9jISmSjGdUwNpGknPPEXdZ3w/RO+czI3zZmMNUxIvF+RBOv45FQRd6JpMojAOBjZ
-                            blIJ9uxIZl9CTc7AytutChk/JS0uME0bZnCdIxitsMraRITSiUqZw9FDlghcbAPU
-                            66+EIqmAas0pNzHIgICsTQFpVpR7aOCrGDgLH8ZhnE895Bte5hdTbDwEBVFYZ4NE
-                            oMGUwgRhly0g9EAh04ercObE4NZLuF9XIrw6L5bUoOAn7AXCiIfGcUHukEt2NbSi
-                            zwOfrKyshMvwQeUu1QXdr2sCAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRwLWRnbm9j
-                            Y2hpLmlyY2NzLmdhcnIuaXSGMWh0dHBzOi8vaWRwLWRnbm9jY2hpLmlyY2NzLmdh
-                            cnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMfsRTXhI2SK/tSeRLeojBMD
-                            y034MA0GCSqGSIb3DQEBBQUAA4IBAQBZTmIO9IWCOi8wbPcBpgyZYhwn39CfeBJp
-                            qf4NhXa9ZO6IC+qMG3+dZGlg0FkqTkbArc7tTATUL0b7p1zWXsH8GgtyigKjzdKB
-                            6mKwtYErqp0gF4438G8XpXsolrjF/RyCrxj7aXDzIKktk2cXKVqF9xtMc5H1AAkq
-                            hnyOXvP4oteo+j+aww+rS4ITijKAXLhgFoNbGIfN3zTfTywBKU46+ZAuuzbLyNa/
-                            fKX+hJtcp9X9ctp8azb3HudIHe+5YSDOKWYPAgEdXDTlBXdd0/9zrEp1UIZ3jx6I
-                            MJX+TT5lOVFqu29vcvoiXmH3XIAZi7JIvcAt3STJGs7wZFJzrTrx
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-dgnocchi.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Don Carlo Gnocchi Onlus</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.dongnocchi.it/documenti/eng/index_eng.htm</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.dongnocchi.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>mailto:idpcloud-service@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr.xml b/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml
index b06a069b..852fae0a 100644
--- a/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr.xml
+++ b/swamid-interfederations-2.0/idp-ensr.ens-rennes.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-rennes.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr.xml b/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml
index e7e6dafc..92fd78e4 100644
--- a/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr.xml
+++ b/swamid-interfederations-2.0/idp-etu.crous-grenoble.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-grenoble.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml
index 82e1bfcf..82e1bfcf 100644
--- a/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-preprod.cardiff.ac.uk-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..0fc4d58f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-ssbar.beniculturali.garr.it-idp-shibboleth.xml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-ssbar.beniculturali.garr.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-23T06:04:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">archeoroma.beniculturali.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti della Soprintendenza Speciale per i Beni Archeologici di Roma</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://archeoroma.beniculturali.it/en/idem-info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://archeoroma.beniculturali.it/idp/info</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-32x32_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-32x32_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-160x120_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-ssbar.beniculturali.garr.it/idp/images/logoEnte-160x120_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://archeoroma.beniculturali.it/en/privacy-0</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://archeoroma.beniculturali.it/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDajCCAlKgAwIBAgIVAK1w02d7b+IBhciTHgzqFmh3HoqaMA0GCSqGSIb3DQEB
+BQUAMCoxKDAmBgNVBAMTH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXQw
+HhcNMTQwNTMwMDkwNjUxWhcNMzQwNTMwMDkwNjUxWjAqMSgwJgYDVQQDEx9pZHAt
+c3NiYXIuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAtUyDEbuWYgBDLthfID5RiAaqAVV+VVSwK9JsbPyA0WEQG4mU
+wTwk9baImykOzOksmIgWY1XgBOy8jtI/fJ/9VBpz71paCkEjMQH7u6tHGuAVx6ZC
+QcWsSu1Iemktd2K8P+gWNUSW32GwRHOe8IrNVsuAQV0BnDvLKFnOyIaCSxJe1aCA
+mlobazivS7xvZ4fIKScfhmxX2vMcAogy6SlVrk5Nbz1g4ptLSMe2H6eP7pjp9Dw2
+JVCraHiCPlDUfLqKNANYLIcv03k8cY89NT0rEBS8ILawQCT5wdAj+toLOk7Dg9S9
+fc++QHWOnlI9eU6WBNIHnDxer2xep24CE7vHpwIDAQABo4GGMIGDMGIGA1UdEQRb
+MFmCH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXSGNmh0dHBzOi8vaWRw
+LXNzYmFyLmJlbmljdWx0dXJhbGkuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNV
+HQ4EFgQU5OBUAd7iE3QPu87pd4OJ35n3xDwwDQYJKoZIhvcNAQEFBQADggEBAEtE
+EPZSrzpFbPHz65DWhxm6+FXDuRKYG9jwTabcikn4y19ykhauySmYUYfDE91vmKA/
+cJr4u720j9qvmZ/Z3pO6w8vD+SKrUHG5ez8m4ArGK35sYEEMA1JrW8oV6rcMk46x
+nL/TyhPinDLChZjlYEt5i4m2KlCipHc302KnbtLyjm8HsTAVkMxTibNCQHzI0m0B
+EmVP49peQFE/K1rZTi3f/z9I78UNUEz9SkbZBs4OBaFHd9RGtRuqD3lvWJchPJZ7
+D8mIA/RlAEXaL23Azho0dkiWphN6VkwqAW8btg6BPaeWCE8Z/EDZCinHXWyOE9is
+1UGZpgRi7oyzxW0d230=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-ssbar.beniculturali.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">archeoroma.beniculturali.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDajCCAlKgAwIBAgIVAK1w02d7b+IBhciTHgzqFmh3HoqaMA0GCSqGSIb3DQEB
+BQUAMCoxKDAmBgNVBAMTH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXQw
+HhcNMTQwNTMwMDkwNjUxWhcNMzQwNTMwMDkwNjUxWjAqMSgwJgYDVQQDEx9pZHAt
+c3NiYXIuYmVuaWN1bHR1cmFsaS5nYXJyLml0MIIBIjANBgkqhkiG9w0BAQEFAAOC
+AQ8AMIIBCgKCAQEAtUyDEbuWYgBDLthfID5RiAaqAVV+VVSwK9JsbPyA0WEQG4mU
+wTwk9baImykOzOksmIgWY1XgBOy8jtI/fJ/9VBpz71paCkEjMQH7u6tHGuAVx6ZC
+QcWsSu1Iemktd2K8P+gWNUSW32GwRHOe8IrNVsuAQV0BnDvLKFnOyIaCSxJe1aCA
+mlobazivS7xvZ4fIKScfhmxX2vMcAogy6SlVrk5Nbz1g4ptLSMe2H6eP7pjp9Dw2
+JVCraHiCPlDUfLqKNANYLIcv03k8cY89NT0rEBS8ILawQCT5wdAj+toLOk7Dg9S9
+fc++QHWOnlI9eU6WBNIHnDxer2xep24CE7vHpwIDAQABo4GGMIGDMGIGA1UdEQRb
+MFmCH2lkcC1zc2Jhci5iZW5pY3VsdHVyYWxpLmdhcnIuaXSGNmh0dHBzOi8vaWRw
+LXNzYmFyLmJlbmljdWx0dXJhbGkuZ2Fyci5pdC9pZHAvc2hpYmJvbGV0aDAdBgNV
+HQ4EFgQU5OBUAd7iE3QPu87pd4OJ35n3xDwwDQYJKoZIhvcNAQEFBQADggEBAEtE
+EPZSrzpFbPHz65DWhxm6+FXDuRKYG9jwTabcikn4y19ykhauySmYUYfDE91vmKA/
+cJr4u720j9qvmZ/Z3pO6w8vD+SKrUHG5ez8m4ArGK35sYEEMA1JrW8oV6rcMk46x
+nL/TyhPinDLChZjlYEt5i4m2KlCipHc302KnbtLyjm8HsTAVkMxTibNCQHzI0m0B
+EmVP49peQFE/K1rZTi3f/z9I78UNUEz9SkbZBs4OBaFHd9RGtRuqD3lvWJchPJZ7
+D8mIA/RlAEXaL23Azho0dkiWphN6VkwqAW8btg6BPaeWCE8Z/EDZCinHXWyOE9is
+1UGZpgRi7oyzxW0d230=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-ssbar.beniculturali.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</OrganizationName>
+    <OrganizationName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SSBAR - Soprintendenza Archeologica di Roma</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SSBAR - Soprintendenza Archeologica di Roma</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://archeoroma.beniculturali.it/en</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://archeoroma.beniculturali.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>idpcloud-service@garr.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..7d691e55
--- /dev/null
+++ b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-stellamaris.irccs.garr.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-29T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">irccs-stellamaris.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for the IRCCS Fondazione Stella Maris</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider della IRCCS Fondazione Stella Maris</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.irccs-stellamaris.it/idem/info_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.irccs-stellamaris.it/idem/info.html</mdui:InformationURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_en.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_it.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_en.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_it.png</mdui:Logo>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.irccs-stellamaris.it/idem/privacy_en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.irccs-stellamaris.it/idem/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
+BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
+MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
+bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
+Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
+Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
+jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
+LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
+TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
+cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
+YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
+VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
+72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
+XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
+eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
+PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
+tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
+lKnM7w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">irccs-stellamaris.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
+BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
+MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
+bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
+AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
+Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
+Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
+jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
+LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
+TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
+cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
+YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
+VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
+72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
+XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
+eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
+PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
+tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
+lKnM7w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</OrganizationName>
+    <OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IRCCS Fondazione Stella Maris</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">IRCCS Fondazione Stella Maris</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.irccs-stellamaris.it</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.irccs-stellamaris.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>technical support</GivenName>
+    <EmailAddress>mailto:ced@irccs-stellamaris.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.xml b/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.xml
deleted file mode 100644
index cae8165c..00000000
--- a/swamid-interfederations-2.0/idp-stellamaris.irccs.garr.it.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp-stellamaris.irccs.garr.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-10-29T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irccs-stellamaris.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for the IRCCS Fondazione Stella Maris</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider della IRCCS Fondazione Stella Maris</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.irccs-stellamaris.it/idem/info_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.irccs-stellamaris.it/idem/info.html</mdui:InformationURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_en.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-16x16_it.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_en.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp-stellamaris.irccs.garr.it/idp/images/logoEnte-80x60_it.png</mdui:Logo>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.irccs-stellamaris.it/idem/privacy_en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.irccs-stellamaris.it/idem/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
-                            BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
-                            MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
-                            bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                            AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
-                            Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
-                            Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
-                            jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
-                            LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
-                            TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
-                            cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
-                            YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
-                            VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
-                            72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
-                            XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
-                            eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
-                            PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
-                            tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
-                            lKnM7w==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp-stellamaris.irccs.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irccs-stellamaris.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDYDCCAkigAwIBAgIUFMkZfuL5qKNNf1/kspMp2S6XOIMwDQYJKoZIhvcNAQEF
-                            BQAwKDEmMCQGA1UEAxMdaWRwLXN0ZWxsYW1hcmlzLmlyY2NzLmdhcnIuaXQwHhcN
-                            MTMwOTAzMDkxNTAwWhcNMzMwOTAzMDkxNTAwWjAoMSYwJAYDVQQDEx1pZHAtc3Rl
-                            bGxhbWFyaXMuaXJjY3MuZ2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-                            AQoCggEBAInbhmdOnasbq+dw01M5N2VHMh3OrBIaHsmgVGOcn8dmWUL2j1WzSYZZ
-                            Ozgav7kY2dC5rCfFPabqpdfDoaM7OI56R6JTjg6KIHHj+gpVz+nWvBrlgiE0d1IL
-                            Hk2Xt6yP+0SYv8IjV7OoehHTTT/uvkX0nAKaJb+JjHLwiAE1JJmNrvI5JeURBgw2
-                            jbG+V4gF5EmN9xaWRyRumCCEYuzAnlB58kdMY6bV2A6n8BMB5MVS5i04dbwuckNQ
-                            LaibNzSSVyTJ5pyZZEVkRF57drR2FKENxW5bkZ7ipGnLEKoXC5mmADYmXcu0t96b
-                            TUiIkYIUWXDkS8XJML8y7X0qogM9A28CAwEAAaOBgTB/MF4GA1UdEQRXMFWCHWlk
-                            cC1zdGVsbGFtYXJpcy5pcmNjcy5nYXJyLml0hjRodHRwczovL2lkcC1zdGVsbGFt
-                            YXJpcy5pcmNjcy5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSQ5DrW
-                            VFYfupI80cbtPn5VpSFKOTANBgkqhkiG9w0BAQUFAAOCAQEADCkGyy6JL919kwGU
-                            72HLcSUCQ5dd00/B73MQwCRvSikVg5QtE+UiI5TFF6wvLLvGYItGJMTsoh4sWGRK
-                            XK6uukR2v5/vHcPLCmT34M4kGiSrSSjr/YETB7Ygb5av91u+CwzDJNr4en/rBgVc
-                            eZEro1ZfDubMkAy/ZjUYe50BzBikWjGbLNVz/yIinTAwaMbpDBfGkl5WYOIYJijy
-                            PeUvqINSd3PLIyJv5TUyi2Xmr6m1bDLcuE8gt0ocR/sJFkEQGgEVufvLAzBsdmP5
-                            tJheicSWcYTDZZfsp20xfHPiEyuQPvYatp+5aUfmlfhdWFsifQ5P0N1mdISV6crR
-                            lKnM7w==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp-stellamaris.irccs.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.irccs-stellamaris.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.irccs-stellamaris.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>technical support</md:GivenName>
-    <md:EmailAddress>mailto:ced@irccs-stellamaris.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml
index 98f5ead2..98f5ead2 100644
--- a/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp-test.ucs.ed.ac.uk-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp-unito-prod.cineca.it.xml b/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
index 2f977757..8738aa3e 100644
--- a/swamid-interfederations-2.0/idp-unito-prod.cineca.it.xml
+++ b/swamid-interfederations-2.0/idp-unito-prod.cineca.it-idp-shibboleth.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp-unito-prod.cineca.it/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp-unito-prod.cineca.it/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-03-15T14:45:00Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-02-18T15:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -9,10 +9,10 @@
     <Extensions>
       <shibmd:Scope regexp="false">unito.it</shibmd:Scope>
       <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">University of Turin (new idp)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Turin</mdui:DisplayName>
         <mdui:DisplayName xml:lang="it">Università di Torino</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for users of University of Turin</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università di Torino</mdui:Description>
+        <mdui:Description xml:lang="it">Identity PRovider per gli utenti dell'Università di Torino</mdui:Description>
         <mdui:InformationURL xml:lang="en">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto_en</mdui:InformationURL>
         <mdui:InformationURL xml:lang="it">http://www.unito.it/unitoWAR/portletlocator/istruzioni_supporto</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.unito.it/unitoWAR/page/istituzionale_en/main/P181600246861349184985899</mdui:PrivacyStatementURL>
@@ -27,25 +27,25 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
-                            BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
-                            MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
-                            cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-                            AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
-                            KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
-                            hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
-                            jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
-                            hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
-                            iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
-                            LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
-                            ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
-                            j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
-                            pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
-                            5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
-                            Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
-                            rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
-                            07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
-                        </ds:X509Certificate>
+MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
+BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
+MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
+cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
+KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
+hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
+jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
+hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
+iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
+LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
+ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
+j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
+pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
+5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
+Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
+rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
+07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -66,25 +66,25 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
-                            BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
-                            MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
-                            cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-                            AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
-                            KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
-                            hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
-                            jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
-                            hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
-                            iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
-                            LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
-                            ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
-                            j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
-                            pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
-                            5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
-                            Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
-                            rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
-                            07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
-                        </ds:X509Certificate>
+MIIDVDCCAjygAwIBAgIVANS07VaPc/gsZ/51WPOjK7yoKLkxMA0GCSqGSIb3DQEB
+BQUAMCUxIzAhBgNVBAMTGmlkcC1kZXYxLnByaXZhdGUuY2luZWNhLml0MB4XDTA4
+MDUyMjEyMTQzMVoXDTI4MDUyMjEyMTQzMVowJTEjMCEGA1UEAxMaaWRwLWRldjEu
+cHJpdmF0ZS5jaW5lY2EuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQCgnlCuoVO1sb9tZmBwkCvQgwNPOpOsYPjA4i1u1AXrsylRET2CX70hT4UK6BK+
+KDOV5uSpuS+NaSWVEBmJ6tC0X8fVzOv29g4qtCmhxEWAI48u4wT6FWFsuKFhTxja
+hs6efm5twHi2mErT6f6lqlSIJ4xO2tCBCNIg5fkrRQ95VuvwMv4DJH3vxh7Df+Uy
+jb4bIOtqf5dvf8Xyex72xF0fJxhA+fSz3bmUrF1JQHmYHbfI+YA9n6iqe12QjZZM
+hIFMh/8EH//KGv6CbKrADzvQcsxp5/E7D9RxMHE+fMZXiAG6G2Ecnr7SGjtZo1bN
+iMkNcmMF1HA8cDS7C9LjX/LrAgMBAAGjezB5MFgGA1UdEQRRME+CGmlkcC1kZXYx
+LnByaXZhdGUuY2luZWNhLml0hjFodHRwczovL2lkcC1kZXYxLnByaXZhdGUuY2lu
+ZWNhLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQA5cxSUsB+rEi7tszL9OEk
+j0g3UDANBgkqhkiG9w0BAQUFAAOCAQEADhdCzQ4Ykhg8L8cwJkxPqUd5v5r+NDt5
+pDoaiQRYc3fHdtFwM3gP/EjoDaUiVG0Y33ujAiuHUG3xsFdOXD74F4xHukvWi1Ju
+5JLy4jbfiflYlVG+tBnQJLGTs17XlfrCwu7rxkxwYUdoU/HsON+ILktn528x2VOu
+Layzxemfc+eMxAu5A3S3dgZeUsofk6eyfnqid/+HcfX02WrRC4+LO3w1zLbMSpBZ
+rKIhw5Oev5p6kVlaDPyF+Jlm5FaSSpYCKBYnT58GuwOrWx6QDRR8MGGWR537letk
+07bJX5s43M2G37DFfX90r9NG22Fp3CkbS8kiAXgJQP/P5Dy3PL6+uA==
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aai.arnes.si.xml b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
index 4415c02e..46662005 100644
--- a/swamid-interfederations-2.0/idp.aai.arnes.si.xml
+++ b/swamid-interfederations-2.0/idp.aai.arnes.si-idp-20090116.xml
@@ -11,14 +11,90 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arnes.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">test.arnes.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">guest.arnes.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pirnice.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvkds.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrace.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddvic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iam.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-zetale.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmalecnik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-volicina.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ljutomer.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-logatec.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zelezniki.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrzic.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">8talcev.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ososkar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bistrica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostomaz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vergerio.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mps.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gracisce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preserjeradomlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobravlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-starse.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vist.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscg-info.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preddvor.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtci-brezovica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-strocjavas.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cufar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-miklavz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslesce.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dutovlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-danilekumar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osenams.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hrvatini.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os2ms.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-svjurij.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seps.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-sezana.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbeltinci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmesto.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-breg.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-raka.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslava.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor1.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gpetrovci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospg.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osik.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimnazija-ormoz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poldestrazisar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">11sola.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossvj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osormoz.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-secovlje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskolezija.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abesednjak.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrojica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dornberk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-iroba.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerknica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskoseze.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-laporje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ljudskivrtptuj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscankova.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-podgrad.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-verzej.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konsak.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miroslav-vilhar.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ss-crnomelj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franaerjavca.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brusnice.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjernej.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszuzemberk.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-drska.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cirkovce.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-sg.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gabrovka-dole.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kapela.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vstp.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sentjanz.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osgorjup.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-mostnasoci.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirkulane-zavrc.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osblanca.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gros-radgona.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdravlje.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmokronog.si</shibmd:Scope>
@@ -37,38 +113,50 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dragatus.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmislinja.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospuconci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospreska.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kosana.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospreserje.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oszalog.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">icp-mb.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-radenci.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslucija.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrteczala.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ospo-slb.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbakovci.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-divaca.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ekonomska-ms.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hinko-smrekar.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdragomelj.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-s.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arrs.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sssb.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dt.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dos-prosenjakovci.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbos.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osstopice.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-odranci.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oshjh-staritrg.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-leon.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ajdovscina.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-igroharja.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kis.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">o-azilb.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kanal.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-trebnje.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mklj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">okrogar.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-kamnica.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfrsmb.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobrna.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-jelsane.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobrovo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmoravce.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osferdavesela.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossmartno-tuhinj.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-pivka.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-sladki-vrh.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cdi-univerzum.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-miklavz.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbohinj.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimjes.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brezovica.si</shibmd:Scope>
@@ -94,68 +182,16 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osfram.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskosmac.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osld.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-hrvatini.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-otocec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os2ms.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-svjurij.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sc-sezana.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osbeltinci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmesto.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-breg.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslava.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-tabor1.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gpetrovci.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poldestrazisar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">11sola.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ossvj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osormoz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-secovlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskolezija.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">abesednjak.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dornberk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-iroba.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-cerknica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oskoseze.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-laporje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dk.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-ljudskivrtptuj.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscankova.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mdj.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ng-slo.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dssl.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gimidrija.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sszagorje.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fmalgaja.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">slivnica.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osdobje.si</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vzgojni-zavod-verzej.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konsak.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">miroslav-vilhar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-franaerjavca.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-brusnice.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osenams.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-danilekumar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dutovlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oslesce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cufar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-strocjavas.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtci-brezovica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preddvor.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oscg-info.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vist.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-starse.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-dobravlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-preserjeradomlje.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-gracisce.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mps.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vergerio.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostomaz.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-bistrica.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ososkar.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ostrzic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-zelezniki.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-logatec.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vrtec-ljutomer.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">os-volicina.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osmalecnik.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sola-zetale.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iam.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ddvic.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvkds.si</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">osrace.si</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">konservatorij-maribor.si</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">ARNES</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sl">Arnes</mdui:DisplayName>
diff --git a/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..09d7ec24
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.aalto.fi-idp-shibboleth.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.aalto.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">aalto.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEZTCCA02gAwIBAgIQfPk0tfjUFfPvbNYjMlu/rDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTExMTAwMDAwMFoXDTE2MTExMDIzNTk1OVowOjEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRUwEwYDVQQDEwxpZHAuYWFsdG8u
+ZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjQ14Y5ls9qgndtooF
+Z9tekHhuETMtovhozaCqvm6HwVE+jEo9ik4zwre42zTGz2QACBOldN5RlFw/A3kJ
+oGK5jEqQZFIw2XG22C+A7NNoZLqgGH7K3BYlYpI1Vpqpx+tk2/QpVUi4JqdIfVxT
+KHQZIW66dV4Zz+JMlAiPR/qzjLBYwUBllE5GG/BMBo7fQvMKqfrdAi3QcPdsiAQG
+Hl39WcchL53Y2tN8xOq2bkk6XOELBEe6byYdVgRzsGi6eyQHPvcWGb/Fl2JPahUj
+WM8Zz1w077omI4tzq/OLhnKAB/J25m9SAh23rq/lCFrnle528tE/nRBqX/yop8Hh
+n++dAgMBAAGjggFpMIIBZTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO5
+7TAdBgNVHQ4EFgQU7fL+WKGykn8q5Nden977Qx3neOEwDgYDVR0PAQH/BAQDAgWg
+MAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIG
+A1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEwL6At
+oCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0G
+CCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5h
+Lm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRj
+cy50ZXJlbmEub3JnMBcGA1UdEQQQMA6CDGlkcC5hYWx0by5maTANBgkqhkiG9w0B
+AQUFAAOCAQEAMqh4jbB8O648lGCpqemnz15SXeHGdQAyfvC3xDwEVa7eplPzeSg1
+XW1MqufDwc6j7nO5fYtULdMuj7/GM9gXkiU2Zv+qPbymrdADan8zqHQ65Ph+JarH
+U+WwQBqDu5B4ZLpp1188FPxqX+cq/5AdJ0/yxiQjG5yC0o5iPV94AEnUBCrB7Kp1
+Y79B00ak/mPB48aieNaM+iyYfkmyrzg7qlaRcXhh0CsFlL9zDt7l8eUImkesv6UM
+Cxdagkq9pUvFaktXeSRZbrRFcaP2j/TqkPnCtuoK/oQxvwcnllp4PqGQHypWfHOd
+ZxL0Jnn1/d6adGsxw3M6+kdWZG8Iu+3Mzg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.aalto.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Aalto-yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Aalto University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Aalto-universitetet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Aalto-yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Aalto University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Aalto-universitetet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.aalto.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.aalto.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.aalto.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Mika</md:GivenName>
+    <md:SurName>Niemi</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Tunturi</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Timo</md:GivenName>
+    <md:SurName>Tunturi</md:SurName>
+    <md:EmailAddress>mailto:servicedesk@aalto.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..c373b984
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.abo.fi-idp-shibboleth.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.abo.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">abo.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYjCCA0qgAwIBAgIRAPtd73PPNmqn8n4RXo42m8MwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA0MDUwMDAwMDBaFw0xNjA0MjUyMzU5NTlaMDgxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDETMBEGA1UEAxMKaWRwLmFiby5m
+aTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAO5UWgT90vXzUDlkapH5
+CVGFvoVgNDWxVr7WhrH+z2moP5h1wkK/Dnr0CKsglVyNkHycNkLmNH/9CVynp6LN
+sl+CEli5BmskLGNAvc+Q9bQwV52OJZQnXeCDDYSwSgDiIgrrml8niocBehGJEORC
+KW51UErjEf6U//1VfW1vG2r3BydjqM7pqs2GZx9p/US7F6lds8La1Vf/jp1ErW6G
+g1TzHYkx56EYNpqjo2Uin2vHowhidM37grjJQJ+q2qb7JsS4t074EwEQA0fF4wKa
+Yv6coSZyOpPXuuDLDlp3/dfY+beqR2oRml3HMvPnSp8+x/4y3/zEkcXcksmlwVCG
+LBUCAwEAAaOCAWcwggFjMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47nt
+MB0GA1UdDgQWBBT6OoUGpLGH7zyiXK+pmGrcVKeRnDAOBgNVHQ8BAf8EBAMCBaAw
+DAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYD
+VR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2g
+K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
+KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
+LnRlcmVuYS5vcmcwFQYDVR0RBA4wDIIKaWRwLmFiby5maTANBgkqhkiG9w0BAQUF
+AAOCAQEABsw3n2IGqqaYTvw7lHIvQzk6FmF3TqhJIV3SZv6Pm/sY1gY/RAykgGkM
+Sggdizdzf7LdaKaJRLOkUjj+za2zCGIE2n75XQBG4Qh+fcSfUFyCOdelGAOsoUDX
+nm7SpO8lLINjKr28Z7ll70fYUUvuwntEfYVcWtiZ/dicL8GWrcewROGGMDuKynKy
+UpUufLIUdgHlejsfRYwsV+rOMlDnzI4Mgw06fqiILAHhW1sGAD6yQ6FX2zOR5oVU
+4jIupvZYa1oNsIp/M5Ks7/uTY9T0cOYFlQaesTr6Mb18BK/lhvZ8hUblemAxM5DJ
+eg6LbC2vP3oGU43ehAd8KuMBp3jegA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.abo.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Åbo Akademi</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Åbo Akademi University</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Åbo Akademi</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Åbo Akademi</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Åbo Akademi University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Åbo Akademi</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.abo.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.abo.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.abo.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Barbro</md:GivenName>
+    <md:SurName>Sjoblom</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dennis</md:GivenName>
+    <md:SurName>Holtlund</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Barbro</md:GivenName>
+    <md:SurName>Sjoblom</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Barbro</md:GivenName>
+    <md:SurName>Sjoblom</md:SurName>
+    <md:EmailAddress>mailto:haka@abo.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.aco.net.xml b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
index eb4bec77..11cd1c2c 100644
--- a/swamid-interfederations-2.0/idp.aco.net.xml
+++ b/swamid-interfederations-2.0/idp.aco.net-idp-shibboleth.xml
@@ -27,7 +27,7 @@
         <mdui:GeolocationHint>geo:48.2132234,16.3581464</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -69,7 +69,7 @@ nWGBQ+FiDBdPEO2Ny3SNjJ3B67hbmXBJSEJw9g==
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aco.net</shibmd:Scope>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
diff --git a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml b/swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml
index 8d1cafa3..8d1cafa3 100644
--- a/swamid-interfederations-2.0/idp.admin.grnet.gr.xml
+++ b/swamid-interfederations-2.0/idp.admin.grnet.gr-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.amue.fr.xml b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
index c28c9b66..72220bcb 100644
--- a/swamid-interfederations-2.0/idp.amue.fr.xml
+++ b/swamid-interfederations-2.0/idp.amue.fr-idp-saml2-metadata.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">amue.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cpu.fr</shibmd:Scope>
@@ -19,6 +19,33 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+					      MIIDgTCCAmmgAwIBAgIJAJz0e9ITZF9gMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
+BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQHDAVQYXJpczENMAsG
+A1UECgwEQU1VRTEUMBIGA1UEAwwLaWRwLmFtdWUuZnIwHhcNMTQxMDE1MTQyMjUz
+WhcNMjQxMDE2MTQyMjUzWjBXMQswCQYDVQQGEwJGUjETMBEGA1UECAwKU29tZS1T
+dGF0ZTEOMAwGA1UEBwwFUGFyaXMxDTALBgNVBAoMBEFNVUUxFDASBgNVBAMMC2lk
+cC5hbXVlLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA241uUmwE
+4O95iIpPgHVBmvQsXgqUx6Jz1tKGQn4T2TQntn//Y2P8qRykhQ2YV+qLbJNrYWC9
+UYMlE+/aP4muMF4ChLV7ij3c6gCkxCAigOoHiQZFwLNPDzjiNs/eAxE/RDB9BUcf
+HL+953Q3lL/EEsWkTggPxaqWatyXbtPRaGl4WypVsztziF9D/Kdo5VVP9dElasBO
+aBXRy5HZLVHmGpCaaiOydcMyLf2CO0hA6pxDl3aYvyh1BLF5vcbMTg4tpu7Ks33c
+0H8Gdv8i8FYXZzHrHTghsfHp42obl0f7E7hUuHxRdwOgq7szbMeXIh5HPWm1Yz2S
+XPBwe5LjhuZw3wIDAQABo1AwTjAdBgNVHQ4EFgQUtFPL4vJjppV2NlZrKkczRW4j
+1l8wHwYDVR0jBBgwFoAUtFPL4vJjppV2NlZrKkczRW4j1l8wDAYDVR0TBAUwAwEB
+/zANBgkqhkiG9w0BAQUFAAOCAQEAe3jRuNrsDnBpwD2x6Yep61EPOXTjix12k2iy
+U6x6ggpL3hBjfJuEzMViHB/x2tVc/KaM2QiqRqiIsK73Woa1G00IS7AZvzFm1uyo
+I+tTmgFAcNORr5ucYnCdj3BzirEwLhGbczidsBquyvKL4VzT0oMlVND4jD5DFSlG
+/UFZ57goJxGSNK7pG4RsTi+Eha6CQgm7rNeHMr4lnBLjIOMft37/vkSo1Wx2vXTA
+Y6g6XMXwo2b6mIgK0y4447ZzOokArx1Jy7yvg7LDXTwUVVevrIy2Gb+sQlpGeKmr
+lO2z79XxgAmGiMTqrh2EIm+X9F53PSRqNjOExud+Ge1XjSYNVg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDgTCCAmmgAwIBAgIJANYhmQZ/PLaYMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV
 BAYTAkZSMRMwEQYDVQQIDApTb21lLVN0YXRlMQ4wDAYDVQQHDAVQYXJpczENMAsG
 A1UECgwEQU1VRTEUMBIGA1UEAwwLaWRwLmFtdWUuZnIwHhcNMTMxMTI1MDk0NzM3
@@ -42,7 +69,6 @@ JwghMs3y4HmiEKEylVhTWipavdzRw41b9jbFKmgB7MqdBiCfhQ==
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.amue.fr/idp/saml2/sso"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.amue.fr/idp/saml2/sso"/>
diff --git a/swamid-interfederations-2.0/idp.bc.cas.cz.xml b/swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml
index 32bd0f13..2e413732 100644
--- a/swamid-interfederations-2.0/idp.bc.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.bc.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-02T15:40:40Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.bth.se.xml b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
index 9dd5228c..9dd5228c 100644
--- a/swamid-interfederations-2.0/idp.bth.se.xml
+++ b/swamid-interfederations-2.0/idp.bth.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.canarie.ca.xml b/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml
index 9d3bb4f8..9d3bb4f8 100644
--- a/swamid-interfederations-2.0/idp.canarie.ca.xml
+++ b/swamid-interfederations-2.0/idp.canarie.ca-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.capes.gov.br.xml b/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml
index 93d10b48..93d10b48 100644
--- a/swamid-interfederations-2.0/idp.capes.gov.br.xml
+++ b/swamid-interfederations-2.0/idp.capes.gov.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml b/swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml
index aea025e0..aea025e0 100644
--- a/swamid-interfederations-2.0/idp.cardiff.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.cardiff.ac.uk-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml
new file mode 100644
index 00000000..8d2f3717
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.cedia.org.ec-idp-shibboleth.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.cedia.org.ec/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-08-28T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+                                http://www.cedia.org.ec/minga
+                        </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <shibmd:Scope regexp="false">cedia.org.ec</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CEDIA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">CEDIA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                                CEDIA - Ecuadorean Consortium for Advanced Internet Development
+                        </mdui:Description>
+        <mdui:Description xml:lang="es">
+                                CEDIA - Consorcio Ecuatoriano para el Desarrollo de Internet Avanzado
+                        </mdui:Description>
+        <mdui:InformationURL xml:lang="en">
+                                http://www.cedia.org.ec
+                        </mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">
+                                http://www.cedia.org.ec
+                        </mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIHnzCCBYegAwIBAgIBCDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
+DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
+MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
+bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
+MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDIwMTAxMjU0
+OFoXDTE2MDIwMTAxMjU0OFowgcIxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
+eTEPMA0GA1UEBxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29u
+c29yY2lvIEVjdWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5l
+dCBBdmFuemFkbzEZMBcGA1UEAxMQaWRwLmNlZGlhLm9yZy5lYzEfMB0GCSqGSIb3
+DQEJARYQbmVnQGNlZGlhLm9yZy5lYzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAKSsCSs49O1Pt5o6DSOaCGd5tzQALUWSn+MaOJEf/T+OlO47Ao1b5mz2
+Qn2+2fKhjNfTmxEaLCGkrtlMfZvGpVCpatYjVOqw1faGHc/MoohcsgjQQhUMEUBd
+Ez9UV9z4ogC5mWE9KoVlUbCT8+z2TfU4qlQgB/nOx0F71Frnex9cRhkmiYI2z8OC
+Gmeio8wxXU0jYvEYv3Hk6/Q+dPOIKwyPItk9rg/gL/aVor2uAZ6B6UJiasU7riOq
+qth/6cnriUymDX04wSJZWGfAX+/IJ1VRwPyYAT/szRMVoBzV/bEWgRnO2zTGjLn0
+/zS76W7JAdVu5i/x3nrZL00dzu8wFAZmC4CurMznL8Rz1CI7u/F/TJjpq6Tgw+fT
+jzL9pBn95sLe0dQzsxWJ4COe/yK/ANO1LhDUUGV83nHVLMphfUsHj9bh2NTtECbt
+uKVmnSRLLtXPION6r+arqXfWqSN0EqfVZGdFK+Z+dAaVtr1BX2sXZVm1pQNpjNeJ
+fcMrpDPGSQXPCLZfVAmfvHGsXvq6VDmv1dXULUFauTGnsXbG1GkRGU70A5CR2oyF
+RWnL/5nMXAnIb8trJmN2u6kIKV+AyjeNKgn3OnT5xSW1XD66nhzTtOhnGzuCPcH/
+2wG0fyUCshwc1gY2Tl2u8YplLndWlTXFvFUMyWzyBXAyKtAR53KhAgMBAAGjggGf
+MIIBmzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDArBglghkgBhvhCAQ0E
+HhYcVGlueUNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUpu+3H1k4
+WykGUu2yNZioiqwV6HAwgfQGA1UdIwSB7DCB6YAUXr5EvOJqnceMOEVQzXKYLF9c
+/jOhgcWkgcIwgb8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVheTEPMA0GA1UE
+BxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29uc29yY2lvIEVj
+dWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5ldCBBdmFuemFk
+bzEWMBQGA1UEAxMNY2EuZWR1cm9hbS5lYzEfMB0GCSqGSIb3DQEJARYQbmVnQGNl
+ZGlhLm9yZy5lY4IJANQ3cRbGqAp6MBsGA1UdEgQUMBKBEG5lZ0BjZWRpYS5vcmcu
+ZWMwGwYDVR0RBBQwEoEQbmVnQGNlZGlhLm9yZy5lYzANBgkqhkiG9w0BAQUFAAOC
+AgEAUbDgG1MR04EhdgEQUTt99d2ipr7ehfMKwfm7W3XiaHzqXOmqsogjlOJVBkUo
+4+PWVC0kfy7pOI0CWji7TfmKsh6iW9peM5TT2Iir/NLZD2PJl9EiOgSavmtjlL3N
+Dm0pBh0dpYXxJQpPtWjYntuuP6YLpQHM0PUgOhbGe9N3d3k1DZHOtDaOcA7UjKcW
+PvsCD3+jciSw33//J/asuixqvpoxZO1TUQbFm9HpLgEiw4iPVu/lo7mEsuz4LxQd
+N00udea/m/hhE5xmoQa4HSfvB/SahN3JOzljhpKEVABrPFfgBtMPw57HFI/SY4X0
++P4Uvc95C/KHisKv56PXq/3YSJs4wWY7nHdMNn7VKajvQ12HMQAZ+9nlUqeo7Crh
+npeGWSfCa3GJLtEYDbdWEIQdj5aJRgsV2EdSplgB23W/o5H4mvip90bWxKJdu0Av
+oeRBRK2PKulEhMstu76LPfv/oAA1hYWaPoIkQGsotqlAl3tvG1+/W9VCwcPuH/nQ
+WHgEVQZSqFt3m+FzghJRRQvGe7foGZoddosgg3tLgrzaWF+Vr8SkzRNlvdBdK/rU
+cJA93fCpqCNEcakWGckj7E/ieF/X9MKTS7c3Ui83BpY2jmQ9U3fX8g+44UsO2w4A
+a8vDEfSWxvi6ARpCFm1bcC8P5WcwHW/f72CcmM1RwWQBLKE=
+
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cedia.org.ec/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.cedia.org.ec/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.cedia.org.ec/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.cedia.org.ec/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">org.ec</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIHnzCCBYegAwIBAgIBCDANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
+DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
+MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
+bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
+MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDIwMTAxMjU0
+OFoXDTE2MDIwMTAxMjU0OFowgcIxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
+eTEPMA0GA1UEBxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29u
+c29yY2lvIEVjdWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5l
+dCBBdmFuemFkbzEZMBcGA1UEAxMQaWRwLmNlZGlhLm9yZy5lYzEfMB0GCSqGSIb3
+DQEJARYQbmVnQGNlZGlhLm9yZy5lYzCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCC
+AgoCggIBAKSsCSs49O1Pt5o6DSOaCGd5tzQALUWSn+MaOJEf/T+OlO47Ao1b5mz2
+Qn2+2fKhjNfTmxEaLCGkrtlMfZvGpVCpatYjVOqw1faGHc/MoohcsgjQQhUMEUBd
+Ez9UV9z4ogC5mWE9KoVlUbCT8+z2TfU4qlQgB/nOx0F71Frnex9cRhkmiYI2z8OC
+Gmeio8wxXU0jYvEYv3Hk6/Q+dPOIKwyPItk9rg/gL/aVor2uAZ6B6UJiasU7riOq
+qth/6cnriUymDX04wSJZWGfAX+/IJ1VRwPyYAT/szRMVoBzV/bEWgRnO2zTGjLn0
+/zS76W7JAdVu5i/x3nrZL00dzu8wFAZmC4CurMznL8Rz1CI7u/F/TJjpq6Tgw+fT
+jzL9pBn95sLe0dQzsxWJ4COe/yK/ANO1LhDUUGV83nHVLMphfUsHj9bh2NTtECbt
+uKVmnSRLLtXPION6r+arqXfWqSN0EqfVZGdFK+Z+dAaVtr1BX2sXZVm1pQNpjNeJ
+fcMrpDPGSQXPCLZfVAmfvHGsXvq6VDmv1dXULUFauTGnsXbG1GkRGU70A5CR2oyF
+RWnL/5nMXAnIb8trJmN2u6kIKV+AyjeNKgn3OnT5xSW1XD66nhzTtOhnGzuCPcH/
+2wG0fyUCshwc1gY2Tl2u8YplLndWlTXFvFUMyWzyBXAyKtAR53KhAgMBAAGjggGf
+MIIBmzAJBgNVHRMEAjAAMBEGCWCGSAGG+EIBAQQEAwIGQDArBglghkgBhvhCAQ0E
+HhYcVGlueUNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUpu+3H1k4
+WykGUu2yNZioiqwV6HAwgfQGA1UdIwSB7DCB6YAUXr5EvOJqnceMOEVQzXKYLF9c
+/jOhgcWkgcIwgb8xCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVheTEPMA0GA1UE
+BxMGQ3VlbmNhMQ4wDAYDVQQKEwVDRURJQTFGMEQGA1UECxM9Q29uc29yY2lvIEVj
+dWF0b3JpYW5vIHBhcmEgZWwgRGVzYXJyb2xsbyBkZSBJbnRlcm5ldCBBdmFuemFk
+bzEWMBQGA1UEAxMNY2EuZWR1cm9hbS5lYzEfMB0GCSqGSIb3DQEJARYQbmVnQGNl
+ZGlhLm9yZy5lY4IJANQ3cRbGqAp6MBsGA1UdEgQUMBKBEG5lZ0BjZWRpYS5vcmcu
+ZWMwGwYDVR0RBBQwEoEQbmVnQGNlZGlhLm9yZy5lYzANBgkqhkiG9w0BAQUFAAOC
+AgEAUbDgG1MR04EhdgEQUTt99d2ipr7ehfMKwfm7W3XiaHzqXOmqsogjlOJVBkUo
+4+PWVC0kfy7pOI0CWji7TfmKsh6iW9peM5TT2Iir/NLZD2PJl9EiOgSavmtjlL3N
+Dm0pBh0dpYXxJQpPtWjYntuuP6YLpQHM0PUgOhbGe9N3d3k1DZHOtDaOcA7UjKcW
+PvsCD3+jciSw33//J/asuixqvpoxZO1TUQbFm9HpLgEiw4iPVu/lo7mEsuz4LxQd
+N00udea/m/hhE5xmoQa4HSfvB/SahN3JOzljhpKEVABrPFfgBtMPw57HFI/SY4X0
++P4Uvc95C/KHisKv56PXq/3YSJs4wWY7nHdMNn7VKajvQ12HMQAZ+9nlUqeo7Crh
+npeGWSfCa3GJLtEYDbdWEIQdj5aJRgsV2EdSplgB23W/o5H4mvip90bWxKJdu0Av
+oeRBRK2PKulEhMstu76LPfv/oAA1hYWaPoIkQGsotqlAl3tvG1+/W9VCwcPuH/nQ
+WHgEVQZSqFt3m+FzghJRRQvGe7foGZoddosgg3tLgrzaWF+Vr8SkzRNlvdBdK/rU
+cJA93fCpqCNEcakWGckj7E/ieF/X9MKTS7c3Ui83BpY2jmQ9U3fX8g+44UsO2w4A
+a8vDEfSWxvi6ARpCFm1bcC8P5WcwHW/f72CcmM1RwWQBLKE=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.cedia.org.ec:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CEDIA - Consorcio Ecuatoriano para el desarrollo de Internet Avanzado</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CEDIA - Consorcio Ecuatoriano para el desarrollo de Internet Avanzado</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cedia.org.ec/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Claudio Chacon A</SurName>
+    <EmailAddress>neg@cedia.org.ec</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.cereq.fr.xml b/swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml
index 9ee64489..c88a4c48 100644
--- a/swamid-interfederations-2.0/idp.cereq.fr.xml
+++ b/swamid-interfederations-2.0/idp.cereq.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cereq.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.cirad.fr.xml b/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml
index c8f9ab9c..d4c196d2 100644
--- a/swamid-interfederations-2.0/idp.cirad.fr.xml
+++ b/swamid-interfederations-2.0/idp.cirad.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cirad.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.cnous.fr.xml b/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml
index cf00f84f..08b91638 100644
--- a/swamid-interfederations-2.0/idp.cnous.fr.xml
+++ b/swamid-interfederations-2.0/idp.cnous.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnous.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.company.ja.net.xml b/swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml
index 7f61c336..7f61c336 100644
--- a/swamid-interfederations-2.0/idp.company.ja.net.xml
+++ b/swamid-interfederations-2.0/idp.company.ja.net-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.condorcet.be.xml b/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
index bdb9a1ae..bdb9a1ae 100644
--- a/swamid-interfederations-2.0/idp.condorcet.be.xml
+++ b/swamid-interfederations-2.0/idp.condorcet.be-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.cpe.fr.xml b/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml
index e73f59cb..98a66470 100644
--- a/swamid-interfederations-2.0/idp.cpe.fr.xml
+++ b/swamid-interfederations-2.0/idp.cpe.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cpe.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -43,39 +43,6 @@ h34f/9zZRRI=
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIElzCCA3+gAwIBAgIRANZ+IFZ22zvSEG7SCUToIzIwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAzMTAwMDAwMDBaFw0xNDAzMDkyMzU5NTlaMHcxCzAJBgNV
-BAYTAkZSMRUwEwYDVQQHEwxWSUxMRVVSQkFOTkUxLjAsBgNVBAoTJUVDT0xFIFNV
-UCBDSElNSUUgUEhZUyBFTEVDVFJPTklRIExZT04xDDAKBgNVBAsTA01DMjETMBEG
-A1UEAxMKaWRwLmNwZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-ANfteKQe8KHS3pG87hpzww6gI+7DYLlY0Kz79TtXWI+FJ25PUjKWKwH5diFSXF+X
-D9b0xdbvEE+WHBJob02TvpXAZDEUfNKA+rL4VnwdYU4NyxHcIxKUENF2rVYJg95g
-mLeku1suo3L/jdD8OuJucVHOH2F2eFkkibnQyP8J8z80lmN4++l4uBiPmdEn/gfK
-djJkE8KuUwD4tCtrJBBwfAfjHhZBAqDIlSMJ7mLHk2TAnIbrWOTwPAg7dn1kQtst
-ZnaUqsQRtkE+SyBW/lGI/VgeVPr7Gt/9pVTGik+78O0c3UKAJNrcdgTpLEa2TTbJ
-CMmKVSFF1hj4huWmVpLnWtkCAwEAAaOCAV0wggFZMB8GA1UdIwQYMBaAFAy9k2gM
-896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRpbQ8kDYZ/3/NCFsg58TRDJRrulTAO
-BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
-AQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAx
-MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-cC50Y3MudGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAuY3BlLmZyMA0GCSqGSIb3
-DQEBBQUAA4IBAQBbEte9ddKlGVbI4XO/2FARITm2K+U2Sy0KGdUETpYqKmLhU2+E
-S010xINPbN4jTq6PDZVV5u57MMKEBTPZ2YhbJ/13WW0vrvUuk8sqnM4YXwvIbNlx
-e0iWdsIH6/CKW5GrC9ozrX6JuPTLW3r2DUj+Dcm+VjgbKdKaJDQgjm4w54ImmAwE
-pPquhX3HTvQ0TNQWmWy/ZLk2kSdo8F5eT9f8V1zUzVCLyxB4U3y3rA7m0eWxfOil
-QvA1mfXr3rfYQhhoQK1EzM++MGANJYCV4j2BgQO822sdEYqYKoZCFaY70ZYxkjZH
-yui/YIiwc1Qxxt+N8n4ltKiD1fdMuTNv9lRZ
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.cpe.fr/idp/profile/SAML2/POST/SSO"/>
diff --git a/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml
new file mode 100644
index 00000000..295aaf73
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.craw.eu-idp-shibboleth.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.craw.eu/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">cra.wallonie.be</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">CRA-W</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Centre Wallon de Recherches Agronomiques</mdui:Description>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6N0UwQjlGOTUzODI3MTFFNDhEQjM5QTkyMDFFMzRCQTIiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6N0UwQjlGOTYzODI3MTFFNDhEQjM5QTkyMDFFMzRCQTIiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo3RTBCOUY5MzM4MjcxMUU0OERCMzlBOTIwMUUzNEJBMiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo3RTBCOUY5NDM4MjcxMUU0OERCMzlBOTIwMUUzNEJBMiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/Pt40DxoAAAKESURBVHjajJJNTBNBFMff7G7brQ20Vr4hiHjQkEjgwAW9yMGPEyHxpjEaDh48cOqBaLw1US9GT97Vix64mBAVoigaDV8JCPiREJEiKIVaWrrd3c6M/ylL0igk7uaX2ex7//9782bY7WeN1OJn1BXUyJW01xMGreDN3wGN/u+5Crp3CxQNBGB7i++DOHB2Cxo6lIkC0aaQVOWzSRZfIpv7yZH6SYSveLmfSoWqoNIaqgVLchrIhiiVOk0uhOrf2apxailLtDvCUPku+KA+dE+YRturBUnFaIAJWsqHKD5/gagQIuI+Gq5vocGOeFhVQkdDWD9j1rTKJU3akhYhxrJtINBQULfJNHKUVzV0+9JyPmrmuFnj11x0pN20kDxqCZrDUUklZKqwN0QudYoG1uh4zRDcfEDvPRhcqys3rDMGafcWXPn6cZbTjCOLWzBKJm54Z5wuQHiqYYAmkp30O3N4vqd6ol4wPvjCEn1zjuyAqBVbMJH7DbwH6zsGx0AfuqiN+FPTRyNTMXPfxsuu2uHQg7SvIsnlCoQB5LwFsyAK2sFH8Irded6oGjoPYhrjwfV89WTUtxWVeuaERvI7I+0WzB/tcg+Uadgw9ZyEw0MkzbrC310XWmxyhH8055ZdS2SbxyJmkirNVRLyn0trg1/Gk4VesoVJy1uNU2n7gBEJJBc23Ug065bbtlXTWb9/+l1/W6wCg6+QUvsJUSVIgo3tC3VjbPukGe8BKyT1MDHRBGbw/xxxc6StamT98pG71yWxWinZEgQXdwwM0q2dltKgGcIM1i/gEFiGSQodjeN7BnUSXmyj9Bip5K43eMEf3h4xOO0rZpD3ac5Tm5tqkPnSQfwRYAD8LgMNnba3AAAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAJkAAABLCAYAAABjqiWeAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYxIDY0LjE0MDk0OSwgMjAxMC8xMi8wNy0xMDo1NzowMSAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNS4xIFdpbmRvd3MiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6QjE2QUJENUUzODI3MTFFNEIxN0RGQ0MzMEIyNkQwNDEiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6QjE2QUJENUYzODI3MTFFNEIxN0RGQ0MzMEIyNkQwNDEiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpCMTZBQkQ1QzM4MjcxMUU0QjE3REZDQzMwQjI2RDA0MSIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpCMTZBQkQ1RDM4MjcxMUU0QjE3REZDQzMwQjI2RDA0MSIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PorMSJ0AABA5SURBVHja7F0JdFTlFb5v9skKSVgDhC3sFRG0uAIWrB7EqoindWldTku1VdEqyvGcWrXWqnVBrFZrq7VQRMFKRQQREKKgrMpq2BMghJiNSTKZN2/ee7133p3wMkySGUjCzOS/OffM5M3/3ryZ973vLv/970i6roMQIW0pFvEVCBEgEyJAJkRIS2KL55N7aUVexO1+dCPHuS0w0iEFn8exXIF6HuozqG16phljDwgm62AyBHUu6nLUS9oaYILJOpa4UB9kzeRt1cJcCmktuZgsPOqYsO0dHmTCXLaOzEJdFQFgJCcEkwk5E0lHfQP1p82MKRcgE3K6koX6X9TLWhhXKkCWoHKWwzVisA9RL41i7BHhkyWgSKhl6lmF2T+iBJiMekyALAHFiigrC+jg08/KB/g16rQox5ahlgiQJehJV2sABxUdbFK7vnU31CdiGH8Q1StAlsCyza8D4gzaEWfTUbvEMH6HiI8SGGTEYMfRL9uBQHO0D8qcqLfEuM8mAbEEZzIC2gZZg6Pon7naHmjnoubHMB4NOmwWEEtwkNHJk7n8rF6HIgSavW2BNjbG8YdQ9wiIJcG0ErHZCU1HoGngQe4g0ymBjh8sNpVazrydE+OprUf1CYglydwlMVgtAmypVw0CjlIcBJlY1CZpkGGvw2OpTcGtb4yn9UlbfV4ibCt/blKHFOdEkCx3C33ZNSDDi8eHw8f77wJd8sd0r3Wy1cLIzCL4Td4yGJhSCj7NHn5dc2I4oAeMCfNWBRaxNrGCjHdBJd5UHryhvPi8AgOgKwXI2gtoOlQobthRPRCvhhzbFdQl+LLsfFhZPgLWXvh7SLP6IKBbzZFlagynsgZaIdMfYixiZnQ7oRgd0AoE12H0P8sRWKGqYHoQIGtXHw2/ciuymMUf+85WGQqr8+HtI+Nh5oDF4FFSQq+4UVNiONL8M/VhiLUoqDmGYNqHT0pUApYRshLoQuYyIa6JcEvDgeaHVw5dBbfmroVMmzfEZikxMBlNI318usxFwPEikvYjsHailiK4AroBrEQBVVI6/q37jShwuKY3fFI2ClJsDSY3jTUa+Q/7ZDGBK+S8b0SHa2GdCssxWi4J6A2vWUV0mWxAU+H14klBc2mRgo5P1yi/K0pZvBErc9E77EIHa1GdBl/JGtToBrBsUrtOmQmQtaOMQ3/OsaF6EOyuzcWLrdC2nlHu+x7q3uh8R+PL34sm8QNkLsrzlWO0aIfEZi3hk7X8XfwVdSpQTkzSzJFDXhT70/hnormrib3IFK5H00iPkAC5LgEykxheTMxXjJayzUO9HrUWjOVstabXB0dxjLfJ6rXkd1WhU/+NT4NCxUhB2KWOcfcmjaiaDbq5SsBp84CsIm4kLdpd/8kAC5GNi/Jmmt6AgCEt7E/L3p5s7kumM9mOqNqEPtcJnv7qCABLOp9M1a2Q4yqD7qlFSGn2aHejGrGfmf63g2519HRVQG93BaUwOkPL1RdUyHikKfaqQF/rY68GK9Hvogy9M0kc+g4JMjKVDqsM52RtQsRFBTJaEPJo2LYAQsCfgsfJsNUjA1mGQvOFijQR/kr4RmIpC5ciUdRYjL6XU+qYkVbSfWZZdcIl3T6DrLRDaKOcLQ2/ELV32DYFdIuc66oChyUAuh7sZdGU1DETKuHsVYqgWkIpCZ8eNJV2CTqsJB3INDSZGY5q+EnfuWCV1JaCgP4RtnnQXFaOy9oFLouf2HFSM/s/RK6Wmb0o57UFo8YPvQZ7OSSRJ0rKz+9T3TC262oY3W0VGr/UWAOfwwhV74j0YgJYb2a7SPIO6msh9iJTWImYpkx9gU9rAJ2QJL7JZM0N1/SZDxnuEsRMk/5Z1amOnXV7J1cljMo8SOU+V0PkOcsvUe8KoZTmFTei70VJ1UOK3uEc+w4LMkpnZGOkeVP+q3jF9abM5qktBFRHwaVoKvullEmKZvtFhH2opPpGmsd2BiNHCEaO69H3UgR7dSyQhcwmRZrDgtGmK9KQsDWRUi3S3ufTeqyncuxxuOGHYeOLUKfYJCixhHwvZC9a/2kXvlfHBFlIJuUuBsmiRGIzmtA+mbHVbCt7pZUcmdx1K9SrzplhY2mh7mRkrz1Vqg4feQ3fS4HknhJqDYn3jD9VP5SdaUpjUKcdyGYbYWc5+vDWRms7nI1uNNXx2p29V0GWveZKTyDlKtO4HThoKvpee3Yja61DcNVqEcFl45TIINQBHL3SZ6B8XBqjnNIeNWC0lNqPug+1kFlSFSBrfxkGxoLa1/ninIZI+KfBZT2WIcjG8nVuWCrS6STAnGuHdS5cfn/fJe461fWc6QCfoSm8FV2u0rUYOdJiYmvjCe1+YDRfmYB6Af/vjtWyM9jWoS4Do3y7UoCsfeRzMNY7bgVjAnoZX4xIRYHEFpmMIGKJhopDv+aC/Mxd0D3tAJTW9TOXZg80IkoLMcisPw6eD+l23x9rA64RnJqYg+bxoeKALq9B9qpQG8DVnXwzMBqvXASx1f9HEnIYR7D+Cozq2o84TbJOgKzt5c9glNE8j/oUGHOEx/lOD/AFzmKAhUBGr3+KOptAqesSpFprYUzXL2DJgYHmYxuOfSDl+RmDFqy7ttvGG2sC7gco6kQwPYCkNZ/AtYt7buA2Yqo7wZhMzznDz6Xw+ZM4oHEZGdWvTWelVU8voi4RIGtbobnB3WD0BevF2pxksl90M+oMYgRFd8DIrA2wtGhacFYAJJ18pGtASS2Y0H3Dw0/mL5joUx3z0DQuRDw9uE/Ri7bKxgIO3DYBI8rf4firYgyWNGZeKgHaycHDYTCqNmr55gE2r3Q+2WCs7yR/bjjr5azEaI8yuwuQtbKQgcrjnNZoMEpq7oxyX6qg+Bc53wHN9pdsZxnkuEuhrA4PJynTIeAqH99t0/WLzntuUopVfcyr2m5B07iAar0QZFS8eiWay3vA+NGHaIUAVIC6lIFRaDbdMUoGm9DxqDeA8bsA1EL0YQ4UBMhaScj87eULfR3qY6hzUB9BvZb9mZaEHPlqi6S9abQjsAwAJX3M4MwD4z8a86zFapHde2T7JbsUjcCVi+Caiuz1cwZ1tPI1+1CLUY+20mf3MFBJ/4Q6CvUOMJbcvcF+qgBZK8qn/EgMQUvOZrH5IFNC0z/U3rxHM+bs7wiywhRbXQHo1qxhOetun9r3Pd+2gBd2y44vqlR1KsJvGvpdVzADRiOUzP0fHRtaecV4E0IB0D38OW9DnclMfTyuTVE8/95lE7+tRH7KIjBKogls1CB4A19wNzvNnfi5nbdTL/0qBNn+ajmrskLuljMoc/tQJMmLalXnZWgXx1jN6YyWhaI/KtemitrvzuJX1I/N6bYZk4qKBJO1nuzkfNTLqDS3OJm305d8gJX8txo4Wa9Pla1dNd0yoLOzIi/HdbyXojlSqcjRGVu2fhez1lyIj/78B1m7CnPZ+uJhc7GKfZVcDg5IJzS3I5Voq3pMi850fp/X2TTKcfh9lMXzxUr0uct3ONf1N1M6oLWEGqZQvRjVk01EfT9OASYc/3YQiuTu4mjrtxyBdj4DRqBasYUcaJQLiAiQhUdelD97nP006qY0kk2pLYIJ9HBURsnSLQwu6vH6faPICIdaLYFgKTc9D2h2COhiTXRHBVlIitnMkaYxyMgxps48GgcEJ1gJUIoZUDqXA9mkANitMvgCKVDq7Q0Vck7weZ+0/dDVfQxsCDxVs4K/5cUqAmTJ8kGCfWKRbewWhcESnCqg6LIQmadQMzn8xEoWSTXtpwXBRdW0Nos/CLNj9b1gU9k42FY5Gkq8fUBVEUzIYE5HFfRKPQT90/fC4E7fwoCM7wSKkhFklqDpMh6DZgxBomgOqPR1gX2e4eDxd8L/7Qg4Pzit9dA7tQiyXGXQ2VmO4wNQKXfBMVkgq47gPObm8ovgBG7zISuNylkX3H/N0Sng9WcbFRu4D1gCQdKTA6mwv2ok7K+4ANa5x8Fjo+/D95DxOKIuNiFBZo/QLZGYp0bJDPpG1QiU495eUFTXH47W5UEJaj0BI1TSH8ozIwjS7R4Ykf01MlAhrDhyHXxfnws6tTEgcGiOBldtT+Vow6oSqGy1ESgTGdCqBttL2S2KQFCig+yl7Y+feo0RGOX13aFeTQUfmTA1JdjvlS56kHGs3ojGtEbJgPUlk2E9xQQNzARGvwxku9My0biv3eIXKEpkkO2rOjciYAyAaMYqpMgAoXnM28HIoSFV6ZuRgebg2G38OgUE0zhFsQKMQkGKRKm/2HIeQ6XTVCY01jgGfMNpkg3GyxrISjoc8AyBH2RvAq+SFgoaaDHwLznIoIpXKhGqCFl6MNpT0bSUuUELFT7ey/z7LhiVFkkjcT13KT1RcDq70QTybL5gq/mCEuioWpHKZWiuk+b8QtNPe/gi0w33NoOTqh0+ByPBS1NJ1AtjKP9P/cuMAkIMBOySH6b0mwsTcxdjYGEjM05zidtN53MrGNNQJDSZvxKMWv7+HAkDv34zP78YTqMadsak+K38STZvdTwYc5rV/JwuKq0RoNZPVLVBU0NUo0WZ+1pObVCOrA8YC0CeBaNKlca9xWCkpXHDmNXotafBmHgPml1Ft8MH+6bDm7tnQrWcTQ1fdpjYEKDxb2PeG/IS4eSPgVHiOFSvth6SoNw62UE2ix+pR8WasNeopuxVMOrzyZQ5mc3uB2MKicq6d/P22Qwqs+c/m1lvGOfeTIGAD7Ycvxxe+PbpYADisMhzTfsRSDOZSc0roG4z3RhdTIwmfLI4li5s9ggYi5sYE4ok8tic+plVzEvRKFk7j1luIrMgjaXCSS+EmuQZ+2WGolKw1UGVryfM3Xt3zYwRf1hqkQLlOlhyeMwENtkO0/vk8/GnmN73QwGy+AcZOfTfsbmMyu2DyP0LbmLmIpCQs+Ph58SCAXboyZR+3Wgvax0Ue4becLAmf/WQztuW+FXnbSaGDbGfZrIgtEimBz9fDkn6U9LJOK3kPEM34HzUfzOwrmBHXWP2Wsls6WDwXX3K3pp1d2l9LxietXWuySRewI/EnFSfT+VJVFRpLu9+R6Qw4l++Z2CQA98XIv/WJK3NVMDcmiAyixFIX+D0RkiIvepMvqzMjnojF9dqr4H8zJ0041DA5zDINIAi1pdQfxQG0CIGcFKKJclAtpZvnPsivJ7G+aee0HztWabJR4rEkk2Laoe89L3QM+UwBDQbvcf7YSPm8OPLYdsXwinNXwTI4lWeYqa6m1MNfRg0lHsq4At5gMFihci/y7A6lHpicyZxmoFWSY01+XKnim4PdhGySQ3NXRbAyQW834KxAh6YtTaafLR5kMSSbCD7CoxO1lTI+AibIUpNfAFGw7vbw6LISP01KOP+Fkeg9EP1+ziYGME5rDqI1BhFt4DbWQ4jszcGJ+dZKCm72cRiAROwQmxGdXDfJDPIktHxX8S+0o85TaBwFLjM5ItRFDeSXwsHDG27g9mFnHyqQ9vAppZWeGdAhHbqoLlgVM4K6JFSDPWNW4g+wIz4boTzpPYKWwBAT2aQxfW0khBhLoUIESATIkAmpIPI/wUYAHgWZETgx0vuAAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:IPHint>193.190.115.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:06a8:3960::/48</mdui:IPHint>
+        <mdui:DomainHint>CRA.WALLONIE.BE</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:50.5662,4.7247</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
+MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
+25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
+yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
+FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
+DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
+sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
+9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
+tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
+RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
+yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
+tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
+NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
+                	</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.craw.eu/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.craw.eu/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.craw.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.craw.eu/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">craw.eu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
+BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
+MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
+25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
+yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
+FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
+DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
+sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
+A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
+aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
+9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
+tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
+RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
+yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
+tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
+NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
+			</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CRA-W</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CRA-W</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.cra.wallonie.be</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Mikhael</GivenName>
+    <SurName>Jacquemain</SurName>
+    <EmailAddress>maintenance@cra.wallonie.be</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.craw.eu.xml b/swamid-interfederations-2.0/idp.craw.eu.xml
deleted file mode 100644
index 36a75454..00000000
--- a/swamid-interfederations-2.0/idp.craw.eu.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.craw.eu/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">craw.eu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
-MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
-25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
-yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
-FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
-DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
-sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
-9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
-tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
-RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
-yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
-tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
-NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
-                	</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.craw.eu/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.craw.eu/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.craw.eu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.craw.eu/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">craw.eu</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDGDCCAgCgAwIBAgIVAIP1OBVd297uoZOia+Zqp6HAJ9DDMA0GCSqGSIb3DQEB
-BQUAMBYxFDASBgNVBAMTC2lkcC5jcmF3LmV1MB4XDTEzMDIxNTA3NDMyMVoXDTMz
-MDIxNTA3NDMyMVowFjEUMBIGA1UEAxMLaWRwLmNyYXcuZXUwggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQDuCWtJ/aDFBmejY17mEqrlgFxmetfLJWKCy6vU
-25241tsMqWW42YVuxtPwKP6Z5ure+RCzgUF0ZdddKqyaUpmNxeIq7OC7q21mMeBQ
-yahzvjzq8VgcM2iKcgCw/nNnrSZwkIaJMaej7Aw2U5VVs65rZ6bbztQbMKj51BbJ
-FM28lyTLC96+mTaofJ8hvkn2cPH3IecCFlRwNcx4w5SGuVGIPNEISQ8ypEzd2MNA
-DcnwemG46Ipv/MyILJPWP19xjl7z6VgeBLNHc0iigepBOrSnSq49WXpdwvFlkjMY
-sbPxGD1CQfPXBo6dDBNQdjn3V4cdfWRO5/Dp0J4mkkFsJkzDAgMBAAGjXTBbMDoG
-A1UdEQQzMDGCC2lkcC5jcmF3LmV1hiJodHRwczovL2lkcC5jcmF3LmV1L2lkcC9z
-aGliYm9sZXRoMB0GA1UdDgQWBBQNbK63mDGwrA0LIPx4J3pCP/MHqjANBgkqhkiG
-9w0BAQUFAAOCAQEANbBixgiBQhJ/xB9Et8d+kZwK/OIC+Q08aCUuSlJ8URS7yB8a
-tQlX9xCW1Dj9eBVzsCNEVZQVhUA7SepbCHXwPh3cjim/255V/dboxEa5HtH76Pn5
-RSqOLhoN5SrqZn9JMZfJqIbU8vcLEwR9HqbFT0gDseyCExBdGEZb2cbnidxaTIrr
-yf6vu9LsSxP4gck3NrkfrUAWqxYis+a2qSXTni00wDcj5Si0DxZTIIFUfVeTPm02
-tEQG0fUEqzyBDxdQFuNsput7RfHF9S6iXjAEUyOc8+dXbxLs+kziJteBX01SSNI4
-NuU+VQNtPt46TiTwvP7DiXqrbeMbYZkfPB/jLQ==
-			</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.craw.eu:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.craw.eu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CRA-W</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CRA-W</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.cra.wallonie.be</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christopher</GivenName>
-    <SurName>PAUL</SurName>
-    <EmailAddress>maintenance@cra.wallonie.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.crihan.fr.xml b/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml
index 1e3ddc98..ac88dc9c 100644
--- a/swamid-interfederations-2.0/idp.crihan.fr.xml
+++ b/swamid-interfederations-2.0/idp.crihan.fr-saml2-idp-metadata.php.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crihan.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-antillesguyane.fr.xml b/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml
index 5f82aaa7..a5b85ac7 100644
--- a/swamid-interfederations-2.0/idp.crous-antillesguyane.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-antillesguyane.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-antillesguyane.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-besancon.fr.xml b/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml
index 019a7ff8..388604e7 100644
--- a/swamid-interfederations-2.0/idp.crous-besancon.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-besancon.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-besancon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-caen.fr.xml b/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml
index 3b5b6d9a..8d4b5a93 100644
--- a/swamid-interfederations-2.0/idp.crous-caen.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-caen.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-caen.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-clermont.fr.xml b/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml
index 1112eafb..5aa2f1bc 100644
--- a/swamid-interfederations-2.0/idp.crous-clermont.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-clermont.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-clermont.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-creteil.fr.xml b/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml
index 56a1bca3..cdaeaf53 100644
--- a/swamid-interfederations-2.0/idp.crous-creteil.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-creteil.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-creteil.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-dijon.fr.xml b/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
index 65eaa53a..d78aec4b 100644
--- a/swamid-interfederations-2.0/idp.crous-dijon.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-dijon.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-dijon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-grenoble.fr.xml b/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml
index fc1c077b..d46bb7a8 100644
--- a/swamid-interfederations-2.0/idp.crous-grenoble.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-grenoble.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-grenoble.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -16,24 +16,30 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-					      MIIDQDCCAiigAwIBAgIVAKP0f1PGUpZo/0eLWuTnWjqSKGBMMA0GCSqGSIb3DQEB
-BQUAMCAxHjAcBgNVBAMTFWlkcC5jcm91cy1ncmVub2JsZS5mcjAeFw0xMTEyMDEx
-MjA5MTZaFw0zMTEyMDExMjA5MTZaMCAxHjAcBgNVBAMTFWlkcC5jcm91cy1ncmVu
-b2JsZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIB4rWqyVeXZ
-GZh1VQDFNwh939ct9pPJ4Tr+Qg0+XBNJTapUFNjgGtNMuCI09po3KvIC9vYbxHpv
-uBStIQVitvNhMAT2pRTC6dg6U7QKEw1K1Qic/++UJpNZ4NO6YyF/wJ5ahdDXD7RW
-ZUsREyjYq1qoqT+Dy3UzRO05afIWAe7kpG976dR8VdNyMIIquoG0EKTcqbcjs+PM
-B8wPu5xQTKCO3L/xVxF1rRNYeSonbmU/6tMdiHh0HKjNaBRrNWvqfwCG2vqv809R
-BZnWmb2SZhORHV0+XdcH2/8K54u+WlxndzsQYX63LiWoLpDLEEVPlNI3B5qH1d5E
-UYw3X8YtbqsCAwEAAaNxMG8wTgYDVR0RBEcwRYIVaWRwLmNyb3VzLWdyZW5vYmxl
-LmZyhixodHRwczovL2lkcC5jcm91cy1ncmVub2JsZS5mci9pZHAvc2hpYmJvbGV0
-aDAdBgNVHQ4EFgQUR0sqS0nPfsXC2BEqpOb4mPbEKk4wDQYJKoZIhvcNAQEFBQAD
-ggEBAEU6q/hafkFuDhvyH4wiWAyyYU5NCULMqDvmgGILmAOWIBKFJ3N8PnX8fgpN
-+p3RZb1+QWD6vK78TMQP96cQ7CIfFMYZ/P+VuNvDaCfn/AyvEQkJAtYdyIHRTS0u
-HsSStNqIBEhJIXp8A+Ej7EUip6DbQKXXBH57meN6Zu98GRk9qkFXmAbsQ3l3VmSo
-kMAd+x/ISXucYhrVJIbWYod/Edpu4j51MHI44O4o6RGSgiaGK+zJj8573YOFc70f
-0/9Xh773qtLYAG1ORxr4Leh0eZMHouWN2nMT2LjXF9yPPOkv0ROFHEGO/PUXMZyQ
-U74UCjCLcEIseJspIZWjpZ53QLE=
+					      MIIEdzCCA1+gAwIBAgIQJXNY9IPVDDkw5l9yCMhrQTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDkxNTAwMDAwMFoXDTE3MDkxNDIzNTk1OVowQzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR4wHAYDVQQDExVpZHAuY3JvdXMt
+Z3Jlbm9ibGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHPm9t
+Jjz1cm0wZpVpxnN8vANWsur6N3iue42UeYbyXWTvHRSmO+QZMTYMULmTLf5zhp1r
+zF56kyPMfO7PMtJ5E1xlz22L+mlg7Rd3FQH3JZxlpZPDDVqXAL4mxZH/kPfrHr98
+kkp9tMbuGVC0CKyE6pVVw8HQrp2ZMNLVsHnwta0dMRDxUzOjpY3STs7BQxqO0rhy
+n53wd3jb74oIj5oTi1AW/r2lvu5d2IXTSWjlOxgpAg+Pay+rwT98yv0Ox0G6XdXQ
+8IhPrWdL421/VKIu5xqfDtSKgJeq2JNlamqx0crk7MlBRyUEXGMlOL0CPqzAiPfp
+TBn3LYg95jrVJ5ofAgMBAAGjggFyMIIBbjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUiAemAdbi7dUgmxf4rUhJVqdgFAIwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCAGA1UdEQQZMBeCFWlkcC5jcm91cy1ncmVu
+b2JsZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEATZ2G4Kb8XApp47+o/4/GFetVkiZc
+L113ZiOXH4Q/ZD9sfAqh/6G5kvAYDdCLCL5UxmOcOkXH/wkXyoeP82yyFF5GeGzp
+mwKoOpr34+0ux4ctI1T1UZNPz5Bv4AUAEBbru6ZpCsEmw5KwFpSGOjPnlPspkJBT
+r3RAsxa5qG2yMzJRa0PiywpXd8q82JfFk2cHL9P4au0u5p9H9Hin+Cpvmn0StV51
+iEsqhPuQmD3oc87nHEra79A3QGjMSN1zaSbcadRvXZhHdZaez/C9h8yyPKkR9wM2
+rp/TCvQsQDOOiVfOsrZjqiF1nBI3Z/KLRoV9yz3wmtdG59CY0Pf+XM0plg==
 					    </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.crous-limoges.fr.xml b/swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml
index 4246dab1..304cc5d0 100644
--- a/swamid-interfederations-2.0/idp.crous-limoges.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-limoges.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-limoges.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-montpellier.fr.xml b/swamid-interfederations-2.0/idp.crous-montpellier.fr-idp-shibboleth.xml
index ec729289..ba58d1e9 100644
--- a/swamid-interfederations-2.0/idp.crous-montpellier.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-montpellier.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous34.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-montpellier.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.crous-nancy-metz.fr.xml b/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml
index de7271df..4b7c72f5 100644
--- a/swamid-interfederations-2.0/idp.crous-nancy-metz.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-nancy-metz.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nancy-metz.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-nantes.fr.xml b/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml
index e1e5a56d..cfaab8b2 100644
--- a/swamid-interfederations-2.0/idp.crous-nantes.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-nantes.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nantes.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-nice.fr.xml b/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml
index 3763ef3b..13b57e1a 100644
--- a/swamid-interfederations-2.0/idp.crous-nice.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-nice.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-nice.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-orleans-tours.fr.xml b/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml
index 8cd91eb9..f48e16a5 100644
--- a/swamid-interfederations-2.0/idp.crous-orleans-tours.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-orleans-tours.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-orleans-tours.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-paris.fr.xml b/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml
index c0d9ab65..f2adb846 100644
--- a/swamid-interfederations-2.0/idp.crous-paris.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-paris.fr-idp-shibboleth.xml
@@ -5,11 +5,14 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-paris.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">CROUS Paris</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Employee</mdui:Description>
         <mdui:DisplayName xml:lang="fr">CROUS Paris</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Agents de la fonction publique</mdui:Description>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/idp.crous-poitiers.fr.xml b/swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml
index 0cbb7f41..aac4a776 100644
--- a/swamid-interfederations-2.0/idp.crous-poitiers.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-poitiers.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-poitiers.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-reims.fr.xml b/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml
index 0a38601c..dba734bc 100644
--- a/swamid-interfederations-2.0/idp.crous-reims.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-reims.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-reims.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-rennes.fr.xml b/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml
index 0ecbc960..61e08c03 100644
--- a/swamid-interfederations-2.0/idp.crous-rennes.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-rennes.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-rennes.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.crous-strasbourg.fr.xml b/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml
index 399490c7..f2c736b4 100644
--- a/swamid-interfederations-2.0/idp.crous-strasbourg.fr.xml
+++ b/swamid-interfederations-2.0/idp.crous-strasbourg.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-strasbourg.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.cs.cas.cz.xml b/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml
index bd19da5a..f8f81f5a 100644
--- a/swamid-interfederations-2.0/idp.cs.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.cs.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-17T15:52:29Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.csc.fi.xml b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
index c26902b0..e65b29bd 100644
--- a/swamid-interfederations-2.0/idp.csc.fi.xml
+++ b/swamid-interfederations-2.0/idp.csc.fi-idp-shibboleth.xml
@@ -13,9 +13,9 @@
         <mdui:DisplayName xml:lang="fi">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="sv">CSC - Tieteen tietotekniikan keskus Oy</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">CSC - IT Center for Science Ltd.</mdui:DisplayName>
-        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
         <mdui:Description xml:lang="fi">CSC on opetus- ja kulttuuriministeriön hallinnoima tieteen tietotekniikan keskus.</mdui:Description>
         <mdui:Description xml:lang="sv">CSC — Tieteen tietotekniikan keskus Oy är IT-centret för vetenskap.</mdui:Description>
+        <mdui:Description xml:lang="en">CSC — IT Center for Science Ltd is administered by the Ministry of Education, Science and Culture.</mdui:Description>
         <mdui:Logo height="256" width="256">https://idp.csc.fi/idp/img/csc.jpg</mdui:Logo>
         <mdui:InformationURL xml:lang="fi">http://www.csc.fi/index_html</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://www.csc.fi/english</mdui:InformationURL>
diff --git a/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr.xml b/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml
index 221741b8..6aef292d 100644
--- a/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr.xml
+++ b/swamid-interfederations-2.0/idp.cue-lillenorddefrance.fr-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cue-lillenorddefrance.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.cvgz.cas.cz.xml b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
index 52ba1d4b..3f4068c6 100644
--- a/swamid-interfederations-2.0/idp.cvgz.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.cvgz.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-06T13:35:26Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.cyceron.fr:8443.xml b/swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml
index bf8a67fc..c34ce24d 100644
--- a/swamid-interfederations-2.0/idp.cyceron.fr:8443.xml
+++ b/swamid-interfederations-2.0/idp.cyceron.fr:8443-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cyceron.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.dante.net.xml b/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml
index 69539885..69539885 100644
--- a/swamid-interfederations-2.0/idp.dante.net.xml
+++ b/swamid-interfederations-2.0/idp.dante.net-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.dfn.de.xml b/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml
index 908633c1..908633c1 100644
--- a/swamid-interfederations-2.0/idp.dfn.de.xml
+++ b/swamid-interfederations-2.0/idp.dfn.de-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..c47e9e84
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dias.ie-idp-shibboleth.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dias.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2013-11-15T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dias.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Dublin Institute for Advanced Studies</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.dias.ie</mdui:InformationURL>
+        <mdui:Logo height="112" width="136">https://edugate.heanet.ie/rr3/logos/dias_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUD82Rv6ZhMvwGESzIOJRkEtryOk4wDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLaWRwLmRpYXMuaWUwHhcNMTMxMTE1MTAxODExWhcNMzMx
+MTE1MTAxODExWjAWMRQwEgYDVQQDEwtpZHAuZGlhcy5pZTCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAINbJEvXC7qeIqXcCt3l6qrIw7ckk6FIy/rBBbO0
+0HkzFWd6JsOO3QZ8ymRgVeap9N1SycxIuox63M8sa89KwNVXAvNyDfrbvmbqIxzJ
+T5RmHl4ISgrsQubAWJ7eNiqVXiMvQe+e2A7iPpplPJYGqhvG/TB6F/4QDfGO+G9/
+tK+EdCvntS8wEy/s0UrDVOo+upvJnypzNJLcavfZWWwfjzR57Rcx48jTlRjZRe0R
+4/2rWS5yAJ8UhjBksoGD36ZHIpc1GFI5JeSNbGA7V501qhhjK9X09A+/NAlLGIj3
+s2ZJPfNGMPaY6Uc7u6sfEvwUJoz8kUnIV7Ac8HNw/d8Joi8CAwEAAaNdMFswOgYD
+VR0RBDMwMYILaWRwLmRpYXMuaWWGImh0dHBzOi8vaWRwLmRpYXMuaWUvaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFJ8KCzRdsORXHfsuXHNeCrKqR4owMA0GCSqGSIb3
+DQEBBQUAA4IBAQBPyzwZNTdiO9/RRp0f8hBqP0rOsO7mueuDbGvZoCPUEYiBkYiG
+zYB2DHkcfAYQls/vuI7DiuLWQC5COLsoDVgAW59VBrRKTRwpIjktvTM3C2aexomw
+GW7M9XqyiTdArQb3Inyl8Jca4HiniDEorh7OqjGEIakT4cIj8Vfu43b+E0L28otA
+GphiaINCWGdfHDfbsuc6fLoJp4WzSQHxGQEkkHE/XO6zWQLXPNuO9eU3MWwqw+or
+LlHiaoyxj0hM9NnJIllv1huBF7CHL4EadiizxS/nK2mx0vZgJVvQAOG6Kir3lbME
+h8KMdglIpPQmLF1/JtTN3QNn8SZmE7iel3kB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dias.ie/idp/profile/Logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dias.ie/idp/profile/Logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dias.ie/idp/profile/Logout"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://idp.dias.ie/idp/profile/Logout"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dias.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dias.ie/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dias.ie/idp/profile/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dias.ie/idp/profile/SAML2/SOAP/ECP"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Dublin Institute for Advanced Studies</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Dublin Institute for Advanced Studies</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.dias.ie</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jean Francois</md:GivenName>
+    <md:SurName>Bucas</md:SurName>
+    <md:EmailAddress>jfbucas@stp.dias.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jean Francois</md:GivenName>
+    <md:SurName>Bucas</md:SurName>
+    <md:EmailAddress>jfbucas@stp.dias.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jean Francois</md:GivenName>
+    <md:SurName>Bucas</md:SurName>
+    <md:EmailAddress>jfbucas@stp.dias.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dijon.iufm.fr.xml b/swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.xml
index 2817c3f4..a39a1a02 100644
--- a/swamid-interfederations-2.0/idp.dijon.iufm.fr.xml
+++ b/swamid-interfederations-2.0/idp.dijon.iufm.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dijon.iufm.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
new file mode 100644
index 00000000..1bfe5d13
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.dir.garr.it-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.dir.garr.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2010-09-30T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">garr.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">GARR IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for GARR staff</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="it">GARR IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per il personale GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
+DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
+LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
+X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
+OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
+jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
+9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
+ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
++e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
+R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
+XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
+lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
+pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
+5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dir.garr.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dir.garr.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">garr.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
+DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
+LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
+X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
+OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
+jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
+9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
+ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
++e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
+R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
+XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
+lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
+pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
+5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">GARR</OrganizationName>
+    <OrganizationName xml:lang="it">GARR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GARR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">GARR</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>
+                system.support@garr.it
+            </EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dir.garr.it.xml b/swamid-interfederations-2.0/idp.dir.garr.it.xml
deleted file mode 100644
index 919cc783..00000000
--- a/swamid-interfederations-2.0/idp.dir.garr.it.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.dir.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-07-29T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">garr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GARR IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for GARR staff</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="it">GARR IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider per il personale GARR</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
-                            BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
-                            DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
-                            BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
-                            LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
-                            X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
-                            OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
-                            jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
-                            9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
-                            o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
-                            ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
-                            +e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
-                            R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
-                            XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
-                            lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
-                            pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
-                            5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.dir.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.dir.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.dir.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">garr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GARR AA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attribute Authority for GARR staff</mdui:Description>
-        <mdui:DisplayName xml:lang="it">GARR AA</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Attribute Authority per il personale GARR</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDJzCCAg+gAwIBAgIUMJUKlH8ou/Aqe5RpN9dGZSep/CQwDQYJKoZIhvcNAQEF
-                            BQAwGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MB4XDTExMTEyMTEwNDY1NloX
-                            DTMxMTEyMTEwNDY1NlowGjEYMBYGA1UEAxMPaWRwLmRpci5nYXJyLml0MIIBIjAN
-                            BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtQSmT31kE2g6itpnCjcLrFBCUL04
-                            LsMioxbBFbCFsMn3vgHOubmhpwuNOUBYhl8MkSIGjoAcYCbDc4hDSucQMSx1fgvF
-                            X/S2QfJr7Bu6mNxzt9RqMoXWnuqkKKZYZw+DjITqzZp3g2+lB3i3b9x1jOh4AhSe
-                            OoWoVyXx/x+EQS9WJ55GEw/fKi70GtrrKI5wu4D/z+bigZG5TOg3A3o197mLt0ns
-                            jwSd51WdtbZ+AccwyTOyQgFCqwRxszQEvqIt2wyNYt0AOcYi2jRUlpc2jnikytXN
-                            9hsNZPT0Y9Yuxi5IVRxSIkdeIs9eGOxrJqxg6FWwIdFHpNyF9MVjx4eZewIDAQAB
-                            o2UwYzBCBgNVHREEOzA5gg9pZHAuZGlyLmdhcnIuaXSGJmh0dHBzOi8vaWRwLmRp
-                            ci5nYXJyLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRybtrE0ndZvt7hHlAA
-                            +e035msGLzANBgkqhkiG9w0BAQUFAAOCAQEAWFusaIXa/wOcsEEvKRA83mFVulM/
-                            R0lA/D+Zm0LH1SxVEprX7/Iv001U1M5c6ySFWHgR6v7CIHHVpNF+aMr1kNw4U2wc
-                            XMWli2Htykpd8sgrjx7Eg4+3WITxupXwxbvxU86orNntPcJCASVcDVbrBReC6mZ2
-                            lxawzxIGWbSVbKo24lUcklBeoMKiG8Itw2/ouzjcmdw3defNBMlZ9akWdFSK1z58
-                            pm4pftMyNdlh91nMxDa0caZ8+7fZcTPs0bFQdivu3vdL1+OcwlAmcloilD54xfiV
-                            5vGMEoxK1AfQhXgis+ZYJ2VRydbeSS0gEohRmR/53LIOjBfZ6VnKy71yew==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.dir.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.dir.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GARR</OrganizationName>
-    <OrganizationName xml:lang="it">GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GARR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">GARR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>system.support@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.dit.ie.xml b/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
index 561649c5..f0cb69c9 100644
--- a/swamid-interfederations-2.0/idp.dit.ie.xml
+++ b/swamid-interfederations-2.0/idp.dit.ie-idp-shibboleth.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dit.ie/idp/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dit.ie/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-07T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-07T00:00:00Z"/>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">dit.ie</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dit.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Dublin Institute of Technology</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Bhaile Atha Cliath</mdui:DisplayName>
-        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.dit.ie</mdui:InformationURL>
+        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/dit.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:53.3386922370051,-6.266900897026062</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAJ7TJcMtAwNtz/8vec1TyPtNeUveMA0GCSqGSIb3DQEB
diff --git a/swamid-interfederations-2.0/idp.dkit.ie.xml b/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml
index 89545f05..87194afa 100644
--- a/swamid-interfederations-2.0/idp.dkit.ie.xml
+++ b/swamid-interfederations-2.0/idp.dkit.ie-idp-shibboleth.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dkit.ie/idp/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.dkit.ie/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-09T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-09T00:00:00Z"/>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">dkit.ie</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkit.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Dundalk Institute of Technology</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta Dhún Dealgan</mdui:DisplayName>
-        <mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.dkit.ie</mdui:InformationURL>
+        <mdui:Logo height="98" width="155">https://edugate.heanet.ie/rr3/logos/dkit.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:53.984667,-6.394150</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIDFzCCAf+gAwIBAgIUXWnVlumk2ydwS9DRW7Xoxc2vfvcwDQYJKoZIhvcNAQEF
diff --git a/swamid-interfederations-2.0/idp.ebi.ac.uk.xml b/swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml
index 768a0e01..768a0e01 100644
--- a/swamid-interfederations-2.0/idp.ebi.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.ebi.ac.uk-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ec-lille.fr.xml b/swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml
index b74247ac..83795ef3 100644
--- a/swamid-interfederations-2.0/idp.ec-lille.fr.xml
+++ b/swamid-interfederations-2.0/idp.ec-lille.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-lille.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ig2i.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.ecam.fr.xml b/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml
index 66e40642..8282f657 100644
--- a/swamid-interfederations-2.0/idp.ecam.fr.xml
+++ b/swamid-interfederations-2.0/idp.ecam.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ecam.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.ed.ac.uk.xml b/swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml
index 0a96e7f9..0a96e7f9 100644
--- a/swamid-interfederations-2.0/idp.ed.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.ed.ac.uk-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ehess.fr.xml b/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml
index 08364c0f..fe3068c6 100644
--- a/swamid-interfederations-2.0/idp.ehess.fr.xml
+++ b/swamid-interfederations-2.0/idp.ehess.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ehess.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.elte.hu.xml b/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml
index a9dccbf7..5959916f 100644
--- a/swamid-interfederations-2.0/idp.elte.hu.xml
+++ b/swamid-interfederations-2.0/idp.elte.hu-auth-saml2-idp-metadata.php.xml
@@ -13,6 +13,12 @@
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <mdui:GeolocationHint>geo:47.49005,19.05955</mdui:GeolocationHint>
       </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="hu">Eötvös Loránd Tudományegyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Eötvös Loránd University Budapest</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Eötvös Loránd Tudományegyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Eötvös Loránd University Budapest</mdui:Description>
+      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idp.enib.fr.xml b/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml
index 85589e17..a88b83b7 100644
--- a/swamid-interfederations-2.0/idp.enib.fr.xml
+++ b/swamid-interfederations-2.0/idp.enib.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enib.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.enit.fr.xml b/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml
index f5e2ac0e..3f52d8b4 100644
--- a/swamid-interfederations-2.0/idp.enit.fr.xml
+++ b/swamid-interfederations-2.0/idp.enit.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enit.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.enitab.fr.xml b/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
index d144809a..46af478a 100644
--- a/swamid-interfederations-2.0/idp.enitab.fr.xml
+++ b/swamid-interfederations-2.0/idp.enitab.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enitab.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.ens-cachan.fr.xml b/swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml
index 504fd7b9..9a5cb269 100644
--- a/swamid-interfederations-2.0/idp.ens-cachan.fr.xml
+++ b/swamid-interfederations-2.0/idp.ens-cachan.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-cachan.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.ens.fr.xml b/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml
index 600f0bda..4d67bbfa 100644
--- a/swamid-interfederations-2.0/idp.ens.fr.xml
+++ b/swamid-interfederations-2.0/idp.ens.fr-idp-idp.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.ensai.fr.xml b/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml
index 68c58f0b..5e68c26c 100644
--- a/swamid-interfederations-2.0/idp.ensai.fr.xml
+++ b/swamid-interfederations-2.0/idp.ensai.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensai.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.ensait.fr.xml b/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml
index adb7e3fb..0f6cd566 100644
--- a/swamid-interfederations-2.0/idp.ensait.fr.xml
+++ b/swamid-interfederations-2.0/idp.ensait.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensait.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.ensma.fr.xml b/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml
index 5e99eb20..5aebf336 100644
--- a/swamid-interfederations-2.0/idp.ensma.fr.xml
+++ b/swamid-interfederations-2.0/idp.ensma.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensma.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.enssib.fr.xml b/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml
index 91ba3595..0530f280 100644
--- a/swamid-interfederations-2.0/idp.enssib.fr.xml
+++ b/swamid-interfederations-2.0/idp.enssib.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enssib.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -79,7 +79,7 @@ rAdVc6ukYTipKpuEb2afsqV7HRnwpfVkVt1QieIu1hurHlbR
   <Organization>
     <OrganizationName xml:lang="en">ENSSIB</OrganizationName>
     <OrganizationDisplayName xml:lang="en">ENSSIB</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.enssib.fr</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Sébastien BOUTELIER</SurName>
diff --git a/swamid-interfederations-2.0/idp.ent.dauphine.fr.xml b/swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml
index 8d643273..515a16f2 100644
--- a/swamid-interfederations-2.0/idp.ent.dauphine.fr.xml
+++ b/swamid-interfederations-2.0/idp.ent.dauphine.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dauphine.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.entpe.fr.xml b/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
index 0107e1ec..c82f54dd 100644
--- a/swamid-interfederations-2.0/idp.entpe.fr.xml
+++ b/swamid-interfederations-2.0/idp.entpe.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.net</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">entpe.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.epfl.ch.xml b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
index 13241ee3..f08f0909 100644
--- a/swamid-interfederations-2.0/idp.epfl.ch.xml
+++ b/swamid-interfederations-2.0/idp.epfl.ch-idp-shibboleth.xml
@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.epfl.ch/idp/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-06-26T08:42:04Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-09-29T15:25:24Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor errorURL="http://support-it.epfl.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml
new file mode 100644
index 00000000..327bced9
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.eso.org-idp-shibboleth.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.eso.org/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-22T16:13:35Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">eso.org</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">ESO - European Southern Observatory</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">ESO - European Southern Observatory</mdui:DisplayName>
+        <mdui:Description xml:lang="de">ESo baut und betreibt astronomische Teleskope</mdui:Description>
+        <mdui:Description xml:lang="en">ESO builds and operates astronomical telescopes</mdui:Description>
+        <mdui:Logo height="16" width="16">https://www.eso.org/images/eso-logo-16x16.png</mdui:Logo>
+        <mdui:Logo height="64" width="64">https://www.eso.org/images/eso-logo.ico</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">https://www.eso.org/public/germany/about-eso/esoglance/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://www.eso.org/public/about-eso/esoglance/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.eso.org/public/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.eso.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=trustmaster@eso.org,CN=idp.eso.org,O=ESO - European Organisation for Astronomical Research,L=Garching,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGWDCCBUCgAwIBAgIHGGCD/SMRJzANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UE
+BhMCREUxPjA8BgNVBAoTNUVTTyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3Ig
+QXN0cm9ub21pY2FsIFJlc2VhcmNoMQwwCgYDVQQLEwNURUMxFjAUBgNVBAMTDUVT
+TyBQS0kgLSBHMDIxIjAgBgkqhkiG9w0BCQEWE3RydXN0bWFzdGVyQGVzby5vcmcw
+HhcNMTQxMDE3MTIwNzA5WhcNMTkwNzA5MjM1OTAwWjCBqzELMAkGA1UEBhMCREUx
+DzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIR2FyY2hpbmcxPjA8BgNVBAoTNUVT
+TyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3IgQXN0cm9ub21pY2FsIFJlc2Vh
+cmNoMRQwEgYDVQQDEwtpZHAuZXNvLm9yZzEiMCAGCSqGSIb3DQEJARYTdHJ1c3Rt
+YXN0ZXJAZXNvLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/y
+weMbb9mXT+teqXFEevPWlvO48gTjIqNAcrGs9XvZtLCQB91hftXOkS21aNhpO1jD
+pJeU6WRjH7WEU3/oXGGqXztxV3I6giyMm8UB0qNLtDm2MuGhYT4CqIwunIzqYKJG
+nvvhi6NTAqhO2wP+XIK7dCnYhehRPhAivMKwLWabKKHF4SPV1X4R/AIMPbu2QFnK
+lM3grdo6lctuGWGcJ9n2UU/9ywQmiZmczQigimkjPp6K/1GFZI5TmIP5uO+Wv+sD
+JxETIOvsYQK5y+CmU5fl1kSPKUwpa+ssfKldRZIpTc2sukFlnU8XAmMpSmjyzsXL
+wEoojn5FmgPgdHLQrwUCAwEAAaOCApEwggKNME8GA1UdIARIMEYwEQYPKwYBBAGB
+rSGCLAEBBAMCMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0G
+CysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUSPnc6DulTXOTEQM+i/fbNpxx
+6OowHwYDVR0jBBgwFoAUsR53NN55AbLmThsm4pt3idg5vn0weAYDVR0RBHEwb4IR
+YXdlYjQwLmhxLmVzby5vcmeCD2lkcC5hZHMuZXNvLm9yZ4ILaWRwLmVzby5vcmeC
+DmlkcC5ocS5lc28ub3Jngg9zZHAuYWRzLmVzby5vcmeCC3NkcC5lc28ub3Jngg5z
+ZHAuaHEuZXNvLm9yZzB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
+BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
+ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2Vzby1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
+AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9lc28tY2EvcHViL2NhY2VydC9nX2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAL10jELuLO7BfdWD2GV/chZe20xt
+M8NthmUA4i6VG9/MRTIFzhR9qwnl0nBQPGCisGH07EU6DvKH6XVMBtW2XidOL2Xq
+vyw9Ztvs5H2ypRnV6FDUKRf1PdbdY6pqTInn5Yt8cw8Rv9h5FDNCXLoLjkRuBNQf
+xgdPNKcKNSTAAI+bnXftMKiV6JHYQxbxsL+x4qVYlHQT425U12ZWwYuE28GzjhUf
+qkP9zWDiEtC88Nxn/NisXmpRJul/cG0ddb3N9XAfvBvjIMN4+rxLvb1ehqLreZFf
+26ev5dBb9dYdJ92x6RFKiD6kvBVZSNaN7KY5ogvz8WmWnXlllor+GGdxQkA=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.eso.org/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.eso.org/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.eso.org/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.eso.org/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">eso.org</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.eso.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=trustmaster@eso.org,CN=idp.eso.org,O=ESO - European Organisation for Astronomical Research,L=Garching,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGWDCCBUCgAwIBAgIHGGCD/SMRJzANBgkqhkiG9w0BAQsFADCBlzELMAkGA1UE
+BhMCREUxPjA8BgNVBAoTNUVTTyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3Ig
+QXN0cm9ub21pY2FsIFJlc2VhcmNoMQwwCgYDVQQLEwNURUMxFjAUBgNVBAMTDUVT
+TyBQS0kgLSBHMDIxIjAgBgkqhkiG9w0BCQEWE3RydXN0bWFzdGVyQGVzby5vcmcw
+HhcNMTQxMDE3MTIwNzA5WhcNMTkwNzA5MjM1OTAwWjCBqzELMAkGA1UEBhMCREUx
+DzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMIR2FyY2hpbmcxPjA8BgNVBAoTNUVT
+TyAtIEV1cm9wZWFuIE9yZ2FuaXNhdGlvbiBmb3IgQXN0cm9ub21pY2FsIFJlc2Vh
+cmNoMRQwEgYDVQQDEwtpZHAuZXNvLm9yZzEiMCAGCSqGSIb3DQEJARYTdHJ1c3Rt
+YXN0ZXJAZXNvLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL/y
+weMbb9mXT+teqXFEevPWlvO48gTjIqNAcrGs9XvZtLCQB91hftXOkS21aNhpO1jD
+pJeU6WRjH7WEU3/oXGGqXztxV3I6giyMm8UB0qNLtDm2MuGhYT4CqIwunIzqYKJG
+nvvhi6NTAqhO2wP+XIK7dCnYhehRPhAivMKwLWabKKHF4SPV1X4R/AIMPbu2QFnK
+lM3grdo6lctuGWGcJ9n2UU/9ywQmiZmczQigimkjPp6K/1GFZI5TmIP5uO+Wv+sD
+JxETIOvsYQK5y+CmU5fl1kSPKUwpa+ssfKldRZIpTc2sukFlnU8XAmMpSmjyzsXL
+wEoojn5FmgPgdHLQrwUCAwEAAaOCApEwggKNME8GA1UdIARIMEYwEQYPKwYBBAGB
+rSGCLAEBBAMCMBEGDysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0G
+CysGAQQBga0hgiweMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQG
+CCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUSPnc6DulTXOTEQM+i/fbNpxx
+6OowHwYDVR0jBBgwFoAUsR53NN55AbLmThsm4pt3idg5vn0weAYDVR0RBHEwb4IR
+YXdlYjQwLmhxLmVzby5vcmeCD2lkcC5hZHMuZXNvLm9yZ4ILaWRwLmVzby5vcmeC
+DmlkcC5ocS5lc28ub3Jngg9zZHAuYWRzLmVzby5vcmeCC3NkcC5lc28ub3Jngg5z
+ZHAuaHEuZXNvLm9yZzB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
+Y2RwMi5wY2EuZGZuLmRlL2Vzby1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
+BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
+ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
+ZGZuLmRlL2Vzby1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
+AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS9lc28tY2EvcHViL2NhY2VydC9nX2Nh
+Y2VydC5jcnQwDQYJKoZIhvcNAQELBQADggEBAL10jELuLO7BfdWD2GV/chZe20xt
+M8NthmUA4i6VG9/MRTIFzhR9qwnl0nBQPGCisGH07EU6DvKH6XVMBtW2XidOL2Xq
+vyw9Ztvs5H2ypRnV6FDUKRf1PdbdY6pqTInn5Yt8cw8Rv9h5FDNCXLoLjkRuBNQf
+xgdPNKcKNSTAAI+bnXftMKiV6JHYQxbxsL+x4qVYlHQT425U12ZWwYuE28GzjhUf
+qkP9zWDiEtC88Nxn/NisXmpRJul/cG0ddb3N9XAfvBvjIMN4+rxLvb1ehqLreZFf
+26ev5dBb9dYdJ92x6RFKiD6kvBVZSNaN7KY5ogvz8WmWnXlllor+GGdxQkA=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.eso.org:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.eso.org:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e446</OrganizationName>
+    <OrganizationName xml:lang="en">e446</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">ESO - European Organisation for Astronomical Research</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">ESO - European Organisation for Astronomical Research</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.eso.org</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.eso.org</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Michael</GivenName>
+    <SurName>Naumann</SurName>
+    <EmailAddress>mailto:mnaumann@eso.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Michael</GivenName>
+    <SurName>Naumann</SurName>
+    <EmailAddress>mailto:mnaumann@eso.org</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.eurecom.fr.xml b/swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml
index d57393e5..eb4052a6 100644
--- a/swamid-interfederations-2.0/idp.eurecom.fr.xml
+++ b/swamid-interfederations-2.0/idp.eurecom.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eurecom.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.feide.no.xml b/swamid-interfederations-2.0/idp.feide.no.xml
index bdc96611..b2f3c3ad 100644
--- a/swamid-interfederations-2.0/idp.feide.no.xml
+++ b/swamid-interfederations-2.0/idp.feide.no.xml
@@ -42,6 +42,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfk.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bi.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bibsys.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bo.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boe.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bokn.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bomlo.kommune.no</shibmd:Scope>
@@ -50,6 +51,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diakonova.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dmmh.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">donna.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dovreskulane.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">drammen.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dvm.iktsenteret.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eid.kommune.no</shibmd:Scope>
@@ -149,7 +151,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">haugesund.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hbv.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hedmark.org</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnegs.fronter.com</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemne.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemnes.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hemsedal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heroy-no.kommune.no</shibmd:Scope>
@@ -158,7 +160,6 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hials.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hib.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hibu.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hifm.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hig.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hih.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hihm.no</shibmd:Scope>
@@ -186,10 +187,12 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hoylandet.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsh.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurdal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hurum.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hyllestad.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iktsenteret.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jolster.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jondal.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kafjord.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">karmoyskolen.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khib.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">khio.no</shibmd:Scope>
@@ -205,14 +208,18 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kvn.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lardal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">larvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lavangen.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ldh.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leikanger.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">leirfjord.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lenvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lesjaskulane.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lier.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lierne.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lillesand.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lindas.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lomskulane.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">loten.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lunner.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">luster.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lybskole.no</shibmd:Scope>
@@ -223,11 +230,11 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">marker.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">masfjorden.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meland.kommune.no</shibmd:Scope>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meldal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">melhus.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meraker.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">met.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mf.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mhs.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midsund.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">midtre-gauldal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">modalen.kommune.no</shibmd:Scope>
@@ -236,6 +243,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsos.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">namsskogan.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nannestad.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">narvik.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">naustdal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nb.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nedre-eiker.kommune.no</shibmd:Scope>
@@ -249,8 +257,10 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nla.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmbu.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nmh.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nome.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nord-aurdal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordkapp.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nordreisa.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nore-og-uvdal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notodden.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">notteroy.kommune.no</shibmd:Scope>
@@ -283,21 +293,26 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">romskog.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royken.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">royrvik.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">salangen.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">saltdal.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samfunnsforskning.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sami.vgs.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samiskhs.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">samnanger.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sande.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandefjord.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sandnes.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauda.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sauherad.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selbu.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selje.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">seljord.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">selskolene.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfj.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skanland.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skaun.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skiptvet.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjaakskulane.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skjervoy.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.fredrikstad.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.svk.no</shibmd:Scope>
@@ -334,6 +349,7 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tinn.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tjome.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tokke.kommune.no</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tonsberg.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">torsken.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">trogstad.kommune.no</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">troms.vgs.no</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.fgu.cas.cz.xml b/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml
index 5e5c5c37..061ba899 100644
--- a/swamid-interfederations-2.0/idp.fgu.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.fgu.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-29T13:36:13Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.fh-kaernten.at.xml b/swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml
index 062ea691..67f8b7b8 100644
--- a/swamid-interfederations-2.0/idp.fh-kaernten.at.xml
+++ b/swamid-interfederations-2.0/idp.fh-kaernten.at-idp-shibboleth.xml
@@ -20,7 +20,7 @@
         <mdui:Logo height="16" width="16">https://www3.fh-kaernten.at/favicon.png</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
@@ -58,7 +58,7 @@ CKMOmy35Xw==</ds:X509Certificate>
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fh-kaernten.at</shibmd:Scope>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIDMzCCAhugAwIBAgIUE3xzrdaog0SOPU1LEoHlaWT6wKAwDQYJKoZIhvcNAQEF
diff --git a/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml b/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
index b9e7804b..b9e7804b 100644
--- a/swamid-interfederations-2.0/idp.fh-rosenheim.de.xml
+++ b/swamid-interfederations-2.0/idp.fh-rosenheim.de-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.fzu.cas.cz.xml b/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml
index beee4668..b2e9c3d8 100644
--- a/swamid-interfederations-2.0/idp.fzu.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.fzu.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-18T10:07:35Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml
new file mode 100644
index 00000000..8c8045e2
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.gakunin.nii.ac.jp-idp-shibboleth.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.gakunin.nii.ac.jp/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.gakunin.jp" registrationInstant="2011-04-13T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.gakunin.jp/en-Join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="ja">https://www.gakunin.jp/join/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gakunin.nii.ac.jp</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="ja">学認IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">GakuNin IdP</mdui:DisplayName>
+        <mdui:Logo height="64" width="64">https://idp.gakunin.nii.ac.jp/images/gakunin64.png</mdui:Logo>
+        <mdui:Keywords xml:lang="en">category:location:others category:organizationType:others</mdui:Keywords>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:35.692558,139.757999</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIHpbHvyrEXQEwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
+BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
+aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
+SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTEzMDEyODAzMDgxMloXDTE1MDIyNzAz
+MTgxMlowgaoxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEqMCgGA1UE
+ChMhTmF0aW9uYWwgSW5zdGl0dXRlIG9mIEluZm9ybWF0aWNzMTwwOgYDVQQLEzND
+eWJlciBTY2llbmNlIEluZnJhc3RydWN0dXJlIERldmVsb3BtZW50IERlcGFydG1l
+bnQxHjAcBgNVBAMTFWlkcC5nYWt1bmluLm5paS5hYy5qcDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMLBjh+F6IRNBBi5+Ag+Qg7GVpArTsh/6jSDI9Ah
+R53bxKhOFl5l3lPcHs80AbfQ/Ti6EYm+OpoSmz6eAI81/FHzFlFp/YYlcIyl++8i
+pmF9nAZLJWbgXk6ov59ooUxFhPZVYXJE0GIiOHY/O48hvoewAZu2oLZcP9JB08az
+CqyyX2pm8XVsjDJwl3vg3rVtdnIWos4ehzIRUO0XxUED8oqxYQtFUIivwAD3VdqK
+ScfFmwCf2PzoVaX6oJ4HaMMrJD81xwjw/h+AIlaX56+C1UTiDFEvgipw8YuR9sOg
+XXOW5Sb+DgXsD4OqJ6tgryRVqltdVId+o8W/xxUo0cvwkmkCAwEAAaOCAVAwggFM
+MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU
+R/UG3Pd9rjhd6CWxBzX8S/e/mVswHwYDVR0jBBgwFoAUewoH9xjKjA7W2rxQgGws
+RwLRDfswIAYDVR0RBBkwF4IVaWRwLmdha3VuaW4ubmlpLmFjLmpwMGYGA1UdIARf
+MF0wTQYKKoMIjJweAQICATA/MD0GCCsGAQUFBwIBFjFodHRwczovL3JlcG8xLnNl
+Y29tdHJ1c3QubmV0L3NwY3BwL2Nwcy9pbmRleC5odG1sMAwGCiqDCIybG2SHBQEw
+SAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL3JlcG8xLnNlY29tdHJ1c3QubmV0L3Nw
+cGNhL25paS9vZGNhMi9mdWxsY3JsLmNybDARBglghkgBhvhCAQEEBAMCBkAwDQYJ
+KoZIhvcNAQEFBQADggEBAM+eH9qnj/+9hzzL7RTZO2oRc01Eqd4NqifGzaYfEfSk
+wR+xbS7h6VKR/4X7bZe429eiFFK7GwTD7bwdh+zDxU2pS/ZTZeNbJfTCy3hhAfNZ
+a7iEGe0BVviVF8Bz/Z0el49vGS5nliW59KXIUW7io9xEA9B95CURBl8ETgBWFyrY
+l9SsjlYOiPx1KtUf21UlZPjdbF4aJpXb8omLo/3Mk/qnWzx1qcCKUiGlVDRGPBn8
+UVT6kyMwBnKi5CVVK5v+ZgOlCXO7J0aldTBcH/s28hiUas9yReFyoNmLG2ozboeu
+ZkIzMSzb7JBh32BmlOPf+Ntq0wkxlFhnZM4tNF2J/Nk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.gakunin.nii.ac.jp/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.gakunin.nii.ac.jp/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.gakunin.nii.ac.jp/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gakunin.nii.ac.jp</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE/DCCA+SgAwIBAgIIHpbHvyrEXQEwDQYJKoZIhvcNAQEFBQAwfTELMAkGA1UE
+BhMCSlAxETAPBgNVBAcTCEFjYWRlbWUyMSowKAYDVQQKEyFOYXRpb25hbCBJbnN0
+aXR1dGUgb2YgSW5mb3JtYXRpY3MxDTALBgNVBAsTBFVQS0kxIDAeBgNVBAsTF05J
+SSBPcGVuIERvbWFpbiBDQSAtIEcyMB4XDTEzMDEyODAzMDgxMloXDTE1MDIyNzAz
+MTgxMlowgaoxCzAJBgNVBAYTAkpQMREwDwYDVQQHEwhBY2FkZW1lMjEqMCgGA1UE
+ChMhTmF0aW9uYWwgSW5zdGl0dXRlIG9mIEluZm9ybWF0aWNzMTwwOgYDVQQLEzND
+eWJlciBTY2llbmNlIEluZnJhc3RydWN0dXJlIERldmVsb3BtZW50IERlcGFydG1l
+bnQxHjAcBgNVBAMTFWlkcC5nYWt1bmluLm5paS5hYy5qcDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAMLBjh+F6IRNBBi5+Ag+Qg7GVpArTsh/6jSDI9Ah
+R53bxKhOFl5l3lPcHs80AbfQ/Ti6EYm+OpoSmz6eAI81/FHzFlFp/YYlcIyl++8i
+pmF9nAZLJWbgXk6ov59ooUxFhPZVYXJE0GIiOHY/O48hvoewAZu2oLZcP9JB08az
+CqyyX2pm8XVsjDJwl3vg3rVtdnIWos4ehzIRUO0XxUED8oqxYQtFUIivwAD3VdqK
+ScfFmwCf2PzoVaX6oJ4HaMMrJD81xwjw/h+AIlaX56+C1UTiDFEvgipw8YuR9sOg
+XXOW5Sb+DgXsD4OqJ6tgryRVqltdVId+o8W/xxUo0cvwkmkCAwEAAaOCAVAwggFM
+MA4GA1UdDwEB/wQEAwIFoDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQU
+R/UG3Pd9rjhd6CWxBzX8S/e/mVswHwYDVR0jBBgwFoAUewoH9xjKjA7W2rxQgGws
+RwLRDfswIAYDVR0RBBkwF4IVaWRwLmdha3VuaW4ubmlpLmFjLmpwMGYGA1UdIARf
+MF0wTQYKKoMIjJweAQICATA/MD0GCCsGAQUFBwIBFjFodHRwczovL3JlcG8xLnNl
+Y29tdHJ1c3QubmV0L3NwY3BwL2Nwcy9pbmRleC5odG1sMAwGCiqDCIybG2SHBQEw
+SAYDVR0fBEEwPzA9oDugOYY3aHR0cDovL3JlcG8xLnNlY29tdHJ1c3QubmV0L3Nw
+cGNhL25paS9vZGNhMi9mdWxsY3JsLmNybDARBglghkgBhvhCAQEEBAMCBkAwDQYJ
+KoZIhvcNAQEFBQADggEBAM+eH9qnj/+9hzzL7RTZO2oRc01Eqd4NqifGzaYfEfSk
+wR+xbS7h6VKR/4X7bZe429eiFFK7GwTD7bwdh+zDxU2pS/ZTZeNbJfTCy3hhAfNZ
+a7iEGe0BVviVF8Bz/Z0el49vGS5nliW59KXIUW7io9xEA9B95CURBl8ETgBWFyrY
+l9SsjlYOiPx1KtUf21UlZPjdbF4aJpXb8omLo/3Mk/qnWzx1qcCKUiGlVDRGPBn8
+UVT6kyMwBnKi5CVVK5v+ZgOlCXO7J0aldTBcH/s28hiUas9yReFyoNmLG2ozboeu
+ZkIzMSzb7JBh32BmlOPf+Ntq0wkxlFhnZM4tNF2J/Nk=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.gakunin.nii.ac.jp:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.gakunin.nii.ac.jp:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">National Institute of Informatics</OrganizationName>
+    <OrganizationName xml:lang="ja">国立情報学研究所</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GakuNin IdP</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="ja">学認IdP</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">https://www.gakunin.jp/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Hideaki</GivenName>
+    <SurName>NODA</SurName>
+    <EmailAddress>mailto:gakunin-help@nii.ac.jp</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.georgikon.hu.xml b/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml
index 4e861d97..8e9ee20d 100644
--- a/swamid-interfederations-2.0/idp.georgikon.hu.xml
+++ b/swamid-interfederations-2.0/idp.georgikon.hu-idp-saml2-idp-metadata.php.xml
@@ -15,6 +15,12 @@
         <mdui:IPHint>193.224.81.0/24</mdui:IPHint>
         <mdui:GeolocationHint>geo:46.75190,17.2404</mdui:GeolocationHint>
       </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="hu">Pannon Egyetem Georgikon Kar</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Pannonia Georgikon Faculty</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Georgikon - Pannon Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Georgikon - University of Pannonia</mdui:Description>
+      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idp.gli.cas.cz.xml b/swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml
index 77e918d1..6f61a2dc 100644
--- a/swamid-interfederations-2.0/idp.gli.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.gli.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-04-09T14:17:34Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.hainaut-promsoc.be.xml b/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
index 15300949..15300949 100644
--- a/swamid-interfederations-2.0/idp.hainaut-promsoc.be.xml
+++ b/swamid-interfederations-2.0/idp.hainaut-promsoc.be-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.heanet.ie.xml b/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
index 1c751a7f..45c4492b 100644
--- a/swamid-interfederations-2.0/idp.heanet.ie.xml
+++ b/swamid-interfederations-2.0/idp.heanet.ie-idp-shibboleth.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.heanet.ie/idp/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.heanet.ie/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.edugate.ie/welcome-edugate-federation/membership</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">heanet.ie</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">heanet.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">HEAnet Limited.</mdui:DisplayName>
-        <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.heanet.ie</mdui:InformationURL>
+        <mdui:Logo height="82" width="200">https://edugate.heanet.ie/rr3/logos/heanet.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:53.34964831237833,-6.246660947799683</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIDHzCCAgegAwIBAgIUGqvc4DxR6ZObzP+9tjmx/JHShXIwDQYJKoZIhvcNAQEF
diff --git a/swamid-interfederations-2.0/idp.hebis.de.xml b/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml
index 24ff9a9c..24ff9a9c 100644
--- a/swamid-interfederations-2.0/idp.hebis.de.xml
+++ b/swamid-interfederations-2.0/idp.hebis.de-uni-frankfurt.xml
diff --git a/swamid-interfederations-2.0/idp.hesam.eu.xml b/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml
index 28ab682d..f557f568 100644
--- a/swamid-interfederations-2.0/idp.hesam.eu.xml
+++ b/swamid-interfederations-2.0/idp.hesam.eu-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hesam.eu</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.hig.se.xml b/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
index 39d32d74..39d32d74 100644
--- a/swamid-interfederations-2.0/idp.hig.se.xml
+++ b/swamid-interfederations-2.0/idp.hig.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml b/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml
index 1294554f..1294554f 100644
--- a/swamid-interfederations-2.0/idp.hs-esslingen.de.xml
+++ b/swamid-interfederations-2.0/idp.hs-esslingen.de-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.hslu.ch.xml b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
index c6b9f819..b57a1696 100644
--- a/swamid-interfederations-2.0/idp.hslu.ch.xml
+++ b/swamid-interfederations-2.0/idp.hslu.ch-idp-shibboleth.xml
@@ -4,6 +4,11 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-08-18T09:06:25Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://refeds.org/category/research-and-scholarship</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor errorURL="http://hotline.hslu.ch/" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.ibp.cas.cz.xml b/swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml
index dce62109..e25a14c9 100644
--- a/swamid-interfederations-2.0/idp.ibp.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.ibp.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-07-25T15:25:07Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.icpf.cas.cz.xml b/swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml
index 56897e44..c097c317 100644
--- a/swamid-interfederations-2.0/idp.icpf.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.icpf.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-18T10:21:01Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml b/swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml
index ea2e29e0..ea2e29e0 100644
--- a/swamid-interfederations-2.0/idp.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/idp.ids-mannheim.de-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ifal.edu.br.xml b/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml
index 832b9f63..832b9f63 100644
--- a/swamid-interfederations-2.0/idp.ifal.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ifal.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ifap.edu.br.xml b/swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml
index 6eae8191..6eae8191 100644
--- a/swamid-interfederations-2.0/idp.ifap.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ifap.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ifc.edu.br.xml b/swamid-interfederations-2.0/idp.ifc.edu.br-idp-shibboleth.xml
index ad72b357..ad72b357 100644
--- a/swamid-interfederations-2.0/idp.ifc.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ifc.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ifpb.edu.br.xml b/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
index 5aeaf5e1..5aeaf5e1 100644
--- a/swamid-interfederations-2.0/idp.ifpb.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ifpb.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ifremer.fr.xml b/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml
index bd3bf59b..78ae2bcf 100644
--- a/swamid-interfederations-2.0/idp.ifremer.fr.xml
+++ b/swamid-interfederations-2.0/idp.ifremer.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifremer.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml
new file mode 100644
index 00000000..f8ae3c9a
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ifsudestemg.edu.br-idp-shibboleth.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.ifsudestemg.edu.br/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="pt-br">
+                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
+                              </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:Description>
+        <mdui:Description xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.ifsudestemg.edu.br/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+    MIID3jCCAsYCAQIwDQYJKoZIhvcNAQEFBQAwgbQxFjAUBgNVBAoTDUlGIFN1ZGVz
+dGUgTUcxFzAVBgNVBAsTDlBST0RJL0RHVEkvQ1JJMSUwIwYJKoZIhvcNAQkBFhZj
+cmlAaWZzdWRlc3RlbWcuZWR1LmJyMRUwEwYDVQQHEwxKdWl6IGRlIEZvcmExFTAT
+BgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFmlkcC5p
+ZnN1ZGVzdGVtZy5lZHUuYnIwHhcNMTQwNTI2MTkzNjM4WhcNMTcwNTI1MTkzNjM4
+WjCBtDEWMBQGA1UEChMNSUYgU3VkZXN0ZSBNRzEXMBUGA1UECxMOUFJPREkvREdU
+SS9DUkkxJTAjBgkqhkiG9w0BCQEWFmNyaUBpZnN1ZGVzdGVtZy5lZHUuYnIxFTAT
+BgNVBAcTDEp1aXogZGUgRm9yYTEVMBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYD
+VQQGEwJCUjEfMB0GA1UEAxMWaWRwLmlmc3VkZXN0ZW1nLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEoOjQZlyUQUe1L4itiQULFj/VW1LhW
+nUTS1MuWbER1HiWpuT6UJFMY+0q0d/tQ0RPXQakkvpWPC1yxR7iknXgg9oxjSb9T
+9WjLPbdvQCMPFCVe/aBgwUZ9RdLsETcuHagJ+ebD7QB1NnVhco9/rE398YHT+5X7
+OZkFuqOSKaEw7+79Jt5Vc4w6Tc6fPzrCAaT7G7YuXKRq0I8WV3xJClz0OwHZymz8
+eEBB7F/E0kr61/XRQjf3i4+F6pad8UT6FkmWbEvfFr54OtvqaPKL9tZWPnncrg4r
+Shw2qieG3AqcXO2jIGC3Iyk/TSS6lQQHYv1v5ELst87SQ8tSwuO8Yp8CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAXmh5aRLYZn3vwyFcDKhR2i1SmaDMlJnN73ubJ8Pk
+3gwuyPcj/XdpLSFsCSKNeM2BAljp5D8i93+j9RjR/GvKA4pchq4DdVrw/45gcW57
+bnC1Dux/0kfBgZLy8GUg612ZdWm0F2kttOI/kDWmlWOFERcqmja0LM4cwzs+byj8
+Wum6NyNsy/5XSVhTMA7xUcypbrU/d7S9I2ik9Kope2e4Oihu5GX1YvtapIOzZ2EQ
+0yyvP5Y629IcqIzAMqR5tcYK9dMl2fmFQBhwdGciJKxQaAdyQkKvrXfSkuV/mi0V
+NPp10MrDZ1q+QBfffi16WobvmUBWgpE7UqgwTmJztWx7yA==
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ifsudestemg.edu.br/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ifsudestemg.edu.br/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.br</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+      
+MIID3jCCAsYCAQIwDQYJKoZIhvcNAQEFBQAwgbQxFjAUBgNVBAoTDUlGIFN1ZGVz
+dGUgTUcxFzAVBgNVBAsTDlBST0RJL0RHVEkvQ1JJMSUwIwYJKoZIhvcNAQkBFhZj
+cmlAaWZzdWRlc3RlbWcuZWR1LmJyMRUwEwYDVQQHEwxKdWl6IGRlIEZvcmExFTAT
+BgNVBAgTDE1pbmFzIEdlcmFpczELMAkGA1UEBhMCQlIxHzAdBgNVBAMTFmlkcC5p
+ZnN1ZGVzdGVtZy5lZHUuYnIwHhcNMTQwNTI2MTkzNjM4WhcNMTcwNTI1MTkzNjM4
+WjCBtDEWMBQGA1UEChMNSUYgU3VkZXN0ZSBNRzEXMBUGA1UECxMOUFJPREkvREdU
+SS9DUkkxJTAjBgkqhkiG9w0BCQEWFmNyaUBpZnN1ZGVzdGVtZy5lZHUuYnIxFTAT
+BgNVBAcTDEp1aXogZGUgRm9yYTEVMBMGA1UECBMMTWluYXMgR2VyYWlzMQswCQYD
+VQQGEwJCUjEfMB0GA1UEAxMWaWRwLmlmc3VkZXN0ZW1nLmVkdS5icjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMEoOjQZlyUQUe1L4itiQULFj/VW1LhW
+nUTS1MuWbER1HiWpuT6UJFMY+0q0d/tQ0RPXQakkvpWPC1yxR7iknXgg9oxjSb9T
+9WjLPbdvQCMPFCVe/aBgwUZ9RdLsETcuHagJ+ebD7QB1NnVhco9/rE398YHT+5X7
+OZkFuqOSKaEw7+79Jt5Vc4w6Tc6fPzrCAaT7G7YuXKRq0I8WV3xJClz0OwHZymz8
+eEBB7F/E0kr61/XRQjf3i4+F6pad8UT6FkmWbEvfFr54OtvqaPKL9tZWPnncrg4r
+Shw2qieG3AqcXO2jIGC3Iyk/TSS6lQQHYv1v5ELst87SQ8tSwuO8Yp8CAwEAATAN
+BgkqhkiG9w0BAQUFAAOCAQEAXmh5aRLYZn3vwyFcDKhR2i1SmaDMlJnN73ubJ8Pk
+3gwuyPcj/XdpLSFsCSKNeM2BAljp5D8i93+j9RjR/GvKA4pchq4DdVrw/45gcW57
+bnC1Dux/0kfBgZLy8GUg612ZdWm0F2kttOI/kDWmlWOFERcqmja0LM4cwzs+byj8
+Wum6NyNsy/5XSVhTMA7xUcypbrU/d7S9I2ik9Kope2e4Oihu5GX1YvtapIOzZ2EQ
+0yyvP5Y629IcqIzAMqR5tcYK9dMl2fmFQBhwdGciJKxQaAdyQkKvrXfSkuV/mi0V
+NPp10MrDZ1q+QBfffi16WobvmUBWgpE7UqgwTmJztWx7yA==
+                    
+            </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ifsudestemg.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</OrganizationName>
+    <OrganizationName xml:lang="pt-br">IF Sudeste MG - Instituto Federal de Educacao, Ciencia e Tecnologia do Sudeste de Minas Gerais</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pt-br">IFSudesteMG - Instituto Federal do Sudeste de Minas Gerais</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ifsudestemg.edu.br/</OrganizationURL>
+    <OrganizationURL xml:lang="pt-br">http://www.ifsudestemg.edu.br/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Elder Marcelino</SurName>
+    <EmailAddress>elder.marcelino@ifsudestemg.edu.br</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ifto.edu.br.xml b/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml
index ca21033e..ca21033e 100644
--- a/swamid-interfederations-2.0/idp.ifto.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ifto.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.iit.it.xml b/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
index 41699f92..6aaafff9 100644
--- a/swamid-interfederations-2.0/idp.iit.it.xml
+++ b/swamid-interfederations-2.0/idp.iit.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.iit.it/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.iit.it/idp/shibboleth">
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-07-24T14:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
@@ -7,8 +7,8 @@
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">iit.it</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">IIT - Istituto Italiano di Tecnologia</mdui:DisplayName>
         <mdui:DisplayName xml:lang="it">IIT - Istituto Italiano di Tecnologia</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for staff and students of IIT - Istituto Italiano di Tecnologia</mdui:Description>
@@ -22,7 +22,7 @@
         <mdui:Logo height="60" width="80" xml:lang="en">https://idp.iit.it/public/logo80.png</mdui:Logo>
         <mdui:Logo height="60" width="80" xml:lang="it">https://idp.iit.it/public/logo80.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:DomainHint>iit.it</mdui:DomainHint>
         <mdui:IPHint>90.147.14.0/24</mdui:IPHint>
         <mdui:IPHint>90.147.15.0/24</mdui:IPHint>
@@ -30,26 +30,27 @@
       </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
-                            BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
-                            MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
-                            AQUAA4IBDwAwggEKAoIBAQCXtz7N8Q8s8RgmfsMD0oKFSU3Tka0uiSLLb32v1GGU
-                            BUa/0PJ2JHtGflLSUqat5eY57tgapbmuZ4wcL69dNEysmulLcaXBEJW6N+gZgOEp
-                            jefydM9yur6LyQFGPJEo8xtjhLgje835g69lRejx5I6uR/xB/ZpsFFezZB0bEiLT
-                            o++j3feGk41B/9sHtHF1hsXZB1XxACtoF7PSSCXHVzlWaL3Dqqy/7/LHSYRbRM7V
-                            M7nEbT3rnGIYy7w4127q8EYyO70ehC2x06kNAt7cpEPyT6I86Q9g39KCztAmpAXt
-                            ar3oBkWq3OTR2til0WqsnAI28PlULIcthqVAn53bp/pLAgMBAAGjWzBZMDgGA1Ud
-                            EQQxMC+CCmlkcC5paXQuaXSGIWh0dHBzOi8vaWRwLmlpdC5pdC9pZHAvc2hpYmJv
-                            bGV0aDAdBgNVHQ4EFgQUlm9TS1DW0CQjQP3dOgSB1L9zICkwDQYJKoZIhvcNAQEF
-                            BQADggEBAAhirHsW76gKfQPyNc1tAUQOu+wt9wlb+lkkthT7sRcBfInpB7JAEABY
-                            EEL+vARREM0JGlIVjDolnQcfX08+XVkIgmIzte5/8hDKtN8FalpD5FhvdKfOxh+6
-                            LIzpG+nsuhX+Zg7xlfy1acqfqjT3LutHTDc1+GKnQo/pUoZbTvjzZLtEd1pXibZy
-                            w1LSYU47K4epzK2OpxXyX85KoNdnjfK4qPH2DOt9RAtcryqL1o0C9vAYspib/Efr
-                            pMQa1UDXAYBHZUmb72ol+6UtRnrFLWJJOIa/XXL21p1NQ3A17rssS751OfcFmkLP
-                            roltF87PG3SU/pYmKkSZM7KUtqQHk3U=
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
+MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCXtz7N8Q8s8RgmfsMD0oKFSU3Tka0uiSLLb32v1GGU
+BUa/0PJ2JHtGflLSUqat5eY57tgapbmuZ4wcL69dNEysmulLcaXBEJW6N+gZgOEp
+jefydM9yur6LyQFGPJEo8xtjhLgje835g69lRejx5I6uR/xB/ZpsFFezZB0bEiLT
+o++j3feGk41B/9sHtHF1hsXZB1XxACtoF7PSSCXHVzlWaL3Dqqy/7/LHSYRbRM7V
+M7nEbT3rnGIYy7w4127q8EYyO70ehC2x06kNAt7cpEPyT6I86Q9g39KCztAmpAXt
+ar3oBkWq3OTR2til0WqsnAI28PlULIcthqVAn53bp/pLAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5paXQuaXSGIWh0dHBzOi8vaWRwLmlpdC5pdC9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUlm9TS1DW0CQjQP3dOgSB1L9zICkwDQYJKoZIhvcNAQEF
+BQADggEBAAhirHsW76gKfQPyNc1tAUQOu+wt9wlb+lkkthT7sRcBfInpB7JAEABY
+EEL+vARREM0JGlIVjDolnQcfX08+XVkIgmIzte5/8hDKtN8FalpD5FhvdKfOxh+6
+LIzpG+nsuhX+Zg7xlfy1acqfqjT3LutHTDc1+GKnQo/pUoZbTvjzZLtEd1pXibZy
+w1LSYU47K4epzK2OpxXyX85KoNdnjfK4qPH2DOt9RAtcryqL1o0C9vAYspib/Efr
+pMQa1UDXAYBHZUmb72ol+6UtRnrFLWJJOIa/XXL21p1NQ3A17rssS751OfcFmkLP
+roltF87PG3SU/pYmKkSZM7KUtqQHk3U=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -67,29 +68,30 @@
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iit.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">iit.it</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
-                            BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
-                            MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
-                            AQUAA4IBDwAwggEKAoIBAQCXtz7N8Q8s8RgmfsMD0oKFSU3Tka0uiSLLb32v1GGU
-                            BUa/0PJ2JHtGflLSUqat5eY57tgapbmuZ4wcL69dNEysmulLcaXBEJW6N+gZgOEp
-                            jefydM9yur6LyQFGPJEo8xtjhLgje835g69lRejx5I6uR/xB/ZpsFFezZB0bEiLT
-                            o++j3feGk41B/9sHtHF1hsXZB1XxACtoF7PSSCXHVzlWaL3Dqqy/7/LHSYRbRM7V
-                            M7nEbT3rnGIYy7w4127q8EYyO70ehC2x06kNAt7cpEPyT6I86Q9g39KCztAmpAXt
-                            ar3oBkWq3OTR2til0WqsnAI28PlULIcthqVAn53bp/pLAgMBAAGjWzBZMDgGA1Ud
-                            EQQxMC+CCmlkcC5paXQuaXSGIWh0dHBzOi8vaWRwLmlpdC5pdC9pZHAvc2hpYmJv
-                            bGV0aDAdBgNVHQ4EFgQUlm9TS1DW0CQjQP3dOgSB1L9zICkwDQYJKoZIhvcNAQEF
-                            BQADggEBAAhirHsW76gKfQPyNc1tAUQOu+wt9wlb+lkkthT7sRcBfInpB7JAEABY
-                            EEL+vARREM0JGlIVjDolnQcfX08+XVkIgmIzte5/8hDKtN8FalpD5FhvdKfOxh+6
-                            LIzpG+nsuhX+Zg7xlfy1acqfqjT3LutHTDc1+GKnQo/pUoZbTvjzZLtEd1pXibZy
-                            w1LSYU47K4epzK2OpxXyX85KoNdnjfK4qPH2DOt9RAtcryqL1o0C9vAYspib/Efr
-                            pMQa1UDXAYBHZUmb72ol+6UtRnrFLWJJOIa/XXL21p1NQ3A17rssS751OfcFmkLP
-                            roltF87PG3SU/pYmKkSZM7KUtqQHk3U=
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUHIWbRP4lLaQqLeAOPCDTBpfKvFAwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLmlpdC5pdDAeFw0xMzA1MzExNjAxMTRaFw0zMzA1
+MzExNjAxMTRaMBUxEzARBgNVBAMTCmlkcC5paXQuaXQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCXtz7N8Q8s8RgmfsMD0oKFSU3Tka0uiSLLb32v1GGU
+BUa/0PJ2JHtGflLSUqat5eY57tgapbmuZ4wcL69dNEysmulLcaXBEJW6N+gZgOEp
+jefydM9yur6LyQFGPJEo8xtjhLgje835g69lRejx5I6uR/xB/ZpsFFezZB0bEiLT
+o++j3feGk41B/9sHtHF1hsXZB1XxACtoF7PSSCXHVzlWaL3Dqqy/7/LHSYRbRM7V
+M7nEbT3rnGIYy7w4127q8EYyO70ehC2x06kNAt7cpEPyT6I86Q9g39KCztAmpAXt
+ar3oBkWq3OTR2til0WqsnAI28PlULIcthqVAn53bp/pLAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5paXQuaXSGIWh0dHBzOi8vaWRwLmlpdC5pdC9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUlm9TS1DW0CQjQP3dOgSB1L9zICkwDQYJKoZIhvcNAQEF
+BQADggEBAAhirHsW76gKfQPyNc1tAUQOu+wt9wlb+lkkthT7sRcBfInpB7JAEABY
+EEL+vARREM0JGlIVjDolnQcfX08+XVkIgmIzte5/8hDKtN8FalpD5FhvdKfOxh+6
+LIzpG+nsuhX+Zg7xlfy1acqfqjT3LutHTDc1+GKnQo/pUoZbTvjzZLtEd1pXibZy
+w1LSYU47K4epzK2OpxXyX85KoNdnjfK4qPH2DOt9RAtcryqL1o0C9vAYspib/Efr
+pMQa1UDXAYBHZUmb72ol+6UtRnrFLWJJOIa/XXL21p1NQ3A17rssS751OfcFmkLP
+roltF87PG3SU/pYmKkSZM7KUtqQHk3U=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
diff --git a/swamid-interfederations-2.0/idp.img.cas.cz.xml b/swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml
index 4b8688fe..ac4c5dea 100644
--- a/swamid-interfederations-2.0/idp.img.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.img.cas.cz-idp-shibboleth.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.img.cas.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-09T12:29:04Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.inalco.fr.xml b/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
index e134976a..2736f4c9 100644
--- a/swamid-interfederations-2.0/idp.inalco.fr.xml
+++ b/swamid-interfederations-2.0/idp.inalco.fr-idp.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inalco.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.inha.fr.xml b/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml
index ec7814d4..796e2f20 100644
--- a/swamid-interfederations-2.0/idp.inha.fr.xml
+++ b/swamid-interfederations-2.0/idp.inha.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inha.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.inp-toulouse.fr.xml b/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml
index ae215542..d1cf5de7 100644
--- a/swamid-interfederations-2.0/idp.inp-toulouse.fr.xml
+++ b/swamid-interfederations-2.0/idp.inp-toulouse.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inp-toulouse.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.inpa.gov.br.xml b/swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml
index 392875d6..392875d6 100644
--- a/swamid-interfederations-2.0/idp.inpa.gov.br.xml
+++ b/swamid-interfederations-2.0/idp.inpa.gov.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.inra.fr.xml b/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml
index 37de6a04..8c34feed 100644
--- a/swamid-interfederations-2.0/idp.inra.fr.xml
+++ b/swamid-interfederations-2.0/idp.inra.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inra.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -43,37 +43,6 @@ UCoh/SWrQNc=
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIENjCCAx6gAwIBAgILAQAAAAABH6fjLKgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
-MDIyNDA5NTUwMVoXDTEyMDIyNDA5NTUwMVowajELMAkGA1UEBhMCRlIxEzARBgNV
-BAgTClNvbWUtU3RhdGUxMDAuBgNVBAoTJ0lOU1RJVFVUIE5BVElPTkFMIFJFQ0hF
-UkNIRSBBR1JPTk9NSVFVRTEUMBIGA1UEAxMLaWRwLmlucmEuZnIwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBALXjKuuUE+BJbk8hGVkWa3UN2CooR3EL1Gzohu7t
-p/x/Cg9fDRp7C1eQx9skU36gXMyNYLt0zFxj/gQtK5uaA/jyrk5Pv5Erl6IgV+/j
-SB7MoVxxpEAAw5bA7Jn4l7w2TYOSgU23b81l0t0yKRZfMxp6yDBV2sZ0dUQlbOjj
-/PBLAgMBAAGjggFqMIIBZjBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEF
-BQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5j
-Zm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2
-d1DhMB0GA1UdDgQWBBSyiTuwksrohbZxTo8OZl/qohvb6TA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBP
-BggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFs
-c2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwFgYDVR0RBA8wDYILaWRwLmlucmEuZnIwDQYJKoZIhvcN
-AQEFBQADggEBAFE92Y/ZvaSGDFHmw4HhEpFKKBNBurDTCEgMaP8xvQ+QAjJlt3lV
-Yv9HgV44JGPxwxctrFmPdPgxELpwFkMBwWV/aTGoRJGkUiCVyCdUjj6OK+tK51Ib
-jvYtre2xJ2tWunZPjY9rntoLRmd6OYVj9zpaKAbZpdPvipiUuBSyVvgb4Wx9iODK
-eZBf3iqJFVrjpryJTRV17PSD+uPBozqjRO9yVTCSbD7dEzMiLGqbigcodaWoVbbk
-A4iIV8dJ8MhnsUcfCVY9vN5SQT1LMXgOzD0b4kDzyxSWTeOhzyJwL6XjmAe83Swm
-QUbOdbLdaZttqaZqzJT1bIG8RqlRXrUhD+c=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.inra.fr/idp/profile/SAML2/POST/SSO"/>
@@ -115,37 +84,6 @@ UCoh/SWrQNc=
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIENjCCAx6gAwIBAgILAQAAAAABH6fjLKgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
-A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
-bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA5
-MDIyNDA5NTUwMVoXDTEyMDIyNDA5NTUwMVowajELMAkGA1UEBhMCRlIxEzARBgNV
-BAgTClNvbWUtU3RhdGUxMDAuBgNVBAoTJ0lOU1RJVFVUIE5BVElPTkFMIFJFQ0hF
-UkNIRSBBR1JPTk9NSVFVRTEUMBIGA1UEAxMLaWRwLmlucmEuZnIwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBALXjKuuUE+BJbk8hGVkWa3UN2CooR3EL1Gzohu7t
-p/x/Cg9fDRp7C1eQx9skU36gXMyNYLt0zFxj/gQtK5uaA/jyrk5Pv5Erl6IgV+/j
-SB7MoVxxpEAAw5bA7Jn4l7w2TYOSgU23b81l0t0yKRZfMxp6yDBV2sZ0dUQlbOjj
-/PBLAgMBAAGjggFqMIIBZjBQBgNVHSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEF
-BQcCARYsaHR0cDovL3d3dy5nbG9iYWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5j
-Zm0wDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2
-d1DhMB0GA1UdDgQWBBSyiTuwksrohbZxTo8OZl/qohvb6TA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBP
-BggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFs
-c2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEF
-BQcDAQYIKwYBBQUHAwIwFgYDVR0RBA8wDYILaWRwLmlucmEuZnIwDQYJKoZIhvcN
-AQEFBQADggEBAFE92Y/ZvaSGDFHmw4HhEpFKKBNBurDTCEgMaP8xvQ+QAjJlt3lV
-Yv9HgV44JGPxwxctrFmPdPgxELpwFkMBwWV/aTGoRJGkUiCVyCdUjj6OK+tK51Ib
-jvYtre2xJ2tWunZPjY9rntoLRmd6OYVj9zpaKAbZpdPvipiUuBSyVvgb4Wx9iODK
-eZBf3iqJFVrjpryJTRV17PSD+uPBozqjRO9yVTCSbD7dEzMiLGqbigcodaWoVbbk
-A4iIV8dJ8MhnsUcfCVY9vN5SQT1LMXgOzD0b4kDzyxSWTeOhzyJwL6XjmAe83Swm
-QUbOdbLdaZttqaZqzJT1bIG8RqlRXrUhD+c=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.inra.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.insa-rennes.fr.xml b/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml
index a1e0ebb3..ad42899b 100644
--- a/swamid-interfederations-2.0/idp.insa-rennes.fr.xml
+++ b/swamid-interfederations-2.0/idp.insa-rennes.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rennes.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.inserm.fr.xml b/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml
index 0fc93eec..617a8c8c 100644
--- a/swamid-interfederations-2.0/idp.inserm.fr.xml
+++ b/swamid-interfederations-2.0/idp.inserm.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inserm.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.ipa.ie.xml b/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml
index c1bb8b31..65958354 100644
--- a/swamid-interfederations-2.0/idp.ipa.ie.xml
+++ b/swamid-interfederations-2.0/idp.ipa.ie-idp-shibboleth.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipa.ie/idp/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ipa.ie/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2011-11-28T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-11-28T00:00:00Z"/>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">ipa.ie</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipa.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Institute of Public Administration</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">An Foras Riarachaín</mdui:DisplayName>
-        <mdui:Logo height="120" width="130">https://edugate.heanet.ie/rr3/logos/ipa.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.ipa.ie</mdui:InformationURL>
+        <mdui:Logo height="120" width="130">https://edugate.heanet.ie/rr3/logos/ipa.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:53.3337363,-6.2300127</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIDFDCCAfygAwIBAgIVAI3sMWxFvjpe4FwTUUSZvm2vGfvVMA0GCSqGSIb3DQEB
diff --git a/swamid-interfederations-2.0/idp.ipb.fr.xml b/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml
index dbbd2137..15f53c2a 100644
--- a/swamid-interfederations-2.0/idp.ipb.fr.xml
+++ b/swamid-interfederations-2.0/idp.ipb.fr-idp-shibboleth.xml
@@ -5,11 +5,11 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipb.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">IPB - Institut Polytechnique de Bordeaux</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fr">IPB - Bordeaux INP</mdui:DisplayName>
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor use="signing">
@@ -44,38 +44,6 @@ ZKgUrRmjDmCf5UuCYHwMtOgFzULqTmmHdveUn/tYTyooHhj9tGz0NOXuzji6RUPt
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEdTCCA12gAwIBAgIRAIpn08DQCZ8Z5FRb3BW4G/wwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTA4MjYwMDAwMDBaFw0xNDA4MjUyMzU5NTlaMFUxCzAJBgNV
-BAYTAkZSMTEwLwYDVQQKEyhJbnN0aXR1dCBQb2x5dGVjaG5pcXVlIGRlIEJvcmRl
-YXV4IC0gSVBCMRMwEQYDVQQDEwppZHAuaXBiLmZyMIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAzb2JDHzjEb9mrAwEGOED/4hcuL8svDhTo1sEU89YXBe8
-Ln2gX5dr1JupouNVKRTahuUnuMLKDWCkyS5vvbtNNFRB1oj+w0tdVRJ4dcHz/fnY
-zpnCws3qLaUkqDF/0Ntqh32oIIuU7yAA/in/ufjR8Uh8Xw4AlsRnfP5LPF+xeFvE
-r/KjQtw9wVumiBM7Cf3vyVOaAHG1KL+CRNDpLztWvuFGc1mSlwZJwnNucGO6jhnU
-o+Ydcw+Ps6ol9dmVE5X4tklQKnR/Pexh6HHOZ3IJAQc93yKREp1TNnFb99K5oq1c
-dnuWkBr9XdOZs+oIVCIO1VWQ3Xfvm+khsv24UPUwXQIDAQABo4IBXTCCAVkwHwYD
-VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB1W8R7J3vdP
-g7Z4EjYd4xAaTdMOMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
-AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
-VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
-cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
-MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMBUGA1UdEQQOMAyCCmlkcC5p
-cGIuZnIwDQYJKoZIhvcNAQEFBQADggEBAEJdT/dKTB9JDuFN65aiC3oY2duBBTAO
-9UiIct0spKuI4TKyj6twPNGhOkNY1bYcPU2PkwJP/Xntrm/QxPCKvc69jy4rfN8R
-QH1wZsVLawG5egH9sLGxTsKfcgXWNb+xvgiOoyHwFyIHB1LT/mxzC/Dvld5JgqUX
-Pvilz2LTSQ4vRtyhqMtuhqKC5BsipmhGLNOhp3edFEWlO98wORyecDoSMhenqsiG
-3dyX4+CCw3h3etpdODyHOSbCNbgt+IP0ZspVgL3L52tBaEl7HjRnvoCUVTF/mrEJ
-bfJgi/LG3ysMC75I61wcN23IPLsxjUi9CLt79VKLVtmIP1WjKVcajM8=
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ipb.fr/idp/profile/SAML2/POST/SSO"/>
@@ -83,8 +51,8 @@ bfJgi/LG3ysMC75I61wcN23IPLsxjUi9CLt79VKLVtmIP1WjKVcajM8=
     <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ipb.fr/idp/profile/Shibboleth/SSO"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="en">IPB - Institut Polytechnique de Bordeaux</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IPB - Institut Polytechnique de Bordeaux</OrganizationDisplayName>
+    <OrganizationName xml:lang="en">IPB - Bordeaux INP</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IPB - Bordeaux INP</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
diff --git a/swamid-interfederations-2.0/idp.ipm.cas.cz.xml b/swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml
index 1a3f0084..fcebe74a 100644
--- a/swamid-interfederations-2.0/idp.ipm.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.ipm.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-05-02T15:43:18Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.irstea.fr.xml b/swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml
index 486e0bdc..2e2184d4 100644
--- a/swamid-interfederations-2.0/idp.irstea.fr.xml
+++ b/swamid-interfederations-2.0/idp.irstea.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irstea.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..38b3e537
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.isibrno.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.isibrno.cas.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-03T16:09:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">isibrno.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider ISI ASCR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚPT AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.isibrno.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.isibrno.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="54">https://jiftach.cas.cz/loga/logo-upt-44.png</mdui:Logo>
+        <mdui:Logo height="90" width="110">https://jiftach.cas.cz/loga/logo-upt-90.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDNDCCAhygAwIBAgIVAN6/dlQMJzTi2IACxc9aB2vEh51LMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5jejAeFw0xNDA2MTcxMTI0
+MjdaFw0zNDA2MTcxMTI0MjdaMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5j
+ejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRKrMNqsBK9lmn6mspW
+Ckqe4oN79quQnbIO8oALicbusGp8fNDB+TKoqWvSYnGm7PpMRAzEXEHUDuRGmu/i
+sO932HYgT03IAJ2Hod0QX6FmASRSFzFzA1XOBmvH7owojKb7RsmMgy41ZWpJr1TZ
+yUzYue5oY046L5LNrRA/gwFMFy03Xx5Dg1KR6Q6+iXK59hbJ68myITGRd4hLjEQ2
+EEztzKlgJbjIwuYR/nTLxzMm7eFmGovsuEw5P2m9+/33V1qegfkQ2hKSWjYTmYhO
+v6ebjThZirBV0+vj4tvz3EBPsBCmukeoJ1D8RG4MOnCCXC6Ez8pOg8G43W7hfMJP
+V2UCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmlzaWJybm8uY2FzLmN6hilodHRw
+czovL2lkcC5pc2licm5vLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+iklO2sw6SHSChxpzcIXV4qssHbQwDQYJKoZIhvcNAQEFBQADggEBALAS8YLsozYH
+OtqA0t3RtJGaBr5M5NOjxvNgofWyTY87UekbzSLoCeGopxPbF1SX4rt3Ys/FX296
+cQaWR7XpGj3Amyw5nLqKxh8jqWBHgzqujSZ+bHPgwvrPZl7FwOzCgr8utIQMGfxO
+vZBbs86W8wZILHNwmlMnZeWEvfrWOL4cJZPNwLp8PnacVszM5aXtr7xtP0lbjBEX
+XWVV2/B9cP9lAuouGum+k7CjvXJEL/Rtzl9lKJgumhwSuaNZkR1LqaNsWAxlWasg
+0LYAs3q2iyLbcWXFezedoHcpzyQzOA42LhjKoy1+OtSOv7BwwdvyxGBozM1WK8nf
+AsEuKAX9NA8=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.isibrno.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.isibrno.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">isibrno.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDNDCCAhygAwIBAgIVAN6/dlQMJzTi2IACxc9aB2vEh51LMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5jejAeFw0xNDA2MTcxMTI0
+MjdaFw0zNDA2MTcxMTI0MjdaMB0xGzAZBgNVBAMTEmlkcC5pc2licm5vLmNhcy5j
+ejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMRKrMNqsBK9lmn6mspW
+Ckqe4oN79quQnbIO8oALicbusGp8fNDB+TKoqWvSYnGm7PpMRAzEXEHUDuRGmu/i
+sO932HYgT03IAJ2Hod0QX6FmASRSFzFzA1XOBmvH7owojKb7RsmMgy41ZWpJr1TZ
+yUzYue5oY046L5LNrRA/gwFMFy03Xx5Dg1KR6Q6+iXK59hbJ68myITGRd4hLjEQ2
+EEztzKlgJbjIwuYR/nTLxzMm7eFmGovsuEw5P2m9+/33V1qegfkQ2hKSWjYTmYhO
+v6ebjThZirBV0+vj4tvz3EBPsBCmukeoJ1D8RG4MOnCCXC6Ez8pOg8G43W7hfMJP
+V2UCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLmlzaWJybm8uY2FzLmN6hilodHRw
+czovL2lkcC5pc2licm5vLmNhcy5jei9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+iklO2sw6SHSChxpzcIXV4qssHbQwDQYJKoZIhvcNAQEFBQADggEBALAS8YLsozYH
+OtqA0t3RtJGaBr5M5NOjxvNgofWyTY87UekbzSLoCeGopxPbF1SX4rt3Ys/FX296
+cQaWR7XpGj3Amyw5nLqKxh8jqWBHgzqujSZ+bHPgwvrPZl7FwOzCgr8utIQMGfxO
+vZBbs86W8wZILHNwmlMnZeWEvfrWOL4cJZPNwLp8PnacVszM5aXtr7xtP0lbjBEX
+XWVV2/B9cP9lAuouGum+k7CjvXJEL/Rtzl9lKJgumhwSuaNZkR1LqaNsWAxlWasg
+0LYAs3q2iyLbcWXFezedoHcpzyQzOA42LhjKoy1+OtSOv7BwwdvyxGBozM1WK8nf
+AsEuKAX9NA8=
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.isibrno.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Institute of Scientific Instruments of the ASCR</OrganizationName>
+    <OrganizationName xml:lang="cs">Ústav přístrojové techniky AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Scientific Instruments of the ASCR, v. v. i.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Ústav přístrojové techniky AV ČR, v. v. i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.isibrno.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.isibrno.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Vaníček</SurName>
+    <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml
new file mode 100644
index 00000000..59cc55c6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.it-tallaght.ie-idp-shibboleth.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.it-tallaght.ie/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-08T00:00:00Z"/>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">it-tallaght.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Technology Tallaght</mdui:DisplayName>
+        <mdui:InformationURL xml:lang="en">http://www.it-tallaght.ie/contactus</mdui:InformationURL>
+        <mdui:Logo height="100" width="152">https://edugate.heanet.ie/rr3/logos/itta.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:GeolocationHint>geo:53.2903000,-6.3631789</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMzCCAhugAwIBAgIUYPVjSYp7op9s7Ie2DtEL+5ZzoCIwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLml0LXRhbGxhZ2h0LmllMB4XDTExMDcyODEyMTQz
+OVoXDTMxMDcyODEyMTQzOVowHTEbMBkGA1UEAxMSaWRwLml0LXRhbGxhZ2h0Lmll
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmSmY3owkK4unuAmRmEZT
+EaRtCmksLa2Okjl9ulhhboHYNubqTfLt/12Jxd95Md9lUi7+KdyakU60kwgImj2w
+CBtFQAhP2MNXdvFB+wSbETyFfYacKdeyPRF6BONAnkn1QUZxmQQOGO0xjxjPccJm
+SPVknQW5xE6B7ZGuvQfnM3HxAE5tXCd5L2ZDBS6MkEX+KZnDmyhltlzJpvpeb23/
+j0sYHNPeBgIhByp7bTK6blVJO0UNMK+Ts9Fi118r7fJlP6VEGPFKPtyRnrACBamx
+NfRF2ncBOBfxla8mIx9XwNJkvaX2UMCrUrcN1WBoUTfKeQae55lTisaps7auln/5
+mwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAuaXQtdGFsbGFnaHQuaWWGKWh0dHBz
+Oi8vaWRwLml0LXRhbGxhZ2h0LmllL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTo
+un8552N5PrTaJaM2AOMIuyJykTANBgkqhkiG9w0BAQUFAAOCAQEARXS+XY144D9N
+K1uz60zUXXF4Ij90+ljigGxOjcce0EMRI+Zqhfiq0mYGRr3z/yyir9/WDv8/U1bo
+ivvfNqimHVEl821GC1Jnjw3sLwCCvwBaq91Y2Pqfu13nv9dpGOVIxsCeNGGFM4mv
+MORRBvK+bkMmhm5rNZb1zEDkCkSKGgdQLzd4sQO7M/f46XJmqffhNjQ6FysjZYyO
+fvQkMgjKXKvMuOcowJFd2qlyR5s9mkU/vlsuG/8X03M/XC7fQ9g/Z5AZiBmT5UR7
+Tz1+RVaB+0GP8hZXw6p8CGDihXoX8rV0N4aSrnG/7oJOBsdL+liIEINf0MKqSHGH
+Bf7NsJw2jQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.it-tallaght.ie/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.it-tallaght.ie/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Institute of Technology Tallaght</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Institute of Technology Tallaght</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.it-tallaght.ie/contactus</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>McCarrick</md:SurName>
+    <md:EmailAddress>Martin.McCarrick@it-tallaght.ie</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Martin</md:GivenName>
+    <md:SurName>McCarrick</md:SurName>
+    <md:EmailAddress>Martin.McCarrick@it-tallaght.ie</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.it.gu.se.xml b/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
index 55d4a223..55d4a223 100644
--- a/swamid-interfederations-2.0/idp.it.gu.se.xml
+++ b/swamid-interfederations-2.0/idp.it.gu.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.it.su.se.xml b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
index d567ea44..d567ea44 100644
--- a/swamid-interfederations-2.0/idp.it.su.se.xml
+++ b/swamid-interfederations-2.0/idp.it.su.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..a509d98b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.itam.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.itam.cas.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-24T16:47:06Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">itam.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider ITAM AS CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance ÚTAM AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.itam.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.itam.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="42">https://jiftach.cas.cz/loga/logo-itam-44.png</mdui:Logo>
+        <mdui:Logo height="1095" width="1044">https://jiftach.cas.cz/loga/logo-itam-1095.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUEsBKg0xdOetjiFaXL+mfQFs6ERcwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MB4XDTE0MTAyMjA3MDMxOFoX
+DTM0MTAyMjA3MDMxOFowGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxAvwUCh/S8mxj1tvJq+Q+wssQ91g
+V83jKtGHeZnM+ADZ2iFNglHPE+BBBYb1bj9pqsP2BRwWIPWHeJ8bz1sLVeC90t23
+xLOudYs1ACIskNK7gvcKF1QBGGopHlUXmAgxibLTT+4+ZcBbzOdCMakBlxQd4wr5
+gSB35AD8SR7Qe5t3PoE5SQ3PK224l6DALOW9YdZ5bI0VfUJAqQjiDp9/hfmBXaod
+Kzx2N+G12Jyay7VTnq7HCqUCwkWmMk2ZPmRUFwJ5abxOQtO3ClfDRoGHgVQSlR9O
+Lwe0Ee3wFxvcCvGlTFdJ6WHgV5mhIB4PHxGyHADIW1BGG3Vd8WgX3w/2oQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuaXRhbS5jYXMuY3qGJmh0dHBzOi8vaWRwLml0
+YW0uY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ34hoPcWC9wTBNpEun
+P6HH6dsWFDANBgkqhkiG9w0BAQUFAAOCAQEAJ0emvpLRJ3uJgfwgdXNI56Gi7zw/
+VtqXMmeuioY4Hqn3il10yOxvyM9FJCbgsGmCSpyUiIQzvMbZhJXjG/XSM17G3OdB
+t0gXjqSZ8XUzQ76xxGi4pBVlqTr50XpC6tlbOxZ8GflFX5DCGNTOSW/QKZUjnqB/
+ttna9+UdDjmShQa2JBMmJ+mRM6m8RFEy2WQZplChLZkoZqLIWD48YY3GjGtOQ6FP
+2qO9lehSxJNgnAqM7raKBHwJIsZqYuTMaDU1Xm7JVg0eD9ht2Lvzmax69VjL1soY
+G0bWc5sh8gUEJyktAyE0P2pKMYNPDEfIv8LruQtOG9uU2F62xtvp+hJoyg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itam.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.itam.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.itam.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.itam.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">itam.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJzCCAg+gAwIBAgIUEsBKg0xdOetjiFaXL+mfQFs6ERcwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MB4XDTE0MTAyMjA3MDMxOFoX
+DTM0MTAyMjA3MDMxOFowGjEYMBYGA1UEAxMPaWRwLml0YW0uY2FzLmN6MIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxAvwUCh/S8mxj1tvJq+Q+wssQ91g
+V83jKtGHeZnM+ADZ2iFNglHPE+BBBYb1bj9pqsP2BRwWIPWHeJ8bz1sLVeC90t23
+xLOudYs1ACIskNK7gvcKF1QBGGopHlUXmAgxibLTT+4+ZcBbzOdCMakBlxQd4wr5
+gSB35AD8SR7Qe5t3PoE5SQ3PK224l6DALOW9YdZ5bI0VfUJAqQjiDp9/hfmBXaod
+Kzx2N+G12Jyay7VTnq7HCqUCwkWmMk2ZPmRUFwJ5abxOQtO3ClfDRoGHgVQSlR9O
+Lwe0Ee3wFxvcCvGlTFdJ6WHgV5mhIB4PHxGyHADIW1BGG3Vd8WgX3w/2oQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAuaXRhbS5jYXMuY3qGJmh0dHBzOi8vaWRwLml0
+YW0uY2FzLmN6L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ34hoPcWC9wTBNpEun
+P6HH6dsWFDANBgkqhkiG9w0BAQUFAAOCAQEAJ0emvpLRJ3uJgfwgdXNI56Gi7zw/
+VtqXMmeuioY4Hqn3il10yOxvyM9FJCbgsGmCSpyUiIQzvMbZhJXjG/XSM17G3OdB
+t0gXjqSZ8XUzQ76xxGi4pBVlqTr50XpC6tlbOxZ8GflFX5DCGNTOSW/QKZUjnqB/
+ttna9+UdDjmShQa2JBMmJ+mRM6m8RFEy2WQZplChLZkoZqLIWD48YY3GjGtOQ6FP
+2qO9lehSxJNgnAqM7raKBHwJIsZqYuTMaDU1Xm7JVg0eD9ht2Lvzmax69VjL1soY
+G0bWc5sh8gUEJyktAyE0P2pKMYNPDEfIv8LruQtOG9uU2F62xtvp+hJoyg==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.itam.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR</OrganizationName>
+    <OrganizationName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Theoretical and Applied Mechanics AS CR, v.v.i.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Ústav teoretické a aplikované mechaniky AV ČR, v.v.i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.itam.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.itam.cas.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Vaníček</SurName>
+    <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml b/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
index 3661d33f..255aae0d 100644
--- a/swamid-interfederations-2.0/idp.its.fz-juelich.de.xml
+++ b/swamid-interfederations-2.0/idp.its.fz-juelich.de-idp-shibboleth.xml
@@ -58,6 +58,47 @@ W70+0kLcZsWMkom+vyzZuZjO/6mIzKUUKJeySUawrqBfZK4L
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=webmaster@fz-juelich.de,CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF5TCCBM2gAwIBAgIHGFschQrLkzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UE
+BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
+MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
+KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MTAxMzA5NDQyMVoXDTE5
+MDcwOTIzNTkwMFowga4xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
+V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
+emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
+aC5kZTEmMCQGCSqGSIb3DQEJARYXd2VibWFzdGVyQGZ6LWp1ZWxpY2guZGUwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5t9fIu0COttZeG5Xo6y/zqMfv
+vIwH5FNJaX0kelKKx49rxcxUxbt2gOEcrAemc+KMsTI4xmOSEzJIkInQUoXXkAkR
+qI7KaUZ/ZzZFLiIdVT7DdTx1cQkzj6Q/yDZA9vv/yHTocq66ujPJZngtemu7PWWo
+nqxd11bkMuCbFOsWUhZ8tTCwiDAOdpXCZH+mqLZCSNu2cr55zO+bHdHlQegOrPeF
+8/GDyMtPVk9ByPcW9msCAhiKsGGYU85Q650/IO6IIDZddCwr1zHNu+QeO/4U52Kg
+A2PWoxBsr2VTqfJPDQBupxm1nuxjL89UnRYqmI4WxcTCtP7abFlsGSEjMrkJAgMB
+AAGjggIvMIICKzBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEE
+AYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUNlyp1PKKm1tbM/BJ6zblU9W9IocwHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
+5ZQmVg8RAiUwIAYDVR0RBBkwF4IVaWRwLml0cy5mei1qdWVsaWNoLmRlMHsGA1Ud
+HwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpq
+LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsGAQUFBwEBBIG+MIG7MDMGCCsG
+AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
+QQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
+YWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
+AQsFAAOCAQEAjQatrjj9D0sreu0Dj3GsN3NLBiBxwTxyRAApzAiZuGu1960JhtvL
+DsnGukFCe++xd6qco82ZIrwCWrbjK2SQoAexiQqH4TXWqQaPcIr8zDwj0WKv63mN
+LhzmBIePWsND5pIb6qS3a4RvRK9u9BViQllWSQYUlkBNoA8HtulmqNkgVCgt7De9
+ZhDGRZAiGhA+N67ts/h9zW6fT6SqHgCgcTSG6mVSMX2ZR9XTocoAXCfwEV7VkGl7
+L9aUnCact8MBZGMgWHR8NVFyhEofMTBIiXwGawBgzB+bU/xOcBp/3ulxy2K3mfEK
+WsS4+1PQhtDqnQMdqkPWm1zlseEGiXqFtw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
@@ -111,6 +152,47 @@ W70+0kLcZsWMkom+vyzZuZjO/6mIzKUUKJeySUawrqBfZK4L
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.its.fz-juelich.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=webmaster@fz-juelich.de,CN=idp.its.fz-juelich.de,O=Forschungszentrum Juelich GmbH,L=Juelich,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIF5TCCBM2gAwIBAgIHGFschQrLkzANBgkqhkiG9w0BAQsFADCBgzELMAkGA1UE
+BhMCREUxJzAlBgNVBAoTHkZvcnNjaHVuZ3N6ZW50cnVtIEp1ZWxpY2ggR21iSDEq
+MCgGA1UEAxMhRlpKIENlcnRpZmljYXRpb24gQXV0aG9yaXR5IC0gRzAyMR8wHQYJ
+KoZIhvcNAQkBFhBjYUBmei1qdWVsaWNoLmRlMB4XDTE0MTAxMzA5NDQyMVoXDTE5
+MDcwOTIzNTkwMFowga4xCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNOb3JkcmhlaW4t
+V2VzdGZhbGVuMRAwDgYDVQQHEwdKdWVsaWNoMScwJQYDVQQKEx5Gb3JzY2h1bmdz
+emVudHJ1bSBKdWVsaWNoIEdtYkgxHjAcBgNVBAMTFWlkcC5pdHMuZnotanVlbGlj
+aC5kZTEmMCQGCSqGSIb3DQEJARYXd2VibWFzdGVyQGZ6LWp1ZWxpY2guZGUwggEi
+MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC5t9fIu0COttZeG5Xo6y/zqMfv
+vIwH5FNJaX0kelKKx49rxcxUxbt2gOEcrAemc+KMsTI4xmOSEzJIkInQUoXXkAkR
+qI7KaUZ/ZzZFLiIdVT7DdTx1cQkzj6Q/yDZA9vv/yHTocq66ujPJZngtemu7PWWo
+nqxd11bkMuCbFOsWUhZ8tTCwiDAOdpXCZH+mqLZCSNu2cr55zO+bHdHlQegOrPeF
+8/GDyMtPVk9ByPcW9msCAhiKsGGYU85Q650/IO6IIDZddCwr1zHNu+QeO/4U52Kg
+A2PWoxBsr2VTqfJPDQBupxm1nuxjL89UnRYqmI4WxcTCtP7abFlsGSEjMrkJAgMB
+AAGjggIvMIICKzBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8rBgEE
+AYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJBgNV
+HRMEAjAAMAsGA1UdDwQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4E
+FgQUNlyp1PKKm1tbM/BJ6zblU9W9IocwHwYDVR0jBBgwFoAUIL1xiaXJKjMvEeAf
+5ZQmVg8RAiUwIAYDVR0RBBkwF4IVaWRwLml0cy5mei1qdWVsaWNoLmRlMHsGA1Ud
+HwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
+cmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZnpq
+LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsGAQUFBwEBBIG+MIG7MDMGCCsG
+AQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1Aw
+QQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZnpqLWNhL3B1Yi9j
+YWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL2Z6ai1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDANBgkqhkiG9w0B
+AQsFAAOCAQEAjQatrjj9D0sreu0Dj3GsN3NLBiBxwTxyRAApzAiZuGu1960JhtvL
+DsnGukFCe++xd6qco82ZIrwCWrbjK2SQoAexiQqH4TXWqQaPcIr8zDwj0WKv63mN
+LhzmBIePWsND5pIb6qS3a4RvRK9u9BViQllWSQYUlkBNoA8HtulmqNkgVCgt7De9
+ZhDGRZAiGhA+N67ts/h9zW6fT6SqHgCgcTSG6mVSMX2ZR9XTocoAXCfwEV7VkGl7
+L9aUnCact8MBZGMgWHR8NVFyhEofMTBIiXwGawBgzB+bU/xOcBp/3ulxy2K3mfEK
+WsS4+1PQhtDqnQMdqkPWm1zlseEGiXqFtw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
     <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
     <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.its.fz-juelich.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
diff --git a/swamid-interfederations-2.0/idp.itsligo.ie.xml b/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml
index 6eba3b00..b832f31c 100644
--- a/swamid-interfederations-2.0/idp.itsligo.ie.xml
+++ b/swamid-interfederations-2.0/idp.itsligo.ie-idp-shibboleth.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itsligo.ie/idp/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.itsligo.ie/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2011-07-07T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-07-07T00:00:00Z"/>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">itsligo.ie</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">itsligo.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Institute of Technology Sligo</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">An Institiúid Teicneolaíochta, Sligeach</mdui:DisplayName>
-        <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/its.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.itsligo.ie</mdui:InformationURL>
+        <mdui:Logo height="68" width="224">https://edugate.heanet.ie/rr3/logos/its.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:54.2769291,-8.4651857</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIDJDCCAgygAwIBAgIVAM0cwxuTuo+doAYLQTZ+F9Kh2xiQMA0GCSqGSIb3DQEB
diff --git a/swamid-interfederations-2.0/idp.ittralee.ie.xml b/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml
index 84c00eb0..24012353 100644
--- a/swamid-interfederations-2.0/idp.ittralee.ie.xml
+++ b/swamid-interfederations-2.0/idp.ittralee.ie-idp.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ittralee.ie/idp">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ittralee.ie/idp">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-04T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-11-04T00:00:00Z"/>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">ittralee.ie</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ittralee.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">Institute of Technology Tralee</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">Institiúid Teicneolaíochta, Trá Lí</mdui:DisplayName>
-        <mdui:Logo height="62" width="248">https://edugate.heanet.ie/rr3/logos/ittra.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.ittralee.ie</mdui:InformationURL>
+        <mdui:Logo height="62" width="248">https://edugate.heanet.ie/rr3/logos/ittra.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:52.28620934512703,-9.67296838760376</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIHHjCCBgagAwIBAgIRAICl/N1E7wMHQx0BHxXzfIcwDQYJKoZIhvcNAQEFBQAw
diff --git a/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
new file mode 100644
index 00000000..38a556a0
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.izs.it-idp-shibboleth.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.izs.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-27T16:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">izs.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell' Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for the user of Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://www.izs.it/IZS/Engine/RAServePG.php/P/695510010701/W/0/L/0</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.izs.it/IZS/Engine/RAServePG.php/P/695510010701/W/0/L/1</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.izs.it/IZS/Engine/RAServePG.php/P/695610010701/W/0/L/0</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.izs.it/IZS/Engine/RAServePG.php/P/695610010701/W/0/L/1</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUZ8t3b8eAjLbPx7nCcmtLRNfMP/wwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLml6cy5pdDAeFw0xNDAzMjQxMjI2NTBaFw0zNDAz
+MjQxMjI2NTBaMBUxEzARBgNVBAMTCmlkcC5penMuaXQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCEZQogi++nPZ4OO1lklIcyCvA0W9NCyKLvVybJh1XM
+RT7jCoYa/rcsTS0mXt8sQIhRgC/mYAjIUMAophRaxewLjXiUBzFEdgc2ssP/ooYm
+O90nK5u3huiOav0KjNyS2Noei06yO57Iqx3L7ZJfWj2ligNrdN2HvIv+zMLe6m+d
+5g0tNWeP1Fya2kC9rY4O2yOR826vkJ/B4CLg8nQcOIWFnYWxBfNGWalShUR0K5+o
+RS3FWEda1ngg5ZxuLRKHVbGPU3eF513ZLGBS77aw9/L2dkFuaa8P+s/OQgTGI2Lp
+1CDAysIcxAZldY61BTxUfChYA99zgeQltvLmQMVr4YoPAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5penMuaXSGIWh0dHBzOi8vaWRwLml6cy5pdC9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUgQniglbaB0PJ8a6mBBEG7QB+Z80wDQYJKoZIhvcNAQEF
+BQADggEBACey/uQv50Tla66zVhm4C9Rj6zVJp/QMMNwO0j7BeihE3h4YRVqBrL79
+VhChAhnV8CTuP2g4iSx8ssk/ypw9/vIt54hnEgk16/gc+Fe/5IUk8Sd0ACtrX83u
+wHBi/QTBY+ja7HHUqG1OOItHTOdSkaEA3wMrRICIAem+tc6riyqt7Rdq+TyPVukg
+55oCYkYmDX6wPU/0yWOuR6ZbDthggmsKATteRrT//mM5qLhW0Ddiv5wWqCIlt3Oo
+F0PKMvSLcp+4wF7XpaoMsHY6biufInIY2o4pb+Qie/4VeXMbYG4OEahvxXZl1ugp
+z+ag8yGYGtSO0bWu0ysZBLnaYCV2HDA=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.izs.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.izs.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.izs.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.izs.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">izs.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDEzCCAfugAwIBAgIUZ8t3b8eAjLbPx7nCcmtLRNfMP/wwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLml6cy5pdDAeFw0xNDAzMjQxMjI2NTBaFw0zNDAz
+MjQxMjI2NTBaMBUxEzARBgNVBAMTCmlkcC5penMuaXQwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCEZQogi++nPZ4OO1lklIcyCvA0W9NCyKLvVybJh1XM
+RT7jCoYa/rcsTS0mXt8sQIhRgC/mYAjIUMAophRaxewLjXiUBzFEdgc2ssP/ooYm
+O90nK5u3huiOav0KjNyS2Noei06yO57Iqx3L7ZJfWj2ligNrdN2HvIv+zMLe6m+d
+5g0tNWeP1Fya2kC9rY4O2yOR826vkJ/B4CLg8nQcOIWFnYWxBfNGWalShUR0K5+o
+RS3FWEda1ngg5ZxuLRKHVbGPU3eF513ZLGBS77aw9/L2dkFuaa8P+s/OQgTGI2Lp
+1CDAysIcxAZldY61BTxUfChYA99zgeQltvLmQMVr4YoPAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC5penMuaXSGIWh0dHBzOi8vaWRwLml6cy5pdC9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUgQniglbaB0PJ8a6mBBEG7QB+Z80wDQYJKoZIhvcNAQEF
+BQADggEBACey/uQv50Tla66zVhm4C9Rj6zVJp/QMMNwO0j7BeihE3h4YRVqBrL79
+VhChAhnV8CTuP2g4iSx8ssk/ypw9/vIt54hnEgk16/gc+Fe/5IUk8Sd0ACtrX83u
+wHBi/QTBY+ja7HHUqG1OOItHTOdSkaEA3wMrRICIAem+tc6riyqt7Rdq+TyPVukg
+55oCYkYmDX6wPU/0yWOuR6ZbDthggmsKATteRrT//mM5qLhW0Ddiv5wWqCIlt3Oo
+F0PKMvSLcp+4wF7XpaoMsHY6biufInIY2o4pb+Qie/4VeXMbYG4OEahvxXZl1ugp
+z+ag8yGYGtSO0bWu0ysZBLnaYCV2HDA=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.izs.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.izs.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationName>
+    <OrganizationName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Istituto Zooprofilattico Sperimentale dell'Abruzzo e del Molise "G. Caporale"</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.izs.it</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.izs.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Fabrizio</GivenName>
+    <SurName>Quaranta</SurName>
+    <EmailAddress>idem@izs.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Daniele</GivenName>
+    <SurName>Zippo</SurName>
+    <EmailAddress>idem@izs.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.kb.se.xml b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
index 6bb74f83..6bb74f83 100644
--- a/swamid-interfederations-2.0/idp.kb.se.xml
+++ b/swamid-interfederations-2.0/idp.kb.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.lapinamk.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lapinamk.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..e1e1e9e7
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lapinamk.fi-idp-shibboleth.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.lapinamk.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">edu.tokem.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">lapinamk.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">ramk.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">tokem.fi</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="fi">Lapin ammattikorkeakoulu</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="sv">Lapplands YH</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Lapland UAS</mdui:DisplayName>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAPU41ovbqC7No8q/JafFb+0wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDAxMjMwMDAwMDBaFw0xNzAxMjIyMzU5NTlaMD0xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLmxhcGlu
+YW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAr050+KUHu9a+
+je75uUh/iQCBuoBdOtTRN5NHKK4cRKfM2+0+10zSvCxbcbul0T+yKbiHL5fVVOmm
+T3EZ0M0uInzjgICg63u5HmaF90DjFLpBtaZX/TTaWzvdFODFgqnZabyW/30ea7Zq
+5/8b0NK5Q/klEFYO4TIgkkBVwIlI6pGU/X9V596iEPHfyylR2dEIARviYTeqdQg3
+GVig/DngKBcan11pmEu3mhjVJl+yXRQeGhdeNXC7k8e3XMwEn/L2TEFy909qgHdT
+3Jm2y0g7SHzRoPt4UGJVx0t5dYFRPSEfJcxlP6/B5boU0RpYMa3AjBv7Nnk12+Ww
+vNQAf8Mt3wIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+6pDjue0wHQYDVR0OBBYEFBghh/DvfWtZXDg/l/liGeY0dFwlMA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+cC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9pZHAubGFwaW5hbWsuZmkwDQYJ
+KoZIhvcNAQEFBQADggEBACI8smMl17k5l6eOmo1E9yZkF/QasMOd7NaiNT7Cmddt
+nAHtPG7nNFJX+Vj7aOhxZb6Dicp8aPueeswp1tX36PLj4QImXwLs/MoZ0DRUpsAI
+dqBucmey2exV/eIsfLoEOGnoe9aJJHbf1FS/0c4JR7PUfKShp7mYrROKmVZ+N/ya
+ohzJ/hrZTS8lhx46mWsy8WJoZyvV8SSU7SJTblRU1rbjhMIwXWGpAXgq69Oa72IY
+SUNstvZgVwotwKijIBs0iDamz8pzrMKBN1Qft+gzNRC19ijM3S+Ydrx23uBOJz9S
+iBFAJu7GLakQ21kx0iJw7Cvw3dG4QswwoiTV55pAx6g=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lapinamk.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Lapin amk</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Lapin amk</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Lapland University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lapplands Yrkeshögskola</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.lapinamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.lapinamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.lapinamk.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Markku</md:GivenName>
+    <md:SurName>Taipale</md:SurName>
+    <md:EmailAddress>mailto:markku.taipale@lapinamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jukka</md:GivenName>
+    <md:SurName>Heikkila</md:SurName>
+    <md:EmailAddress>mailto:jukka.heikkila@lapinamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lib.cas.cz.xml b/swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml
index 47a28be6..3bc40c70 100644
--- a/swamid-interfederations-2.0/idp.lib.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.lib.cas.cz-idp-shibboleth.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.lib.cas.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T13:21:26Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
-      </mdasrt:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml
new file mode 100644
index 00000000..072eb4e5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.lrz.de-idp-shibboleth.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lrz.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T12:36:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Leibniz-Rechenzentrum (LRZ)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Der LRZ Identity Provider bedient Benutzer und Mitarbeiter des Leibniz-Rechenzentrums, insb. auch Supercomputing-Kunden</mdui:Description>
+        <mdui:Description xml:lang="en">The LRZ Identity Provider is used by staff members and users of Leibniz Supercomputing Centre, especially users of supercomputing systems.</mdui:Description>
+        <mdui:Logo height="70" width="360">https://idp.lrz.de/idp/images/lrzlogo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.lrz.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.lrz.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
+t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
+tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
+3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
+Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
+E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
+32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
+IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
+CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
+ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
+YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
+AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
+XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
+Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
+rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
+BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
+RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
+t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
+tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
+3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
+Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
+E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
+32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
+IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
+CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
+ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
+YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
+AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
+XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
+Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
+rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
+BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
+RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lrz.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lrz.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
+t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
+tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
+3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
+Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
+E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
+32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
+IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
+CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
+ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
+YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
+AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
+XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
+Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
+rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
+BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
+RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lrzidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGTzCCBTegAwIBAgIHGEI+4YLsVDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE4WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxyemlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCx
+t8+GWafraqMospDHenrOrAISX5HeJurj9I5SVF5gwJVrcgHy6/AOyU/MbrCBL/2O
+tlJCDsg4s8eBZQwx6a1nBbRHzxSmthMr6JDA0+y0FwGzOgUhF/XjEvHMHlIR49HR
+3f5LkO/ZBGWhWulJwD3ERQN0/1BcZMXvRceyqgqpwsLzNBwLwp2YUjoZwRnDMWdu
+Uzy5e0l41lXPhLu+99lO0XnYO5bMai1px2u//w8wtVYxkYRqJ6g1EvrpWJXVTGq2
+E5ezNX80ErAt2ttPP2YAchLxHOax/FOlor8q5Wwo60jkQxIIBTbY9W5ab19WHU52
+32z126AigkiXCMEkcz15AgMBAAGjggKHMIICgzBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFL7jMwPY5/3ueZLsMMbBt+vZ
+IbKwMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MHYGA1UdEQRvMG2C
+CmlkcC5scnouZGWCC2lkcDEubHJ6LmRlggtpZHAyLmxyei5kZYINbHJ6aWRwLmxy
+ei5kZYIObHJ6aWRwMS5scnouZGWCDmxyemlkcDIubHJ6LmRlgRZ6YnZ3LWNlcnQt
+YWRtaW5AbHJ6LmRlMHcGA1UdHwRwMG4wNaAzoDGGL2h0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDWgM6Axhi9odHRwOi8vY2Rw
+Mi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDCBxwYIKwYBBQUH
+AQEEgbowgbcwMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS9scnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQw
+DQYJKoZIhvcNAQELBQADggEBADrPD4GN7XpZSyxGBvHy+7fMrJNxyWybTsHkyiAI
+XGUF/jn9m7Bnvucb60PzyzJ5aD63AsaeSxSXDyYpNzne93O1aEtXyveTeFhbRyx1
+Wcf5G1KbRbljULRatUJSOggUWO4HerToAobx4xXyFrD7aPQkGGFVnqemjOnE4A4e
+rl8OfaKkOu43F4KbxVUf2zcSQ5h4qdbwORNXCxNNGfKlzphRMpq7V4B6Z8+i7FCx
+BDOcL0w+IjJuDkD8Jf5DMiEGUIppU2vYOylvYENKX2Mdd4ZMcOw2d1jqC0xC/8qj
+RXNKbj96BedS8e05bbrOSj9H7/qX5osIxDaY+rr6g3HF+2c=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e38</OrganizationName>
+    <OrganizationName xml:lang="en">e38</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.lrz.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.lrz.de/english/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.lrz.de.xml b/swamid-interfederations-2.0/idp.lrz.de.xml
deleted file mode 100644
index 5dfc6f63..00000000
--- a/swamid-interfederations-2.0/idp.lrz.de.xml
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.lrz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-27T12:36:25Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Leibniz-Rechenzentrum (LRZ)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Der LRZ Identity Provider bedient Benutzer und Mitarbeiter des Leibniz-Rechenzentrums, insb. auch Supercomputing-Kunden</mdui:Description>
-        <mdui:Description xml:lang="en">The LRZ Identity Provider is used by staff members and users of Leibniz Supercomputing Centre, especially users of supercomputing systems.</mdui:Description>
-        <mdui:Logo height="70" width="360">https://idp.lrz.de/idp/images/lrzlogo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.lrz.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.lrz.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
-Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
-A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
-M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
-aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
-wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
-AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
-uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
-gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
-ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
-Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
-ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
-Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
-BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
-qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
-/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
-zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
-kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
-t0kVopfGsEIT142DrBwPmGvPGmU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
-Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
-A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
-M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
-aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
-wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
-AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
-uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
-gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
-ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
-Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
-ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
-Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
-BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
-qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
-/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
-zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
-kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
-t0kVopfGsEIT142DrBwPmGvPGmU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lrz.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
-Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
-A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
-M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
-aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
-wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
-AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
-uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
-gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
-ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
-Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
-ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
-Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
-BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
-qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
-/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
-zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
-kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
-t0kVopfGsEIT142DrBwPmGvPGmU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lrzidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lrzidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFsDCCBJigAwIBAgIEDyCYejANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMTE2MDkyNzA3WhcNMTQxMTE1MDkyNzA3WjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1scnppZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxHsxzqhKyx3Slkyzt4c04/jX
-Q0GUPRaNqRm+oxbsrZg3kAAT0yCYrmXhxzeXobLiHRk5dmrsa/sXXRvxJVPGMAJu
-A1MYKmdiGkDjLx2qum7nL5zBqg77bBLd/sLjPE+JKKBY0JUXY+jSOkOCw7ajYVBS
-M6otuG29Ur0AC2S46PS/2xCVQ43q1hPjBpzOjTmEYzXpDHtzQ/0iN8T4t2h59nOh
-aFdzLZeVcW0/8RBbUZ7ncWNgpFjrb8/jBgO4t56i6oG7O8ov1Fg/FCjs5JkxtjSu
-wPJhf9hn5l/hzD5uvmSQk6FGYEFgcZDwQ+M+9IJYYogyT0aLrXUDsEExfVMQJwID
-AQABo4ICKTCCAiUwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQ67fNreuuuqZsQxbfwYUDAlgnH
-uzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjCBnQYDVR0RBIGVMIGS
-gR96YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1scnppZHAubHJ6LmRl
-ghZscnppZHAubHJ6LW11ZW5jaGVuLmRlgg5scnppZHAyLmxyei5kZYIXbHJ6aWRw
-Mi5scnotbXVlbmNoZW4uZGWCCmlkcC5scnouZGWCE2lkcC5scnotbXVlbmNoZW4u
-ZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnot
-Y2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9jZHAyLnBjYS5kZm4u
-ZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEFBQcBAQSBhTCBgjA/
-BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9scnotY2EvcHViL2Nh
-Y2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8vY2RwMi5wY2EuZGZu
-LmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQEFBQAD
-ggEBAGI1WoP7gaN/ncu/zm0JUuTccqL86LCd4g3P9vTP9a4VxWNlOSQg4K7yMRfU
-qX8ucTKUmUKeDpnvwJ9YlWaDqvOYzGLF7fZ6Rbz4W/si2zUiwMolB3CIO/4MXfUM
-/bm8b5lA74/1tZpWmUvxEpc1H0TYqtebUCy8YyRZUiMIJiFfz+z4F1wOee4oX6Cg
-zr9vr1VW+jum9tjzpTKyBUL215I7etftMaPCJG5de3pPHMarpGXm2ceLxxop+p9r
-kmP6mFCnCpJB25WedJapbI4BclKNVU/NseS+NuY2TB0bi2Q35BbvuutJ8gG4MRSD
-t0kVopfGsEIT142DrBwPmGvPGmU=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e38</OrganizationName>
-    <OrganizationName xml:lang="en">e38</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Leibniz-Rechenzentrum der Bayerischen Akademie der Wissenschaften</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Leibniz Supercomputing Centre (LRZ) of the Bavarian Academy of Sciences and Humanities</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.lrz.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.lrz.de/english/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mast.br.xml b/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml
index bb5c70a7..bb5c70a7 100644
--- a/swamid-interfederations-2.0/idp.mast.br.xml
+++ b/swamid-interfederations-2.0/idp.mast.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..30a198f8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.mbu.cas.cz-idp-shibboleth.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.mbu.cas.cz/idp/shibboleth">
+  <Extensions>
+    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+    </eduidmd:RepublishRequest>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-09-08T13:24:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">mbu.cas.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Institute of Microbiology AS CR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Mikrobiologický ústav AV ČR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider IMIC AV CR employees.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance MBŮ AV ČR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mbu.cas.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.mbu.cas.cz/</mdui:InformationURL>
+        <mdui:Logo height="44" width="60">https://jiftach.cas.cz/loga/logo-mbu-44.png</mdui:Logo>
+        <mdui:Logo height="100" width="137">https://jiftach.cas.cz/loga/logo-mbu-100.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUYdcHhLDHNl2QZ3A36tC8tB4N+0YwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLm1idS5jYXMuY3owHhcNMTQwNTA5MDk0ODE3WhcN
+MzQwNTA5MDk0ODE3WjAZMRcwFQYDVQQDEw5pZHAubWJ1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvELL+7e19R7w9WNnuLbvd9MI9Y6emS
+0o4NDUddY65/SqZeeNaTqsdCQO8htLIIvzwm2vh9geeNEVwpRejz1N1kzcVLIpxa
+9udowrfSKKAuavwFiSYyrznKAtD2/G00U+Ity4Mi6IjxpdNocIQgSfaD/cVOvg3k
+Qw2B0jOSYdEAu0nG8I6LlUp9T6aSI7jqUDcAIAB6CMOxGL6/+GwEuPYMNBxGrAAZ
+pWPGUO4mBaK0eVrMyq++fImM5yab6B42nfe4RvA9C2Lt50OgvOia8LKRjtVGaATI
+DUOOiX2B5sWVYAHFfsXCFuS9CjjYMxMMT5t5A1guNOhd86rPCayVfJ0CAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLm1idS5jYXMuY3qGJWh0dHBzOi8vaWRwLm1idS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA/LgQ/gox/xI5+K8hQ6Nrq5
+y0R3MA0GCSqGSIb3DQEBBQUAA4IBAQAxf9HYNhASVDz1dbW/OMXd7mtFoxk7v5bP
+JgXz3W7kW8HyERpcssEbJhB1mmrWTnM/5qiPf6OuBQ7Loa3Wtthx7tei2bXXBwKb
+RE5DK04UiRufSq8G6yioadxyMG4lpt+mSSkyYDdP+4DnBgJcrPLORCpkcZaFvZWy
+rgr4jGpkpj7QnuJR5O/mUpLZSxEqspE7TWOgFFWhWfddhKRiThLI/KLysYWaFBOp
+FTr/8tfzH95qtEgw+8NoX7xWbKp42mN27+MCYLdK+gS6RqIv4i+KnDyNO2gYssjq
+eL/EaqTf+uStC8AdxobBI9SwoXW5JUfxiorsYdYvY8cX9JxnJLbA
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.mbu.cas.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.mbu.cas.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">mbu.cas.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIzCCAgugAwIBAgIUYdcHhLDHNl2QZ3A36tC8tB4N+0YwDQYJKoZIhvcNAQEF
+BQAwGTEXMBUGA1UEAxMOaWRwLm1idS5jYXMuY3owHhcNMTQwNTA5MDk0ODE3WhcN
+MzQwNTA5MDk0ODE3WjAZMRcwFQYDVQQDEw5pZHAubWJ1LmNhcy5jejCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAKvELL+7e19R7w9WNnuLbvd9MI9Y6emS
+0o4NDUddY65/SqZeeNaTqsdCQO8htLIIvzwm2vh9geeNEVwpRejz1N1kzcVLIpxa
+9udowrfSKKAuavwFiSYyrznKAtD2/G00U+Ity4Mi6IjxpdNocIQgSfaD/cVOvg3k
+Qw2B0jOSYdEAu0nG8I6LlUp9T6aSI7jqUDcAIAB6CMOxGL6/+GwEuPYMNBxGrAAZ
+pWPGUO4mBaK0eVrMyq++fImM5yab6B42nfe4RvA9C2Lt50OgvOia8LKRjtVGaATI
+DUOOiX2B5sWVYAHFfsXCFuS9CjjYMxMMT5t5A1guNOhd86rPCayVfJ0CAwEAAaNj
+MGEwQAYDVR0RBDkwN4IOaWRwLm1idS5jYXMuY3qGJWh0dHBzOi8vaWRwLm1idS5j
+YXMuY3ovaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFA/LgQ/gox/xI5+K8hQ6Nrq5
+y0R3MA0GCSqGSIb3DQEBBQUAA4IBAQAxf9HYNhASVDz1dbW/OMXd7mtFoxk7v5bP
+JgXz3W7kW8HyERpcssEbJhB1mmrWTnM/5qiPf6OuBQ7Loa3Wtthx7tei2bXXBwKb
+RE5DK04UiRufSq8G6yioadxyMG4lpt+mSSkyYDdP+4DnBgJcrPLORCpkcZaFvZWy
+rgr4jGpkpj7QnuJR5O/mUpLZSxEqspE7TWOgFFWhWfddhKRiThLI/KLysYWaFBOp
+FTr/8tfzH95qtEgw+8NoX7xWbKp42mN27+MCYLdK+gS6RqIv4i+KnDyNO2gYssjq
+eL/EaqTf+uStC8AdxobBI9SwoXW5JUfxiorsYdYvY8cX9JxnJLbA
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.mbu.cas.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Institute of Microbiology  AS CR</OrganizationName>
+    <OrganizationName xml:lang="cs">Mikrobiologický ústav AV ČR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Institute of Microbiology  AS CR, v.v.i.</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Mikrobiologický ústav AV ČR, v.v.i.</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.mbu.cas.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.mbu.cas.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Vaníček</SurName>
+    <EmailAddress>vanicekp@utia.cas.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mci4me.at.xml b/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml
index 24b4601e..af7a4f7d 100644
--- a/swamid-interfederations-2.0/idp.mci4me.at.xml
+++ b/swamid-interfederations-2.0/idp.mci4me.at-idp-shibboleth.xml
@@ -13,7 +13,7 @@
         <mdui:DisplayName xml:lang="en">Management Center Innsbruck</mdui:DisplayName>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -51,7 +51,7 @@ FkV0gy5C/RWb/tKzq9CLPMhkyBCIIS9TjHeEWOUmCN08iic=
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mci4me.at</shibmd:Scope>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
diff --git a/swamid-interfederations-2.0/idp.meduniwien.ac.at.xml b/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
index 3d0cfec1..6f709f60 100644
--- a/swamid-interfederations-2.0/idp.meduniwien.ac.at.xml
+++ b/swamid-interfederations-2.0/idp.meduniwien.ac.at-idp-shibboleth.xml
@@ -15,7 +15,7 @@
         <mdui:Logo height="16" width="16">https://idp.meduniwien.ac.at/idp/favicon.ico</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -55,7 +55,7 @@ OKQ7j1Bqsv6B43xMHff+
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">meduniwien.ac.at</shibmd:Scope>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -93,7 +93,7 @@ OKQ7j1Bqsv6B43xMHff+
     <md:OrganizationDisplayName xml:lang="de">Medizinische Universität Wien</md:OrganizationDisplayName>
     <md:OrganizationDisplayName xml:lang="en">Medical University of Vienna</md:OrganizationDisplayName>
     <md:OrganizationURL xml:lang="de">http://www.meduniwien.ac.at/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.meduniwien.ac.at/homepage/en/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.meduniwien.ac.at/homepage/1/homepage/</md:OrganizationURL>
   </md:Organization>
   <md:ContactPerson contactType="technical">
     <md:GivenName>Herbert</md:GivenName>
diff --git a/swamid-interfederations-2.0/idp.metropolia.fi-idp.xml b/swamid-interfederations-2.0/idp.metropolia.fi-idp.xml
new file mode 100644
index 00000000..840bd980
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.metropolia.fi-idp.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.metropolia.fi/idp">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">metropolia.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAubWV0cm9w
+b2xpYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhuaEYcvTxQ
+wONs2/tCwUNGN3cvP03SK+v4Gm+y3gezXXrISULJjY+sAz4qbuCtyQjewsLe3QL/
+P+fgrF8iWwLxvFANqT0PU3NbiTfweYw4imGF71uB1+BTDeTkVisCbg3ki+owshif
+aKFbO0ukOTUTx5vlBBkw1xFMAAMkttThMWZaAzTFDqnDuNhHnSP9botMOT7MDNJG
+YZh0cXRpyHRRSYmjvcI59iPJwC/zQIoGWskwc3+UyhlFFSX1zF5cKOLQXo1i+VBc
+bqf3/4VJiABIKPeyxsVvFIdo2pkylqUmm8E+wppKfPhnuK5dW8afApaqU/A4p8eh
+9hWDMofDicMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBTgVJX1n83Ge6l78jjijOdYXkXNhTAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLm1ldHJvcG9saWEuZmkw
+DQYJKoZIhvcNAQEFBQADggEBAL7QxHjz3sE9LRXAFbxufA3DLDOvlzotP/x01Czh
+7kVp5CdUsMFZU1lPQ9Kxc5kAa+doh9m4ZEamsBdLdGx3eFZEmzq41n86EImHZhGb
+tWiMfx2qRTWga8WcYgAXW+6TzYP5CAxKxY4eBKKpvE9fsKxE5rKfByt+ZTQ51LgG
+b8SiSXWGmD5k1VIVZ0Y0W2OTmOuAk52Sq4QwaAaJaHWRMvvmX7HxeIDLHpAqxDcc
+qgNggMzs4qK6OjBIA6gCWwre1eRyeS2H1vC0rOhqqmLO5Y6vXw2odVYnKfD5pZHJ
+G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.metropolia.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.metropolia.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.metropolia.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">metropolia.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbzCCA1egAwIBAgIQCc/9tdLS4HQLd5HGhihrEDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxMTAwMDAwMFoXDTE3MDQxMDIzNTk1OVowPzEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFpZHAubWV0cm9w
+b2xpYS5maTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMhuaEYcvTxQ
+wONs2/tCwUNGN3cvP03SK+v4Gm+y3gezXXrISULJjY+sAz4qbuCtyQjewsLe3QL/
+P+fgrF8iWwLxvFANqT0PU3NbiTfweYw4imGF71uB1+BTDeTkVisCbg3ki+owshif
+aKFbO0ukOTUTx5vlBBkw1xFMAAMkttThMWZaAzTFDqnDuNhHnSP9botMOT7MDNJG
+YZh0cXRpyHRRSYmjvcI59iPJwC/zQIoGWskwc3+UyhlFFSX1zF5cKOLQXo1i+VBc
+bqf3/4VJiABIKPeyxsVvFIdo2pkylqUmm8E+wppKfPhnuK5dW8afApaqU/A4p8eh
+9hWDMofDicMCAwEAAaOCAW4wggFqMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBTgVJX1n83Ge6l78jjijOdYXkXNhTAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwHAYDVR0RBBUwE4IRaWRwLm1ldHJvcG9saWEuZmkw
+DQYJKoZIhvcNAQEFBQADggEBAL7QxHjz3sE9LRXAFbxufA3DLDOvlzotP/x01Czh
+7kVp5CdUsMFZU1lPQ9Kxc5kAa+doh9m4ZEamsBdLdGx3eFZEmzq41n86EImHZhGb
+tWiMfx2qRTWga8WcYgAXW+6TzYP5CAxKxY4eBKKpvE9fsKxE5rKfByt+ZTQ51LgG
+b8SiSXWGmD5k1VIVZ0Y0W2OTmOuAk52Sq4QwaAaJaHWRMvvmX7HxeIDLHpAqxDcc
+qgNggMzs4qK6OjBIA6gCWwre1eRyeS2H1vC0rOhqqmLO5Y6vXw2odVYnKfD5pZHJ
+G+Dx7F2feFhAdfZyEz66oAuniAeUWSFMijlxsqfDKgfg5YY=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.metropolia.fi/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.metropolia.fi/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Metropolia-ammattikorkeakoulu</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Helsinki Metropolia University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Metropolia yrkeshögskola</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Metropolia-ammattikorkeakoulu</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Helsinki Metropolia University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Metropolia yrkeshögskola</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.metropolia.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.metropolia.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.metropolia.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jani</md:GivenName>
+    <md:SurName>Kaljunen</md:SurName>
+    <md:EmailAddress>mailto:jani.kaljunen@metropolia.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jukka</md:GivenName>
+    <md:SurName>Veikkolainen</md:SurName>
+    <md:EmailAddress>mailto:jukka.veikkolainen@metropolia.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.mnhn.fr.xml b/swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml
index a5118a91..ca335175 100644
--- a/swamid-interfederations-2.0/idp.mnhn.fr.xml
+++ b/swamid-interfederations-2.0/idp.mnhn.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mnhn.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.mta.hu.xml b/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
index 3d1419d0..86785727 100644
--- a/swamid-interfederations-2.0/idp.mta.hu.xml
+++ b/swamid-interfederations-2.0/idp.mta.hu-idp-saml2-idp-metadata.php.xml
@@ -12,6 +12,12 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">titkarsag.mta.hu</shibmd:Scope>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="hu">MTA Titkárság</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">MTA Titkárság</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">MTA Akadémiai Adattár (AAT)</mdui:Description>
+        <mdui:Description xml:lang="en">MTA Akadémiai Adattár (AAT)</mdui:Description>
+      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/idp.ncirl.ie.xml b/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml
index b834eeac..295c7705 100644
--- a/swamid-interfederations-2.0/idp.ncirl.ie.xml
+++ b/swamid-interfederations-2.0/idp.ncirl.ie-idp-shibboleth.xml
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ncirl.ie/idp/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ncirl.ie/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2011-02-09T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2011-02-09T00:00:00Z"/>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">ncirl.ie</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncirl.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">National College of Ireland</mdui:DisplayName>
         <mdui:Description xml:lang="en">National College of Ireland</mdui:Description>
-        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/nci.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">https://nci360.ncirl.ie/</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="en">http://www.ncirl.ie/Legal/Privacy.aspx</mdui:PrivacyStatementURL>
+        <mdui:Logo height="124" width="124">https://edugate.heanet.ie/rr3/logos/nci.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:53.34900526916922,-6.243662238121033</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIDGzCCAgOgAwIBAgIUDymT+0qnFpj+1wBK67kpD4GOwBQwDQYJKoZIhvcNAQEF
diff --git a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml
index 32c71a1b..32c71a1b 100644
--- a/swamid-interfederations-2.0/idp.nesc.gla.ac.uk.xml
+++ b/swamid-interfederations-2.0/idp.nesc.gla.ac.uk-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.niif.hu.xml b/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
index 0c298c54..be32d6f2 100644
--- a/swamid-interfederations-2.0/idp.niif.hu.xml
+++ b/swamid-interfederations-2.0/idp.niif.hu-shibboleth.xml
@@ -3,6 +3,7 @@
   <Extensions>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-test</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">hexaa</ns9:MetadataSet>
@@ -17,6 +18,10 @@
         <mdui:GeolocationHint>geo:47.518209,19.055394</mdui:GeolocationHint>
       </mdui:DiscoHints>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="hu">NIIF - Nemzeti Információs Infrastruktúra Fejlesztési Intézet</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">NIIF Institute - National Information Infrastructure Development</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">NIIF Intézet</mdui:Description>
+        <mdui:Description xml:lang="en">NIIF Institute</mdui:Description>
         <mdui:Logo height="86" width="150">https://idp.niif.hu/niifi.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
diff --git a/swamid-interfederations-2.0/idp.nordu.net.xml b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
index 5bb03322..5bb03322 100644
--- a/swamid-interfederations-2.0/idp.nordu.net.xml
+++ b/swamid-interfederations-2.0/idp.nordu.net-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.normandie-univ.fr.xml b/swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml
index a279c215..78d19c45 100644
--- a/swamid-interfederations-2.0/idp.normandie-univ.fr.xml
+++ b/swamid-interfederations-2.0/idp.normandie-univ.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">normandie-univ.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.nuigalway.ie.xml b/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml
index 05376305..1f667bc9 100644
--- a/swamid-interfederations-2.0/idp.nuigalway.ie.xml
+++ b/swamid-interfederations-2.0/idp.nuigalway.ie-shibboleth.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nuigalway.ie/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.nuigalway.ie/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-01T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-10-01T00:00:00Z"/>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">nuigalway.ie</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nuigalway.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">National University of Ireland, Galway</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">OÉ Gaillimh</mdui:DisplayName>
-        <mdui:Logo height="68" width="225">https://edugate.heanet.ie/rr3/logos/nuig.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://nuigalway.ie</mdui:InformationURL>
+        <mdui:Logo height="68" width="225">https://edugate.heanet.ie/rr3/logos/nuig.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:53.278923955103785,-9.060437679290771</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIDKzCCAhOgAwIBAgIUaZj83WML6Ro0NOTyru/oCY9DaWcwDQYJKoZIhvcNAQEF
diff --git a/swamid-interfederations-2.0/idp.oamk.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.oamk.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..c2536800
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.oamk.fi-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.oamk.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">oamk.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEJDCCAwygAwIBAgIRAJDZbv9JChO1v4c2PegLC3gwDQYJKoZIhvcNAQEFBQAwOTELMAkGA1UE
+BhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJhIENsYXNzMiBDQTAeFw0xMjAx
+MjQwOTA0MjNaFw0xNTAxMjMwOTA0MjNaMGoxCzAJBgNVBAYTAmZpMSkwJwYDVQQKDCBPdWx1biBz
+ZXVkdW4ga291bHV0dXNrdW50YXlodHltYTEUMBIGA1UEAwwLaWRwLm9hbWsuZmkxGjAYBgkqhkiG
+9w0BCQEWC25vY0BvYW1rLmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAz1pmmgwq
+ddeiMWmthZP0W34WIKx4g5csiP/9p6DigzhNGn5+sZgsh7gb6FS1VtXWhwCFnCZCb/f0vm0AEqc2
+H9IQHTKPWWeM33S3uCOUBh1Jf7B9/3ysa70gZIdPFMkt+tX0Fd8hByeybu8FDyRwq95la1L3kPuQ
+qX6do0Ks2kEmALSHwPP9aMfCB8Mr4hZx0YpECVheIS2NgISbCtvx5F9IvfUds7FNr5eVHbz5j1dm
+gSalDjSGZN2HAwMw8EW91d314SYDtwdEC2PdvUCdbjdOnTXoHsftcDtS9PoWGzqZjLoptDjalc1z
+j8Q3UUVyqXDX9HGwDq9p+ZdEaYokPwIDAQABo4H1MIHyMBMGA1UdIwQMMAqACEqgqliE0148MBkG
+A1UdIAQSMBAwDgYMKwYBBAGCDwIDAQECMHIGA1UdHwRrMGkwZ6BloGOGYWxkYXA6Ly8xOTQuMjUy
+LjEyNC4yNDE6Mzg5L2NuPVNvbmVyYSUyMENsYXNzMiUyMENBLG89U29uZXJhLGM9Rkk/Y2VydGlm
+aWNhdGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MA4GA1UdDwEB/wQEAwIEsDAdBgNVHQ4EFgQUAuG1dJ173cm7/fePBi906Va3TdUwDQYJKoZIhvcN
+AQEFBQADggEBAHSh0AVK4D+979981GuW1T+gEsp7vGBH1x9TiFPc8WI25UJ46eSf14wSzB+f3irK
+T4s6CyvMJr2lZylvZF61orVJ/p2Ii21z8l/SEbk3ZbAT/vawdKU0dffypy4FhwWfTXADHAc9Li7z
+K3YfRLJLUxYw8nt/3XjqiZ0q6CkEu7ZOZ163ew27oGv8TpNTjQAFh1ZX5xkKrwMhrhaykpO2Ww3E
+Df2IYPvrPLtJYSHAn0aZ1UIn5dl8+/tFu9dpYn7p12/c9IBiBzyOUEn6uczxGlyf7NG35lscHuwR
+Ry8FNbWVwbylLohU2Ms9XOSxHmexafsdLuZYGASMnCUQQgdzX/E=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.oamk.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Oulun ammattikorkeakoulu</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Oulu University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Yrkeshögskolan i Uleåborg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.oamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.oamk.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.oamk.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Panu</md:GivenName>
+    <md:SurName>Jylha</md:SurName>
+    <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Panu</md:GivenName>
+    <md:SurName>Jylha</md:SurName>
+    <md:EmailAddress>mailto:haka_admin@oamk.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.parisdescartes.fr.xml b/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml
index 8f71380b..80fbd12e 100644
--- a/swamid-interfederations-2.0/idp.parisdescartes.fr.xml
+++ b/swamid-interfederations-2.0/idp.parisdescartes.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">parisdescartes.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris5.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.ppke.hu.xml b/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml
index 5084dec7..3eaf6e66 100644
--- a/swamid-interfederations-2.0/idp.ppke.hu.xml
+++ b/swamid-interfederations-2.0/idp.ppke.hu-idp-shibboleth.xml
@@ -17,6 +17,10 @@
         <mdui:GeolocationHint>geo:47.48841,19.0784</mdui:GeolocationHint>
       </mdui:DiscoHints>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="hu">Pázmány Péter Katolikus Egyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Pazmany Peter Catholic University</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">PPKE - Pázmány Péter Katolikus Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">PPKE - Pázmány Péter Catholic University</mdui:Description>
         <mdui:Logo height="86" width="86">https://idp.ppke.hu/logo.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
diff --git a/swamid-interfederations-2.0/idp.psu.cas.cz.xml b/swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml
index cfbb145f..13ba0248 100644
--- a/swamid-interfederations-2.0/idp.psu.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.psu.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-07-25T15:25:07Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml b/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
index 37bb406b..37bb406b 100644
--- a/swamid-interfederations-2.0/idp.puc-campinas.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.puc-campinas.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.renater.fr.xml b/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml
index 978cf7f0..35ee3b94 100644
--- a/swamid-interfederations-2.0/idp.renater.fr.xml
+++ b/swamid-interfederations-2.0/idp.renater.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">renater.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -46,7 +46,7 @@ JA+a0emlAOfEnZeRkpSunkghdezhsTvs0DB3QVZyrFRKmxA5IiORVg==
   <Organization>
     <OrganizationName xml:lang="en">GIP RENATER</OrganizationName>
     <OrganizationDisplayName xml:lang="en">GIP RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.renater.fr</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <EmailAddress>support@support.renater.fr</EmailAddress>
diff --git a/swamid-interfederations-2.0/idp.reuna.cl.xml b/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml
index 5791c843..5791c843 100644
--- a/swamid-interfederations-2.0/idp.reuna.cl.xml
+++ b/swamid-interfederations-2.0/idp.reuna.cl-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.rnp.br.xml b/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
index 35561afa..35561afa 100644
--- a/swamid-interfederations-2.0/idp.rnp.br.xml
+++ b/swamid-interfederations-2.0/idp.rnp.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.scc.kit.edu.xml b/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
index 86e2630e..86e2630e 100644
--- a/swamid-interfederations-2.0/idp.scc.kit.edu.xml
+++ b/swamid-interfederations-2.0/idp.scc.kit.edu-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.sciencespobordeaux.fr.xml b/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml
index b2bc2919..b3b7e9d7 100644
--- a/swamid-interfederations-2.0/idp.sciencespobordeaux.fr.xml
+++ b/swamid-interfederations-2.0/idp.sciencespobordeaux.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespobordeaux.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scpobx.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.sgi.cefetmg.br.xml b/swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml
index eddb22ad..eddb22ad 100644
--- a/swamid-interfederations-2.0/idp.sgi.cefetmg.br.xml
+++ b/swamid-interfederations-2.0/idp.sgi.cefetmg.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.shh.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.shh.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..4e0db6ad
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.shh.fi-idp-shibboleth.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.shh.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">hanken.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQR1F2IKk/FGfCBPi7E7Lr9DANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMTAxODAwMDAwMFoXDTE2MTExMjIzNTk1OVowODEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAuc2hoLmZp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0tjmJ1ERx/Za5uVfPURB
+8eTAKK0QEXJD/++dCZcVSrIpau8jiLkmi+kzweI531JVBDrpT24jFGXn2cKnzUIB
+xpOWEUKLQSkYdA3LoKD1gJjjFxF8Y3J237Zlg3QL/dmNnfCLxs8SsXbCsjxpuPAP
+wYRR1ZEL2SjdU3zEDc4iqMqkk5wS4lzjB1SMNFaaKRRsW97BAKATyHRwp4a01nB4
+o0MDNn4iGcIoE3kO9X83H7smurBXGqVzc4dnfH3yLOXF+NMpRbH9upSrSBe2EoZU
+jc+Vi4/fsEXRmr/u+8IOb1ERpYNLCd6L+mD9ppbA3ZeRJe/LRaq7MFQX3VzMR5mn
+xwIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
+HQYDVR0OBBYEFH9BqIu5UIBGpznMYuQP3dJQ6f7zMA4GA1UdDwEB/wQEAwIFoDAM
+BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
+HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
+hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAuc2hoLmZpMA0GCSqGSIb3DQEBBQUA
+A4IBAQBk7DXTXfwZCTrFUVB73h4TzHF2zrIUm83SFCNcn5BBA9qKRL/TfozD4ZwK
+1zfaVtcc8gpS4tUE+T3dOa2zKvUgYSuDScC7cInBht1wLUrukBhQCDIU+0lKaBJv
+A17KXHxowqua95sMKkN3tDUB7lbLCuPxhJyWzE2E9TrJ2oTYQ35C3cGd5FbnLEWk
+9ceS4WR5+t1lpvC4uwWrc0DYgb0ADv9TDW52/qssZKNLbVu5BwRKI6ToAZTgnNbf
+aeNbuslxAJn11gg6nMy8yRVZMTOMZoLK5j4vNXhp8YngrWxdGBDIaEtLvLWfIs99
+nAiHebdvpVCIMaM703zAuuDVImHf</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.shh.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Hanken Svenska handelshögskolan</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Hanken School of Economics</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Hanken Svenska handelshögskolan</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Hanken Svenska handelshögskolan</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Hanken School of Economics</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Hanken Svenska handelshögskolan</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.hanken.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.hanken.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.hanken.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Kuno</md:GivenName>
+    <md:SurName>Ohrman</md:SurName>
+    <md:EmailAddress>mailto:shibboservice@hanken.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Johan</md:GivenName>
+    <md:SurName>Isaksson</md:SurName>
+    <md:EmailAddress>mailto:shibboservice@hanken.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Hanken</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:help@hanken.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.shibboleth.net.xml b/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml
index 676a22e2..676a22e2 100644
--- a/swamid-interfederations-2.0/idp.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/idp.shibboleth.net-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml
new file mode 100644
index 00000000..69b6134f
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sissa.it-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.sissa.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-03T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">
+                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">sissa.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">SISSA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">SISSA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
+        <mdui:Description xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw
+MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd
+wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx
+I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak
+3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym
+pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB
+PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq
+hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT
+P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r
+jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE
+j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF
+NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI
+Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sissa.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sissa.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sissa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sissa.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">sissa.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw
+MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd
+wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx
+I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak
+3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym
+pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB
+PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq
+hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT
+P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r
+jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE
+j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF
+NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI
+Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</OrganizationName>
+    <OrganizationName xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SISSA</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SISSA</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.sissa.it/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.sissa.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Massimiliano</GivenName>
+    <SurName>Ritossa</SurName>
+    <EmailAddress>helpdesk@sissa.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <EmailAddress>helpdesk@sissa.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.sissa.it.xml b/swamid-interfederations-2.0/idp.sissa.it.xml
deleted file mode 100644
index 0e46da2b..00000000
--- a/swamid-interfederations-2.0/idp.sissa.it.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sissa.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-09-09T11:40:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">
-                    https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">sissa.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">SISSA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">SISSA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
-        <mdui:Description xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.itcs.sissa.it/services/idem</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://idp.sissa.it/img/logo16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://idp.sissa.it/img/logo80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak 3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8 BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>
-                urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-            </md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sissa.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sissa.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sissa.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sissa.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">sissa.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDGzCCAgOgAwIBAgIUBDNUKHsGJPdh6XQWcjVI7QsO2fUwDQYJKoZIhvcNAQEF BQAwFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MB4XDTEwMTExMTEyMTAyNVoXDTMw MTExMTEyMTAyNVowFzEVMBMGA1UEAxMMaWRwLnNpc3NhLml0MIIBIjANBgkqhkiG 9w0BAQEFAAOCAQ8AMIIBCgKCAQEAijIA8AmcGKkBom6g4javpNcollJH9oq+13Fd wvNPUJTXPNDRrmNO9jhgY7Jcx2+I8jkOryP7ifpKtlmEt3k3W0o08Om/jKbdayKx I8phZMe2/fKiUVtUJz1zQ9cE02Cmd0vTb8421Y7JnmKcf7uwNLQnU4elT079Clak 3gwk2VJJja+yzrB9DMLhHs+rRZp4cqgJaH1LqcLtrp435xcFEr+NL15Ei2dFWtym pGgf/wLASEgqws2RSdvEu2Kz+m2vDIox6N9mZN/FW2chyjSJ/scv9pkYXeZAyaOB PtmGF50A7HOZDFUnQQ62EEQ74QmE/mhgSyPSGUjs/i+utY96PQIDAQABo18wXTA8 BgNVHREENTAzggxpZHAuc2lzc2EuaXSGI2h0dHBzOi8vaWRwLnNpc3NhLml0L2lk cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRVL7DD1CdWBVf38sDt3Plq+UeOzzANBgkq hkiG9w0BAQUFAAOCAQEADshw70QDPxPI3c9iJReHPp9xpkTrCV4i+oqK2ChSp3UT P2guauh6zdXbOMCBD1Zs+rMP5/LinkJpT7P9dM0jQgmD8uXbi6livyB4Brf49P0r jtKgeiplWeXSXzKnAwELHEDa5ixsvMT/WfBWVCNfrnTE/fR0YjGw35SqYgYiUfpE j/oS9mPKY09i92fgmfmVjtGvhY5ZD+nWpzdO+quvwKsYUyU9gfrB2EwW5eh+G1oF NWYprJEp7gYuge/L84Gq90zXkCvRlN+pYFDOHwQqPkaQZ8B1anEoH/5/wpI5CGlI Dqa9SIiHIzb6oiTRzBRED+zbqd+EzvCwEdoMBnarPQ==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sissa.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sissa.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>
-                urn:oasis:names:tc:SAML:2.0:nameid-format:transient
-            </md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Scuola Internazionale Superiore di Studi Avanzati</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SISSA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SISSA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.sissa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.sissa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Massimiliano</md:GivenName>
-    <md:SurName>Ritossa</md:SurName>
-    <md:EmailAddress>helpdesk@sissa.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:EmailAddress>helpdesk@sissa.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.soc.cas.cz.xml b/swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml
index b8fe4414..a04c91ce 100644
--- a/swamid-interfederations-2.0/idp.soc.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.soc.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-07-24T14:09:34Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.ssc.cas.cz.xml b/swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml
index 654aa93d..d3ab96b9 100644
--- a/swamid-interfederations-2.0/idp.ssc.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.ssc.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-06T11:08:18Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
new file mode 100644
index 00000000..9413ddc5
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sssup.it-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.sssup.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-08T10:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">sssup.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Scuola Superiore Sant'Anna</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Scuola Superiore Sant'Anna</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Scuola Superiore Sant'Anna users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti della Scuola Superiore Sant'Anna</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.sssup.it/idem/idem.en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.sssup.it/idem/idem.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.sssup.it/idem/privacy.en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.sssup.it/idem/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUZ0H4Pz2dfwqiTQgEDudEffWgc8gwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MB4XDTEwMDUxMTExMzAyMFoXDTMw
+MDUxMTExMzAyMFowFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmtnry6/PMlG+TnohAUy1szeBK2LtInYyhAV
+62GVLtgRj91lu+Ylv1DoVM/W+/F5qqDivYFepFH/ROaBxYnGIQPN9hbIQWW6y+2u
+a4SN8MsC2NF5TGt4hOa558TDXy8AvrN1XWYavVxyZnCFbUG7xnvaksHgn8r+EqXa
+33t3g27DCqr8gZ2mKL4DdqMEqYaWYFvQcsSGFI7R7k2FlpwrkN0XV0J6sJziw7NX
+xMMyPEzSA+hWf9MNPqfSPq+IXyRwJLChGGbKAnVHmNFP0uAi30rNoTWaniHoeHrj
+/QxNpIE+bFarIxmSm03CTCtPUhOUHScz3WHWNp5RF6Af3GnWcwIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuc3NzdXAuaXSGI2h0dHBzOi8vaWRwLnNzc3VwLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQBxI1S8NHoUaJu90/HWsDurxXT6zANBgkq
+hkiG9w0BAQUFAAOCAQEAUaTYopotKd4yJbt9MzZJwBS0NBQRrNkADwWSZ6ztfRTf
+Pbf5ZaDncxgw5GKdJZVY2VXkdSubhgBd0OPH37ah8iqeMftj7W6R+MVrd8v+Snv6
+Rfw6VfKlWgbHOchBj9qVJeXYMlxME7fKrhLcgzEV3xcsv/o5Li3GGBd4H+ybQMI7
+eKmkLMLVatoixFReLXPIiqVo79MkEVyVGlrK4dYrOJcJ594hstk9F3vcdY/U42LP
+AewSvVJLiwSwBXI+SE51+MTKSLnFgaysxCtFXAaO/yD62zA24gn7zju09SpRaRug
+O2Tf736AClLCgVeKQWYHIWrtjstpgmVbC1kZC/7hrA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.sssup.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sssup.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sssup.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sssup.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">sssup.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUZ0H4Pz2dfwqiTQgEDudEffWgc8gwDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MB4XDTEwMDUxMTExMzAyMFoXDTMw
+MDUxMTExMzAyMFowFzEVMBMGA1UEAxMMaWRwLnNzc3VwLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjmtnry6/PMlG+TnohAUy1szeBK2LtInYyhAV
+62GVLtgRj91lu+Ylv1DoVM/W+/F5qqDivYFepFH/ROaBxYnGIQPN9hbIQWW6y+2u
+a4SN8MsC2NF5TGt4hOa558TDXy8AvrN1XWYavVxyZnCFbUG7xnvaksHgn8r+EqXa
+33t3g27DCqr8gZ2mKL4DdqMEqYaWYFvQcsSGFI7R7k2FlpwrkN0XV0J6sJziw7NX
+xMMyPEzSA+hWf9MNPqfSPq+IXyRwJLChGGbKAnVHmNFP0uAi30rNoTWaniHoeHrj
+/QxNpIE+bFarIxmSm03CTCtPUhOUHScz3WHWNp5RF6Af3GnWcwIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAuc3NzdXAuaXSGI2h0dHBzOi8vaWRwLnNzc3VwLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBQBxI1S8NHoUaJu90/HWsDurxXT6zANBgkq
+hkiG9w0BAQUFAAOCAQEAUaTYopotKd4yJbt9MzZJwBS0NBQRrNkADwWSZ6ztfRTf
+Pbf5ZaDncxgw5GKdJZVY2VXkdSubhgBd0OPH37ah8iqeMftj7W6R+MVrd8v+Snv6
+Rfw6VfKlWgbHOchBj9qVJeXYMlxME7fKrhLcgzEV3xcsv/o5Li3GGBd4H+ybQMI7
+eKmkLMLVatoixFReLXPIiqVo79MkEVyVGlrK4dYrOJcJ594hstk9F3vcdY/U42LP
+AewSvVJLiwSwBXI+SE51+MTKSLnFgaysxCtFXAaO/yD62zA24gn7zju09SpRaRug
+O2Tf736AClLCgVeKQWYHIWrtjstpgmVbC1kZC/7hrA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.sssup.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sssup.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</OrganizationName>
+    <OrganizationName xml:lang="it">Scuola Superiore Sant'Anna di Studi Universitari e di Perfezionamento</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Scuola Superiore Sant'Anna</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Scuola Superiore Sant'Anna</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.santannaschool.eu</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.sssup.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>helpdesk@sssup.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.strasbourg.archi.fr.xml b/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml
index 9b8e1063..20b9122a 100644
--- a/swamid-interfederations-2.0/idp.strasbourg.archi.fr.xml
+++ b/swamid-interfederations-2.0/idp.strasbourg.archi.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">strasbourg.archi.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -47,7 +47,6 @@ ade38YYscP19cjJ5xgSciH1tHTO7eNq7iirrjgxn9nM1Cxpq716Kv1DwnyFT9IA=
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.strasbourg.archi.fr/idp/profile/SAML2/POST/SSO"/>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.strasbourg.archi.fr/idp/profile/SAML2/Redirect/SSO"/>
diff --git a/swamid-interfederations-2.0/idp.student.bth.se.xml b/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml
index 54eb8c63..54eb8c63 100644
--- a/swamid-interfederations-2.0/idp.student.bth.se.xml
+++ b/swamid-interfederations-2.0/idp.student.bth.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml
new file mode 100644
index 00000000..64358877
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.sze.hu-idp-shibboleth.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.sze.hu/idp/shibboleth">
+  <Extensions>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-test</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">sze</ns9:MetadataSet>
+    <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-idps</ns9:MetadataSet>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sze.hu</shibmd:Scope>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="hu">Széchenyi István Egyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Széchenyi István University</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Széchenyi István Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Széchenyi István University</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEwNTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJXSDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwEQzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNVHREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEBBQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUsjYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXKq0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLrOSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.sze.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sze.hu/idp/profile/SAML2/POST/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.sze.hu/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.sze.hu/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.sze.hu/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sze.hu</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDFDCCAfygAwIBAgIVAOdmgiuOmsyG0E988guPIMBUjJtTMA0GCSqGSIb3DQEBBQUAMBUxEzARBgNVBAMTCmlkcC5zemUuaHUwHhcNMTEwNTA1MDg0ODAxWhcNMzEwNTA1MDg0ODAxWjAVMRMwEQYDVQQDEwppZHAuc3plLmh1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcyXIVSgRNHxWV+T1wJwWoGT5tIcb90UUX+US7PT8pT9OjTj8Ihx1UW6nVWwf2VhSwYoRGrDkzPKwSd6mDbmQr1fmlxPRByxJw1jJWY3Qz4lVEazNK7WDlNswqxQdDNjS/iQOMYAj9s4SerZGnNLuhIQM7DSh2dxpyidGyjJouhqq3cqpzUk/5WEcoUblXhJlX22iCBeSjay7MzVoIHfSSaWCeQCD4hEScQDDfJXSDOF9edhOCogA51eMZR/j/HzvP+G0E7E4v25HUKl1r2a+/wSRziv5v4b79B0pwwEQzQ7Riq8kCyxJRRF2BRj0eGNaoC2aM8nh+u7UxqVqlP8nQIDAQABo1swWTA4BgNVHREEMTAvggppZHAuc3plLmh1hiFodHRwczovL2lkcC5zemUuaHUvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFLEnpKVtW3BAbuNKj5XjDx4dgkpCMA0GCSqGSIb3DQEBBQUAA4IBAQAwn6lCoBZp10wWRdbxDffHh19pPhdV21WqA2PmdfHcoQMVKQyZJEUsjYr6CDdf/IvTAnm4rS9pLPJYR/OH+5Qbmaxh3fnrloC31V5m4grHjtC3vpdopzXKq0ybme0lyT/nx/bgjrWg+TEEc5BRNr0maOARkbhd3pmY6Cf5xY0IgdoNmmXyL74V/ZRa7RtjFMyDJvDXdrpv4ltJEh6x+Obn9AHspTBfOOGLVeNOmP+jxQARDoqbuRLrOSuW+Ic/02Yf5OzC2P/EXX4ZgKla1bfKGxI3tL/aEzSL4TUXsy/FLdnWt3YnUqjG5yWCQ9QnXtlAO1oCYYabYMKqmVcBQAYg</ds:X509Certificate>
+        </ds:X509Data>
+        <ds:KeyName>idp.sze.hu</ds:KeyName>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.sze.hu:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="hu">Széchenyi István Egyetem</OrganizationName>
+    <OrganizationName xml:lang="en">Széchenyi István University</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">Széchenyi István Egyetem</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Széchenyi István University</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">http://www.sze.hu</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.sze.hu</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Csábi Béla</SurName>
+    <EmailAddress>mailto:csabi@sze.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <SurName>Csábi Béla</SurName>
+    <EmailAddress>mailto:csabi@sze.hu</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <SurName>Csábi Béla</SurName>
+    <EmailAddress>mailto:csabi@sze.hu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.szie.hu.xml b/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml
index 92dca71d..bb1911c7 100644
--- a/swamid-interfederations-2.0/idp.szie.hu.xml
+++ b/swamid-interfederations-2.0/idp.szie.hu-idp-shibboleth.xml
@@ -13,6 +13,10 @@
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">szie.hu</shibmd:Scope>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="hu">Szent István Egyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Szent István University</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Szent István Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Szent István University</mdui:Description>
         <mdui:Logo height="78" width="111">https://idp.szie.hu/idp/szie-logo.png</mdui:Logo>
       </mdui:UIInfo>
     </Extensions>
diff --git a/swamid-interfederations-2.0/idp.telecom-bretagne.eu.xml b/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml
index 49e1b95a..cf2ba771 100644
--- a/swamid-interfederations-2.0/idp.telecom-bretagne.eu.xml
+++ b/swamid-interfederations-2.0/idp.telecom-bretagne.eu-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-bretagne.eu</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.telecom-lille1.eu.xml b/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml
index 9abfbd68..026de149 100644
--- a/swamid-interfederations-2.0/idp.telecom-lille1.eu.xml
+++ b/swamid-interfederations-2.0/idp.telecom-lille1.eu-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-lille1.eu</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.telecom-paristech.fr.xml b/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
index 6513c816..56f54d83 100644
--- a/swamid-interfederations-2.0/idp.telecom-paristech.fr.xml
+++ b/swamid-interfederations-2.0/idp.telecom-paristech.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-paristech.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-telecom.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
new file mode 100644
index 00000000..8fe21a38
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.tut.fi-shibboleth2.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.tut.fi/shibboleth2">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz4MIT6HA16a4IVjVYld
+TdYEickxDC6fItsAwAwd3JlQSYJTKTApegd7+YyMtTBQzHARGWAAA0UFoEnfCrt6
+1/dKp52O93pH3E2flgD2SPsNgYCndqT80F2ddB9GnoP1nIroctTsyT6fG/9ETyln
+mDnuD3dk2RElEqq0sfP1anar039Dikl3s3ejyx71t3AP55rdDejgVbtSCI4psv2R
+jUsxYkc//ib6EAKS0aDGU/BjHKuyWXHPCzQ7gDx/fEXnEwLEhlhs13GMLUaAVo4q
+c1qsVX18ZYroUj8QokcZKgoPEEa8lB6EJDmTNtMAyW5MBtjGifyu267k+pXtz92V
+iQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
+HQYDVR0OBBYEFMBs3AXDyvNaBP4G37RtoMViq+UXMA4GA1UdDwEB/wQEAwIFoDAM
+BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
+HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
+hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudHV0LmZpMA0GCSqGSIb3DQEBBQUA
+A4IBAQBDxV7R20F2QLA7iG4KqYmfTogCZH40kRnOR2bOZr6WtYSflhhNv3otGgZA
+R9NIo5nDX+5spMJzlWV9nvJyYczwMPOn89V032XqSs8OFkvsdKClL7PYzSAu4lAG
+Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
+7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
+DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
+ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.tut.fi/idp/profile/SAML2/Redirect/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.tut.fi/idp/profile/SAML2/POST/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">tut.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEYTCCA0mgAwIBAgIQTO185Oil7C75C/tFRdicDDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQxMDAwMDAwMFoXDTE3MDQwOTIzNTk1OVowODEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRMwEQYDVQQDEwppZHAudHV0LmZp
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApz4MIT6HA16a4IVjVYld
+TdYEickxDC6fItsAwAwd3JlQSYJTKTApegd7+YyMtTBQzHARGWAAA0UFoEnfCrt6
+1/dKp52O93pH3E2flgD2SPsNgYCndqT80F2ddB9GnoP1nIroctTsyT6fG/9ETyln
+mDnuD3dk2RElEqq0sfP1anar039Dikl3s3ejyx71t3AP55rdDejgVbtSCI4psv2R
+jUsxYkc//ib6EAKS0aDGU/BjHKuyWXHPCzQ7gDx/fEXnEwLEhlhs13GMLUaAVo4q
+c1qsVX18ZYroUj8QokcZKgoPEEa8lB6EJDmTNtMAyW5MBtjGifyu267k+pXtz92V
+iQIDAQABo4IBZzCCAWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0w
+HQYDVR0OBBYEFMBs3AXDyvNaBP4G37RtoMViq+UXMA4GA1UdDwEB/wQEAwIFoDAM
+BgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNV
+HSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaAr
+hilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggr
+BgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5v
+cmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3Mu
+dGVyZW5hLm9yZzAVBgNVHREEDjAMggppZHAudHV0LmZpMA0GCSqGSIb3DQEBBQUA
+A4IBAQBDxV7R20F2QLA7iG4KqYmfTogCZH40kRnOR2bOZr6WtYSflhhNv3otGgZA
+R9NIo5nDX+5spMJzlWV9nvJyYczwMPOn89V032XqSs8OFkvsdKClL7PYzSAu4lAG
+Cj4/xx7pvgz9SHv2SayMjSGZIoitGEU68qBPP1oZpRdmvXmQVHxuDTw778VdIzM4
+7cSZOVQdyVEocSioH757tQktT5bbY4MuYdtPjDX+ICBS/OsXEGzUeTOnQHw2UU6e
+DVju6E0NmdQxPsN3Q0wLMgnLm4CcKxHsIsNWU+xyos9Sk1FnupZbxCFyBipOX7RY
+ov0reXszINweUWTYJchavcG3Dfyx</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.tut.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Tampere University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Tampereen teknillinen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Tampere University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Tammerfors tekniska universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.tut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tut.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.tut.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jussi</md:GivenName>
+    <md:SurName>Tirkkonen</md:SurName>
+    <md:EmailAddress>mailto:idp-support@tut.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml
index 897bf8a7..22422b69 100644
--- a/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr.xml
+++ b/swamid-interfederations-2.0/idp.u-bordeaux-montaigne.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux-montaigne.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml
index e69e234f..b7592a9b 100644
--- a/swamid-interfederations-2.0/idp.u-bordeaux.fr.xml
+++ b/swamid-interfederations-2.0/idp.u-bordeaux.fr-idp_ubx-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux1.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml
index df22f0e7..74a0791f 100644
--- a/swamid-interfederations-2.0/idp.u-bordeaux1.fr.xml
+++ b/swamid-interfederations-2.0/idp.u-bordeaux1.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux1.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux2.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml
index 3e76bea0..e6dfc9cb 100644
--- a/swamid-interfederations-2.0/idp.u-bordeaux2.fr.xml
+++ b/swamid-interfederations-2.0/idp.u-bordeaux2.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux2.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux3.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml
index 44dfa252..c648004d 100644
--- a/swamid-interfederations-2.0/idp.u-bordeaux3.fr.xml
+++ b/swamid-interfederations-2.0/idp.u-bordeaux3.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux3.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -44,39 +44,6 @@ y9Lo5MJ5yNmEDB5+h/7fJyAcRzIuprZEv/c0v+d4qbevTm3iIRM=
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEmDCCA4CgAwIBAgIRAKs62Y2J5eDcqyyUHrEfgyAwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAyMDcwMDAwMDBaFw0xNDAyMDYyMzU5NTlaMHAxCzAJBgNV
-BAYTAkZSMQ8wDQYDVQQHEwZQZXNzYWMxMzAxBgNVBAoMKlVuaXZlcnNpdMOpIE1p
-Y2hlbCBkZSBNb250YWlnbmUgQm9yZGVhdXggMzEbMBkGA1UEAxMSaWRwLnUtYm9y
-ZGVhdXgzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA06cj7R5h
-b59JKndjpvyOM/tO4BJLKtBVJuEGrhas6zMAnAkU9vpH2GkJh/uU++fEbkclKanU
-/Hn244CChidwJ5Ej/aTyEje8LU0kzYId6sS/K8E6g1LX5diumgjEvN61BsszXxfe
-jYlyzQIKYG10DyvCuNnFvJH9iWzCl38Fc2r0ej6RGCpOPsOmi9/5NCSmhD8u1mAA
-T3Tgf3XvVKUgG9dw+Rzh4EIry3KPoClfTtlxtCHMJdE27Vw0HYAdO+XEvcbolH3a
-hEMmVVHnsCsxFgJAv5JVyd1pSKPCzRJuvz1yUcl+4X9Jok691E86vi/dmxBHl/ht
-3Nc1zYZka9F3RQIDAQABo4IBZTCCAWEwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
-N1dH6pDjue0wHQYDVR0OBBYEFIknA6wkBp4b8Nx3FFifFeFN+DjWMA4GA1UdDwEB
-/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
-BQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuG
-KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-ZXJlbmEub3JnMB0GA1UdEQQWMBSCEmlkcC51LWJvcmRlYXV4My5mcjANBgkqhkiG
-9w0BAQUFAAOCAQEACMXkh+jjAg2Z44D2JTu/NIDaxQvFY/sFstQjxl0MzZnHZiww
-duiZMqm+iY2t7CdZn5BxGyLz8lDU+mNGIDXoFItcb4L54gPErZgo1SonS8+0ZRGN
-TB/ARen8JkDB5/MfK89GqI28peNzhSgG0dZZ9oobS9+8DLKYDhF2ht7koerST9mx
-gVC+nRUjaghxZDhcjwtJ5tf9EEahmjlZziwCsByd6rFvU4x1oFvtbaIKMtu1LWKT
-p6/j/WIKayaCCXh5exdW3B/vGGd36UbwBJfFs3lfBJ+7tKS2yZgsC/8LmPvXVT1A
-VWvDVq1DTU5MThOZ26w68xDGZ+qtTUt7knXeEA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-bordeaux3.fr/idp/profile/SAML2/POST/SSO"/>
diff --git a/swamid-interfederations-2.0/idp.u-bordeaux4.fr.xml b/swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml
index 8534005c..f06a600d 100644
--- a/swamid-interfederations-2.0/idp.u-bordeaux4.fr.xml
+++ b/swamid-interfederations-2.0/idp.u-bordeaux4.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bordeaux4.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.u-cergy.fr.xml b/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml
index 9e5e7718..058465bd 100644
--- a/swamid-interfederations-2.0/idp.u-cergy.fr.xml
+++ b/swamid-interfederations-2.0/idp.u-cergy.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-cergy.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.u-clermont1.fr.xml b/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml
index 8479db64..a88eb565 100644
--- a/swamid-interfederations-2.0/idp.u-clermont1.fr.xml
+++ b/swamid-interfederations-2.0/idp.u-clermont1.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-clermont1.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.u-paris2.fr.xml b/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml
index deb54c21..ea081388 100644
--- a/swamid-interfederations-2.0/idp.u-paris2.fr.xml
+++ b/swamid-interfederations-2.0/idp.u-paris2.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-paris2.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.u-picardie.fr.xml b/swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml
index 5b5b67ea..a5296a3d 100644
--- a/swamid-interfederations-2.0/idp.u-picardie.fr.xml
+++ b/swamid-interfederations-2.0/idp.u-picardie.fr-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-picardie.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -16,6 +16,32 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
+					      MIIDLzCCAhegAwIBAgIUc8NfuYdK4dyRrkHm6/tLQySUqJIwDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAwwRaWRwLnUtcGljYXJkaWUuZnIwHhcNMTQxMDE2MDcwNzMz
+WhcNMzQxMDE2MDcwNzMzWjAcMRowGAYDVQQDDBFpZHAudS1waWNhcmRpZS5mcjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIXETB/OTBKk7/ZYdhwaXv/C
+aOZF3gT6kl41CEjA7l5cqbL92LV6FSxW0QnvoRogXqGsNoO54HfepaFWWAg9bTJR
+Jdb7SRGQGOhWcuYFag3Q6i5s6/GJaaeapAX5o0Rzld3/2/uPyeTQBtkfYYU//vgZ
+tE8Lf3HDYMJD1B9HuerE8glmEDLB0N/bxAAZI7T2BRmg8+PXnJOZ4SIk77eHMnP1
+Ae5JfKWeqfF8AgLxnP4JD7zHuQT8lB2JbfmAyf1bOSa7ivCEeDOh48rNnBV78uw5
+1N1cMRsIoc+bbd+jkElU8jCu4pbvRfU17pMePbfUnD7I8g0P8r7VJiUIxG7DIvMC
+AwEAAaNpMGcwHQYDVR0OBBYEFNIgDO/aawjPE0CQ0GfmqjVnE6GRMEYGA1UdEQQ/
+MD2CEWlkcC51LXBpY2FyZGllLmZyhihodHRwczovL2lkcC51LXBpY2FyZGllLmZy
+L2lkcC9zaGliYm9sZXRoMA0GCSqGSIb3DQEBBQUAA4IBAQADjxTKGUIdJMklNUpE
+LiNIGAjS1VDb6B5HEzm6up7LejLhoHlyuioAUN44fxvCL1ohHxdIRw0x8KhGjdy1
+2U8GF3nFdW54Mq4UqAXeCcJ2l2zKhAwScsTvN/8M1tAD1u7nm/0gb8H82NPxsF3V
+M7WZ6QFH8UhZZ9a+oZOsLDokNV6RnkvSINxmNYzDFhe9QtYP07xjkOAYIwwS6nYz
+U+g/1EeMs9SHCFLDY5mjMXLXXLDCVFhQDN8ek//VqmEx+gTUDUcmMkxy+7rEMrIw
+zKSuEobTpLGYSGzMJJYF0NU6sMHnkurmFxA1S6tfm3DPniPJwR0RlSBpBeuJkqPg
+oubj
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
 					      MIIDajCCAlKgAwIBAgIVANKhuMi11QAW10TrFPegvTUOqn3bMA0GCSqGSIb3DQEB
 BQUAMCoxKDAmBgNVBAMTH3NoaWJib2xldGgtMDEud2ViLnUtcGljYXJkaWUuZnIw
 HhcNMTEwNjE2MTE0MzAyWhcNMzEwNjE2MTE0MzAyWjAqMSgwJgYDVQQDEx9zaGli
@@ -39,39 +65,6 @@ r+QqS3A3s1MpUhjcsw8FjQI13dTP9JbxHe7m/B44rp2myRaIj5iL9OBrd/Wgmu3d
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEfTCCA2WgAwIBAgIQFrc22NJ0sZXYUohpmyOzPzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTExMDYzMDAwMDAwMFoXDTE0MDYyOTIzNTk1OVowVzELMAkGA1UE
-BhMCRlIxLDAqBgNVBAoMI1VuaXZlcnNpdMOpIGRlIFBpY2FyZGllIEp1bGVzIFZl
-cm5lMRowGAYDVQQDExFpZHAudS1waWNhcmRpZS5mcjCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAKp28e4dTUt02azH+q4b5K3a6G/KBn5pRnImq4iqQAO7
-0sZ2d/7BOE3RhdCdhsNTnmJwhlLLzrI13+3K4Ynn+nDIK9Pc6e2uiMGZPjaKHs3b
-FMDryRyYhymENkeXHTl+EdxWM7OifpGJOqpZbpvps+uByq6KDYPH1HnYyCEC6WXd
-KBXnE6piwnVsL1+TYdvmdew9FVtw2RGsbiYiDY++UStyPNxiTK/8jUcmualeXZgo
-GhNAGCZMPdKl+VJeDOVDKhAUwF4qi+lFltl34pJ4Op6jq196H7SRPJ+9iSEjzuDb
-jjo79CPC8vo6sx8Kuj0+hwgRbXORvJi/YEyIxGZz0xkCAwEAAaOCAWQwggFgMB8G
-A1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRDxEQmo2u+
-i+w4gS2+FNlrznbibTAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNV
-HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIx
-AQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAcBgNVHREEFTATghFpZHAu
-dS1waWNhcmRpZS5mcjANBgkqhkiG9w0BAQUFAAOCAQEAf/mglTmr+XP4XzcNQATd
-M1HPc/JptcV6L5NFynuTQgaMn7y/594L8ypoLYFGKhCzHCJLWymImzu5W+17gX44
-kJPFDnHC/tvcIgOL3hcPuZqBe4vzpdzkEeYhFj7eh70n5h5V9TQ+L7afdmsTdPRP
-8dyF8wKtwrXH3tUhlJyJnFy92qQa9PyHqrLVaUfGCS1YBwbnrGLo94Ilj4u74n1P
-yIB/fBitCRnxgC9VNR8oZRXBup5v0qBhyYn1tDji7ipPOtfVzQVydUmfxvxNQvNA
-cUvarUQlWqBSKrKZ+3yXqKx3GZ+jiaKGFxaeR+rhMR0ZBUrp4r+oOfLDe2s8Oadi
-TA==
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.u-picardie.fr/profile/SAML2/POST/SSO"/>
diff --git a/swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml
new file mode 100644
index 00000000..1967e960
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ucuenca.edu.ec-idp-shibboleth.xml
@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.ucuenca.edu.ec/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://minga.cedia.org.ec" registrationInstant="2014-10-17T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="es">
+                                http://www.cedia.org.ec/minga
+                        </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <shibmd:Scope regexp="false">ucuenca.edu.ec</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UCUENCA</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UCUENCA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                                UCUENCA - University of Cuenca
+                        </mdui:Description>
+        <mdui:Description xml:lang="es">
+                                UCUENCA - Universidad de Cuenca
+                        </mdui:Description>
+        <mdui:InformationURL xml:lang="en">
+                                http://www.ucuenca.edu.ec
+                        </mdui:InformationURL>
+        <mdui:InformationURL xml:lang="es">
+                                http://www.ucuenca.edu.ec
+                        </mdui:InformationURL>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIHfzCCBWegAwIBAgIBCzANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
+DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
+MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
+bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
+MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDYyNjIyNDcz
+MloXDTE5MDYyNTIyNDczMlowgaAxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
+eTEPMA0GA1UEBxMGQ3VlbmNhMRAwDgYDVQQKEwdVY3VlbmNhMR4wHAYDVQQLExVV
+bml2ZXJzaWRhZCBkZSBDdWVuY2ExGzAZBgNVBAMTEmlkcC51Y3VlbmNhLmVkdS5l
+YzEhMB8GCSqGSIb3DQEJARYSbm9jQHVjdWVuY2EuZWR1LmVjMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEArwRQTiod9Z5u4YrlHPdCewpOVYyY194eam5W
+rlJElPDMmGwhwZiU2wj+gidLlzZl8Dg6/Yuz181aScrz44eZLMiHJEXHo/4Re3Gl
+YybeMbAHX6Tjxhr4Nn6iAFFnre6292ZoiKoG6yqEV08AEY5Tcs5dZClEYX+J5+uG
+czIImWWCb0SE/6pGpK7wH9QJqVgWxxcoQKbHmMYyoRvJuEs6Bm0JFOZjBo62UPsF
+6+GFvlNE8JmlJFEAojq/OYZmZh44vu6iFWOc4CoGviScMFQMlL5VhltGNkjGz8EG
+iTqh6rvWB647lLif+W3lc3qIxh5FT+6A2Du0baZFK1oFyZpL7QOw0G9VNmbr168x
+KRpwLyBXSP6rIAuLe9ZSk1sRF3xt2ADL2Z4gaAY20TkFlCz3+wlE2XZaKK5mQOI1
+ZTvLHXiIFqZEXahrH8gJBLUPdjK6nsZbnETqcgiSXtzURX6Uga2/fqsdoFEOFv4s
+M+HvFbwbAtNRZ94i/AidlMGDjfDH3PUDX/Tf1k1IYoL4ElFrUUrC5V82Otoi6leV
+jk86diRPDF0CMZZ75g1A14KQNef/NE+OfVr3ffedJ8HwNfiCx8OXxzkuEehlH2wg
+Hkw3bybRgfQwUAjmRhLzljMYyjyEy1A97C1T7on/L5KjucwELjBsxEOGS2Jbs4aF
+uo4XNqUCAwEAAaOCAaEwggGdMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
+MCsGCWCGSAGG+EIBDQQeFhxUaW55Q0EgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
+A1UdDgQWBBSoZLhY9p44fdwsaDeKAdjBTM8wgTCB9AYDVR0jBIHsMIHpgBRevkS8
+4mqdx4w4RVDNcpgsX1z+M6GBxaSBwjCBvzELMAkGA1UEBhMCRUMxDjAMBgNVBAgT
+BUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElBMUYwRAYDVQQL
+Ez1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJvbGxvIGRlIElu
+dGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVjMR8wHQYJKoZI
+hvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjggkA1DdxFsaoCnowGwYDVR0SBBQwEoEQ
+bmVnQGNlZGlhLm9yZy5lYzAdBgNVHREEFjAUgRJub2NAdWN1ZW5jYS5lZHUuZWMw
+DQYJKoZIhvcNAQEFBQADggIBABOPR7fu8jE4sX0G1INTL18vKTxP7TqEy+jBFYJU
+HG2IKUaJ3t8txI7vZWXQ8WHK+OiAE6wcSnw9qF/TYcImP8G9ZRw4exFqEOb6pWEC
+Dfy9yAh/MQb2YnJP86M7yTYjziDluACNr4Jtu5Y4ZjSMYXwLC7y2B2CfiSfx8lPH
+MYgLhHanEPaV+rYjlNylsYg9yZdM+OdB31FUWZ9n6oSlbCDHjjLciwg4dwK5TOlE
+KcftZjprpmuZVYniT8X36v4cp9nZdaNYbWKHRZ/Ks/uFp8STU60DWYqWtXSpXSK3
+94dDRbeWrCL8LoggTpUEt/H8sKcr2kia/QNSobXHTMOTj0Qh8PaaNmstXaE/DL+C
+PDf3y0MN6e9YWbeW6oMiKzXe+CeSj/XWGGrtYU/rftVUgKs4M6D+mTHpmnD+q1FT
+tTUixXd8UNu35L2Lm7VOmXdxBmrE5KGDUfAjlOULmfeAdis4Bid/zcIy7EassngZ
+Hn7KvhbATaUdIx6lqsNVyxUz7U2TFlIk70cm2iSkdvGlop0AgNEVry8MBgBw9AvT
+vALkOpAYlJFMYczcSNKSzPjh3cY7cUE0pIRqU4yCK4g69CEQVVnxnctxdhSh2w3W
+ho3ZWwDxAtglwPXJcZeQ9QXi7hzhFOcPg1HBpdKEmI9/9NoBciSkNgLwjwFKE5ri
+W8yj
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML1/SOAP/Artifact Resolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML2/SOAP/ArtifactResoluti on" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.ucuenca.edu.ec/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/POST-SimpleSign/ SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ucuenca.edu.ec/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">edu.ec</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIHfzCCBWegAwIBAgIBCzANBgkqhkiG9w0BAQUFADCBvzELMAkGA1UEBhMCRUMx
+DjAMBgNVBAgTBUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElB
+MUYwRAYDVQQLEz1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJv
+bGxvIGRlIEludGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVj
+MR8wHQYJKoZIhvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjMB4XDTE0MDYyNjIyNDcz
+MloXDTE5MDYyNTIyNDczMlowgaAxCzAJBgNVBAYTAkVDMQ4wDAYDVQQIEwVBenVh
+eTEPMA0GA1UEBxMGQ3VlbmNhMRAwDgYDVQQKEwdVY3VlbmNhMR4wHAYDVQQLExVV
+bml2ZXJzaWRhZCBkZSBDdWVuY2ExGzAZBgNVBAMTEmlkcC51Y3VlbmNhLmVkdS5l
+YzEhMB8GCSqGSIb3DQEJARYSbm9jQHVjdWVuY2EuZWR1LmVjMIICIjANBgkqhkiG
+9w0BAQEFAAOCAg8AMIICCgKCAgEArwRQTiod9Z5u4YrlHPdCewpOVYyY194eam5W
+rlJElPDMmGwhwZiU2wj+gidLlzZl8Dg6/Yuz181aScrz44eZLMiHJEXHo/4Re3Gl
+YybeMbAHX6Tjxhr4Nn6iAFFnre6292ZoiKoG6yqEV08AEY5Tcs5dZClEYX+J5+uG
+czIImWWCb0SE/6pGpK7wH9QJqVgWxxcoQKbHmMYyoRvJuEs6Bm0JFOZjBo62UPsF
+6+GFvlNE8JmlJFEAojq/OYZmZh44vu6iFWOc4CoGviScMFQMlL5VhltGNkjGz8EG
+iTqh6rvWB647lLif+W3lc3qIxh5FT+6A2Du0baZFK1oFyZpL7QOw0G9VNmbr168x
+KRpwLyBXSP6rIAuLe9ZSk1sRF3xt2ADL2Z4gaAY20TkFlCz3+wlE2XZaKK5mQOI1
+ZTvLHXiIFqZEXahrH8gJBLUPdjK6nsZbnETqcgiSXtzURX6Uga2/fqsdoFEOFv4s
+M+HvFbwbAtNRZ94i/AidlMGDjfDH3PUDX/Tf1k1IYoL4ElFrUUrC5V82Otoi6leV
+jk86diRPDF0CMZZ75g1A14KQNef/NE+OfVr3ffedJ8HwNfiCx8OXxzkuEehlH2wg
+Hkw3bybRgfQwUAjmRhLzljMYyjyEy1A97C1T7on/L5KjucwELjBsxEOGS2Jbs4aF
+uo4XNqUCAwEAAaOCAaEwggGdMAkGA1UdEwQCMAAwEQYJYIZIAYb4QgEBBAQDAgZA
+MCsGCWCGSAGG+EIBDQQeFhxUaW55Q0EgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0G
+A1UdDgQWBBSoZLhY9p44fdwsaDeKAdjBTM8wgTCB9AYDVR0jBIHsMIHpgBRevkS8
+4mqdx4w4RVDNcpgsX1z+M6GBxaSBwjCBvzELMAkGA1UEBhMCRUMxDjAMBgNVBAgT
+BUF6dWF5MQ8wDQYDVQQHEwZDdWVuY2ExDjAMBgNVBAoTBUNFRElBMUYwRAYDVQQL
+Ez1Db25zb3JjaW8gRWN1YXRvcmlhbm8gcGFyYSBlbCBEZXNhcnJvbGxvIGRlIElu
+dGVybmV0IEF2YW56YWRvMRYwFAYDVQQDEw1jYS5lZHVyb2FtLmVjMR8wHQYJKoZI
+hvcNAQkBFhBuZWdAY2VkaWEub3JnLmVjggkA1DdxFsaoCnowGwYDVR0SBBQwEoEQ
+bmVnQGNlZGlhLm9yZy5lYzAdBgNVHREEFjAUgRJub2NAdWN1ZW5jYS5lZHUuZWMw
+DQYJKoZIhvcNAQEFBQADggIBABOPR7fu8jE4sX0G1INTL18vKTxP7TqEy+jBFYJU
+HG2IKUaJ3t8txI7vZWXQ8WHK+OiAE6wcSnw9qF/TYcImP8G9ZRw4exFqEOb6pWEC
+Dfy9yAh/MQb2YnJP86M7yTYjziDluACNr4Jtu5Y4ZjSMYXwLC7y2B2CfiSfx8lPH
+MYgLhHanEPaV+rYjlNylsYg9yZdM+OdB31FUWZ9n6oSlbCDHjjLciwg4dwK5TOlE
+KcftZjprpmuZVYniT8X36v4cp9nZdaNYbWKHRZ/Ks/uFp8STU60DWYqWtXSpXSK3
+94dDRbeWrCL8LoggTpUEt/H8sKcr2kia/QNSobXHTMOTj0Qh8PaaNmstXaE/DL+C
+PDf3y0MN6e9YWbeW6oMiKzXe+CeSj/XWGGrtYU/rftVUgKs4M6D+mTHpmnD+q1FT
+tTUixXd8UNu35L2Lm7VOmXdxBmrE5KGDUfAjlOULmfeAdis4Bid/zcIy7EassngZ
+Hn7KvhbATaUdIx6lqsNVyxUz7U2TFlIk70cm2iSkdvGlop0AgNEVry8MBgBw9AvT
+vALkOpAYlJFMYczcSNKSzPjh3cY7cUE0pIRqU4yCK4g69CEQVVnxnctxdhSh2w3W
+ho3ZWwDxAtglwPXJcZeQ9QXi7hzhFOcPg1HBpdKEmI9/9NoBciSkNgLwjwFKE5ri
+W8yj
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.ucuenca.edu.ec:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">UCUENCA - Universidad de Cuenca</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Ucuenca - Universidad de Cuenca</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ucuenca.edu.ec.ec/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Claudio Chacon A</SurName>
+    <EmailAddress>noc@ucuenca.edu.ec</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ueb.cas.cz.xml b/swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml
index 752e7eed..fdbf6e3f 100644
--- a/swamid-interfederations-2.0/idp.ueb.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.ueb.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-04-07T09:50:19Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..5c0771e6
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uef.fi-idp-shibboleth.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.uef.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">uef.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDjDCCAnSgAwIBAgICBA8wDQYJKoZIhvcNAQEFBQAwgZAxCzAJBgNVBAYTAkZJ
+MQ8wDQYDVQQHDAZLdW9waW8xJjAkBgNVBAoMHVVuaXZlcnNpdHkgb2YgRWFzdGVy
+biBGaW5sYW5kMRAwDgYDVQQLDAdTaGliIENBMRQwEgYDVQQDDAtVRUYgU2hpYiBD
+QTEgMB4GCSqGSIb3DQEJARYRaG9zdG1hc3RlckB1ZWYuZmkwHhcNMTQwNDA5MTQx
+MTIzWhcNMjkwNDA1MTQxMTIzWjBZMQswCQYDVQQGEwJGSTEmMCQGA1UECgwdVW5p
+dmVyc2l0eSBvZiBFYXN0ZXJuIEZpbmxhbmQxDTALBgNVBAsMBFRpa2UxEzARBgNV
+BAMMCmlkcC51ZWYuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDE
+JZ1AwVGJ2S7FOsjH/vsvo2SEsUwN9QFdz4Kf+QBR50NaOocbl6wV6spOt//d/Tbp
+M9qs4Z9EgfT8hvCjNLRhI4m8w6XhYlA/MmBcxgQBYn19xoUTJ3DcJJddLIQsMU2H
+qOKoiYWwLL1ZQgbFG5ilZ15ZWpUXRBdDt9Hn8eK2SF2dPNrUKuAOZyDkMSY9cfwR
+pWrSUwX7Mm9+8TceZHWHaoPR2nbBABqBNuhXvZl6yK+bGXFvbPNGbMJTwXY/LJvc
+4x+sSDuR7HM5tGFcwFjVfj2yEva9BwG8jXWB/RSj7eleHLLM7+PvvR5axVaPbQ/9
+CIJjgPh1r8P8arKs140LAgMBAAGjJjAkMCIGA1UdEQQbMBmCCmlkcC51ZWYuZmmC
+C2lkcDIudWVmLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQA9xGaMiAZM1Ivp3XcTeNn2
+2U/vcCD9fZ9FbrB9buJrECPFh31xJqCtY4gTqdJZl9Z9T3e3I8SqahRPdKX8QPed
+XpIjKfMDM9SBSzMFuSUWyVrbvNCrQScwX+qD5PlpsACQzAGC+Q2pF5lqVx9zERef
+fq7jOiSACuaC39ymek0Wok1k6Mes9krUmwJOdP4SjPmgzWCdeh9X/d3xHgUpg2x5
+Sami+WFaMgXxZxJhK+roCmH3hkSh3r8U7xlrnfckSfQ2es9PGYnFI6UlZJqqtrTc
+WGsRO8eC1kCnCdgVhnerPYdvl76LeqVtkqSwepNbrncvnyGIOh+jhD2yrwRV7oqQ</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uef.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Eastern Finland</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Östra Finlands universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Itä-Suomen yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Eastern Finland</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Östra Finlands universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.uef.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uef.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uef.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Jarno</md:GivenName>
+    <md:SurName>Huuskonen</md:SurName>
+    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Markus</md:GivenName>
+    <md:SurName>Hagman</md:SurName>
+    <md:EmailAddress>mailto:markus.hagman@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Jarno</md:GivenName>
+    <md:SurName>Huuskonen</md:SurName>
+    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Jarno</md:GivenName>
+    <md:SurName>Huuskonen</md:SurName>
+    <md:EmailAddress>mailto:haka-ilmoitukset@uef.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.ufe.cas.cz.xml b/swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml
index a91f9751..1fb688b6 100644
--- a/swamid-interfederations-2.0/idp.ufe.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.ufe.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-06-12T10:58:21Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.ufgd.edu.br.xml b/swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml
index a417a233..a417a233 100644
--- a/swamid-interfederations-2.0/idp.ufgd.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.ufgd.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ufmg.br.xml b/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml
index a0d91e33..a0d91e33 100644
--- a/swamid-interfederations-2.0/idp.ufmg.br.xml
+++ b/swamid-interfederations-2.0/idp.ufmg.br-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ufpr.br.xml b/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml
index 7f392164..7f392164 100644
--- a/swamid-interfederations-2.0/idp.ufpr.br.xml
+++ b/swamid-interfederations-2.0/idp.ufpr.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ufsm.br.xml b/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
index b399d033..b399d033 100644
--- a/swamid-interfederations-2.0/idp.ufsm.br.xml
+++ b/swamid-interfederations-2.0/idp.ufsm.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.uha.fr.xml b/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml
index e82e6bbb..3f0e01b1 100644
--- a/swamid-interfederations-2.0/idp.uha.fr.xml
+++ b/swamid-interfederations-2.0/idp.uha.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uha.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.uhk.cz.xml b/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml
index b24eeffe..687cd3bd 100644
--- a/swamid-interfederations-2.0/idp.uhk.cz.xml
+++ b/swamid-interfederations-2.0/idp.uhk.cz-idp-shibboleth.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp.uhk.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-03-06T13:11:04Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.ujep.cz.xml b/swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml
index 7ed2c38e..564cd5f6 100644
--- a/swamid-interfederations-2.0/idp.ujep.cz.xml
+++ b/swamid-interfederations-2.0/idp.ujep.cz-idp-shibboleth.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ujep.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:26:39Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
@@ -26,41 +31,6 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIE6zCCA9OgAwIBAgIEQrOHrDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
-LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
-U05FVCBDQTAeFw0xMDAyMDUwNjA5MjJaFw0xMTAzMDUwNjM5MjJaMGsxEjAQBgoJ
-kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEkMCIGA1UE
-ChMbVW5pdmVyc2l0eSBvZiBKLiBFLiBQdXJreW5lMRQwEgYDVQQDEwtpZHAudWpl
-cC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDXBB0IPCgSo2Jw
-Fwo96bXHg5dB0ebhdbk5VeNIpGuitrdyb7+Y6sQL2jn5rLUuy0koyFtKnsi5CCIv
-3PoaJ0cUDGVx90m4yYK8E1rOHG4qc1SOWl5X0IHM5CwAGPXzWzBL0xQgq8qQs1nd
-IdYg8iMmC5bNwaV2XFtp03feERQmh2H/wAZJupWhPWrb1QzNDE1ndoZIbUlkn6MK
-yjlPZmXz9HapN5p6wypWL8M/0ILx5TC5KqDgTPbj3hlkxX4VpxoHCLI1qQyIJ6FM
-psiJF7XbKfuHTccwfLG4lEzVcf8V1hz5DeXyzr5syq+Lzf91XSRL/v3jQQ4AUmGI
-GSvDh2sCAwEAAaOCAb0wggG5MA4GA1UdDwEB/wQEAwIFoDAZBgNVHSAEEjAQMA4G
-DCsGAQQBvnkBAgICADA9BgNVHREENjA0gRVwYXZlbC5wb2xhY2VrQHVqZXAuY3qC
-C2lkcC51amVwLmN6gg5zaGliYWwudWplcC5jejCCAQsGA1UdHwSCAQIwgf8wWqBY
-oFakVDBSMRIwEAYKCZImiZPyLGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNu
-ZXQtY2ExEjAQBgNVBAMTCUNFU05FVCBDQTENMAsGA1UEAxMEQ1JMNTCBoKCBnaCB
-moZCaHR0cDovL3d3dy5jZXNuZXQuY3ovcGtpL2NybC9jbj1DRVNORVQlMjBDQSxk
-Yz1jZXNuZXQtY2EsZGM9Y3ouY3JshlRsZGFwOi8vbGRhcC5jZXNuZXQtY2EuY3ov
-Y249Q0VTTkVUJTIwQ0EsZGM9Y2VzbmV0LWNhLGRjPWN6P2NlcnRpZmljYXRlUmV2
-b2NhdGlvbkxpc3QwHwYDVR0jBBgwFoAUL2wFw1EmrK85nD44Nd1SKSeAxfUwHQYD
-VR0OBBYEFEvU9hiShsbDbtbv8Bg8RyDqOCyCMA0GCSqGSIb3DQEBBQUAA4IBAQDI
-oR3OpYnhdXm4Ay0pZAemLcMySvsKwgTrw/F0pT7Sn2MPUcc+LwkCwiXAecyPaLEl
-bivcNmN7cZF7R2ef/BMeDNhWEZLYnYHE/xRmu0b6Mx/vhKxqZRh5s82EePASB5Xf
-MPOU2JcpDXIEJKQjIyVPQPs6Y3fVL8nJX7aLlkLZ+UVlTnbpdLv09RNjtRgVxh1/
-2dor6/RyEsQP1/Ekz482iFqL+61pjXzrQssdTFKlTMxRKM2h5i2B0MmPrne1zGSh
-+q3x181uOgv1cCJATcU9PZiAd/Eua7SUs0ItvX1y5HUPKKknExJ+9cxssQxBU7SH
-idTONNLnAFV37h16DlOV
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
 Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
 YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
@@ -107,41 +77,6 @@ U19RU7sLdrZ60inUFxdxr+AR
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIE6zCCA9OgAwIBAgIEQrOHrDANBgkqhkiG9w0BAQUFADBDMRIwEAYKCZImiZPy
-LGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNuZXQtY2ExEjAQBgNVBAMTCUNF
-U05FVCBDQTAeFw0xMDAyMDUwNjA5MjJaFw0xMTAzMDUwNjM5MjJaMGsxEjAQBgoJ
-kiaJk/IsZAEZFgJjejEZMBcGCgmSJomT8ixkARkWCWNlc25ldC1jYTEkMCIGA1UE
-ChMbVW5pdmVyc2l0eSBvZiBKLiBFLiBQdXJreW5lMRQwEgYDVQQDEwtpZHAudWpl
-cC5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDXBB0IPCgSo2Jw
-Fwo96bXHg5dB0ebhdbk5VeNIpGuitrdyb7+Y6sQL2jn5rLUuy0koyFtKnsi5CCIv
-3PoaJ0cUDGVx90m4yYK8E1rOHG4qc1SOWl5X0IHM5CwAGPXzWzBL0xQgq8qQs1nd
-IdYg8iMmC5bNwaV2XFtp03feERQmh2H/wAZJupWhPWrb1QzNDE1ndoZIbUlkn6MK
-yjlPZmXz9HapN5p6wypWL8M/0ILx5TC5KqDgTPbj3hlkxX4VpxoHCLI1qQyIJ6FM
-psiJF7XbKfuHTccwfLG4lEzVcf8V1hz5DeXyzr5syq+Lzf91XSRL/v3jQQ4AUmGI
-GSvDh2sCAwEAAaOCAb0wggG5MA4GA1UdDwEB/wQEAwIFoDAZBgNVHSAEEjAQMA4G
-DCsGAQQBvnkBAgICADA9BgNVHREENjA0gRVwYXZlbC5wb2xhY2VrQHVqZXAuY3qC
-C2lkcC51amVwLmN6gg5zaGliYWwudWplcC5jejCCAQsGA1UdHwSCAQIwgf8wWqBY
-oFakVDBSMRIwEAYKCZImiZPyLGQBGRYCY3oxGTAXBgoJkiaJk/IsZAEZFgljZXNu
-ZXQtY2ExEjAQBgNVBAMTCUNFU05FVCBDQTENMAsGA1UEAxMEQ1JMNTCBoKCBnaCB
-moZCaHR0cDovL3d3dy5jZXNuZXQuY3ovcGtpL2NybC9jbj1DRVNORVQlMjBDQSxk
-Yz1jZXNuZXQtY2EsZGM9Y3ouY3JshlRsZGFwOi8vbGRhcC5jZXNuZXQtY2EuY3ov
-Y249Q0VTTkVUJTIwQ0EsZGM9Y2VzbmV0LWNhLGRjPWN6P2NlcnRpZmljYXRlUmV2
-b2NhdGlvbkxpc3QwHwYDVR0jBBgwFoAUL2wFw1EmrK85nD44Nd1SKSeAxfUwHQYD
-VR0OBBYEFEvU9hiShsbDbtbv8Bg8RyDqOCyCMA0GCSqGSIb3DQEBBQUAA4IBAQDI
-oR3OpYnhdXm4Ay0pZAemLcMySvsKwgTrw/F0pT7Sn2MPUcc+LwkCwiXAecyPaLEl
-bivcNmN7cZF7R2ef/BMeDNhWEZLYnYHE/xRmu0b6Mx/vhKxqZRh5s82EePASB5Xf
-MPOU2JcpDXIEJKQjIyVPQPs6Y3fVL8nJX7aLlkLZ+UVlTnbpdLv09RNjtRgVxh1/
-2dor6/RyEsQP1/Ekz482iFqL+61pjXzrQssdTFKlTMxRKM2h5i2B0MmPrne1zGSh
-+q3x181uOgv1cCJATcU9PZiAd/Eua7SUs0ItvX1y5HUPKKknExJ+9cxssQxBU7SH
-idTONNLnAFV37h16DlOV
-                     </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
 MIIELjCCAxYCCQD8WhkthREzrjANBgkqhkiG9w0BAQUFADCB2DELMAkGA1UEBhMC
 Q1oxFzAVBgNVBAgTDkN6ZWNoIFJlcHVibGljMRcwFQYDVQQHEw5Vc3RpIG5hZCBM
 YWJlbTE9MDsGA1UEChM0SmFuIEV2YW5nZWxpc3RhIFB1cmt5bmUgVW5pdmVyc2l0
diff --git a/swamid-interfederations-2.0/idp.ujf.cas.cz.xml b/swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml
index cd36fa30..57293f90 100644
--- a/swamid-interfederations-2.0/idp.ujf.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.ujf.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-04-09T14:17:34Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.ul.ie.xml b/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml
index 9f04c0ad..ae0a69ec 100644
--- a/swamid-interfederations-2.0/idp.ul.ie.xml
+++ b/swamid-interfederations-2.0/idp.ul.ie-idp-shibboleth.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ul.ie/idp/shibboleth">
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.ul.ie/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo registrationAuthority="http://www.heanet.ie" registrationInstant="2010-09-22T00:00:00Z"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.heanet.ie" registrationInstant="2010-09-22T00:00:00Z"/>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
-      <shibmd:Scope regexp="false">ul.ie</shibmd:Scope>
-      <mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ul.ie</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">University of Limerick</mdui:DisplayName>
         <mdui:DisplayName xml:lang="ga">Ollscoil Luimnigh</mdui:DisplayName>
-        <mdui:Logo height="105" width="146">https://edugate.heanet.ie/rr3/logos/ul.png</mdui:Logo>
         <mdui:InformationURL xml:lang="en">http://www.ul.ie</mdui:InformationURL>
+        <mdui:Logo height="105" width="146">https://edugate.heanet.ie/rr3/logos/ul.png</mdui:Logo>
       </mdui:UIInfo>
-      <mdui:DiscoHints>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:GeolocationHint>geo:52.67381900899521,-8.566224575042725</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor>
-      <ds:KeyInfo>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
 MIIDEDCCAfigAwIBAgIVAJxKI/0KxawomkWiBThPEUHGaeWBMA0GCSqGSIb3DQEB
diff --git a/swamid-interfederations-2.0/idp.ulapland.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.ulapland.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..2c4ebebd
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.ulapland.fi-idp-shibboleth.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://idp.ulapland.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">ulapland.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGrDCCBJSgAwIBAgIQdmrtc4rB3ElPE0L6/94NTjANBgkqhkiG9w0BAQUFADA5
+MRQwEgYDVQQKDAtUZWxpYVNvbmVyYTEhMB8GA1UEAwwYVGVsaWFTb25lcmEgU2Vy
+dmVyIENBIHYxMB4XDTE0MDQxNjEwMjQ0N1oXDTE2MDQxNTEwMjQ0N1owgYQxCzAJ
+BgNVBAYTAkZJMRAwDgYDVQQIDAdMYXBsYW5kMRIwEAYDVQQHDAlSb3ZhbmllbWkx
+HjAcBgNVBAoMFVVuaXZlcnNpdHkgb2YgTGFwbGFuZDEVMBMGA1UECwwMSUNUIFNl
+cnZpY2VzMRgwFgYDVQQDDA9pZHAudWxhcGxhbmQuZmkwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQDF4kd9ojVzXalhcDQm+DqVC9DAv+SNYCxSWnhbkms2
+8PPk5cMT6WfHy242QSKYZe2Asbvx856xCxbI+pkEtN7MyeDGu5PmFetwcSj5qaVG
+5spVNoZAgzLKWTzBfmxTT9EjhDioLV2ObqIzR+NTOCvQjfEGKpw9Lg9JobadmUwp
+kDhk1Y3o7ERBnOdyVFfvggl8sUMzU47XJfxk+jlpvOy7x3rQswTTOaGZkgd0OVxC
+awr6HzbBTEu08AiX2nsD3GnqSUPS38/K26a5KGOzFx7j+kT4K+ICBiPTFYgTKgln
+50rIwCn2wYf96vb/Vj6KT/S3WpQ6hVLMie5QA5Zuwl4rAgMBAAGjggJiMIICXjCB
+jQYIKwYBBQUHAQEEgYAwfjAtBggrBgEFBQcwAYYhaHR0cDovL29jc3AudHJ1c3Qu
+dGVsaWFzb25lcmEuY29tME0GCCsGAQUFBzAChkFodHRwOi8vcmVwb3NpdG9yeS50
+cnVzdC50ZWxpYXNvbmVyYS5jb20vdGVsaWFzb25lcmFzZXJ2ZXJjYXYxLmNlcjAf
+BgNVHSMEGDAWgBSggb5Vm/N/YQWEiy0MO+AISe5XPjAZBgNVHSAEEjAQMA4GDCsG
+AQQBgg8CAwEBDzCBygYDVR0fBIHCMIG/MEKgQKA+hjxodHRwOi8vY3JsLTMudHJ1
+c3QudGVsaWFzb25lcmEuY29tL3RlbGlhc29uZXJhc2VydmVyY2F2MS5jcmwweaB3
+oHWGc2xkYXA6Ly9jcmwtMS50cnVzdC50ZWxpYXNvbmVyYS5jb20vY249VGVsaWFT
+b25lcmElMjBTZXJ2ZXIlMjBDQSUyMHYxLG89VGVsaWFTb25lcmE/Y2VydGlmaWNh
+dGVyZXZvY2F0aW9ubGlzdDtiaW5hcnkwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMA4GA1UdDwEB/wQEAwIEsDB4BgkqhkiG9w0BCQ8EazBpMA4GCCqGSIb3
+DQMCAgIAgDAOBggqhkiG9w0DBAICAIAwCwYJYIZIAWUDBAEqMAsGCWCGSAFlAwQB
+LTALBglghkgBZQMEAQIwCwYJYIZIAWUDBAEFMAcGBSsOAwIHMAoGCCqGSIb3DQMH
+MBoGA1UdEQQTMBGCD2lkcC51bGFwbGFuZC5maTANBgkqhkiG9w0BAQUFAAOCAgEA
+KrVSvHwBWFnLVT/pQoSRaNMTnMymhmYDM78Lo2PVXLEnfmuD8pZYXFTLGxRMDkM/
+bC8oGTXFKBmphr0wn2unD06itE+XBZXpQac+497q1Fb7/rgmf7Vp11Zq2m2yUnjm
+NaGIsjgP+K6Y1EmeAXicbMVHVjJ2MmBuwTRhZI5kOIktUWrHuthSQ3Vu78Urdirz
+fEC0lqokvJIABrQQf36sZc84p7oyrO7EWb2BePM3ZtNQwSpDATTdhDTTdVgETA6T
+JGOcnvlP6i2rVel18noDgvoUuPr8TKkeV5uyc0cF7nfLnqQpRiLrWnF1Eko0Ze3w
+QmGUdoWkB/RQ9BgJ3Bbfo+37EZg+VxXBCI0chCEXjFwMAurS4SzBYplZsBr7WxXH
+JsrHg0F9JQvo5wQ04sZuiMP3WQhVuTdvHay11pih6GY1ujlMMjlbqlg1SrCJ3tMi
+jwhCYD9uz2EVokoHVRBYfsr9iE9H/Fo9PXYIZJNRdpSQahLammOLqnhmhRGBMtg6
+6zHBsKhwIbmxyb2z8ri2J4bucZG0tLqw+5pm39zMjHpvjUJ49cNhVF8hH8Tsxglb
+WBUVl8rtnAcsFuvvT5nyxPRV6+2hromsdwEK4PeUyLz0BFxQM5U/J9KOhC1faVfM
+sNec1gZqKR5mpgC1RQRtCn3q7woBwcokimHhhsFgFu8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.ulapland.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Lapin yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Lapland</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Lapplands universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Lapin yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Lapland</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Lapplands universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.ulapland.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.ulapland.fi</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.ulapland.fi</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Arto</md:GivenName>
+    <md:SurName>Hangasluoma</md:SurName>
+    <md:EmailAddress>mailto:arto.hangasluoma@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Esa</md:GivenName>
+    <md:SurName>Matasaho</md:SurName>
+    <md:EmailAddress>mailto:esa.matasaho@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Arto</md:GivenName>
+    <md:SurName>Hangasluoma</md:SurName>
+    <md:EmailAddress>mailto:arto.hangasluoma@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>Iikka</md:GivenName>
+    <md:SurName>Kupari</md:SurName>
+    <md:EmailAddress>mailto:iikka.kupari@ulapland.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.umk.pl.xml b/swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml
index 095ae6b1..e5d5ba16 100644
--- a/swamid-interfederations-2.0/idp.umk.pl.xml
+++ b/swamid-interfederations-2.0/idp.umk.pl-simplesaml-saml2-idp-metadata.php.xml
@@ -14,8 +14,14 @@
         <mdui:Description xml:lang="en">
             Nicolaus Copernicus University Identity Provider is used by employees.
          </mdui:Description>
-        <mdui:Logo height="168" width="150" xml:lang="en">https://www.umk.pl/grafika/logoumk.png</mdui:Logo>
+        <mdui:Logo height="168" width="150" xml:lang="en">https://www.umk.pl/grafika/logoumk64.png</mdui:Logo>
       </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>158.75.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>uni.torun.pl</mdui:DomainHint>
+        <mdui:DomainHint>umk.pl</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:53.1234804,18.0084378</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </md:Extensions>
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
new file mode 100644
index 00000000..02ea365b
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unibocconi-prod.it-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unibocconi-prod.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-08-29T10:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unibocconi.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Bocconi University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Universita' Bocconi</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for Bocconi University users</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' Bocconi</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unibocconi.eu/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unibocconi.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unibocconi.eu/idem-privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unibocconi.it/idem-privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
+NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
+if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
+jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
+dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
+iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
+ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
+L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
+l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
+7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
+BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
+uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
+9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
+uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
+K93oKA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unibocconi.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibocconi.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unibocconi.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
+NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
+if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
+jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
+dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
+iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
+ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
+L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
+l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
+7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
+BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
+uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
+9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
+uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
+K93oKA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Bocconi University</OrganizationName>
+    <OrganizationName xml:lang="it">Universita' Bocconi</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Bocconi University</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Universita' Bocconi</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unibocconi.eu/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.unibocconi.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>idem@unibocconi.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unibocconi-prod.it.xml b/swamid-interfederations-2.0/idp.unibocconi-prod.it.xml
deleted file mode 100644
index 03a7ff14..00000000
--- a/swamid-interfederations-2.0/idp.unibocconi-prod.it.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unibocconi-prod.it/idp/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-08-29T10:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">unibocconi.it</shibmd:Scope>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Bocconi University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Universita' Bocconi</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for Bocconi University users</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Universita' Bocconi</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unibocconi.eu/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unibocconi.it/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unibocconi.eu/idem-privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unibocconi.it/idem-privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
-                            BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
-                            NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
-                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
-                            if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
-                            jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
-                            dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
-                            iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
-                            ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
-                            AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
-                            L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
-                            l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
-                            7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
-                            BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
-                            uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
-                            9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
-                            uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
-                            K93oKA==  
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unibocconi.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unibocconi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unibocconi.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">unibocconi.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDMDCCAhigAwIBAgIVAIwE2/JkvYoJZcBwpAXXselfihnEMA0GCSqGSIb3DQEB
-                            BQUAMBwxGjAYBgNVBAMTEWlkcC51bmlib2Njb25pLml0MB4XDTEwMDIxNzEzMjAx
-                            NloXDTMwMDIxNzEzMjAxNlowHDEaMBgGA1UEAxMRaWRwLnVuaWJvY2NvbmkuaXQw
-                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCccPuV4oaBTT+Pg8czitby
-                            if616ZGLNOcdn58FvjPTx7/bgqy1KoFEnkQyzskglkxQTeVzo0cw3vhydJmnu0/4
-                            jAmS4AleN5k8RqK/JVDseUYPev6LOgtaghlmaiVBwozRf7iGuiMfwj9ZC4iavaOh
-                            dbqzGyvbx2SREifRNYGgWrUOwrFdAdbwbT5fmEfxnRm81RdYFFmjYARSKgQdbXTG
-                            iLa4+117OU19ybxVvdWU0nnz+b0YfcE7F/JtbaMwt27JKx2X67+N7z/6Hjg/kQme
-                            ktt+pXdqYNKk1km8sMa21Tfb9mBufLwgbgVTUXN/ZoaDWHCV8QiX1ydiaekrX1Q/
-                            AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bmlib2Njb25pLml0hihodHRwczov
-                            L2lkcC51bmlib2Njb25pLml0L2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBSo5rDb
-                            l8qPk/l/4PTC/gsy6kVagzANBgkqhkiG9w0BAQUFAAOCAQEAb0iBvtK+sxUDPRsh
-                            7mkuz7da4Cbd6YqX3CB5eQ3quBqo7/EjVbyu3o+BwOHBQwjv3PcTd0xv5axZ4jft
-                            BCyUTpp6lEHTRQw5e3AC46tOBM/pnioN3qVz7AuKZK9GOCNK4LwlRKck8QtvrDc9
-                            uPLi1pZq4lUAe9cGV5cBKinnpcMl4acTzqOWJ1ddEIR6KFiPiYE+uwxm6Jfrvydp
-                            9lYG4I0gNd31pe3fVIsHCpD7NDVYFmk7AJ7GIyXxjbzPFkcY7xqHMb8RlZutzQa2
-                            uo9UEg+bZsGyqWbheDSr5LT8Dc6JLI7PzMH0Q5O/ejDBq+gEuXcQxAKl/esAeLLp
-                            K93oKA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unibocconi.it/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unibocconi.it/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Bocconi University</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Universita' Bocconi</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Bocconi University</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Universita' Bocconi</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unibocconi.eu/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unibocconi.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>idem@unibocconi.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unica.it.xml b/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
index 4322dd13..499cde55 100644
--- a/swamid-interfederations-2.0/idp.unica.it.xml
+++ b/swamid-interfederations-2.0/idp.unica.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unica.it/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unica.it/idp/shibboleth">
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
@@ -7,24 +7,45 @@
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Cagliari State University</mdui:DisplayName>
+      <shibmd:Scope regexp="false">unica.it</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="it">Università degli Studi di Cagliari</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Cagliari State University users</mdui:Description>
+        <mdui:DisplayName xml:lang="en">Cagliari State University</mdui:DisplayName>
         <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Cagliari</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://people.unica.it/idem/english-info</mdui:InformationURL>
+        <mdui:Description xml:lang="en">Identity Provider for Cagliari State University users</mdui:Description>
         <mdui:InformationURL xml:lang="it">http://people.unica.it/idem/info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://people.unica.it/idem/rules/</mdui:PrivacyStatementURL>
+        <mdui:InformationURL xml:lang="en">http://people.unica.it/idem/english-info</mdui:InformationURL>
         <mdui:PrivacyStatementURL xml:lang="it">http://people.unica.it/idem/regole/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://people.unica.it/idem/rules/</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>unica.it</mdui:DomainHint>
+        <mdui:DomainHint>www.unica.it</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:39.2238411,9.1216613</mdui:GeolocationHint>
+      </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0yOTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17COKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItinGub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJKoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJp6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrBbcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/
-                            hie88l1nMwTMMKjmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0y
+OTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5
+iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17C
+OKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItin
+Gub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1
+E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/
+Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJ
+KoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJ
+p6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD
+0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrB
+bcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/hie88l1nMwTMMK
+jmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S
+7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -39,14 +60,30 @@
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unica.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">unica.it</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0yOTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17COKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItinGub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJKoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJp6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrBbcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/
-                            hie88l1nMwTMMKjmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE= 
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAIrVesupIJXVvOJ8Fd/p5fJf+3WXMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDAeFw0wOTA5MDMxNTQyMzhaFw0y
+OTA5MDMxNTQyMzhaMBcxFTATBgNVBAMTDGlkcC51bmljYS5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAOMXRHdthMpVg/OZq0FjVMjInXCzJg0wMiC5
+iajyy2o7I8xlLHkuWLaTa8nOMx3sPoSRiNvyC/F6tpq1fyL1xM6rHC0jm/src17C
+OKB+Vk7TiTdbLugWcKmiUIl9hXjQBuNQHjJpPvoMNmynpiKzJGqr21VNEnfdItin
+Gub+PLT0OU3zBVfO9gbMs1i8iE60Yhks9zowT2mXqlZYvLiYANZJpqTKVk1N9zH1
+E6DrGuTKo434sh9nHFcQcNPgobJqOGawwWxLXJ/1GgwwLeGXTjFxN43mdNKMz6J/
+Wb0aXL343rgxjnaNMN0W0cDraXllAbKcyxFwHSrzGiUN7rRFHIECAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaWNhLml0hiNodHRwczovL2lkcC51bmljYS5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUPaAgHz1jAomoOLcOZ0U+2gHYRiswDQYJ
+KoZIhvcNAQEFBQADggEBALAcfYQamaCFcd1PSLh/twRlywMMlLgXLklNVIVEbgaJ
+p6MmW/jPU21SDkWnQUSlFmgsnL8ONvuX4SGPLKg3XCYKa0c2rP6Q6v8M2xjl0vSD
+0XLwrb5EklZKdPKS5JeBt12dIKscRixRwLoXX8cm1tkQbs/0sNa3GceqvdaorsrB
+bcRbNFgSlA88yKQjeJZJM14pJG7DHSmfYaRFVcnD1v5dELyJG/hie88l1nMwTMMK
+jmsja+qhLCYV1c2MxeV3Y9qdd6imW3OtJXsXMQGQguIhVktWDjM6wD1/ICSm0F5S
+7jxX0Ysnsl9xDuWqKQF0i0Ds6hxNBAiG3jmRGTCF6JE=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unicaen.fr.xml b/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
index 3595db0c..265517d6 100644
--- a/swamid-interfederations-2.0/idp.unicaen.fr.xml
+++ b/swamid-interfederations-2.0/idp.unicaen.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicaen.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.unijui.edu.br.xml b/swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml
index 78f52dcb..78f52dcb 100644
--- a/swamid-interfederations-2.0/idp.unijui.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.unijui.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.unimc.it.xml b/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
index cb570183..e6bc5e41 100644
--- a/swamid-interfederations-2.0/idp.unimc.it.xml
+++ b/swamid-interfederations-2.0/idp.unimc.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimc.it/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unimc.it/idp/shibboleth">
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-04-22T12:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">
@@ -9,8 +9,8 @@
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimc.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">unimc.it</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="en">University of Macerata.</mdui:DisplayName>
         <mdui:DisplayName xml:lang="it">Universita' di Macerata</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity provider for University of Macerata users (Students, Teachers, and Employees)</mdui:Description>
@@ -26,28 +26,27 @@
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
-                            BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
-                            MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAJtks8bJInpYW8j049YMBTWfGRfkMgTPQ2fI
-                            T1TLbkZ+zSTvm+hgBdeyY0g0EkpC7MmkrcigKc+BWdXaaeBHWh1extz08cVtcNEH
-                            52vTw9asy2cXh/EFd0Br1zc9j0dEXLhnCVNHI6Vi7F7oTlsAb2Xt7/iQuWjT/cKM
-                            Eiqt+qVSgdtRsRCD6RJLlINGeunjFDizUymDxtt1ZB5mU1DlpC4cynImG0jI3DsK
-                            h0MhjeYSWLn9giA7j7hOTSqJuZddv/Y+YOWrMScV1jfiu1uMN2DllOjapt7DUsxi
-                            bgtrc7Vig5o/ZVqLd4zI8lHsrqKUCDQBO9EviQq98bMbqqTCq/MCAwEAAaNfMF0w
-                            PAYDVR0RBDUwM4IMaWRwLnVuaW1jLml0hiNodHRwczovL2lkcC51bmltYy5pdC9p
-                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1nYOH/vCkNVmfvhCYkLSRhlGZR0wDQYJ
-                            KoZIhvcNAQEFBQADggEBAFmIBImjvlX9VF4e/qYv/rvTILMUskF6rC8BTSYzIdLk
-                            wX4H6k+AUkTWkdEBkvJyvcIAg8eZqc2TH7CSu4PjYu/p+A8Uum841EY0GngIeQg/
-                            zeF//LRySr7iMMGcB5JmjYdeOa50DtbWAdns7BR8UNBUFYv9CR9iknmcEbtkZylK
-                            H/9RF3Xv7HxDNRzUuFOx0AiVdbUvQNo801Jd0SBwK7JIoYrTGM0OdxlP8VgmixZd
-                            yLZqGcGeMxdBisF78411jjMh+H3rDzmt8W7FkTJI0svAn3THDqBaYJqyPnfJSrab
-                            gakI/LbrmYc1DoncD0v9+M8RyFpzxx+5hDmhAjeucuU=
-                            
-                        </ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
+MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJtks8bJInpYW8j049YMBTWfGRfkMgTPQ2fI
+T1TLbkZ+zSTvm+hgBdeyY0g0EkpC7MmkrcigKc+BWdXaaeBHWh1extz08cVtcNEH
+52vTw9asy2cXh/EFd0Br1zc9j0dEXLhnCVNHI6Vi7F7oTlsAb2Xt7/iQuWjT/cKM
+Eiqt+qVSgdtRsRCD6RJLlINGeunjFDizUymDxtt1ZB5mU1DlpC4cynImG0jI3DsK
+h0MhjeYSWLn9giA7j7hOTSqJuZddv/Y+YOWrMScV1jfiu1uMN2DllOjapt7DUsxi
+bgtrc7Vig5o/ZVqLd4zI8lHsrqKUCDQBO9EviQq98bMbqqTCq/MCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaW1jLml0hiNodHRwczovL2lkcC51bmltYy5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1nYOH/vCkNVmfvhCYkLSRhlGZR0wDQYJ
+KoZIhvcNAQEFBQADggEBAFmIBImjvlX9VF4e/qYv/rvTILMUskF6rC8BTSYzIdLk
+wX4H6k+AUkTWkdEBkvJyvcIAg8eZqc2TH7CSu4PjYu/p+A8Uum841EY0GngIeQg/
+zeF//LRySr7iMMGcB5JmjYdeOa50DtbWAdns7BR8UNBUFYv9CR9iknmcEbtkZylK
+H/9RF3Xv7HxDNRzUuFOx0AiVdbUvQNo801Jd0SBwK7JIoYrTGM0OdxlP8VgmixZd
+yLZqGcGeMxdBisF78411jjMh+H3rDzmt8W7FkTJI0svAn3THDqBaYJqyPnfJSrab
+gakI/LbrmYc1DoncD0v9+M8RyFpzxx+5hDmhAjeucuU=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -62,31 +61,30 @@
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unimc.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">unimc.it</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-                            MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
-                            BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
-                            MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
-                            hvcNAQEBBQADggEPADCCAQoCggEBAJtks8bJInpYW8j049YMBTWfGRfkMgTPQ2fI
-                            T1TLbkZ+zSTvm+hgBdeyY0g0EkpC7MmkrcigKc+BWdXaaeBHWh1extz08cVtcNEH
-                            52vTw9asy2cXh/EFd0Br1zc9j0dEXLhnCVNHI6Vi7F7oTlsAb2Xt7/iQuWjT/cKM
-                            Eiqt+qVSgdtRsRCD6RJLlINGeunjFDizUymDxtt1ZB5mU1DlpC4cynImG0jI3DsK
-                            h0MhjeYSWLn9giA7j7hOTSqJuZddv/Y+YOWrMScV1jfiu1uMN2DllOjapt7DUsxi
-                            bgtrc7Vig5o/ZVqLd4zI8lHsrqKUCDQBO9EviQq98bMbqqTCq/MCAwEAAaNfMF0w
-                            PAYDVR0RBDUwM4IMaWRwLnVuaW1jLml0hiNodHRwczovL2lkcC51bmltYy5pdC9p
-                            ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1nYOH/vCkNVmfvhCYkLSRhlGZR0wDQYJ
-                            KoZIhvcNAQEFBQADggEBAFmIBImjvlX9VF4e/qYv/rvTILMUskF6rC8BTSYzIdLk
-                            wX4H6k+AUkTWkdEBkvJyvcIAg8eZqc2TH7CSu4PjYu/p+A8Uum841EY0GngIeQg/
-                            zeF//LRySr7iMMGcB5JmjYdeOa50DtbWAdns7BR8UNBUFYv9CR9iknmcEbtkZylK
-                            H/9RF3Xv7HxDNRzUuFOx0AiVdbUvQNo801Jd0SBwK7JIoYrTGM0OdxlP8VgmixZd
-                            yLZqGcGeMxdBisF78411jjMh+H3rDzmt8W7FkTJI0svAn3THDqBaYJqyPnfJSrab
-                            gakI/LbrmYc1DoncD0v9+M8RyFpzxx+5hDmhAjeucuU=
-                            
-                        </ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVAIEgUNZ2kbCrw2zNqYwgIJCvedDSMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDAeFw0xMzA0MDExNjAxNDZaFw0z
+MzA0MDExNjAxNDZaMBcxFTATBgNVBAMTDGlkcC51bmltYy5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAJtks8bJInpYW8j049YMBTWfGRfkMgTPQ2fI
+T1TLbkZ+zSTvm+hgBdeyY0g0EkpC7MmkrcigKc+BWdXaaeBHWh1extz08cVtcNEH
+52vTw9asy2cXh/EFd0Br1zc9j0dEXLhnCVNHI6Vi7F7oTlsAb2Xt7/iQuWjT/cKM
+Eiqt+qVSgdtRsRCD6RJLlINGeunjFDizUymDxtt1ZB5mU1DlpC4cynImG0jI3DsK
+h0MhjeYSWLn9giA7j7hOTSqJuZddv/Y+YOWrMScV1jfiu1uMN2DllOjapt7DUsxi
+bgtrc7Vig5o/ZVqLd4zI8lHsrqKUCDQBO9EviQq98bMbqqTCq/MCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaW1jLml0hiNodHRwczovL2lkcC51bmltYy5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU1nYOH/vCkNVmfvhCYkLSRhlGZR0wDQYJ
+KoZIhvcNAQEFBQADggEBAFmIBImjvlX9VF4e/qYv/rvTILMUskF6rC8BTSYzIdLk
+wX4H6k+AUkTWkdEBkvJyvcIAg8eZqc2TH7CSu4PjYu/p+A8Uum841EY0GngIeQg/
+zeF//LRySr7iMMGcB5JmjYdeOa50DtbWAdns7BR8UNBUFYv9CR9iknmcEbtkZylK
+H/9RF3Xv7HxDNRzUuFOx0AiVdbUvQNo801Jd0SBwK7JIoYrTGM0OdxlP8VgmixZd
+yLZqGcGeMxdBisF78411jjMh+H3rDzmt8W7FkTJI0svAn3THDqBaYJqyPnfJSrab
+gakI/LbrmYc1DoncD0v9+M8RyFpzxx+5hDmhAjeucuU=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -97,9 +95,9 @@
   </AttributeAuthorityDescriptor>
   <Organization>
     <OrganizationName xml:lang="en">University of Macerata</OrganizationName>
-    <OrganizationName xml:lang="it">Universita' degli Studi di Macerata</OrganizationName>
+    <OrganizationName xml:lang="it">Università degli Studi di Macerata</OrganizationName>
     <OrganizationDisplayName xml:lang="en">University of Macerata</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Universita' degli Studi di Macerata</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Università degli Studi di Macerata</OrganizationDisplayName>
     <OrganizationURL xml:lang="en">http://www.unimc.it/en</OrganizationURL>
     <OrganizationURL xml:lang="it">http://www.unimc.it/it</OrganizationURL>
   </Organization>
diff --git a/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml
new file mode 100644
index 00000000..d2d03cf3
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unimedizin-mainz.de-idp-shibboleth.xml
@@ -0,0 +1,245 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unimedizin-mainz.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-09T21:46:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">unimedizin-mainz.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universitätsmedizin der JoGu Mainz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University Medical Center of the JoGu Mainz</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</mdui:Description>
+        <mdui:Description xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.unimedizin-mainz.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.unimedizin-mainz.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
+BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
+RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
+bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
+bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
+bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
+MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
+VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
+aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
+cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
+aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
+ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
+0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
+ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
+9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
+2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
+aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
+YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
+VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
+AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
+K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
+jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
+A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
+8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
+AO8Ifi/pFzKtodcKmmfls3M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
+BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
+RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
+bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
+bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
+bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
+MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
+VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
+aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
+cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
+aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
+ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
+0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
+ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
+9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
+2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
+aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
+YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
+VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
+AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
+K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
+jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
+A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
+8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
+AO8Ifi/pFzKtodcKmmfls3M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unimedizin-mainz.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unimedizin-mainz.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">unimedizin-mainz.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
+BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
+RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
+bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
+bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
+bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
+MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
+VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
+aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
+cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
+aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
+ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
+0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
+ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
+9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
+2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
+aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
+YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
+VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
+AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
+K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
+jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
+A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
+8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
+AO8Ifi/pFzKtodcKmmfls3M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>idp.unimedizin-mainz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=idp.unimedizin-mainz.de,O=Universitaetsmedizin der Johannes Gutenberg-Universitaet Mainz,L=Mainz,ST=Rheinland-Pfalz,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGnTCCBYWgAwIBAgIHGFIEk0Z6CDANBgkqhkiG9w0BAQsFADCB2DELMAkGA1UE
+BhMCREUxGDAWBgNVBAgTD1JoZWlubGFuZC1QZmFsejEOMAwGA1UEBxMFTWFpbnox
+RzBFBgNVBAoTPlVuaXZlcnNpdGFldHNtZWRpemluIGRlciBKb2hhbm5lcyBHdXRl
+bmJlcmctVW5pdmVyc2l0YWV0IE1haW56MS8wLQYDVQQDEyZVTklWRVJTSVRBRVRT
+bWVkaXppbi4gTWFpbnogLSBDQSAtIEcwMTElMCMGCSqGSIb3DQEJARYWY2FAdW5p
+bWVkaXppbi1tYWluei5kZTAeFw0xNDEwMDYxMjExNDdaFw0xOTA3MDYwMDAwMDBa
+MIGiMQswCQYDVQQGEwJERTEYMBYGA1UECBMPUmhlaW5sYW5kLVBmYWx6MQ4wDAYD
+VQQHEwVNYWluejFHMEUGA1UEChM+VW5pdmVyc2l0YWV0c21lZGl6aW4gZGVyIEpv
+aGFubmVzIEd1dGVuYmVyZy1Vbml2ZXJzaXRhZXQgTWFpbnoxIDAeBgNVBAMTF2lk
+cC51bmltZWRpemluLW1haW56LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEApf3XPkCctjw5x/tK0fVGr5/M0ZeJ8iPjES2XNyxMMBT0CirU96+r20YW
+aS1rpnWRNwWrr+iWiwK7mYQ5glT5RkwtBB3zdEHYRC/MZHRIrDVlVtEqGVEdN5Fn
+ZEixsxDatWdWBwCcTMO2rp7Uf6zsCxCJn63JwCtZVLyDdcEg4m+2Q32nwQZY29V4
+0t3mVfUZ/r55V9W8V2zhRpRrGarqmCGAv48XXwgVHLhN/Rb0/grsBRJZqEU9CvA0
+ujJwFuk9Lh8S1H3jNbqAv2M2Yf88rQDbGgy8yhOve7aWmHjIxaGm0IOVHSGLHm5g
+9eH/Dd68StfdnxsrubW7Qjl/vTgT7wIDAQABo4ICnjCCApowCQYDVR0TBAIwADAL
+BgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1Ud
+DgQWBBS27g1OcWdymQjf/ek1vvVRKOtGjDAfBgNVHSMEGDAWgBSkOU4ibcYqBiBu
+2uhoUVylgQ52PTBWBgNVHREETzBNghdpZHAudW5pbWVkaXppbi1tYWluei5kZYIY
+aWRwMS51bmltZWRpemluLW1haW56LmRlghhpZHAyLnVuaW1lZGl6aW4tbWFpbnou
+ZGUwgZMGA1UdHwSBizCBiDBCoECgPoY8aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmltZWRpemluLW1haW56LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMEKgQKA+hjxodHRw
+Oi8vY2RwMi5wY2EuZGZuLmRlL3VuaW1lZGl6aW4tbWFpbnotY2EvcHViL2NybC9j
+YWNybC5jcmwwgeEGCCsGAQUFBwEBBIHUMIHRMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwTAYIKwYBBQUHMAKGQGh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2Fj
+ZXJ0L2NhY2VydC5jcnQwTAYIKwYBBQUHMAKGQGh0dHA6Ly9jZHAyLnBjYS5kZm4u
+ZGUvdW5pbWVkaXppbi1tYWluei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwTwYD
+VR0gBEgwRjAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDQYJKoZIhvcNAQELBQADggEB
+AEzbmDhzM5OGsMX1WJbj2tTAvVjlyEm3ioEE58dDV2I5QTi2TovCSxolslWnu6m6
+K0W2XZONTXSlbpr63Mk37KpThaMmt50tGhaQzmhDlcJINxpP4kKsDcYFHaem2wKW
+jHbL3pV2VIrYJwOhbVDFlhxJTRJ3wSrKCn52XT1U2/seD/iFBmfZtjDjnKT81r2F
+A/97xPYyf/ERwisDrvq0NqAlDGUQwqb670CNOLwuxm8UgjRct73RNgea9ez3Gs97
+8dmHUIz1D+e8aGj31RallWAk/ZdYp0rKYM0dd7MGbh6toEevStAbb2MTKHqIv45S
+AO8Ifi/pFzKtodcKmmfls3M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unimedizin-mainz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e417</OrganizationName>
+    <OrganizationName xml:lang="en">e417</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Universitätsmedizin der Johannes Gutenberg-Universität Mainz</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University Medical Center of the Johannes Gutenberg University Mainz Germany</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.unimedizin-mainz.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unimedizin-mainz.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Ataollah</GivenName>
+    <SurName>Khoddam-Zadeh</SurName>
+    <EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ataollah</GivenName>
+    <SurName>Khoddam-Zadeh</SurName>
+    <EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Ataollah</GivenName>
+    <SurName>Khoddam-Zadeh</SurName>
+    <EmailAddress>mailto:ataollah.khoddam-zadeh@unimedizin-mainz.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
new file mode 100644
index 00000000..cf834add
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uniparthenope.it-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.uniparthenope.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-01-11T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uniparthenope.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Università di Napoli Parthenope</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Napoli Parthenope</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for PARTHENOPE University member</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
+OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
+ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
+teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
+Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
++JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
+kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
+lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
+n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
+K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
+4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
+K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
+Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
+c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
+NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
+cReeVaTfudJyy/pCjfbP
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniparthenope.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniparthenope.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uniparthenope.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
+OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
+ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
+teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
+Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
++JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
+kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
+lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
+n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
+K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
+4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
+K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
+Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
+c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
+NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
+cReeVaTfudJyy/pCjfbP
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Università di Napoli Parthenope</OrganizationName>
+    <OrganizationName xml:lang="en">Università di Napoli Parthenope</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Università di Napoli Parthenope</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Università di Napoli Parthenope</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.uniparthenope.it</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uniparthenope.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>N.Napolitano-A.Cioffi</SurName>
+    <EmailAddress>idem@uniparthenope.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniparthenope.it.xml b/swamid-interfederations-2.0/idp.uniparthenope.it.xml
deleted file mode 100644
index 267d4e4b..00000000
--- a/swamid-interfederations-2.0/idp.uniparthenope.it.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.uniparthenope.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-02-15T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">uniparthenope.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UniPARTHENOPE IdP</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">UniPARTHENOPE IdP</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for PARTHENOPE University member</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
-                            BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
-                            OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
-                            ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
-                            teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
-                            Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
-                            +JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
-                            kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
-                            lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
-                            n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
-                            K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
-                            VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
-                            4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
-                            K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
-                            Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
-                            c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
-                            NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
-                            cReeVaTfudJyy/pCjfbP
-                            
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniparthenope.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniparthenope.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniparthenope.it/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">uniparthenope.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UniPARTHENOPE AA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">UniPARTHENOPE AA</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attribute Autority for PARTHENOPE University member</mdui:Description>
-        <mdui:Description xml:lang="it">Attribute Autority per gli afferenti alla Universita' PARTHENOPE</mdui:Description>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDOzCCAiOgAwIBAgIUaE6MYuJWXmKRLkOaoYJ7v4C0fFowDQYJKoZIhvcNAQEF
-                            BQAwHzEdMBsGA1UEAxMUaWRwLnVuaXBhcnRoZW5vcGUuaXQwHhcNMTAxMDExMTA1
-                            OTU2WhcNMzAxMDExMTA1OTU2WjAfMR0wGwYDVQQDExRpZHAudW5pcGFydGhlbm9w
-                            ZS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJkPb9xxWtT2CoJL
-                            teZJDfYsGC3ieLYzf3iE+Yb8tv/4YpEFfUlUK07FH+SBDC0gpmGyd6EhUnaQP9Lz
-                            Hc8iIaiSCNwGy3iZyVQkbYHhiGCcgMvoIbnK2B4/DST1vRjNweCQiZsmk03O05dQ
-                            +JjcgEkFi+8EeSEpOu3IrACRix/FViPy8l0JOr1ftLiONl/7WdyNJorLfTym6+cY
-                            kwSJIOzu5+U0UTx1vQJa1RN67dydGPy68Hq9JiKrYZ9zm+n0w7rbkCe+F4oP4Pp/
-                            lXJhGdenDusAZpohA72CXqFMGpMoKf4ktnm1vg6o2awl6pUQTRFqjhIXdy8v6f7O
-                            n0W9s/sCAwEAAaNvMG0wTAYDVR0RBEUwQ4IUaWRwLnVuaXBhcnRoZW5vcGUuaXSG
-                            K2h0dHBzOi8vaWRwLnVuaXBhcnRoZW5vcGUuaXQvaWRwL3NoaWJib2xldGgwHQYD
-                            VR0OBBYEFBbCXm5gWz4H5pWLzyTs/P1rDgveMA0GCSqGSIb3DQEBBQUAA4IBAQBR
-                            4eYlPyqz4G+EwI5vRbPA+1MZ3C4NNowmgkzvZVYhyuHNvYXqk0AvfyCTbi9fpPjk
-                            K87fkCo6qmaQAHlUE0ZxPzCbR1tRGoOVGAszMesh1whopFxHlfh9/zIFHocE2VDz
-                            Q3X5Orpt5M7J0Q56cXquYh3EuIFmYByXzK9hTOAiDq55n1QQ2nvQHItC4Jkp7GeO
-                            c5D59ahcQWgbzHw5WbJqHuT2JvU+jF8w08RZbxQLCWEQHPKfwCBuKLQy8R4tWbDr
-                            NMFx4IIXL5k2bXFtVidG02j1Mw66zjER3tinreZdr4emOtqomO0kR0kpYkGeqJDU
-                            cReeVaTfudJyy/pCjfbP
-                            
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniparthenope.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="it">Università di Napoli Parthenope</OrganizationName>
-    <OrganizationName xml:lang="en">Università di Napoli Parthenope</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">Università di Napoli Parthenope</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Università di Napoli Parthenope</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.uniparthenope.it</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uniparthenope.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>N.Napolitano-A.Cioffi</SurName>
-    <EmailAddress>idem@uniparthenope.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
new file mode 100644
index 00000000..beba8a73
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.unipg.it-idp-shibboleth.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unipg.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-09-09T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">University of Perugia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli studi di Perugia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for the University of Perugia</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli studi di Perugia</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unipg.it/en/idem-federation</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unipg.it/il-portale/servizi-on-line/federazione-idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipg.it/en/idem-federation/idem-privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipg.it/il-portale/servizi-on-line/federazione-idem/informativa-idem</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <shibmd:Scope regexp="false">unipg.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUbtCA5KDFFzAdtSTGPwrF8RKSWf8wDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MB4XDTEzMTEyOTEwNDgyN1oXDTMz
+MTEyOTEwNDgyN1owFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEArcWMYBTfLliKg2yiUOuJphQVPDuzFh8iAzmB
+N5rs+B9Y841AvxgC2K12IogTLt2oeX5qv2hvyoip2q3XBY8aHo4xwjTW0UmgZ4Td
+dTA1ImOUq61mUYucYemfng+wO2rKpDOaOuwjOOJ4ZwYly0f4MenKDkGxmv/X5vFQ
+mNc5EeC4Zllkvoss95OuE8oQ/xxA+3xsAT6zhjadsHlTrxHfkWBDTbeNhupAbqD0
+JB84CfVNaOrmD/haNzn5lfktKb+aDwac+wSpl/P2wxa2F5ZkTLJeRF6WK0z4S6Wb
+IaaLbrwIXCWnZnQoWY6mFKBaK2hAB8P3emlpsve6cl5QC7TnqwIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAudW5pcGcuaXSGI2h0dHBzOi8vaWRwLnVuaXBnLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRlnQD+3BGocWcSXr2HfL3Pm+HSjTANBgkq
+hkiG9w0BAQUFAAOCAQEAF8seek5DbzQnVsPhRzkzsl367Q6gnCiUWJR4x+KwgDLb
+yC/1F9x62DxiM1HqN21K2IhhJuiBEgEH2vfBBL9XS4U12gCnjOeOrVq4Sn1n0y0n
+Mtr1n/F38kdTww7elicK1c5VfJzNW92SPZ0WDeqx6dsHtCLr0cEbe2m37ObmbP7m
+i+4ZUJg7ph20zCfmZuqz9U7rd2Cextu267R6HGTb7j44QyqyR/HLmGcisZuA8F14
+NESI9h/L+O7VkKo6jKvBZhUuOxNrc/NvUToO5BaKJjtdP0kHDKKgKHpuE5FHSeGr
+a3btFASB68LjOF7z6SBM9h7F+NMDYLzCDuf6qHqMkg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unipg.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unipg.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.unipg.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unipg.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unipg.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDGzCCAgOgAwIBAgIUbtCA5KDFFzAdtSTGPwrF8RKSWf8wDQYJKoZIhvcNAQEF
+BQAwFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MB4XDTEzMTEyOTEwNDgyN1oXDTMz
+MTEyOTEwNDgyN1owFzEVMBMGA1UEAxMMaWRwLnVuaXBnLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEArcWMYBTfLliKg2yiUOuJphQVPDuzFh8iAzmB
+N5rs+B9Y841AvxgC2K12IogTLt2oeX5qv2hvyoip2q3XBY8aHo4xwjTW0UmgZ4Td
+dTA1ImOUq61mUYucYemfng+wO2rKpDOaOuwjOOJ4ZwYly0f4MenKDkGxmv/X5vFQ
+mNc5EeC4Zllkvoss95OuE8oQ/xxA+3xsAT6zhjadsHlTrxHfkWBDTbeNhupAbqD0
+JB84CfVNaOrmD/haNzn5lfktKb+aDwac+wSpl/P2wxa2F5ZkTLJeRF6WK0z4S6Wb
+IaaLbrwIXCWnZnQoWY6mFKBaK2hAB8P3emlpsve6cl5QC7TnqwIDAQABo18wXTA8
+BgNVHREENTAzggxpZHAudW5pcGcuaXSGI2h0dHBzOi8vaWRwLnVuaXBnLml0L2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBRlnQD+3BGocWcSXr2HfL3Pm+HSjTANBgkq
+hkiG9w0BAQUFAAOCAQEAF8seek5DbzQnVsPhRzkzsl367Q6gnCiUWJR4x+KwgDLb
+yC/1F9x62DxiM1HqN21K2IhhJuiBEgEH2vfBBL9XS4U12gCnjOeOrVq4Sn1n0y0n
+Mtr1n/F38kdTww7elicK1c5VfJzNW92SPZ0WDeqx6dsHtCLr0cEbe2m37ObmbP7m
+i+4ZUJg7ph20zCfmZuqz9U7rd2Cextu267R6HGTb7j44QyqyR/HLmGcisZuA8F14
+NESI9h/L+O7VkKo6jKvBZhUuOxNrc/NvUToO5BaKJjtdP0kHDKKgKHpuE5FHSeGr
+a3btFASB68LjOF7z6SBM9h7F+NMDYLzCDuf6qHqMkg==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unipg.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.unipg.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Università degli studi di Perugia</OrganizationName>
+    <OrganizationName xml:lang="en">University of Perugia</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Università degli studi di Perugia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Perugia</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.unipg.it</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unipg.it/en</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Supporto IDEM</GivenName>
+    <EmailAddress>servizio.idem@unipg.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unipi.it.xml b/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
index f581e8f1..d175da4b 100644
--- a/swamid-interfederations-2.0/idp.unipi.it.xml
+++ b/swamid-interfederations-2.0/idp.unipi.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp.unipi.it/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.unipi.it/idp/shibboleth">
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-11-01T15:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
@@ -7,8 +7,8 @@
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">unipi.it</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="it">Università degli Studi di Pisa</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Pisa</mdui:DisplayName>
         <mdui:Description xml:lang="en">Identity Provider for University of Pisa users</mdui:Description>
@@ -22,11 +22,27 @@
       </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0zMTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVOzGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldewzvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqBT1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40WmcAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm26PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJKoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60mPv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4RgwuxZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/
-                            r9aWLZYsIVPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao= 
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0z
+MTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVO
+zGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldew
+zvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqB
+T1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40Wm
+cAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm2
+6PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJ
+KoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6
+hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60m
+Pv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4Rgwu
+xZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/r9aWLZYsI
+VPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H
+23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -41,14 +57,30 @@
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipi.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">unipi.it</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEBBQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0zMTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVOzGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldewzvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqBT1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40WmcAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm26PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0wPAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJKoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60mPv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4RgwuxZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/
-                            r9aWLZYsIVPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao= 
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDHDCCAgSgAwIBAgIVANpHH4cWOn6yEYz2lRJ3vuZn9emLMA0GCSqGSIb3DQEB
+BQUAMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDAeFw0xMTAzMTAxMzM4MjRaFw0z
+MTAzMTAxMzM4MjRaMBcxFTATBgNVBAMTDGlkcC51bmlwaS5pdDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAIxD1yQuyQ1P7wVjslFUKXVAtWQ2Oe9h7vVO
+zGVo+08dZ1RFoS9e4wtMj3UOme7VwxKdvlkzp3B0sSJS5FqZ7oMf3Wi0SZKbldew
+zvO/ToeJLjCq4oQBXmi7RePwHZ2GEmyzk7JTujtnBrY6vjfIB+AwviT3y13OHCqB
+T1XCi8bNsAoviDjyN/TKG/AU1pJFc5NWFLRy1YKC+5FlJCh/Kr+uC/KVdUhn40Wm
+cAjLfTATK+Y1RbVb4eHF6vJOOBsTQqvat4heBmpBnuyY06ngU/dZp6Te3BCPMSm2
+6PQnYF8uf9Ftf5U++J32DJIRKimN8N3y0sVK8xsaIUbmAfkT6gMCAwEAAaNfMF0w
+PAYDVR0RBDUwM4IMaWRwLnVuaXBpLml0hiNodHRwczovL2lkcC51bmlwaS5pdC9p
+ZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUuVwagCJNNlDEGjXsYBV07TH67W4wDQYJ
+KoZIhvcNAQEFBQADggEBACVqW+MNuwIyvc4ut3mhAt/TBD5HOFO7kPaylsaTwIe6
+hBgb6H9cEMHQAmgNFITHjzLjDiM5dag9dWqdDvHLoINgKEKgBSN8/tEJoh7qI60m
+Pv7PNEN3Jolwm8YeB0dite8aPioPvw4kReGAQnmkvDX4q809p3SRBOI9SCM4Rgwu
+xZq2gW4a+MiO6qdJ/MQi/3526//S2wreCvVijqYj68zo+NEN/3vevH/r9aWLZYsI
+VPU5U8UPwrVbbpGR6yUiilBrLvdHfaXWNOTnY7XBdMBms0JZEYGRiyUmQ6j4Pi/H
+23jC2wFN8qTFa4MKNluOJFOvXzgSY5iS1t6g0hrslao=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -58,12 +90,12 @@
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
   </AttributeAuthorityDescriptor>
   <Organization>
-    <md:OrganizationName xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="it">Università degli Studi di Pisa</md:OrganizationName>
-    <md:OrganizationName xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en">University of Pisa</md:OrganizationName>
-    <md:OrganizationDisplayName xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="it">Università di Pisa</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en">University of Pisa</md:OrganizationDisplayName>
-    <md:OrganizationURL xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="it">http://www.unipi.it</md:OrganizationURL>
-    <md:OrganizationURL xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xml:lang="en">http://www.unipi.it/english</md:OrganizationURL>
+    <OrganizationName xml:lang="it">Università degli Studi di Pisa</OrganizationName>
+    <OrganizationName xml:lang="en">University of Pisa</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Università di Pisa</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Pisa</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.unipi.it</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.unipi.it/english</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Technical Support</SurName>
@@ -74,9 +106,9 @@
     <SurName>Tognini</SurName>
     <EmailAddress>samuele.tognini@unipi.it</EmailAddress>
   </ContactPerson>
-  <md:ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="support">
-    <md:GivenName>Davide</md:GivenName>
-    <md:SurName>Vaghetti</md:SurName>
-    <md:EmailAddress>davide.vaghetti@unipi.it</md:EmailAddress>
-  </md:ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Davide</GivenName>
+    <SurName>Vaghetti</SurName>
+    <EmailAddress>davide.vaghetti@unipi.it</EmailAddress>
+  </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml b/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
new file mode 100644
index 00000000..1503b7b8
--- /dev/null
+++ b/swamid-interfederations-2.0/idp.uniroma3.it-idp-shibboleth.xml
@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idp.uniroma3.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uniroma3.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">University Roma TRE IdP</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Roma Tre IdP</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for Roma TRE members</mdui:Description>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Roma Tre</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.idem.uniroma3.it/EN</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.idem.uniroma3.it/IT</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
+bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
+TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
+8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
+CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
+k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
+SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
+x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
+aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
+G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
+Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
+bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
+WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
+wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
+cTXFyKPFTrE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniroma3.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniroma3.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uniroma3.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
+bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
+TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
+8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
+CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
+k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
+SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
+x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
+6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
+AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
+AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
+MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
+bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
+cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
+cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
+aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
+G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
+Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
+bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
+WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
+wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
+cTXFyKPFTrE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Roma TRE</OrganizationName>
+    <OrganizationName xml:lang="it">Università di Roma TRE</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Roma TRE</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Università di Roma TRE</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.uniroma3.it/en2/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.uniroma3.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Technical Support</SurName>
+    <EmailAddress>idem@uniroma3.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.uniroma3.it.xml b/swamid-interfederations-2.0/idp.uniroma3.it.xml
deleted file mode 100644
index 2080f859..00000000
--- a/swamid-interfederations-2.0/idp.uniroma3.it.xml
+++ /dev/null
@@ -1,124 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp.uniroma3.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-09-07T14:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">uniroma3.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University Roma TRE</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Roma Tre</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for Roma TRE members</mdui:Description>
-        <mdui:Description xml:lang="it">Identity Provider per gli utenti di Roma Tre</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.idem.uniroma3.it/EN</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.idem.uniroma3.it/IT</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
-                            bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
-                            TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
-                            8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
-                            CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
-                            k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
-                            SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
-                            x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-                            6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
-                            AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-                            AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-                            MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-                            bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-                            cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-                            cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
-                            aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
-                            G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
-                            Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
-                            bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
-                            WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
-                            wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
-                            cTXFyKPFTrE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.uniroma3.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.uniroma3.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.uniroma3.it/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">uniroma3.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Roma TRE AA</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">AA Università di Roma TRE</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Attribute Authority for Roma TRE members</mdui:Description>
-        <mdui:Description xml:lang="it">Attribute Authority per gli utenti di Roma TRE</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://idem.uniroma3.it/EN</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://idem.uniroma3.it/IT</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEhDCCA2ygAwIBAgIRAJJ4jZUD61jOwDV9E8upZlQwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzAyMjgwMDAwMDBaFw0xNjAyMjgyMzU5NTlaMD0xITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPaWRwLnVuaXJv
-                            bWEzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA4yxN30NCjUmA
-                            TmyysmUMGSKilVFkTAPXxVod1FC1hZONeLGsZBNJ0I14IO5xf4L/W5+UW3qyb/f2
-                            8kJP908QSrMAvdEH5yl4nHTz/MLuZEIBrpTcYKs3sPPkvDlyFWmcdP0hPziETbSB
-                            CtOggV7FrRyo0r6rK1IOCm1lDRLwLliCea/XNJC4RktQGMywyn5W0TjootD/90wc
-                            k+cMKA1i4ldoyHRBcfOfrvxjPdCGZy++WIVVYkyMzOVulB9sNKfE/t81H1LZcaAN
-                            SINPbYPxAM8zlUOUuozUBDVX8XlKE7mbiouq6iAvCNKvE/zh7067Das9i0sydRtN
-                            x+isE34u/wIDAQABo4IBhDCCAYAwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH
-                            6pDjue0wHQYDVR0OBBYEFN7YUQ+ImDerq41pkHNNAD1GWoH7MA4GA1UdDwEB/wQE
-                            AwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcD
-                            AjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAx
-                            MC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-                            bDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRl
-                            cmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2Nz
-                            cC50Y3MudGVyZW5hLm9yZzAyBgNVHREEKzApgg9pZHAudW5pcm9tYTMuaXSCFnNo
-                            aWJib2xldGgudW5pcm9tYTMuaXQwDQYJKoZIhvcNAQEFBQADggEBACYMhQCWzVsh
-                            G6hbEbDKUvYLRAtc6OUZijZuj3aFtqqYyJOEBSjuSXJ6QMkLgL5wbcI4mI9FLLUM
-                            Ae7kAd49N7g9r++YnZz0EhTgdCJGfd+3ZmM9XjD1LUQgn3qJqW8qWRGjclHx/oAb
-                            bRwFd614gGCsWC6s0xtZmesaytSBdzcm5RjnofxPtEHWjQbFhUGxbtFHS6MHmjzT
-                            WgJ2RWgB09FrRjx/SB7UtFR93WaYSKgNq3CxtKnK5CTxUkd/WidcH6h07anBz66R
-                            wv+Hdi7+aibTF9pRMYHhYxatMrnPZpIfbX0vxRiaL3NLfopA7UUKpTwDM7Z3DM/B
-                            cTXFyKPFTrE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.uniroma3.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.uniroma3.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">University of Roma TRE</OrganizationName>
-    <OrganizationName xml:lang="it">Università di Roma TRE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">University of Roma TRE</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">Università Roma TRE</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.uniroma3.it/en2/</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.uniroma3.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Technical Support</SurName>
-    <EmailAddress>idem@uniroma3.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.unistra.fr.xml b/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
index 5d111b17..002d41ae 100644
--- a/swamid-interfederations-2.0/idp.unistra.fr.xml
+++ b/swamid-interfederations-2.0/idp.unistra.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unistra.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-strasbg.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.univ-ag.fr.xml b/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml
index 69563f15..06d071eb 100644
--- a/swamid-interfederations-2.0/idp.univ-ag.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-ag.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-ag.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-amu.fr.xml b/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml
index a62d85a9..e9d456ed 100644
--- a/swamid-interfederations-2.0/idp.univ-amu.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-amu.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-amu.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-artois.fr.xml b/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml
index 2f020ffb..a9f128cf 100644
--- a/swamid-interfederations-2.0/idp.univ-artois.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-artois.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-artois.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-avignon.fr.xml b/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
index 4b3e4ab7..b36d8306 100644
--- a/swamid-interfederations-2.0/idp.univ-avignon.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-avignon.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-avignon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-bpclermont.fr.xml b/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml
index d8d747c1..e3a93704 100644
--- a/swamid-interfederations-2.0/idp.univ-bpclermont.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-bpclermont.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-bpclermont.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-fcomte.fr.xml b/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml
index 0f581ff8..add4dc14 100644
--- a/swamid-interfederations-2.0/idp.univ-fcomte.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-fcomte.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-fcomte.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-lehavre.fr.xml b/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml
index c4e32e3d..fba2b638 100644
--- a/swamid-interfederations-2.0/idp.univ-lehavre.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-lehavre.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lehavre.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-lille3.fr.xml b/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml
index 1678f4cc..5cc5142a 100644
--- a/swamid-interfederations-2.0/idp.univ-lille3.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-lille3.fr-idp.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille3.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-lorraine.fr.xml b/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml
index 31ab7245..5da2d44a 100644
--- a/swamid-interfederations-2.0/idp.univ-lorraine.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-lorraine.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lorraine.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-lyon2.fr.xml b/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
index c6625efc..0f561730 100644
--- a/swamid-interfederations-2.0/idp.univ-lyon2.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-lyon2.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon2.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -58,6 +58,6 @@ MVymo1FuDKpu6laIg6mbezvSwGbqQyQMMg5RA7zWiUJUaBXnBbgUR4Y0+xA8
     <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <EmailAddress>reseau@univ-lyon2.fr</EmailAddress>
+    <EmailAddress>reseau@listes.univ-lyon2.fr</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp.univ-lyon3.fr.xml b/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml
index 3eee9b17..d62468d3 100644
--- a/swamid-interfederations-2.0/idp.univ-lyon3.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-lyon3.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon3.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-orleans.fr.xml b/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml
index 6ebd0c7e..d24bf693 100644
--- a/swamid-interfederations-2.0/idp.univ-orleans.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-orleans.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-orleans.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-paris3.fr.xml b/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml
index 67029926..33c093b2 100644
--- a/swamid-interfederations-2.0/idp.univ-paris3.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-paris3.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris3.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-paris4.fr.xml b/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml
index ebec41ad..7e32cfcf 100644
--- a/swamid-interfederations-2.0/idp.univ-paris4.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-paris4.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.univ-paris8.fr.xml b/swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml
index 509e104e..060b5a5e 100644
--- a/swamid-interfederations-2.0/idp.univ-paris8.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-paris8.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris8.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.univ-tours.fr.xml b/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml
index c596da51..4373e313 100644
--- a/swamid-interfederations-2.0/idp.univ-tours.fr.xml
+++ b/swamid-interfederations-2.0/idp.univ-tours.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tours.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.universite-lyon.fr.xml b/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml
index 2dd45440..947af92f 100644
--- a/swamid-interfederations-2.0/idp.universite-lyon.fr.xml
+++ b/swamid-interfederations-2.0/idp.universite-lyon.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">universite-lyon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.unoesc.edu.br.xml b/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
index a1da9093..a1da9093 100644
--- a/swamid-interfederations-2.0/idp.unoesc.edu.br.xml
+++ b/swamid-interfederations-2.0/idp.unoesc.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.uoa.gr.xml b/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml
index 29e2e26e..29e2e26e 100644
--- a/swamid-interfederations-2.0/idp.uoa.gr.xml
+++ b/swamid-interfederations-2.0/idp.uoa.gr-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.upmc.fr.xml b/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml
index 28137405..1855b7b6 100644
--- a/swamid-interfederations-2.0/idp.upmc.fr.xml
+++ b/swamid-interfederations-2.0/idp.upmc.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upmc.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.uqam.ca.xml b/swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml
index 454362a6..454362a6 100644
--- a/swamid-interfederations-2.0/idp.uqam.ca.xml
+++ b/swamid-interfederations-2.0/idp.uqam.ca-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.urca.br.xml b/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml
index 7f41e3ec..7f41e3ec 100644
--- a/swamid-interfederations-2.0/idp.urca.br.xml
+++ b/swamid-interfederations-2.0/idp.urca.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.ut-capitole.fr.xml b/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
index 4a3611a3..1aadc4cd 100644
--- a/swamid-interfederations-2.0/idp.ut-capitole.fr.xml
+++ b/swamid-interfederations-2.0/idp.ut-capitole.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ut-capitole.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse1.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp.utia.cas.cz.xml b/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml
index 9ae5630a..e48fe61a 100644
--- a/swamid-interfederations-2.0/idp.utia.cas.cz.xml
+++ b/swamid-interfederations-2.0/idp.utia.cas.cz-idp-shibboleth.xml
@@ -4,10 +4,15 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-03-07T08:48:51Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/avcr</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml
index bd1582bb..bd1582bb 100644
--- a/swamid-interfederations-2.0/idp.utorauth.utoronto.ca.xml
+++ b/swamid-interfederations-2.0/idp.utorauth.utoronto.ca-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.vet-alfort.fr.xml b/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml
index ad2a1ec4..513cde39 100644
--- a/swamid-interfederations-2.0/idp.vet-alfort.fr.xml
+++ b/swamid-interfederations-2.0/idp.vet-alfort.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vet-alfort.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp.vib.be.xml b/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml
index ccffbee7..ccffbee7 100644
--- a/swamid-interfederations-2.0/idp.vib.be.xml
+++ b/swamid-interfederations-2.0/idp.vib.be-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at.xml b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
index dfbceee9..dfbceee9 100644
--- a/swamid-interfederations-2.0/idp.zid.tuwien.ac.at.xml
+++ b/swamid-interfederations-2.0/idp.zid.tuwien.ac.at-saml2.xml
diff --git a/swamid-interfederations-2.0/idp1.agroparistech.fr.xml b/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml
index bab7ead6..1a55ad11 100644
--- a/swamid-interfederations-2.0/idp1.agroparistech.fr.xml
+++ b/swamid-interfederations-2.0/idp1.agroparistech.fr-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agroparistech.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr.xml b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
index 6a6bb4ef..44bf3fe1 100644
--- a/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr.xml
+++ b/swamid-interfederations-2.0/idp1.crous-aix-marseille.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix.net</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-aix-marseille.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idp1.crous-toulouse.fr.xml b/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml
index dea14f5c..0836703b 100644
--- a/swamid-interfederations-2.0/idp1.crous-toulouse.fr.xml
+++ b/swamid-interfederations-2.0/idp1.crous-toulouse.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.crous-toulouse.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml b/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml
new file mode 100644
index 00000000..78f38dac
--- /dev/null
+++ b/swamid-interfederations-2.0/idp1.hogent.be-idp-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.hogent.be/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">hogent.be</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Hogent</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Hogeschool Gent</mdui:Description>
+        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEsAAABSCAYAAAAclym5AAAABGdBTUEAALGPC/xhBQAACkFpQ0NQSUNDIFByb2ZpbGUAAEgNnZZ3VFPZFofPvTe90BIiICX0GnoJINI7SBUEUYlJgFAChoQmdkQFRhQRKVZkVMABR4ciY0UUC4OCYtcJ8hBQxsFRREXl3YxrCe+tNfPemv3HWd/Z57fX2Wfvfde6AFD8ggTCdFgBgDShWBTu68FcEhPLxPcCGBABDlgBwOFmZgRH+EQC1Py9PZmZqEjGs/buLoBku9ssv1Amc9b/f5EiN0MkBgAKRdU2PH4mF+UClFOzxRky/wTK9JUpMoYxMhahCaKsIuPEr2z2p+Yru8mYlybkoRpZzhm8NJ6Mu1DemiXho4wEoVyYJeBno3wHZb1USZoA5fco09P4nEwAMBSZX8znJqFsiTJFFBnuifICAAiUxDm8cg6L+TlongB4pmfkigSJSWKmEdeYaeXoyGb68bNT+WIxK5TDTeGIeEzP9LQMjjAXgK9vlkUBJVltmWiR7a0c7e1Z1uZo+b/Z3x5+U/09yHr7VfEm7M+eQYyeWd9s7KwvvRYA9iRamx2zvpVVALRtBkDl4axP7yAA8gUAtN6c8x6GbF6SxOIMJwuL7OxscwGfay4r6Df7n4Jvyr+GOfeZy+77VjumFz+BI0kVM2VF5aanpktEzMwMDpfPZP33EP/jwDlpzcnDLJyfwBfxhehVUeiUCYSJaLuFPIFYkC5kCoR/1eF/GDYnBxl+nWsUaHVfAH2FOVC4SQfIbz0AQyMDJG4/egJ961sQMQrIvrxorZGvc48yev7n+h8LXIpu4UxBIlPm9gyPZHIloiwZo9+EbMECEpAHdKAKNIEuMAIsYA0cgDNwA94gAISASBADlgMuSAJpQASyQT7YAApBMdgBdoNqcADUgXrQBE6CNnAGXARXwA1wCwyAR0AKhsFLMAHegWkIgvAQFaJBqpAWpA+ZQtYQG1oIeUNBUDgUA8VDiZAQkkD50CaoGCqDqqFDUD30I3Qaughdg/qgB9AgNAb9AX2EEZgC02EN2AC2gNmwOxwIR8LL4ER4FZwHF8Db4Uq4Fj4Ot8IX4RvwACyFX8KTCEDICAPRRlgIG/FEQpBYJAERIWuRIqQCqUWakA6kG7mNSJFx5AMGh6FhmBgWxhnjh1mM4WJWYdZiSjDVmGOYVkwX5jZmEDOB+YKlYtWxplgnrD92CTYRm40txFZgj2BbsJexA9hh7DscDsfAGeIccH64GFwybjWuBLcP14y7gOvDDeEm8Xi8Kt4U74IPwXPwYnwhvgp/HH8e348fxr8nkAlaBGuCDyGWICRsJFQQGgjnCP2EEcI0UYGoT3QihhB5xFxiKbGO2EG8SRwmTpMUSYYkF1IkKZm0gVRJaiJdJj0mvSGTyTpkR3IYWUBeT64knyBfJQ+SP1CUKCYUT0ocRULZTjlKuUB5QHlDpVINqG7UWKqYup1aT71EfUp9L0eTM5fzl+PJrZOrkWuV65d7JU+U15d3l18unydfIX9K/qb8uAJRwUDBU4GjsFahRuG0wj2FSUWaopViiGKaYolig+I1xVElvJKBkrcST6lA6bDSJaUhGkLTpXnSuLRNtDraZdowHUc3pPvTk+nF9B/ovfQJZSVlW+Uo5RzlGuWzylIGwjBg+DNSGaWMk4y7jI/zNOa5z+PP2zavaV7/vCmV+SpuKnyVIpVmlQGVj6pMVW/VFNWdqm2qT9QwaiZqYWrZavvVLquNz6fPd57PnV80/+T8h+qwuol6uPpq9cPqPeqTGpoavhoZGlUalzTGNRmabprJmuWa5zTHtGhaC7UEWuVa57VeMJWZ7sxUZiWzizmhra7tpy3RPqTdqz2tY6izWGejTrPOE12SLls3Qbdct1N3Qk9LL1gvX69R76E+UZ+tn6S/R79bf8rA0CDaYItBm8GooYqhv2GeYaPhYyOqkavRKqNaozvGOGO2cYrxPuNbJrCJnUmSSY3JTVPY1N5UYLrPtM8Ma+ZoJjSrNbvHorDcWVmsRtagOcM8yHyjeZv5Kws9i1iLnRbdFl8s7SxTLessH1kpWQVYbbTqsPrD2sSaa11jfceGauNjs86m3ea1rakt33a/7X07ml2w3Ra7TrvP9g72Ivsm+zEHPYd4h70O99h0dii7hH3VEevo4bjO8YzjByd7J7HTSaffnVnOKc4NzqMLDBfwF9QtGHLRceG4HHKRLmQujF94cKHUVduV41rr+sxN143ndsRtxN3YPdn9uPsrD0sPkUeLx5Snk+cazwteiJevV5FXr7eS92Lvau+nPjo+iT6NPhO+dr6rfS/4Yf0C/Xb63fPX8Of61/tPBDgErAnoCqQERgRWBz4LMgkSBXUEw8EBwbuCHy/SXyRc1BYCQvxDdoU8CTUMXRX6cxguLDSsJux5uFV4fnh3BC1iRURDxLtIj8jSyEeLjRZLFndGyUfFRdVHTUV7RZdFS5dYLFmz5EaMWowgpj0WHxsVeyR2cqn30t1Lh+Ps4grj7i4zXJaz7NpyteWpy8+ukF/BWXEqHhsfHd8Q/4kTwqnlTK70X7l35QTXk7uH+5LnxivnjfFd+GX8kQSXhLKE0USXxF2JY0muSRVJ4wJPQbXgdbJf8oHkqZSQlKMpM6nRqc1phLT4tNNCJWGKsCtdMz0nvS/DNKMwQ7rKadXuVROiQNGRTChzWWa7mI7+TPVIjCSbJYNZC7Nqst5nR2WfylHMEeb05JrkbssdyfPJ+341ZjV3dWe+dv6G/ME17msOrYXWrlzbuU53XcG64fW+649tIG1I2fDLRsuNZRvfbore1FGgUbC+YGiz7+bGQrlCUeG9Lc5bDmzFbBVs7d1ms61q25ciXtH1YsviiuJPJdyS699ZfVf53cz2hO29pfal+3fgdgh33N3puvNYmWJZXtnQruBdreXM8qLyt7tX7L5WYVtxYA9pj2SPtDKosr1Kr2pH1afqpOqBGo+a5r3qe7ftndrH29e/321/0wGNA8UHPh4UHLx/yPdQa61BbcVh3OGsw8/rouq6v2d/X39E7Ujxkc9HhUelx8KPddU71Nc3qDeUNsKNksax43HHb/3g9UN7E6vpUDOjufgEOCE58eLH+B/vngw82XmKfarpJ/2f9rbQWopaodbc1om2pDZpe0x73+mA050dzh0tP5v/fPSM9pmas8pnS8+RzhWcmzmfd37yQsaF8YuJF4c6V3Q+urTk0p2usK7ey4GXr17xuXKp2737/FWXq2euOV07fZ19ve2G/Y3WHruell/sfmnpte9tvelws/2W462OvgV95/pd+y/e9rp95Y7/nRsDiwb67i6+e/9e3D3pfd790QepD14/zHo4/Wj9Y+zjoicKTyqeqj+t/dX412apvfTsoNdgz7OIZ4+GuEMv/5X5r0/DBc+pzytGtEbqR61Hz4z5jN16sfTF8MuMl9Pjhb8p/rb3ldGrn353+71nYsnE8GvR65k/St6ovjn61vZt52To5NN3ae+mp4req74/9oH9oftj9MeR6exP+E+Vn40/d3wJ/PJ4Jm1m5t/3hPP7MjpZfgAAAAlwSFlzAAAuIwAALiMBeKU/dgAAAi9pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IlhNUCBDb3JlIDUuNC4wIj4KICAgPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4KICAgICAgPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIKICAgICAgICAgICAgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIgogICAgICAgICAgICB4bWxuczp0aWZmPSJodHRwOi8vbnMuYWRvYmUuY29tL3RpZmYvMS4wLyI+CiAgICAgICAgIDx4bXA6Q3JlYXRvclRvb2w+QWRvYmUgSW1hZ2VSZWFkeTwveG1wOkNyZWF0b3JUb29sPgogICAgICAgICA8dGlmZjpZUmVzb2x1dGlvbj4zMDA8L3RpZmY6WVJlc29sdXRpb24+CiAgICAgICAgIDx0aWZmOk9yaWVudGF0aW9uPjE8L3RpZmY6T3JpZW50YXRpb24+CiAgICAgICAgIDx0aWZmOlhSZXNvbHV0aW9uPjMwMDwvdGlmZjpYUmVzb2x1dGlvbj4KICAgICAgPC9yZGY6RGVzY3JpcHRpb24+CiAgIDwvcmRmOlJERj4KPC94OnhtcG1ldGE+CrAWjfkAABEMSURBVHgB7ZwJkJ1FEYA3m2NDwiEhCYkQgkKhKJcgyCUmRLQQpZRT8YCCUlQUCxWkULBAOQSqQFAKRUSEWIBBQAqIECwBEeQu7iOCEI5oSEggEEg2G79v3vTL7HOP9/bI3VX9uv+enp7unp755//f2x3Q1H/QjGmxtWaIsQMHDtx+yZIlOw4YMGAr2sbDj4Ifl/VVn43sP8hegX8KfIA+9y5cuPAx+MVgwECYJWBbCPqTDugn44Oxu6iwPZpg9+X6YHA3cK3cNo+kvEJSZnI9C3wTtO8IcDRtY2kbC5/85Prp5ubm65FdsWjRovuQB9hu0lYqsJIGFR5vSZLOA+eDS8C54J8I+Fvo7AyOAruasOG0b0Gf/QYNGnQO/R7NdrR1O/g52iPxXdlBbcWCMkljCOwsgpmXg7sN+iXcHd2NywbcVdDNgwcP3hlbTsDr2macEwqbXfUt1JYv69JJQACHEMAsA8nB/CTaCqq+aIKtxkhSSZW7J6mjrnwVhgwZsk0e4/KqsGKruOxbVod6Cwbj/rQWzl8MnQzOZF85BSq4Hwkt4BDQhKgvuvm7Obvf1KJyN3N11JXX32FgE5v9DMjr4DteLwvobbJMlMFsQjXdCT0cnNzW1rY111PghbUrJAW8EL43G7EJjOSsC2/yexsDJuoDg+0pRKK2JDF/pZLGcLf6Bom6UINQ72iCyQywqnqTLO1oQ9Bub20lQ/V+9DRZKVEtLS1btLa2/p3BTMynSdANUPeXWDawqw70pISjokaTqJtJxQiqaq/FixebKO2124hXnVQ1vt5NRFpWbOZXwI8HDyBp06C2uSzKEzaXqw40sgzdK9JjBXvUqfAT2aNOYOldDW9FmSgx9hTYVQsaWYapcjhJ78Gy8yA4lUSdntOhnZTIVSs97aOpN1nqufwGkKDzoIvYo47Kprx9p6WZr1dZUu8yTJXD8vsaVbUty+8HZORZ0P6enVYLqKeyYlP35Hw8OCNXlwlyj1ptoJ7KMqGLufsdBN2Uqjoa+jZo39Vi+RFngu4qy6rygCkcAc6jqnz2E1arqjLg7pIV7duiuzt4JTgHFNYkq5KH6mecqz6phM09Ho6tuFX+qFDNQmaicmrlXpuQdBr3cQZ+Nif1e20AVtmDZyW8jj+7SlYkxIfk7cF7wLnZzGq3BI27q2SlvPAa9z0wI7gL3pcElapa7ZagsXd7dODut5mKLMUnpYDLs5EjQ0xI7HNWZVSt9hoB+8b4YbeeKne80He86FP6oazLIugsWRpJHamocSTKZM1wlB5AvNmMI0gPTLTrEvYWIDXAMuB2ivnCdvV6/Taks2Q5TmR/pBc86rwmBbpzrqK19HO9zG4AdQLqCXBp7/acfX256N7pN0VWWfgJ2yHY7vt/v1YLXWMQo5LkPWi/BXYKnSWraoiKcpDFfEGgsUbAsl9I/x9z+veh2yD7Cgw6kuAXsx1BNSGM/yUULgDfAJXPZ8W04pvv8bWzAfzPudt/F15QJxKbBH50lqyqAoxBh3OlvDvePoNw4hkcewA+vgz9Pye6M1TTrj8uae3tA1pdHYHjGLRbyEv4MA3WxLrffgKZlX49OB8cwd78FLRHELPSxPurs5kZB35/ttRdhfjKxn6724/la1X1B6yHfb/pvqQwXm7iIU4JiwspfaaAL8PWttVel93a3SHaNYQhMh5nK0u2JzA0dzKQLp2p03isBr9i6yg5tWaikssK3BAlbxAx8dEWurU20nUMXNtop+QI5eoMOBsb8sJPtkuDKtRAJChoTXPDl2EnaL0GjMcAWliSY4jrv/ANvYvramaSMxh9Tm8YYHMp4B2kEUcjudK+Qv0Iu/KNwEhiejcdni061WWr22Rxh9Cod7XtsvFGk1X4tPxZ9tLN8GIYk/9w9sYc9DpZYeAFDD9Jsj6C0VjbjVRW9mm5EyfZb8p3knLjuVcKGEvEmgSdfXRVWa7vZIhE3UbC3sf1ltnQypYsJzltuMTycfi5rJiHGo2lq2SZ7bgBTNUws7F3HmBlW4oR5zj8nwjeCsZLzFRxOa4uSRjpTCmVJ3fB2ynUF1HyJCysTMlyFaSqYrI/A+858CpQsBj6LFmedi3h+TxKT6aEt2GDnMS10F2iK1rL/1M/IyFHwr/C5KeV0qhr9QScdFrbWi/ROHvX9/IgJnJl2LuSj5wT93Wy8f9X+P06aFyp4qB1QT3JiqT47HQRuDfVtWe2HntaXYMtByXj038n+WTIG9wNjUFwxdR1F0zafNSTLA1quInyPR3SysBneg34QJva0tWK95HiY6/6OlW1HX6fhos+keizvjcE9SRLg7F3PceAP+J6Bxw4Lo9kma+Iy9HnPv0eT6LOxe8nqapzss89IvUmS+OpZBnQqrobB37mz6zhdSgeSGFXCHB7SJXDXvVb+BarC+pbVn1taK9CP0EjyfKOohNLWI6HQltJnL/N8gneB1JvyUJD+0ClS599xpbhBPqa6CzInlTViRxCb4M33tQGbRgaSZbGHcj1/jS4P/huZs4XaMNAE+asLc8lWa0aKuk7JOn7+DOFSf0pVNC3Hk9mo8lyQAcbQHX9GWd8sbcjCfPcMhy09GNJ9tgpbDQCMY7jOmE+aRzlPgV7J35+WRngqujR8ku9e/FRvQPi2DEkyzeiD2Jvo7DJEpiQ5XEuc2L6ouoMWtgI+2+Bv0tX+QM/TnRc8C5E8cIy+pSqy5SvJgzHvpodnA1Nz49s/jsow3mXgtAfyVrAGBdXzDf5mvlKxwRvRBZ/rBCVntV6TnqyDGM0SzoljFK/iLL/JNfO4I0miH3Cjb8EdfuissJnqTedNqp4F8Z8BP4g/DgHfz4F7xcRJqrh8xR9+g10OgLYmFmdmmf3NSlB+DwWoJ5JC/S6swQqF8s+pf762J8Bvu044BvggegHLPelF47UUoOqOofTR4AvgiZrOvQw2mP/gG0HkQz7B5rMMjHtOrDEd8JmLDkT5VlqTKFU9aWQrXBs6eQIEvVDcKZJA18Ffw1+uiaweoJYyz0QW8fT/z5Qe+KUfDAOG5HkuO5T2tkS6M0gURFxm96AIA9kL/kyRnfNht+CPgo+wvHjGdp8XpsHXci1/YdDR9PP37B+gOttwbjTvoTe1RwyL0X2ABhgomLMkPUp7Y9khYM6L5QBbEUCJhDsx0jCh6Cb0N7d3epVdJ5A9x/QW0mSRwI37wCr2THivBXyPqf9maxwNpZG7V2pBYWx3MnGWkXw/oDERyYDf5PkzCaxM/mNhVX3GlhC2PSJot+TFAMvi2TFWC4vgzS4njyf2d8q8rjQk/506x0sy2SVnhq4GONHdUhDFlSZWC5nLtfAmgysycCaDKzJwJoM9FEGvOPEXUeTcVfqyHzodaXTUb/uZNqtvTN6POjrcbrzY4Vv99wUk1A6a/LiCaCUr1B8R47XK2s0kDIZ8p7g16kxUurUNC2zy2r8A3ikOIlhh0On8dx1C7yNsQR01sPgeNq/Al2bx5NLeQR5HL7U47IhsHJcav43pEN5tJnEI894rv25tV+GXM8LvMlQv7oKH2CXKcQblKVPC8XrjvOzK+X+4bOaXylNKvQOyXoGUc16ltVDUrX4TopElf8PK167BL0OY+tng6lPPcb7SSfFaWJS5pjRjn58HxXmQ7C/7hXSNygVtt2ntmqxNpnxhmATK4cxP0hFTQe/BT8R3As8DTtW1L5M0IVQbVjd2i5BeXfjqR964UtcR9+Qh+0YZ3Mm8wR8+AIN5qHZXyH7989LqB6/aRbKzun1CW17oPOOemC8uo3ZVj/4ZKD4CIcUVe1i4xfawpmnkG9R6CeWti/aLjL2xNxevsrRbtVe0V9ZBFuIq6x+1vYrfaz2Zewbsw/nRe/ybhRGNGgmRXmrqmoEPqCS7creEw+5vnbxLx+sPl/wuS8J2nYsbW0Kfhb0Lx+sIvcox4kx/J8Rk0mkv1F4gX30n7QJsXeoG+Mpj9fV/owo/NaWYzuusoDop1xf3wbDR/uUuskuVT8PeYLYxPxhahgKp1SIJVfKKj2XJjL9NQVGDwd3I8CRKLikHwR/T+B+xR+JtZK353oj8FXaboEKOm8ipf6RAe60mciASFDQoSTT/zHxeRQ2B+33L8a/in6/gnd8K3ER4+0HPZK2O2i7lEo9GuovAJ2s6ZCr8eMyqDFitvkU5BPgtSscgg1/qT1Q59tAl8QZqamDDwbYDZ1YhgdkFR3X+jftn3ER14/B+749ybj29wZV4Pq43PY3hDFZzqoBdwWhuzb9ry3sP4rN8kbxJ4zEX3U4kWdm3TnoPZN5/4wlfJb+MgaGvzW3pe2p1CuTZZAXg5cVOBn+N+BfwOh8cBjGkUnIU7Khl/P/tN5Hm+Xte/fTkYVDh0Uf5Gdn+RUhg6bEQ4dxl9wO3BHcAfu7yCOPpWbwZ+T+L0H9QtfxWuD3A1MSGONoZAngT8r6FoR93AL8JsifHVwTbdidWOnR9N78/wTvyW0XDx06dDyyrUyWAUUiIriu6BezUfv+Ife/G1l8AxzNtt+Q2+9CmCqH6wuy7JKqYq4EE0Ob3/85/pugy2gOgeyZdf1e8hXQ9uqkhZ0ikVORpUokQSdnfWPcJ3Qz3QJZ+o+X6B1TtiGfZj/7h1yDsZ/czrq+lms36NjonPH5rOEtoUeAUQGwTeNAZ92fILov+SVC3LG0uwD5VPr67fDWoHc9736xoVoRATHeIvrMoo/7p5uv32qvjyzpkoyt4K2KNui7uN4V6j874z7Q+gbypIdM33yv/zKYJgnZdPaqO7gWnFj9nYX8VfpbubHMpcYZsQyDF1pCwYDdAM+pyNt/MuMfpu0wpBoxkCZko5DpuBvlC1LAtkiGcp0VhhPYGAJ6inHmIldmIsJeuoHwX20fRbYTaHW5Cf8RfAf91E5fEyA0I7uQ63QhRd8Y0jVtG8NEkGkwrr07J9+hToTg30NGe0VS2egdLyYw+iysJotyG0LwdohbqMpDQL/L8+dEAWFcPVEIWeVq6We0KzExwowKSX+/OAp+JhiO6aRffRm4/ypY1o9a+wuQXUb7HKg+2r8Z/9+Ehg3bhAi29CXs2S/4pJw/SlmVryar6FRt7ESW7FEFrnUd8o+GNknCSkJ0ysS4pDwr2TSPyZglQ0AP08+g/CHc7ty2p8AbsDNlPxNhVe4vBZSHT5GAVvqdhPw/KtTAOK6177lLsL9gYmJSkiB/dCQr24MfbGChHFTjotcxUFBEVf1/w7tsDMwlk841UHUtc5dKbKgP8fD9JDLhHvDOxDU1HQsdCarvmS4lisQeCf9RUKj6SIK0YcLWQScdbOEjkR5jvFO+AF6OPPacsqIQ1w2RD89/wkINRZlGQhy86oBaGSxvIahGfp8k/FMf9qSz4A1cOyNx+FzoBFC4AFTfDdjxbBP8gccU8ED2QI8KuxGwh0L3zgjS8cLH6fDXgE7QsehPkBfgfa40ybY9AUmJh4a/YUOVEkIe8Udb2jawtRO+7YxwnBtjHBN+kbV0MpLl8tCRSYXeIVkvEdpOK9qeh/eWOyNktJ9c6EcCrIJvh06mLmuPCuHPX+H9L98+H+5V2HD53lfo3Q0vRr+b0F039Ol7am57DlnsvSkurkfRNsd2/Dkx90lbE7Lzc79kl/YHB/KxOUr/Bm9ij0nLCj5K0KSxzbT50+j14J+HXsf1S/Aate1WZI/D+zplO/C9oHeim8FjWToXQgUT5exJGWqJh7474D1tjwXtb9v9tJ2J3WOZ1QUiAftIMps2g5xL+7XI34EfDXXMjZH5Y7bz6Hc81Oc5l2Eb7SZufeg0fYWPSjLGZnzYAPoa7f5G9hlloEeT+5ENBBfDewef8T+nCE3wlp7+gAAAAABJRU5ErkJggg==</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:IPHint>193.190.172.0/26</mdui:IPHint>
+        <mdui:IPHint>2001:6a8:1c60:d000::/64</mdui:IPHint>
+        <mdui:DomainHint>hogent.be</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:51.032894, 3.703396</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
+DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
+upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
+Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
+q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
+Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
+YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
+ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
+8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
+VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
+H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
+PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
+YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
+4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.hogent.be/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hogent.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">hogent.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
+BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
+DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
+upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
+Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
+q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
+Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
+YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
+YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
+ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
+8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
+VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
+H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
+PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
+YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
+4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">
+    Hogeschool Gent
+    </OrganizationName>
+    <OrganizationDisplayName xml:lang="en">
+    Hogeschool Gent
+    </OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">
+    http://www.hogent.be
+    </OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Technical Support</GivenName>
+    <SurName>Technical Support</SurName>
+    <EmailAddress>helpdesk@hogent.be</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.hogent.be.xml b/swamid-interfederations-2.0/idp1.hogent.be.xml
deleted file mode 100644
index 04bc41b6..00000000
--- a/swamid-interfederations-2.0/idp1.hogent.be.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://idp1.hogent.be/idp/shibboleth">
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">hogent.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
-DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
-upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
-Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
-q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
-Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
-YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
-ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
-8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
-VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
-H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
-PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
-YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
-4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SLO"/>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/SLO"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp1.hogent.be/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp1.hogent.be/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp1.hogent.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp1.hogent.be/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">hogent.be</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIDJDCCAgygAwIBAgIVAKN8lW+W0bwU2Fgdizh1Fc78eC1cMA0GCSqGSIb3DQEB
-BQUAMBkxFzAVBgNVBAMTDmlkcDEuaG9nZW50LmJlMB4XDTEzMTAwNzE0MzI1M1oX
-DTMzMTAwNzE0MzI1M1owGTEXMBUGA1UEAxMOaWRwMS5ob2dlbnQuYmUwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpFqqWVjzACwe3pHH4Z+zxtqD0UjIF
-upRkh8638dhdPTsEAS/dIdoG9vI5Bo0o/3Mds/2Vcasih1aEtLpOZA5szGjbQyF3
-Bif6ExfNRc07D9o4o1wEzkkOEaNV6edkBJAENNnuFBZVES13FIhvyW673sdFMU26
-q/PTgXt+DVejhpdgkMtqTLaAbD3G4aViVeNIstuJcrIXwZv3YgD4lgU/fXNjjLDE
-Hk8DuL+aGVmalg37cnxNtq+i7O6lW3/yrLxExCOiFkdvcQq2lCfwECU41ira4M2o
-YuB0CDsYqK8rk3Btk4VueIDJsnivARPrJiRNSN7z1WhDjNe7M5pkC4E9AgMBAAGj
-YzBhMEAGA1UdEQQ5MDeCDmlkcDEuaG9nZW50LmJlhiVodHRwczovL2lkcDEuaG9n
-ZW50LmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQC4xxZFlWHXKtFqS2uu3pI
-8k+42jANBgkqhkiG9w0BAQUFAAOCAQEAXFNa7quzgSZt+SBCYhjI/5L5EF5ZkZv1
-VSViW5l/vIyFNfMZiXKKsZXZ55WfGePMbrnWh7l0GPlLzgRpFnLuBRS2+VwzWpzA
-H5KAS7a7R0rgvKd7/21l7XrRcBr6z/TNewOb8mpySJTH5M3in2PejUd5+Ae6PsU9
-PY4KiNwdLjzlzJPo/IBFLxiu70X5hTxip+OxTp7bxMleEG7PnlTzQIWMmBehHnDa
-YCtYQpTwBizo6WlwrYOpE/KWQRYL5BB/Q3aW2KeUy87jEpbgU/SojjBrp5y8wRsp
-4rV7/SlPD5jEYnPfqLEiiXz/yXbN2dNfvlO47aV2d/GdWvKDGnijBw==
-
-                    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp1.hogent.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp1.hogent.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">
-    Hogeschool Gent
-    </OrganizationName>
-    <OrganizationDisplayName xml:lang="en">
-    Hogeschool Gent
-    </OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">
-    http://www.hogent.be
-    </OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Technical Support</GivenName>
-    <SurName>Technical Support</SurName>
-    <EmailAddress>helpdesk@hogent.be</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp1.inria.fr.xml b/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
index fc5d7030..f9006e0d 100644
--- a/swamid-interfederations-2.0/idp1.inria.fr.xml
+++ b/swamid-interfederations-2.0/idp1.inria.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inria.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp1.uwaterloo.ca.xml b/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml
index 0d7854f2..0d7854f2 100644
--- a/swamid-interfederations-2.0/idp1.uwaterloo.ca.xml
+++ b/swamid-interfederations-2.0/idp1.uwaterloo.ca-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp2-1.slu.se.xml b/swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml
index 3173d1dc..3173d1dc 100644
--- a/swamid-interfederations-2.0/idp2-1.slu.se.xml
+++ b/swamid-interfederations-2.0/idp2-1.slu.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml b/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
index bb1bdf4d..04ec7266 100644
--- a/swamid-interfederations-2.0/idp2.civ.cvut.cz.xml
+++ b/swamid-interfederations-2.0/idp2.civ.cvut.cz-idp-shibboleth.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://idp2.civ.cvut.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T14:10:51Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/idp2.crous-toulouse.fr.xml b/swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml
index 41b3143f..cb4e6083 100644
--- a/swamid-interfederations-2.0/idp2.crous-toulouse.fr.xml
+++ b/swamid-interfederations-2.0/idp2.crous-toulouse.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-toulouse.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idp2.iay.org.uk.xml b/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml
index b2c2eb06..b2c2eb06 100644
--- a/swamid-interfederations-2.0/idp2.iay.org.uk.xml
+++ b/swamid-interfederations-2.0/idp2.iay.org.uk-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp2.ics.muni.cz.xml b/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
index 37f790f8..69dcaab9 100644
--- a/swamid-interfederations-2.0/idp2.ics.muni.cz.xml
+++ b/swamid-interfederations-2.0/idp2.ics.muni.cz-idp-shibboleth.xml
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.ics.muni.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T14:56:45Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <mdasrt:AttributeValue>http://eduid.cz/uri/group/mefanet</mdasrt:AttributeValue>
-      </mdasrt:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/group/mefanet</saml:AttributeValue>
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-interfederations-2.0/idp2.idem.garr.it.xml b/swamid-interfederations-2.0/idp2.idem.garr.it.xml
deleted file mode 100644
index eec138f8..00000000
--- a/swamid-interfederations-2.0/idp2.idem.garr.it.xml
+++ /dev/null
@@ -1,101 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idp2.idem.garr.it/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-04-30T09:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">GARR Firenze IdP215</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test Identity Provider for GARR IDEM service</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="it">GARR Firenze IdP215</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Identity Provider di Test per il servizio IDEM GARR</mdui:Description>
-        <mdui:InformationURL xml:lang="it">https://login.dir.garr.it/IdPSupportPage/index.html</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDLzCCAhegAwIBAgIUIFuTnedSw+ncNzrawzn7HrEEKZEwDQYJKoZIhvcNAQEF
-                            BQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTMxMDIyMDgzODU4
-                            WhcNMzMxMDIyMDgzODU4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCC
-                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI2qOdbYF27t06K2AweyYhID
-                            Fg26b4zFyjvhPBFkjKsE+xgWL58ryaxXN9hjFzXVunfZR0eIa4bMOlsn7wssqNrE
-                            0/ZJ7wMCC0/72JDs3ZcdLqwOzstRaW8HVjJkuksZymo/87W/lN5Ep323wO1RCzX9
-                            R0jRRSLcn+YPaXYu6QWUkcCqu8ElcJ7/ZecWUeGe5ZstR+p29PgFYpM4yH37oP7g
-                            5HG343eH0bXQIZMPNkUGvfc+BBxMQHEgDJGjUVJARwkPdeg2L+H1ckgX2IQYaEa2
-                            RRj1ALgai4C2HrwKeDiMfGajPk/SJyuebXwO6xBSlDujZwSBAGEv3BW+dQeyaKMC
-                            AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8v
-                            aWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMNCFHnq
-                            ng82i/VxSLB0slGfNMJSMA0GCSqGSIb3DQEBBQUAA4IBAQA/2OWJ2RB5x17ZevUL
-                            kTZcnxEc0IZ1NrOURX6RV3rXUmcGjxgPA2hVgU5G1eNFtPFNhnRRXlOTQtpL7kPg
-                            Tro6oR6zF9133Hvqt5iF72MftTiIDJPrEdUwhDlUZNkPVDPPK2klKlFaLaAcWt94
-                            5LtPCeA8XydzB3EDGv2v1oW4M0Q/08Y4PR8h+xhpC5hhoa4b5W01koHJMiwMbeTc
-                            kkhaJKFWvSz+8OaYeuE2c7++E/wN1mMpCo5e5i6/yu+dOhG5wqt600w8CmPEsFKV
-                            6GUDU9KnP93i/usK+j/aNxxex5y88/iTZLOwywHbOkuIMx+0kn2Gryztv6DLXnCW
-                            gh97
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.idem.garr.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.idem.garr.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.idem.garr.it/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.idem.garr.it/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp2.idem.garr.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.idem.garr.it/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">garr.it</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIDLzCCAhegAwIBAgIUIFuTnedSw+ncNzrawzn7HrEEKZEwDQYJKoZIhvcNAQEF
-                            BQAwHDEaMBgGA1UEAxMRaWRwMi5pZGVtLmdhcnIuaXQwHhcNMTMxMDIyMDgzODU4
-                            WhcNMzMxMDIyMDgzODU4WjAcMRowGAYDVQQDExFpZHAyLmlkZW0uZ2Fyci5pdDCC
-                            ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAI2qOdbYF27t06K2AweyYhID
-                            Fg26b4zFyjvhPBFkjKsE+xgWL58ryaxXN9hjFzXVunfZR0eIa4bMOlsn7wssqNrE
-                            0/ZJ7wMCC0/72JDs3ZcdLqwOzstRaW8HVjJkuksZymo/87W/lN5Ep323wO1RCzX9
-                            R0jRRSLcn+YPaXYu6QWUkcCqu8ElcJ7/ZecWUeGe5ZstR+p29PgFYpM4yH37oP7g
-                            5HG343eH0bXQIZMPNkUGvfc+BBxMQHEgDJGjUVJARwkPdeg2L+H1ckgX2IQYaEa2
-                            RRj1ALgai4C2HrwKeDiMfGajPk/SJyuebXwO6xBSlDujZwSBAGEv3BW+dQeyaKMC
-                            AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwMi5pZGVtLmdhcnIuaXSGKGh0dHBzOi8v
-                            aWRwMi5pZGVtLmdhcnIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMNCFHnq
-                            ng82i/VxSLB0slGfNMJSMA0GCSqGSIb3DQEBBQUAA4IBAQA/2OWJ2RB5x17ZevUL
-                            kTZcnxEc0IZ1NrOURX6RV3rXUmcGjxgPA2hVgU5G1eNFtPFNhnRRXlOTQtpL7kPg
-                            Tro6oR6zF9133Hvqt5iF72MftTiIDJPrEdUwhDlUZNkPVDPPK2klKlFaLaAcWt94
-                            5LtPCeA8XydzB3EDGv2v1oW4M0Q/08Y4PR8h+xhpC5hhoa4b5W01koHJMiwMbeTc
-                            kkhaJKFWvSz+8OaYeuE2c7++E/wN1mMpCo5e5i6/yu+dOhG5wqt600w8CmPEsFKV
-                            6GUDU9KnP93i/usK+j/aNxxex5y88/iTZLOwywHbOkuIMx+0kn2Gryztv6DLXnCW
-                            gh97
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp2.idem.garr.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp2.idem.garr.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">GARR</OrganizationName>
-    <OrganizationName xml:lang="it">GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">GARR, Test IdP in Florence</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="it">GARR, Test IdP Firenze</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.garr.it/b/eng</OrganizationURL>
-    <OrganizationURL xml:lang="it">http://www.garr.it</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <EmailAddress>idem-help@garr.it</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/idp2.kau.se.xml b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
index a578507e..a578507e 100644
--- a/swamid-interfederations-2.0/idp2.kau.se.xml
+++ b/swamid-interfederations-2.0/idp2.kau.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idp2.redclara.net.xml b/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml
index 0b4f32f2..827cfe19 100644
--- a/swamid-interfederations-2.0/idp2.redclara.net.xml
+++ b/swamid-interfederations-2.0/idp2.redclara.net-idp-shibboleth.xml
@@ -23,7 +23,40 @@ http://cofre.reuna.cl/index.php/es/reglas-federacion
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIGXDCCBUSgAwIBAgIDCjLvMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMTQxNDM4 WhcNMTQwNTAzMjAyNjE2WjBsMRkwFwYDVQQNExBlMUw2MVVERER5U1FPa2pYMQsw CQYDVQQGEwJDTDEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG 9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF AAOCAQ8AMIIBCgKCAQEAyBy9jvKUyU80Fkm1XFt/pm2JQEZxpYaAXOkhEeDIyCOA o0zyy2Vj4DXRGCbPooe+TfLmqguCH6NTtqG8szK3CLNjHJQJFeaSpNF0/XXAshjW z5N7d5lkt/TV2w12fGpQSQZeCv+u3nGmizcK3v0vgEXFJfMefuf2qTaZ4NYkntQZ FSdo/r/1QtOmScSbF/xoBVf8R9gwGewmkr1QTSvUwkTxEftMdWUHyjdhifoG23oH j1qOitYbnvsJHAvHpk2YYfad3k661z1F+7tosMrryyIMeyn7zItxSenIdcEZbiA0 egOEP92Ecpniro0joPOEIjrU/A3TjNPWLr52SdO+owIDAQABo4IC5DCCAuAwCQYD VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O BBYEFLT7+R6Ewb6gOwjoCOUSj/KjCrKFMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQB6vtND9cr2D0K1sOUdrEhc kG084Mqqie6eZmfIahRBYx+R0x3tgobQ6p/VqQLrMer8Fb/p4nocka6NPdGZZ5Ru 0D7sZU6SWWHvtmCiKeytV9gwlg57Ye+kWEgSPezHxqgVeIiw3C/DYfD8gQHr2GLB svrjzrrXn/Lp3WcmxbS+02snN+FErnkmOxaa0AAb9+2ulufSfkfxkF/UfN0vSSxA FYDEHIJr1heg6+mrVI6rqcq3WY1hjhVO3131gqyx3oWoPqDoberPV4bv80eQpdaF qk9bxUKQYBX+LMaDftxRG0S7dlcRmJLgw8TZ52G+hcBxvPomiYU1y0iaX0mDybzB
+MIIGXDCCBUSgAwIBAgIDEE36MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTA1MDk0MTU4
+WhcNMTUwNTA1MTYzNjQyWjBsMRkwFwYDVQQNExBIRkVrbXIzMEliM2VrYzgyMQsw
+CQYDVQQGEwJVWTEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG
+9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA789b8ZQhtUF0MlgLSW1ARfe8RIm2OmXBlMc9gdjrPF4Y
+rKySIm/wDmzwzVG0AhL9/OwRleXs+RrEPyo6/k5z1RxNIHs5y8CcnNFRAxFMWIFZ
+qrkDYfMo/GJcM1BHJ1HoTNKcXviVXvzag5Ca1h3Nogp8Sdp8K+vdIozT5URWmkbU
+JGnRdr82MqvqT4IpFSJ5bUPe1G50cV82h0zQvDVTlk2mo4GFS/B+g1t6yA3dlQn6
+O7gCz+LU/3rDiS/XnI2Qk50k/oNEBGq5VLRv68dv5JnAl17AWWi18dGDKSTY0Zds
+ER9Kn6eFH+4PSnB9IyVxAmjeG85d79PqQBpO4qzu3wIDAQABo4IC5DCCAuAwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFO43JOeGzab8H3c9zLqeuFlaDcOKMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
+CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy
+YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC
+AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
+eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj
+b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m
+IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp
+bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy
+dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh
+cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF
+BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy
+L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z
+dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z
+dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAi6p7SBeDWUNY52CEwi/Cy
+aDobEkEhR2afn6U1Aa7GEYnQ3fLHdmINfXA6n7JIApWsgD9PML6czu7H1X+DsLAK
+quKoDM/9IGe6yhLlKfH2tBxwGcFo8guaKNZd9HztOONj7dkNvGwX9uzMVAXarCw/
++P5NwH3C2Ay5ZJs5oLIh4y6yCS3/I1exOQqIBlZPdIQxqVt2B4Fm0mWXENfpA9N3
+RWQrN7vxHeMorebLpkx6Z8+tw3Svi9Z2oP1vPbnUJpFragDqNoZw6K9Crf/JTqD9
+HtCRp1bLRxJ4Ysu5HdV+kAcTelR3MyDYe/gAGAb5Wu7hmNn3NAwwrFn0TygkPzvl
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -47,7 +80,40 @@ urn:oasis:names:tc:SAML:2.0:nameid-format:transient
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIGXDCCBUSgAwIBAgIDCjLvMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMTQxNDM4 WhcNMTQwNTAzMjAyNjE2WjBsMRkwFwYDVQQNExBlMUw2MVVERER5U1FPa2pYMQsw CQYDVQQGEwJDTDEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG 9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF AAOCAQ8AMIIBCgKCAQEAyBy9jvKUyU80Fkm1XFt/pm2JQEZxpYaAXOkhEeDIyCOA o0zyy2Vj4DXRGCbPooe+TfLmqguCH6NTtqG8szK3CLNjHJQJFeaSpNF0/XXAshjW z5N7d5lkt/TV2w12fGpQSQZeCv+u3nGmizcK3v0vgEXFJfMefuf2qTaZ4NYkntQZ FSdo/r/1QtOmScSbF/xoBVf8R9gwGewmkr1QTSvUwkTxEftMdWUHyjdhifoG23oH j1qOitYbnvsJHAvHpk2YYfad3k661z1F+7tosMrryyIMeyn7zItxSenIdcEZbiA0 egOEP92Ecpniro0joPOEIjrU/A3TjNPWLr52SdO+owIDAQABo4IC5DCCAuAwCQYD VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O BBYEFLT7+R6Ewb6gOwjoCOUSj/KjCrKFMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQB6vtND9cr2D0K1sOUdrEhc kG084Mqqie6eZmfIahRBYx+R0x3tgobQ6p/VqQLrMer8Fb/p4nocka6NPdGZZ5Ru 0D7sZU6SWWHvtmCiKeytV9gwlg57Ye+kWEgSPezHxqgVeIiw3C/DYfD8gQHr2GLB svrjzrrXn/Lp3WcmxbS+02snN+FErnkmOxaa0AAb9+2ulufSfkfxkF/UfN0vSSxA FYDEHIJr1heg6+mrVI6rqcq3WY1hjhVO3131gqyx3oWoPqDoberPV4bv80eQpdaF qk9bxUKQYBX+LMaDftxRG0S7dlcRmJLgw8TZ52G+hcBxvPomiYU1y0iaX0mDybzB
+MIIGXDCCBUSgAwIBAgIDEE36MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
+YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNTA1MDk0MTU4
+WhcNMTUwNTA1MTYzNjQyWjBsMRkwFwYDVQQNExBIRkVrbXIzMEliM2VrYzgyMQsw
+CQYDVQQGEwJVWTEaMBgGA1UEAxMRaWRwMi5yZWRjbGFyYS5uZXQxJjAkBgkqhkiG
+9w0BCQEWF3Bvc3RtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA789b8ZQhtUF0MlgLSW1ARfe8RIm2OmXBlMc9gdjrPF4Y
+rKySIm/wDmzwzVG0AhL9/OwRleXs+RrEPyo6/k5z1RxNIHs5y8CcnNFRAxFMWIFZ
+qrkDYfMo/GJcM1BHJ1HoTNKcXviVXvzag5Ca1h3Nogp8Sdp8K+vdIozT5URWmkbU
+JGnRdr82MqvqT4IpFSJ5bUPe1G50cV82h0zQvDVTlk2mo4GFS/B+g1t6yA3dlQn6
+O7gCz+LU/3rDiS/XnI2Qk50k/oNEBGq5VLRv68dv5JnAl17AWWi18dGDKSTY0Zds
+ER9Kn6eFH+4PSnB9IyVxAmjeG85d79PqQBpO4qzu3wIDAQABo4IC5DCCAuAwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFO43JOeGzab8H3c9zLqeuFlaDcOKMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
+CPfMZC7vDixFMCoGA1UdEQQjMCGCEWlkcDIucmVkY2xhcmEubmV0ggxyZWRjbGFy
+YS5uZXQwggFWBgNVHSAEggFNMIIBSTAIBgZngQwBAgEwggE7BgsrBgEEAYG1NwEC
+AzCCASowLgYIKwYBBQUHAgEWImh0dHA6Ly93d3cuc3RhcnRzc2wuY29tL3BvbGlj
+eS5wZGYwgfcGCCsGAQUFBwICMIHqMCcWIFN0YXJ0Q29tIENlcnRpZmljYXRpb24g
+QXV0aG9yaXR5MAMCAQEagb5UaGlzIGNlcnRpZmljYXRlIHdhcyBpc3N1ZWQgYWNj
+b3JkaW5nIHRvIHRoZSBDbGFzcyAxIFZhbGlkYXRpb24gcmVxdWlyZW1lbnRzIG9m
+IHRoZSBTdGFydENvbSBDQSBwb2xpY3ksIHJlbGlhbmNlIG9ubHkgZm9yIHRoZSBp
+bnRlbmRlZCBwdXJwb3NlIGluIGNvbXBsaWFuY2Ugb2YgdGhlIHJlbHlpbmcgcGFy
+dHkgb2JsaWdhdGlvbnMuMDUGA1UdHwQuMCwwKqAooCaGJGh0dHA6Ly9jcmwuc3Rh
+cnRzc2wuY29tL2NydDEtY3JsLmNybDCBjgYIKwYBBQUHAQEEgYEwfzA5BggrBgEF
+BQcwAYYtaHR0cDovL29jc3Auc3RhcnRzc2wuY29tL3N1Yi9jbGFzczEvc2VydmVy
+L2NhMEIGCCsGAQUFBzAChjZodHRwOi8vYWlhLnN0YXJ0c3NsLmNvbS9jZXJ0cy9z
+dWIuY2xhc3MxLnNlcnZlci5jYS5jcnQwIwYDVR0SBBwwGoYYaHR0cDovL3d3dy5z
+dGFydHNzbC5jb20vMA0GCSqGSIb3DQEBBQUAA4IBAQAi6p7SBeDWUNY52CEwi/Cy
+aDobEkEhR2afn6U1Aa7GEYnQ3fLHdmINfXA6n7JIApWsgD9PML6czu7H1X+DsLAK
+quKoDM/9IGe6yhLlKfH2tBxwGcFo8guaKNZd9HztOONj7dkNvGwX9uzMVAXarCw/
++P5NwH3C2Ay5ZJs5oLIh4y6yCS3/I1exOQqIBlZPdIQxqVt2B4Fm0mWXENfpA9N3
+RWQrN7vxHeMorebLpkx6Z8+tw3Svi9Z2oP1vPbnUJpFragDqNoZw6K9Crf/JTqD9
+HtCRp1bLRxJ4Ysu5HdV+kAcTelR3MyDYe/gAGAb5Wu7hmNn3NAwwrFn0TygkPzvl
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml
index ef04b671..ef04b671 100644
--- a/swamid-interfederations-2.0/idpcafe.ifsc.edu.br.xml
+++ b/swamid-interfederations-2.0/idpcafe.ifsc.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idpcafe.ufjf.br.xml b/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml
index 23df3ae4..23df3ae4 100644
--- a/swamid-interfederations-2.0/idpcafe.ufjf.br.xml
+++ b/swamid-interfederations-2.0/idpcafe.ufjf.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idpcafe.usp.br.xml b/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
index 6d309e40..6d309e40 100644
--- a/swamid-interfederations-2.0/idpcafe.usp.br.xml
+++ b/swamid-interfederations-2.0/idpcafe.usp.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idpcnous.cnous.fr.xml b/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml
index 2b9cb951..325744fd 100644
--- a/swamid-interfederations-2.0/idpcnous.cnous.fr.xml
+++ b/swamid-interfederations-2.0/idpcnous.cnous.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnous.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idpr.tem-tsp.eu.xml b/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
index de3ef8b8..b42251d1 100644
--- a/swamid-interfederations-2.0/idpr.tem-tsp.eu.xml
+++ b/swamid-interfederations-2.0/idpr.tem-tsp.eu-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tem-tsp.eu</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-em.eu</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/idpshib01.ifma.fr.xml b/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml
index 87444f0c..364581f6 100644
--- a/swamid-interfederations-2.0/idpshib01.ifma.fr.xml
+++ b/swamid-interfederations-2.0/idpshib01.ifma.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifma.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idpstaff.belnet.be.xml b/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml
index 7b30b1ec..7b30b1ec 100644
--- a/swamid-interfederations-2.0/idpstaff.belnet.be.xml
+++ b/swamid-interfederations-2.0/idpstaff.belnet.be-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/idptl.telecom-lille.fr.xml b/swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml
index 270aa1cc..0eafb861 100644
--- a/swamid-interfederations-2.0/idptl.telecom-lille.fr.xml
+++ b/swamid-interfederations-2.0/idptl.telecom-lille.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">telecom-lille.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/idptoo.osu.cz.xml b/swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml
index a0bd6561..96ab3630 100644
--- a/swamid-interfederations-2.0/idptoo.osu.cz.xml
+++ b/swamid-interfederations-2.0/idptoo.osu.cz-simplesaml-saml2-idp-metadata.php.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://idptoo.osu.cz/simplesaml/saml2/idp/metadata.php">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-03-21T14:50:41Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
diff --git a/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..aa1ce103
--- /dev/null
+++ b/swamid-interfederations-2.0/idpuniba.uniba.it-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://idpuniba.uniba.it/simplesaml/saml2/idp/metadata.php">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-20T22:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">uniba.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Bari Aldo Moro</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Bari Aldo Moro</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for the users of University of Bari Aldo Moro</mdui:Description>
+        <mdui:InformationURL xml:lang="it">https://idpuniba.uniba.it/info/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://idpuniba.uniba.it/info/</mdui:PrivacyStatementURL>
+        <mdui:Logo height="80" width="60" xml:lang="en">https://idpuniba.uniba.it/info/unibalogo.png</mdui:Logo>
+        <mdui:Logo height="80" width="60" xml:lang="it">https://idpuniba.uniba.it/info/unibalogo.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://idpuniba.uniba.it/info/unibalogo16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://idpuniba.uniba.it/info/unibalogo16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID7TCCAtWgAwIBAgIJANj5CumEPPiKMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
+VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxDjAMBgNVBAoM
+BVVuaUJhMRMwEQYDVQQLDApDU0ktQ2FtcHVzMRowGAYDVQQDDBFpZHB1bmliYS51
+bmliYS5pdDEdMBsGCSqGSIb3DQEJARYOc3RhZmZAdW5pYmEuaXQwHhcNMTQwNDAz
+MTQzMjQwWhcNNDQwMzI2MTQzMjQwWjCBjDELMAkGA1UEBhMCSVQxDjAMBgNVBAgM
+BUl0YWx5MQ0wCwYDVQQHDARCYXJpMQ4wDAYDVQQKDAVVbmlCYTETMBEGA1UECwwK
+Q1NJLUNhbXB1czEaMBgGA1UEAwwRaWRwdW5pYmEudW5pYmEuaXQxHTAbBgkqhkiG
+9w0BCQEWDnN0YWZmQHVuaWJhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2ybitm1sRZ5QF6IXsrh1V1EnuRT5fp3MZdev4WVv5hE/5q/XbRSGSY/v
+eKuQCv2a1yNGd6fwK5lkG0kD8tFoSxfMTz9farfWPpNywhTgvXeMp8nRvzXIJKrw
+T/z34a8CgcXRU19pv6Sd4YgD7Wc/2MP7Uaxp7CCtzYHQ3SOdcWj486spHHdwbMo4
+Ojw9bdZTxkB4XyBVcZ3y5S5P+j/4lsOSSAzKisSCoXm16T+YqZDSZFhwQMdtZTEx
+r2q26MKIqpPzLJMkt0cl/4pHu5olwQ3eTw7ZN/QkpuoXdIRSY5EeeQJyxq67A2ga
+P4KT3ksUKNHobBrPOkaODpnKtiSnJwIDAQABo1AwTjAdBgNVHQ4EFgQU1kgTrmPx
+aF3ULu8QcLg8kF82PXAwHwYDVR0jBBgwFoAU1kgTrmPxaF3ULu8QcLg8kF82PXAw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAcDLZs+MHK89MVM7964gc
+mK1Rr/7CiKc/ZQ7Swr8+j0kxASSTDO4kJ/+p1VfXx2f2SymbPsJgRnJSE8OxRlbn
+VwD2vciIZhyxYyUGVE17drPvUFBJriNCYvS1Rj+wjO3TvHRrDuSm+ss/ygj0L9FG
+2lDz549x+WGCw3DAEiQHyGMf9i/zksTv5BPlxA/7UqQZIa/BFlqEp/EW3YgVu0+W
+9RBoub2eFvPOcllFQoB28Z5gPQRPBWZhA+Zc1UEvfwcXCo6g61WJgiqAGUYT1ov4
+cCuJJOAZD3rKrhRFexgmfSOP68YWTF0vVcsxPccDmYw5wtYiEV7ziUVV9QuMgM58
+kA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID7TCCAtWgAwIBAgIJANj5CumEPPiKMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYD
+VQQGEwJJVDEOMAwGA1UECAwFSXRhbHkxDTALBgNVBAcMBEJhcmkxDjAMBgNVBAoM
+BVVuaUJhMRMwEQYDVQQLDApDU0ktQ2FtcHVzMRowGAYDVQQDDBFpZHB1bmliYS51
+bmliYS5pdDEdMBsGCSqGSIb3DQEJARYOc3RhZmZAdW5pYmEuaXQwHhcNMTQwNDAz
+MTQzMjQwWhcNNDQwMzI2MTQzMjQwWjCBjDELMAkGA1UEBhMCSVQxDjAMBgNVBAgM
+BUl0YWx5MQ0wCwYDVQQHDARCYXJpMQ4wDAYDVQQKDAVVbmlCYTETMBEGA1UECwwK
+Q1NJLUNhbXB1czEaMBgGA1UEAwwRaWRwdW5pYmEudW5pYmEuaXQxHTAbBgkqhkiG
+9w0BCQEWDnN0YWZmQHVuaWJhLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEA2ybitm1sRZ5QF6IXsrh1V1EnuRT5fp3MZdev4WVv5hE/5q/XbRSGSY/v
+eKuQCv2a1yNGd6fwK5lkG0kD8tFoSxfMTz9farfWPpNywhTgvXeMp8nRvzXIJKrw
+T/z34a8CgcXRU19pv6Sd4YgD7Wc/2MP7Uaxp7CCtzYHQ3SOdcWj486spHHdwbMo4
+Ojw9bdZTxkB4XyBVcZ3y5S5P+j/4lsOSSAzKisSCoXm16T+YqZDSZFhwQMdtZTEx
+r2q26MKIqpPzLJMkt0cl/4pHu5olwQ3eTw7ZN/QkpuoXdIRSY5EeeQJyxq67A2ga
+P4KT3ksUKNHobBrPOkaODpnKtiSnJwIDAQABo1AwTjAdBgNVHQ4EFgQU1kgTrmPx
+aF3ULu8QcLg8kF82PXAwHwYDVR0jBBgwFoAU1kgTrmPxaF3ULu8QcLg8kF82PXAw
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAcDLZs+MHK89MVM7964gc
+mK1Rr/7CiKc/ZQ7Swr8+j0kxASSTDO4kJ/+p1VfXx2f2SymbPsJgRnJSE8OxRlbn
+VwD2vciIZhyxYyUGVE17drPvUFBJriNCYvS1Rj+wjO3TvHRrDuSm+ss/ygj0L9FG
+2lDz549x+WGCw3DAEiQHyGMf9i/zksTv5BPlxA/7UqQZIa/BFlqEp/EW3YgVu0+W
+9RBoub2eFvPOcllFQoB28Z5gPQRPBWZhA+Zc1UEvfwcXCo6g61WJgiqAGUYT1ov4
+cCuJJOAZD3rKrhRFexgmfSOP68YWTF0vVcsxPccDmYw5wtYiEV7ziUVV9QuMgM58
+kA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpuniba.uniba.it/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idpuniba.uniba.it/simplesaml/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Università degli Studi di Bari Aldo Moro</OrganizationName>
+    <OrganizationName xml:lang="en">University of Bari Aldo Moro</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">Università degli Studi di Bari Aldo Moro</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">University of Bari Aldo Moro</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.uniba.it</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uniba.it/english-version</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Administrator</SurName>
+    <EmailAddress>staff@uniba.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml
index e1f69a35..e1f69a35 100644
--- a/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br.xml
+++ b/swamid-interfederations-2.0/ifs00sv056.ifsul.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/imogen.surfnet.nl.xml b/swamid-interfederations-2.0/imogen.surfnet.nl.xml
deleted file mode 100644
index 72e641ca..00000000
--- a/swamid-interfederations-2.0/imogen.surfnet.nl.xml
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://imogen.surfnet.nl/proxy/module.php/saml/sp/metadata.php/default-sp">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2013-09-04T14:01:03Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">SURFconext decryption proxy</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Proxy which decrypts assertions and forwards them to SURFconext</mdui:Description>
-        <mdui:Logo height="100" width="186">http://www.surfnet.nl/SURFnet%20imagebank/Logos/logo_surfconext_themasite.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIID/TCCAuWgAwIBAgIJAPJBDh5BkDCmMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDAeFw0xMzA2MTgwNzI5NTRaFw0yMzA2MTgwNzI5NTRaMIGUMQswCQYDVQQGEwJOTDETMBEGA1UECAwKU29tZS1TdGF0ZTEQMA4GA1UEBwwHVXRyZWNodDEQMA4GA1UECgwHU1VSRm5ldDERMA8GA1UECwwIVGVzdCBJZFAxGjAYBgNVBAMMEWltb2dlbi5zdXJmbmV0Lm5sMR0wGwYJKoZIhvcNAQkBFg5iYXNAc3VyZm5ldC5ubDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMXEPdLxltthL2I8oo8H2dJ0iOn3NeRnePRksTn3Y5PoIInHoA2zgOvZqmgot3ovDGEZC9HfAhg4iwLdPfyisQz6bN/8c08BU7VwVwpCbRBG5WFhrPqWEC7vNp5bY8AkE6naxMNCUFgCl/qgjI6c5ainIhfdGfZdZ4TDfIOmed4qXic8J8BjlPm+STK2qJ2BFVjl3UKK/cCr5/h654n8zjw5hTfyQKNg22XdjXM9/RhODdMzGd4ozlSxzUDc7+Z4CzhYd9Gm4nCvXfarvZXqQ22m+wXlCYNuJxFgtcfCQo7KA/d9P4PVI+k6A8hQrukrulaqR0V7aBytFwIULKFm0YMCAwEAAaNQME4wHQYDVR0OBBYEFNI3xt9Ggpd9LP37oo3VYYpTN9iSMB8GA1UdIwQYMBaAFNI3xt9Ggpd9LP37oo3VYYpTN9iSMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAGAbcnBYdAERRJFkl2/q9ZxXjImCxRY1fzMTHTlGFppFMXdH+RRY76hNFPI3UvogcWwN9vJsb/2iO+twWr8ESQYvoeJwWskLitdomOQh1poMja4J+VqA1dBOCZW7rmI8ifc75Gk4NPWsFsBuWnfMgtEFfI7ZNpc6PEF8k/vYEsH58IilI4Cg11pVFj9Tqzscoo7KhfwVGVHFoGagytLKpavH74tvduUUwOreNFSnjB79pEVQYP7I+Gm3fRGI/l5ycNznzZFnaGOx8pM4NfWQfDKGRieQH9OwJe2hPrnbDxDzlH1EerS1yDaK5HkEghH5gZvhePub7hUn+5HoCgutSS0=</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-logout.php/default-sp"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://imogen.surfnet.nl/proxy/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
-    <md:AttributeConsumingService index="0">
-      <md:ServiceName xml:lang="en">SURFconext test proxy</md:ServiceName>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:terena.org:attribute-def:schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-      <md:RequestedAttribute FriendlyName="urn:mace:dir:attribute-def:sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="nl">SURFnet BV</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">SURFnet BV</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="nl">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">SURFnet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="nl">http://www.surfnet.nl/nl/Pages/default.aspx</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.surfnet.nl/en/Pages/default.aspx</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Bas</md:GivenName>
-    <md:SurName>Zoetekouw</md:SurName>
-    <md:EmailAddress>bas.zoetekouw@surfnet.nl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
new file mode 100644
index 00000000..618ed2f9
--- /dev/null
+++ b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it-shibboleth.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://indicate-gw.consorzio-cometa.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-09-05T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">INDICATE e-Culture Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">INDICATE e-Culture Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows users to access the digital repositories created for the INDICATE
+                        project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
+                        Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
+                        e-Infrastructure providers and the general public.
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette agli utenti di accedere gli archivi digitali creati per il progetto
+                        europeo INDICATE con l'obiettivo di dimostrare l'opportunità di adottare e-Infrastrutture per
+                        i patrimoni culturali digitali. Esso è indirizzato ai partner di INDICATE ed altre istituzioni
+                        culturali, i fornitori di e-Infrastrutture ed al pubblico.
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
+2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
+W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">INDICATE e-Culture Science Gateway</ServiceName>
+      <ServiceDescription xml:lang="en">This service allows users to access the digital repositories created for the INDICATE
+                    project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
+                    Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
+                    e-Infrastructure providers and the general public.
+                </ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">COMETA Consortium</OrganizationName>
+    <OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">COMETA</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Marco</GivenName>
+    <SurName>Fargetta</SurName>
+    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Riccardo</GivenName>
+    <SurName>Rotondo</SurName>
+    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Giuseppe</GivenName>
+    <SurName>Platania</SurName>
+    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Carlo</GivenName>
+    <SurName>Rocca</SurName>
+    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Roberto</GivenName>
+    <SurName>Barbera</SurName>
+    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml b/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
deleted file mode 100644
index df54c89c..00000000
--- a/swamid-interfederations-2.0/indicate-gw.consorzio-cometa.it.xml
+++ /dev/null
@@ -1,108 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://indicate-gw.consorzio-cometa.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-22T10:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">INDICATE e-Culture Science Gateway</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">INDICATE e-Culture Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows users to access the digital repositories created for the INDICATE
-                        project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
-                        Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
-                        e-Infrastructure providers and the general public.
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette agli utenti di accedere gli archivi digitali creati per il progetto
-                        europeo INDICATE con l'obiettivo di dimostrare l'opportunità di adottare e-Infrastrutture per
-                        i patrimoni culturali digitali. Esso è indirizzato ai partner di INDICATE ed altre istituzioni
-                        culturali, i fornitori di e-Infrastrutture ed al pubblico.
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://indicate-gw.consorzio-cometa.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">INDICATE e-Culture Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service allows users to access the digital repositories created for the INDICATE
-                    project to demonstrate the usefulness of the adoption of e-Infrastructures for Digital
-                    Cultural Heritage. It is devoted to the INDICATE partners as well as to cultural institutions,
-                    e-Infrastructure providers and the general public.
-                </md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">COMETA Consortium</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consorzio COMETA (COnsorzio Multi Ente per la promozione e l'adozione di Tecnologie di calcolo Avanzato)</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">INDICATE e-Culture Science Gateway provided by COMETA</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">INDICATE e-Culture Science Gateway erogato da COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/instantanatomy.co.uk.xml b/swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml
index afb9bf35..afb9bf35 100644
--- a/swamid-interfederations-2.0/instantanatomy.co.uk.xml
+++ b/swamid-interfederations-2.0/instantanatomy.co.uk-shib.xml
diff --git a/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml b/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml
new file mode 100644
index 00000000..f43ec643
--- /dev/null
+++ b/swamid-interfederations-2.0/ir-lan-fid.images-et-reseaux.com-idp-shibboleth.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ir-lan-fid.images-et-reseaux.com/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-16T11:30:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">images-et-reseaux.com</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Permanents du pôle Images et Réseaux</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Images et Réseaux - Pôle de compétitivité</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Permanents du pôle Images et Réseaux</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDdTCCAl2gAwIBAgIUfVeQwiqB95BAl22ynEYVWqJBclowDQYJKoZIhvcNAQEF
+BQAwLTErMCkGA1UEAwwiaXItbGFuLWZpZDAxLmltYWdlcy1ldC1yZXNlYXV4LmNv
+bTAeFw0xNDEwMTQxNDU4MzFaFw0xNzEwMTQxNDU4MzFaMC0xKzApBgNVBAMMImly
+LWxhbi1maWQwMS5pbWFnZXMtZXQtcmVzZWF1eC5jb20wggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCEtN1a3z7IoDPq2fx+81W+8BVvtZ3skA7iyZjCpNC9
+maYCL9gPo8qOQoXKE3z8vtxZwmV0ynmZBVtPjHwtQqdBCpcViEmT+aXhg9+KaRlQ
+1c8FriEX/A7JtWfwwHRgAvMLujFbi0qIQa+sMZ7ggFDwiqZojQwOgFgKBUTAgN/M
+A+ynQZUo9z1uSxdCiXJpY2010TLJf8WSv1MZGhQP2KLUNKXCY3MNfCMC42OEALJb
+mpRUPiI1weJk7QX6hefMOHwc61bXT9PT62R2LNipzA9f2UBYBQhXXOvtnKcg03/w
+90uQIg+kP6doqffDrlmQsB/AeDbnGbpAM3xumEcdxvOdAgMBAAGjgYwwgYkwHQYD
+VR0OBBYEFNhsNcOXWxlijZxR+nrdBdsaPfw0MGgGA1UdEQRhMF+CImlyLWxhbi1m
+aWQwMS5pbWFnZXMtZXQtcmVzZWF1eC5jb22GOWh0dHBzOi8vaXItbGFuLWZpZDAx
+LmltYWdlcy1ldC1yZXNlYXV4LmNvbS9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0B
+AQUFAAOCAQEACZDPw9UgXcEPiwrXkB+//NbYYpuvj1SW8rS9kV6NhmtToFAfhbn4
+IjhsjSJ9eHC5E6pBthKPif9strOG1GitiSfHHwu9gRCDxLkj53oZhBOXmUDOV7oV
+aaI0SbgfGoUbSZ44WuJdafHEybFlCucWd789zpZGrnLhd+J7G1RWZe+fV4Gn+amf
+C2PYZIo9GQlKMb3kQ3nwsvo9yHGJAoFOVO2idUpEwnRik7OldKPz8JC0tqgcU7ek
+dxih2c1aTtAR8ppMcajXPEpBCfYPLCM/OqiMVe8uYgPXqIt7LmKibPQKYEof2FfJ
+J50vJWk7ByIh8CfHI1165+hJArgbrRdkvw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ir-lan-fid.images-et-reseaux.com/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Images et Réseaux - Pôle de compétitivité</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Images et Réseaux - Pôle de compétitivité</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.images-et-reseaux.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Sergio MORANT</SurName>
+    <EmailAddress>smorant@images-et-reseaux.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/issues.shibboleth.net.xml b/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml
index da4b6342..da4b6342 100644
--- a/swamid-interfederations-2.0/issues.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/issues.shibboleth.net-shibboleth.xml
diff --git a/swamid-interfederations-2.0/itacare.bahiana.edu.br.xml b/swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml
index f9e7a508..f9e7a508 100644
--- a/swamid-interfederations-2.0/itacare.bahiana.edu.br.xml
+++ b/swamid-interfederations-2.0/itacare.bahiana.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/janus.bordeaux.archi.fr.xml b/swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml
index c32b34a5..0578d531 100644
--- a/swamid-interfederations-2.0/janus.bordeaux.archi.fr.xml
+++ b/swamid-interfederations-2.0/janus.bordeaux.archi.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bordeaux.archi.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br.xml b/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml
index 7b2ce0ac..c17a5967 100644
--- a/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br.xml
+++ b/swamid-interfederations-2.0/joaodebarro.iffarroupilha.edu.br-idp-shibboleth.xml
@@ -26,26 +26,26 @@
     MIIEPDCCAyQCAQAwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLUlGRmFycm91
 cGlsaGEgLSBJbnN0aXR1dG8gRmVkZXJhbCBGYXJyb3VwaWxoYTENMAsGA1UECxME
 Q0dUSTEwMC4GCSqGSIb3DQEJARYhZXZlcnRvbi5mYXZhQGlmZmFycm91cGlsaGEu
-ZWR1LmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgGA1UECBMRUmlvIEdyYW5k
-ZSBkbyBTdWwxCzAJBgNVBAYTAkJSMSkwJwYDVQQDEyBqb2FvZGViYXJyby5pZmZh
-cnJvdXBpbGhhLmVkdS5icjAeFw0xNDA0MDMxMzA1MDNaFw0xNzA0MDIxMzA1MDNa
+ZWR1Yi5yMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgGA1UECBMRUmlvIEdyYW5k
+ZSBkbyBTdWwxCzAJBgNVBAYTAkJSMSkwJwYDVQQDEyBqb2FvZG9iYXJyby5pZmZh
+cnJvdXBpbGhhLmVkdS5icjAeFw0xNDA5MTAxMjAzMzJaFw0xNzA5MDkxMjAzMzJa
 MIHjMTYwNAYDVQQKEy1JRkZhcnJvdXBpbGhhIC0gSW5zdGl0dXRvIEZlZGVyYWwg
 RmFycm91cGlsaGExDTALBgNVBAsTBENHVEkxMDAuBgkqhkiG9w0BCQEWIWV2ZXJ0
-b24uZmF2YUBpZmZhcnJvdXBpbGhhLmVkdS5icjEUMBIGA1UEBxMLU2FudGEgTWFy
+b24uZmF2YUBpZmZhcnJvdXBpbGhhLmVkdWIucjEUMBIGA1UEBxMLU2FudGEgTWFy
 aWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEpMCcG
-A1UEAxMgam9hb2RlYmFycm8uaWZmYXJyb3VwaWxoYS5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+EyyNbeZkFJj4td6EylgBHbJBCeFecaBU
-+pnNcNaTeJMyoOe9G1/+E5rS6V95nkT04aSOMyXomNqNpSOgBIkGwSayNXuz7aZv
-0VtZEEzzlNtd1pNIDEfKsbjbmQ7ZtSxKU1tRXnbz6dQiYpReUzKd1O19IsmWvzs1
-NV8qh9CBiuE9dlHk82H3zp9EN9/xTbRt0i6mIA3pDs+g9UM9FDgbBU8npQqZ0CHj
-jmb8nKOoewq4sxRINhfTcghl4YBCVSOiHplDL5/TikITWaOgckndItQzVgKo1ySD
-JSi5tEaUUoX1VSAmSuLpdIH6mFcTh4ZEPb94nz7of0my2yMaGj09AgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAJw+K8mRsbKiTV5WLQfELCkt/bVWZgG6e/8tIzA9eFmY
-kNHLicI/QCeYWlPhRjXwYMXX/NnUrBBPXa9YRspcKTCnVdbDDCgOY3nrfasUr08Y
-1MdgwUmpixFPorcEcm9wZqGInbwsmHbZ6MfZK1G1xOLSEu/OUnF4RReab9PBkXJs
-i8X1ThzT0yqp/n0b+3+6PnFSTiryRlk7HU7g/RLdSsHpv083ikoNYRaigL8qAM99
-u+Phqw8LtdQv6URM19gj/VX5yKkRCMw9AfCbfxtx58YaXNhPoM3oVYPJX+pWcOp1
-OIMN7jIFKjVPmzI3PkBs4da/MiDPhueqp4ZoOuFowTY=
+A1UEAxMgam9hb2RvYmFycm8uaWZmYXJyb3VwaWxoYS5lZHUuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjbxzJf9stIGm23HODfY3e2Qgf5TP4pv4f
+pn2oss8MkC99Rm2XPKcui4ny8H5QJoxHU7L059QST5LdKmUKPWX/ormEqUp9pgSL
+k3V5FChn6P/G636wk8Q4b7zPtk4V5R2crxXXt2jxo3Xhb8PLAm4ypN8uUeDgTj4J
+wgRd3KDJt7fFnAXAouT1l4e0a0LELiuI8kjvGyKcGNV+8opQg2S8/+R9qAh07fKL
+V//OVmoPVWnSJmZBHCoH8AcbghazA7mY3YJVnPZdZC4WwAP7u58pRSKkt0OnXnpF
+SWuviPcoIFLbV5JtgZuyxMzq5wwXniienr18Uv0CBpK0PciRnKtTAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBABzAstXEYvu0dkoQvxEhhOh3kBPm8OurJpiGzGQDKX/G
+VDhgLOI+V/3UjYPTcBEMDJsjWE9Q86tjfyEXl+L3WNg2tDscxTi0hXrn9HtKeFdl
+Eqn7o0P0Zy+Ck28whDSlAKtIsoupQvhvDfE6zVltnk7Y6BtBS6IMbLVtOEC83ayc
+u4j17sJlJYYOO++rnuIMpOk6AArPrZCTBgIM1YGGAVC23z5M4KF25L02p/JvzcCH
+BB5WV7TdBFR34zcIEGOr4l8afrmCKZJw4zqLP7HxMwfVQL+bJw/aVx4owdFh/VEr
+7kc9bN7ChGuVCbg9lLSKtVhDRKDWyuIUt/ioaVOWP8s=
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -71,26 +71,27 @@ OIMN7jIFKjVPmzI3PkBs4da/MiDPhueqp4ZoOuFowTY=
 MIIEPDCCAyQCAQAwDQYJKoZIhvcNAQEFBQAwgeMxNjA0BgNVBAoTLUlGRmFycm91
 cGlsaGEgLSBJbnN0aXR1dG8gRmVkZXJhbCBGYXJyb3VwaWxoYTENMAsGA1UECxME
 Q0dUSTEwMC4GCSqGSIb3DQEJARYhZXZlcnRvbi5mYXZhQGlmZmFycm91cGlsaGEu
-ZWR1LmJyMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgGA1UECBMRUmlvIEdyYW5k
-ZSBkbyBTdWwxCzAJBgNVBAYTAkJSMSkwJwYDVQQDEyBqb2FvZGViYXJyby5pZmZh
-cnJvdXBpbGhhLmVkdS5icjAeFw0xNDA0MDMxMzA1MDNaFw0xNzA0MDIxMzA1MDNa
+ZWR1Yi5yMRQwEgYDVQQHEwtTYW50YSBNYXJpYTEaMBgGA1UECBMRUmlvIEdyYW5k
+ZSBkbyBTdWwxCzAJBgNVBAYTAkJSMSkwJwYDVQQDEyBqb2FvZG9iYXJyby5pZmZh
+cnJvdXBpbGhhLmVkdS5icjAeFw0xNDA5MTAxMjAzMzJaFw0xNzA5MDkxMjAzMzJa
 MIHjMTYwNAYDVQQKEy1JRkZhcnJvdXBpbGhhIC0gSW5zdGl0dXRvIEZlZGVyYWwg
 RmFycm91cGlsaGExDTALBgNVBAsTBENHVEkxMDAuBgkqhkiG9w0BCQEWIWV2ZXJ0
-b24uZmF2YUBpZmZhcnJvdXBpbGhhLmVkdS5icjEUMBIGA1UEBxMLU2FudGEgTWFy
+b24uZmF2YUBpZmZhcnJvdXBpbGhhLmVkdWIucjEUMBIGA1UEBxMLU2FudGEgTWFy
 aWExGjAYBgNVBAgTEVJpbyBHcmFuZGUgZG8gU3VsMQswCQYDVQQGEwJCUjEpMCcG
-A1UEAxMgam9hb2RlYmFycm8uaWZmYXJyb3VwaWxoYS5lZHUuYnIwggEiMA0GCSqG
-SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC+EyyNbeZkFJj4td6EylgBHbJBCeFecaBU
-+pnNcNaTeJMyoOe9G1/+E5rS6V95nkT04aSOMyXomNqNpSOgBIkGwSayNXuz7aZv
-0VtZEEzzlNtd1pNIDEfKsbjbmQ7ZtSxKU1tRXnbz6dQiYpReUzKd1O19IsmWvzs1
-NV8qh9CBiuE9dlHk82H3zp9EN9/xTbRt0i6mIA3pDs+g9UM9FDgbBU8npQqZ0CHj
-jmb8nKOoewq4sxRINhfTcghl4YBCVSOiHplDL5/TikITWaOgckndItQzVgKo1ySD
-JSi5tEaUUoX1VSAmSuLpdIH6mFcTh4ZEPb94nz7of0my2yMaGj09AgMBAAEwDQYJ
-KoZIhvcNAQEFBQADggEBAJw+K8mRsbKiTV5WLQfELCkt/bVWZgG6e/8tIzA9eFmY
-kNHLicI/QCeYWlPhRjXwYMXX/NnUrBBPXa9YRspcKTCnVdbDDCgOY3nrfasUr08Y
-1MdgwUmpixFPorcEcm9wZqGInbwsmHbZ6MfZK1G1xOLSEu/OUnF4RReab9PBkXJs
-i8X1ThzT0yqp/n0b+3+6PnFSTiryRlk7HU7g/RLdSsHpv083ikoNYRaigL8qAM99
-u+Phqw8LtdQv6URM19gj/VX5yKkRCMw9AfCbfxtx58YaXNhPoM3oVYPJX+pWcOp1
-OIMN7jIFKjVPmzI3PkBs4da/MiDPhueqp4ZoOuFowTY=
+A1UEAxMgam9hb2RvYmFycm8uaWZmYXJyb3VwaWxoYS5lZHUuYnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCjbxzJf9stIGm23HODfY3e2Qgf5TP4pv4f
+pn2oss8MkC99Rm2XPKcui4ny8H5QJoxHU7L059QST5LdKmUKPWX/ormEqUp9pgSL
+k3V5FChn6P/G636wk8Q4b7zPtk4V5R2crxXXt2jxo3Xhb8PLAm4ypN8uUeDgTj4J
+wgRd3KDJt7fFnAXAouT1l4e0a0LELiuI8kjvGyKcGNV+8opQg2S8/+R9qAh07fKL
+V//OVmoPVWnSJmZBHCoH8AcbghazA7mY3YJVnPZdZC4WwAP7u58pRSKkt0OnXnpF
+SWuviPcoIFLbV5JtgZuyxMzq5wwXniienr18Uv0CBpK0PciRnKtTAgMBAAEwDQYJ
+KoZIhvcNAQEFBQADggEBABzAstXEYvu0dkoQvxEhhOh3kBPm8OurJpiGzGQDKX/G
+VDhgLOI+V/3UjYPTcBEMDJsjWE9Q86tjfyEXl+L3WNg2tDscxTi0hXrn9HtKeFdl
+Eqn7o0P0Zy+Ck28whDSlAKtIsoupQvhvDfE6zVltnk7Y6BtBS6IMbLVtOEC83ayc
+u4j17sJlJYYOO++rnuIMpOk6AArPrZCTBgIM1YGGAVC23z5M4KF25L02p/JvzcCH
+BB5WV7TdBFR34zcIEGOr4l8afrmCKZJw4zqLP7HxMwfVQL+bJw/aVx4owdFh/VEr
+7kc9bN7ChGuVCbg9lLSKtVhDRKDWyuIUt/ioaVOWP8s=
+
                     
             </ds:X509Certificate>
         </ds:X509Data>
@@ -111,6 +112,6 @@ OIMN7jIFKjVPmzI3PkBs4da/MiDPhueqp4ZoOuFowTY=
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>Everton Fava</SurName>
-    <EmailAddress>everton.fava@iffarroupilha.edu.br</EmailAddress>
+    <EmailAddress>everton.fava@iffarroupilha.edub.r</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/katalog.svkos.cz.xml b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
index 984c5d2c..faabac66 100644
--- a/swamid-interfederations-2.0/katalog.svkos.cz.xml
+++ b/swamid-interfederations-2.0/katalog.svkos.cz-idp-shibboleth.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://katalog.svkos.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-08T16:18:12Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
-      </mdasrt:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-interfederations-2.0/keybucket.app.nordu.net.xml b/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
index f11b9f47..f11b9f47 100644
--- a/swamid-interfederations-2.0/keybucket.app.nordu.net.xml
+++ b/swamid-interfederations-2.0/keybucket.app.nordu.net-saml2-sp-metadata.xml
diff --git a/swamid-interfederations-2.0/kiidp.ki.se.xml b/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
index 26e764d6..26e764d6 100644
--- a/swamid-interfederations-2.0/kiidp.ki.se.xml
+++ b/swamid-interfederations-2.0/kiidp.ki.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/laife-idp.lanet.lv.xml b/swamid-interfederations-2.0/laife-idp.lanet.lv.xml
deleted file mode 100644
index 9acadef7..00000000
--- a/swamid-interfederations-2.0/laife-idp.lanet.lv.xml
+++ /dev/null
@@ -1,90 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://laife-idp.lanet.lv">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE0zCCAvICAQAwDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCTFYxDzANBgNV
-BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxDjAMBgNVBAsT
-BUxBTkVUMRswGQYDVQQDExJsYWlmZS1pZHAubGFuZXQubHYwHhcNMTMwMzA2MTIz
-MTIwWhcNMjMwMzA0MTIzMTIwWjBnMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0
-dmlhMQ0wCwYDVQQHEwRSaWdhMQswCQYDVQQKEwJMVTEOMAwGA1UECxMFTEFORVQx
-GzAZBgNVBAMTEmxhaWZlLWlkcC5sYW5ldC5sdjCCAeowDQYJKoZIhvcNAQEBBQAD
-ggHXADCCAdICggHJAqmEukkBNsZKvEyjT1GqHjnEEb3r3hV+rF8q5EVpq43ceFmY
-az+G4RzLatiYz36+3P+p7ygH8JJQS4N0tzvf+f++0HHNuwn3Ye9pPzbx9k0BwLxw
-/2In3G2qpmZILKO7O0a7g+RF9NGpyDg/h6Y3wuH/mKftYe3GGvHb0k9n1UK9nPKu
-BnY8DnxR/L6p/EK/PSAHDf+B8vqnym2gVeLa/3UUpH0Ael9mo+GUBcsvkRUrN/Wy
-QuHpB3TKVHH7I+gnLDholI+wIu+vHQ/Hhwe6pnq/ph1xoI/NZ4ffBvMDC/gVa/vA
-Qma4g4EvzujoeXJPKIYrKSQ1rmsHITLuHcas33vzsaPxlBVV1UFeX+9jxvtcHLTC
-0utFcZub4TJ/Ys8/FpxmhbxWRdE1JmEDcEYWyE1ubqWDFdRd9ziE8iI1BeIhnJE7
-OKQdEmlY/2mieGDRdAu/nIGzfybKHhht+IueIBan6nezjlG2DIUuFRPTnVPTTXAo
-itAbrueZ3jJK3KtHoqRkSoANHVvKSeKrFuXFk3o8/0gjK6XPkA1IMX/GSK7B0iXk
-tGpaAO25DWb/EpiBDv0QIJp36/tDzpMjYszsiPJTu4da0zmAnQIDAQABMA0GCSqG
-SIb3DQEBBAUAA4IBygAB6y6Da7AM88xoc+Uu/ZL/gsnRQ5/llUT81ZD5T1dx71Ds
-+edMamrtL0uf0zCRWc8hhkn91ut9MNl6XCEVjDSL4+mhlr+i4uJjeSy/xZ1gQYps
-G0NwX0jMrCLw+/sqbZUxvfueb466br8q/bT4838WAsMRnHj5uFu+9sehlL+VXVT/
-iM9otoQIuvBY3SRVL6OV0KPjZO2dv2hK9QB7ar6TRAdNgCda+Fnnx7O56Jg2cc3M
-1CEWJXC5SGCGmqkcBvfa5XJndiLB3J2Lix5WuSryvI+Z/vB/Pd2ppCNvP6NL45+6
-RwT6S+jAos/eQhoefid2ONZhdUfsd0i5uq8E3VZvDoDbpCmxhTcAJNWCVKtWvjBJ
-P5ZOUL4M0KED41xkL3L1jhc14SdqHgbftPtkVuvXEu436GtwHBGD6mKv19JxZm26
-9jxgUzXXW189mznS/jWq1sVfU5Vjt5rRkZWT2Rcnyr+1QHtUnWrcwbJQ4/qC5PaH
-TyEueSY43VvJHl+WtZOLtCxNj4kWDulEYy6xqRdargHclwk9awkAMbP6QKfRaPUK
-74ng3Rk9KuvN5hoQV5oeWUNlkHsxlxoJCJzF+V5ywxYNtoeIi3W7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIE0zCCAvICAQAwDQYJKoZIhvcNAQEEBQAwZzELMAkGA1UEBhMCTFYxDzANBgNV
-BAgTBkxhdHZpYTENMAsGA1UEBxMEUmlnYTELMAkGA1UEChMCTFUxDjAMBgNVBAsT
-BUxBTkVUMRswGQYDVQQDExJsYWlmZS1pZHAubGFuZXQubHYwHhcNMTMwMzA2MTIz
-MTIwWhcNMjMwMzA0MTIzMTIwWjBnMQswCQYDVQQGEwJMVjEPMA0GA1UECBMGTGF0
-dmlhMQ0wCwYDVQQHEwRSaWdhMQswCQYDVQQKEwJMVTEOMAwGA1UECxMFTEFORVQx
-GzAZBgNVBAMTEmxhaWZlLWlkcC5sYW5ldC5sdjCCAeowDQYJKoZIhvcNAQEBBQAD
-ggHXADCCAdICggHJAqmEukkBNsZKvEyjT1GqHjnEEb3r3hV+rF8q5EVpq43ceFmY
-az+G4RzLatiYz36+3P+p7ygH8JJQS4N0tzvf+f++0HHNuwn3Ye9pPzbx9k0BwLxw
-/2In3G2qpmZILKO7O0a7g+RF9NGpyDg/h6Y3wuH/mKftYe3GGvHb0k9n1UK9nPKu
-BnY8DnxR/L6p/EK/PSAHDf+B8vqnym2gVeLa/3UUpH0Ael9mo+GUBcsvkRUrN/Wy
-QuHpB3TKVHH7I+gnLDholI+wIu+vHQ/Hhwe6pnq/ph1xoI/NZ4ffBvMDC/gVa/vA
-Qma4g4EvzujoeXJPKIYrKSQ1rmsHITLuHcas33vzsaPxlBVV1UFeX+9jxvtcHLTC
-0utFcZub4TJ/Ys8/FpxmhbxWRdE1JmEDcEYWyE1ubqWDFdRd9ziE8iI1BeIhnJE7
-OKQdEmlY/2mieGDRdAu/nIGzfybKHhht+IueIBan6nezjlG2DIUuFRPTnVPTTXAo
-itAbrueZ3jJK3KtHoqRkSoANHVvKSeKrFuXFk3o8/0gjK6XPkA1IMX/GSK7B0iXk
-tGpaAO25DWb/EpiBDv0QIJp36/tDzpMjYszsiPJTu4da0zmAnQIDAQABMA0GCSqG
-SIb3DQEBBAUAA4IBygAB6y6Da7AM88xoc+Uu/ZL/gsnRQ5/llUT81ZD5T1dx71Ds
-+edMamrtL0uf0zCRWc8hhkn91ut9MNl6XCEVjDSL4+mhlr+i4uJjeSy/xZ1gQYps
-G0NwX0jMrCLw+/sqbZUxvfueb466br8q/bT4838WAsMRnHj5uFu+9sehlL+VXVT/
-iM9otoQIuvBY3SRVL6OV0KPjZO2dv2hK9QB7ar6TRAdNgCda+Fnnx7O56Jg2cc3M
-1CEWJXC5SGCGmqkcBvfa5XJndiLB3J2Lix5WuSryvI+Z/vB/Pd2ppCNvP6NL45+6
-RwT6S+jAos/eQhoefid2ONZhdUfsd0i5uq8E3VZvDoDbpCmxhTcAJNWCVKtWvjBJ
-P5ZOUL4M0KED41xkL3L1jhc14SdqHgbftPtkVuvXEu436GtwHBGD6mKv19JxZm26
-9jxgUzXXW189mznS/jWq1sVfU5Vjt5rRkZWT2Rcnyr+1QHtUnWrcwbJQ4/qC5PaH
-TyEueSY43VvJHl+WtZOLtCxNj4kWDulEYy6xqRdargHclwk9awkAMbP6QKfRaPUK
-74ng3Rk9KuvN5hoQV5oeWUNlkHsxlxoJCJzF+V5ywxYNtoeIi3W7
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife-idp.lanet.lv/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife-idp.lanet.lv/simplesaml/saml2/idp/SSOService.php"/>
-  </IDPSSODescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">LAIFE</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">Latvian Identity Federation - LAIFE IDP</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">https://laife.lanet.lv/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Administrator</SurName>
-    <EmailAddress>serviss@lanet.lv</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/laife.lanet.lv.xml b/swamid-interfederations-2.0/laife.lanet.lv.xml
deleted file mode 100644
index 2b17526e..00000000
--- a/swamid-interfederations-2.0/laife.lanet.lv.xml
+++ /dev/null
@@ -1,112 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://laife.lanet.lv/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://laife.lanet.lv/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>*.lanet.lv</ds:KeyName>
-        <ds:KeyName>lanet.lv</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.lanet.lv,O=Latvijas Universitates,L=Riga,ST=Latvija,C=LV</ds:X509SubjectName>
-          <ds:X509Certificate>
-MIIFRzCCBC+gAwIBAgIHB+GeqBl7ejANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY
-BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm
-aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5
-IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky
-ODcwHhcNMTEwMzI4MTAxMTU2WhcNMTMwMzI4MTAxMTU2WjBNMRMwEQYDVQQKEwoq
-LmxhbmV0Lmx2MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxEzAR
-BgNVBAMTCioubGFuZXQubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC3LZIGhNBAI//nDxhLKJ52JqavtYF3vIzSwOhauNnLO1iO4Jij0DtnxAQpNuIu
-ONYSU++MOb0lsjeIEy1tVrzkLAmPNedh5IkYVcK8GsraKdvE+DGpJKgpfuqaw4ZZ
-ZGvOhJ4ZjPYRWnuBQvxSmJ11Rp1IiiGqIbakD9nJ4n0/qDN/Jq8qpjpZGNRqbP/b
-M8CNlMges2MnGsYL8mxK+zwRIAAI81+rv+83ZBzns023hhPJ0i3/orq4yuYqZKHg
-KhUHIdDduFZ3RDjjZDdirzuxqBmXtctubejAh4amA4gepufJAJfhrNhzDQDjG/v/
-GsKxhOa3cI4IHHmJVZqdXAJLAgMBAAGjggGsMIIBqDAPBgNVHRMBAf8EBTADAQEA
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAw
-MwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5LmNvbS9nZHMxLTMy
-LmNybDBNBgNVHSAERjBEMEIGC2CGSAGG/W0BBxcBMDMwMQYIKwYBBQUHAgEWJWh0
-dHBzOi8vY2VydHMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wgYAGCCsGAQUFBwEB
-BHQwcjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEoGCCsG
-AQUFBzAChj5odHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRv
-cnkvZ2RfaW50ZXJtZWRpYXRlLmNydDAfBgNVHSMEGDAWgBT9rGEyk2xF1uLuhV+a
-uud2mWjM5zAfBgNVHREEGDAWggoqLmxhbmV0Lmx2gghsYW5ldC5sdjAdBgNVHQ4E
-FgQUzDtQkvXpvhNmd7lv8O6i2cuyRWEwDQYJKoZIhvcNAQEFBQADggEBADv/h1KJ
-5LnLlUx1f5UCpG73ljveZ7mU/Crg+lW7C94Z122RYC93N8xAPlAldniOeicn1dKX
-SxozuQySgzudA2weBzmr+1W4XlUgeaO5xvHxYxe3oUs1UtDaxkhqp25hWG0yWvQ+
-Tr095u0Mrx2k3HzmYN/HkVsUkhhelrG8KVq7rta1CjZVfmt0WHVnGJz2hWPoTaPW
-cTJpk1aTGLektoLaF3PhDYLVo10KEaTokMf9kOsU9zRMVmndj7GTQVVn3S2Txtuq
-bONu6IdJ3rrnkFLTTg2AH72SjjozB2bz7zww6/9JfiqS4eTDGtl/17wlS1dSpC4R
-sn4gMvfrqL7d2Bc=
-         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>*.lanet.lv</ds:KeyName>
-        <ds:KeyName>lanet.lv</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=*.lanet.lv,O=Latvijas Universitates,L=Riga,ST=Latvija,C=LV</ds:X509SubjectName>
-          <ds:X509Certificate>
-MIIFRzCCBC+gAwIBAgIHB+GeqBl7ejANBgkqhkiG9w0BAQUFADCByjELMAkGA1UE
-BhMCVVMxEDAOBgNVBAgTB0FyaXpvbmExEzARBgNVBAcTClNjb3R0c2RhbGUxGjAY
-BgNVBAoTEUdvRGFkZHkuY29tLCBJbmMuMTMwMQYDVQQLEypodHRwOi8vY2VydGlm
-aWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRvcnkxMDAuBgNVBAMTJ0dvIERhZGR5
-IFNlY3VyZSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTERMA8GA1UEBRMIMDc5Njky
-ODcwHhcNMTEwMzI4MTAxMTU2WhcNMTMwMzI4MTAxMTU2WjBNMRMwEQYDVQQKEwoq
-LmxhbmV0Lmx2MSEwHwYDVQQLExhEb21haW4gQ29udHJvbCBWYWxpZGF0ZWQxEzAR
-BgNVBAMTCioubGFuZXQubHYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
-AQC3LZIGhNBAI//nDxhLKJ52JqavtYF3vIzSwOhauNnLO1iO4Jij0DtnxAQpNuIu
-ONYSU++MOb0lsjeIEy1tVrzkLAmPNedh5IkYVcK8GsraKdvE+DGpJKgpfuqaw4ZZ
-ZGvOhJ4ZjPYRWnuBQvxSmJ11Rp1IiiGqIbakD9nJ4n0/qDN/Jq8qpjpZGNRqbP/b
-M8CNlMges2MnGsYL8mxK+zwRIAAI81+rv+83ZBzns023hhPJ0i3/orq4yuYqZKHg
-KhUHIdDduFZ3RDjjZDdirzuxqBmXtctubejAh4amA4gepufJAJfhrNhzDQDjG/v/
-GsKxhOa3cI4IHHmJVZqdXAJLAgMBAAGjggGsMIIBqDAPBgNVHRMBAf8EBTADAQEA
-MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAOBgNVHQ8BAf8EBAMCBaAw
-MwYDVR0fBCwwKjAooCagJIYiaHR0cDovL2NybC5nb2RhZGR5LmNvbS9nZHMxLTMy
-LmNybDBNBgNVHSAERjBEMEIGC2CGSAGG/W0BBxcBMDMwMQYIKwYBBQUHAgEWJWh0
-dHBzOi8vY2VydHMuZ29kYWRkeS5jb20vcmVwb3NpdG9yeS8wgYAGCCsGAQUFBwEB
-BHQwcjAkBggrBgEFBQcwAYYYaHR0cDovL29jc3AuZ29kYWRkeS5jb20vMEoGCCsG
-AQUFBzAChj5odHRwOi8vY2VydGlmaWNhdGVzLmdvZGFkZHkuY29tL3JlcG9zaXRv
-cnkvZ2RfaW50ZXJtZWRpYXRlLmNydDAfBgNVHSMEGDAWgBT9rGEyk2xF1uLuhV+a
-uud2mWjM5zAfBgNVHREEGDAWggoqLmxhbmV0Lmx2gghsYW5ldC5sdjAdBgNVHQ4E
-FgQUzDtQkvXpvhNmd7lv8O6i2cuyRWEwDQYJKoZIhvcNAQEFBQADggEBADv/h1KJ
-5LnLlUx1f5UCpG73ljveZ7mU/Crg+lW7C94Z122RYC93N8xAPlAldniOeicn1dKX
-SxozuQySgzudA2weBzmr+1W4XlUgeaO5xvHxYxe3oUs1UtDaxkhqp25hWG0yWvQ+
-Tr095u0Mrx2k3HzmYN/HkVsUkhhelrG8KVq7rta1CjZVfmt0WHVnGJz2hWPoTaPW
-cTJpk1aTGLektoLaF3PhDYLVo10KEaTokMf9kOsU9zRMVmndj7GTQVVn3S2Txtuq
-bONu6IdJ3rrnkFLTTg2AH72SjjozB2bz7zww6/9JfiqS4eTDGtl/17wlS1dSpC4R
-sn4gMvfrqL7d2Bc=
-         </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laife.lanet.lv/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laife.lanet.lv/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laife.lanet.lv/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://laife.lanet.lv/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://laife.lanet.lv/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://laife.lanet.lv/Shibboleth.sso/SAML/Artifact" index="6"/>
-  </md:SPSSODescriptor>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <SurName>Administrator</SurName>
-    <EmailAddress>serviss@lanet.lv</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de.xml b/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml
index 940abc60..940abc60 100644
--- a/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de.xml
+++ b/swamid-interfederations-2.0/ldap-dariah.esc.rzg.mpg.de-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/lists.geant.net.xml b/swamid-interfederations-2.0/lists.geant.net.xml
new file mode 100644
index 00000000..4aa3bb94
--- /dev/null
+++ b/swamid-interfederations-2.0/lists.geant.net.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lists.geant.net">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-05-27T17:24:47Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Geant test mailing list service</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Dante test groupware service. This service offers mailing lists along with other collaborative tools linked to these lists (wiki, surveys)</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Service de listes de test de Geant</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Service de groupware de test Geant. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="en">https://lists.geant.net/coc.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIC+jCCAeKgAwIBAgIJAJ91D96cmmSLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXZpc2hudS5yZW5hdGVyLmZyMB4XDTE0MDIyMTIyNDM0MFoXDTI0MDIxOTIy
+NDM0MFowHDEaMBgGA1UEAxMRdmlzaG51LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC6Au7wJo96snIMRI96gF4vNkIBCMni4sxYfVmC
+sm+s0Dvnzjuxv0GfZOZrw7VTMrucqNzh0XWHIsdoLtqBg0ZHXRlRraGsEs22cm+w
+CbU0P+vJAT6EgJ2O1IJ9vdrlnFF/KsFuh0wJ3n/DLXnn9pdb9zHW8wUu1LZGEPHs
+WIpQTnWxm6b2FiPfQV6kJRjXgjwQ5LnbirUmSRfjZ/MD166k1/XhKXjtKikP/chF
+sC/3+s8CsNB/3Et/NzJKIpLBXjFdrj5R92zV2r9l5LusQe8YzTP8sjAGKadex8XM
+WdlydXTpMaIqAGZ1D3MJ8W8TSU7k4AS1zh2ldBgesq6bwI49AgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXZpc2hudS5yZW5hdGVyLmZyMB0GA1UdDgQWBBQ3YVGlQFn0dZcJ
+6z0TrciC5+NrIzANBgkqhkiG9w0BAQUFAAOCAQEAUBfBHUpO/03/rkQJiEaoA8xO
+M15wkTwW8q4/UaFlGCHmp+RZyAQW6kwqB4TL7Ej3x/5x551s2qYtstXEPawcNFH7
+s0MdoBzjVldZr1Oo5YbWeqwx6YeBDefRC/uJCeR8XI/tGqHGgj8Jc2cQrT5QhfcT
+ogYCLtavzhT8gPNua7eXnnu0L3T1WQf3Kf0a/IH8iLx6Au7NtaU1hIIi5MR0kVgw
+KkfYgt3iGMMwEHsN1ZHP+aFm/WkR6KJm9R3RUN9MjYoRzVf+Wq7jM9IKaf3vojD2
+qgV795zB+j+dGdmy9+EWyV60D6os+Q+eI4XUsZ5qxDUTRIM1ikBFwRcyju86qg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIC+jCCAeKgAwIBAgIJAJ91D96cmmSLMA0GCSqGSIb3DQEBBQUAMBwxGjAYBgNV
+BAMTEXZpc2hudS5yZW5hdGVyLmZyMB4XDTE0MDIyMTIyNDM0MFoXDTI0MDIxOTIy
+NDM0MFowHDEaMBgGA1UEAxMRdmlzaG51LnJlbmF0ZXIuZnIwggEiMA0GCSqGSIb3
+DQEBAQUAA4IBDwAwggEKAoIBAQC6Au7wJo96snIMRI96gF4vNkIBCMni4sxYfVmC
+sm+s0Dvnzjuxv0GfZOZrw7VTMrucqNzh0XWHIsdoLtqBg0ZHXRlRraGsEs22cm+w
+CbU0P+vJAT6EgJ2O1IJ9vdrlnFF/KsFuh0wJ3n/DLXnn9pdb9zHW8wUu1LZGEPHs
+WIpQTnWxm6b2FiPfQV6kJRjXgjwQ5LnbirUmSRfjZ/MD166k1/XhKXjtKikP/chF
+sC/3+s8CsNB/3Et/NzJKIpLBXjFdrj5R92zV2r9l5LusQe8YzTP8sjAGKadex8XM
+WdlydXTpMaIqAGZ1D3MJ8W8TSU7k4AS1zh2ldBgesq6bwI49AgMBAAGjPzA9MBwG
+A1UdEQQVMBOCEXZpc2hudS5yZW5hdGVyLmZyMB0GA1UdDgQWBBQ3YVGlQFn0dZcJ
+6z0TrciC5+NrIzANBgkqhkiG9w0BAQUFAAOCAQEAUBfBHUpO/03/rkQJiEaoA8xO
+M15wkTwW8q4/UaFlGCHmp+RZyAQW6kwqB4TL7Ej3x/5x551s2qYtstXEPawcNFH7
+s0MdoBzjVldZr1Oo5YbWeqwx6YeBDefRC/uJCeR8XI/tGqHGgj8Jc2cQrT5QhfcT
+ogYCLtavzhT8gPNua7eXnnu0L3T1WQf3Kf0a/IH8iLx6Au7NtaU1hIIi5MR0kVgw
+KkfYgt3iGMMwEHsN1ZHP+aFm/WkR6KJm9R3RUN9MjYoRzVf+Wq7jM9IKaf3vojD2
+qgV795zB+j+dGdmy9+EWyV60D6os+Q+eI4XUsZ5qxDUTRIM1ikBFwRcyju86qg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://lists.geant.net/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lists.geant.net/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="fr">Service de listes de test de Geant</ServiceName>
+      <ServiceName xml:lang="en">Geant test mailing list service</ServiceName>
+      <ServiceDescription xml:lang="fr">Service de groupware de test Geant. Ce service offre des listes de diffusion ainsi que des outils de travail collaboratif couplés aux listes (wikis, sondages).</ServiceDescription>
+      <ServiceDescription xml:lang="en">Dante test groupware service. This service offers mailing lists along with other collaborative tools linked to these lists (wiki, surveys)</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">RENATER</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Pol Moal</SurName>
+    <EmailAddress>pol.moal@renater.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>David Verdin</SurName>
+    <EmailAddress>david.verdin@renater.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml
new file mode 100644
index 00000000..7103d8f2
--- /dev/null
+++ b/swamid-interfederations-2.0/lmuidp.lrz.de-idp-shibboleth.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuidp.lrz.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-11-11T14:59:40Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität München (LMU)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität of Munich (LMU)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity-Provider für die LMU</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for LMU</mdui:Description>
+        <mdui:InformationURL xml:lang="de">https://lmuidp.lrz.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://lmuidp.lrz.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
+XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
+6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
+gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
+acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
+AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
+goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
+N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
+p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
+oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
+0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
+rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
+X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
+XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
+6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
+gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
+acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
+AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
+goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
+N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
+p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
+oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
+0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
+rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
+X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lmuidp.lrz.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
+XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
+6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
+gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
+acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
+AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
+goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
+N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
+p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
+oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
+0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
+rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
+X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=lmuidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+4+lgoTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDE5WhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DWxtdWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC2
+XRjCEr0k6MbdVul4Fh7LnStVjlCFPs86sKFP+AR+B/F7KO9mZiyN9geN8OLcTt/t
+6EVjJ5wlwmqmBNI1LiZ2pcbXDXBISZ5sqOc0AJu12J9vp8BhXbL8TVLb3jKwe+h+
+gTYIZYQr4ZHAzy61GoHjllR91bd97yhOg6+uDb0WIsSEByMNQSYvQ+Ez1wl43oTD
+acsTha0uEdeGRbhEyTnM0K7Vl53y3mobsYhr41PDQQ5C+G97DhYPrApPkx+8c1+K
+AWSeuKsOaUhPd/+U27SjN85d3XFZsTaO7DE+1JwIx2YQuQZIqEdB/c4Nx6rWkBbP
+goQ525ShGAcUp01pLfxTAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFKaWNKU6lkHit7g+/fkQT0Gy
+N+svMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DWxtdWlkcC5scnouZGWCDmxtdWlkcDEubHJ6LmRlgg5sbXVpZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQA/lqhcmySrV1rFabrkq5Q0w3jt
+p/3uI7EwzzcjJi3OYd3RkxM6kg6e2rrUqvZFcc8SpYm2xpMua5rAFnxn3ua1c6fZ
+oxoQqezn8T4hoIW3R88bglSAC6934dhTYyppphANgZskCdF6CyMsrQnVrEjKQhzV
+0bR8i9IWBuWR9eXmdY3CFmkrSplog2JvWb8Llbdy1qtrufrh0UvQzLorV9+XfFTq
+rLGlIaqqDcztN+TBHUYjaY8pcYCzzexidfnc45uavSGgjb72S5180e9Yb37MtFD3
+X9vAm37rs2RCx2XYtdp7GL9GolmAli2pb5KgYojBQ8Re0VgxMFMi35xVQNRj
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e29</OrganizationName>
+    <OrganizationName xml:lang="en">e29</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://lmuidp.lrz.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>LMU-Helpdesk</GivenName>
+    <SurName>LMU-Helpdesk</SurName>
+    <EmailAddress>mailto:helpdesk@campus.lmu.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lmuidp.lrz.de.xml b/swamid-interfederations-2.0/lmuidp.lrz.de.xml
deleted file mode 100644
index c3fbc254..00000000
--- a/swamid-interfederations-2.0/lmuidp.lrz.de.xml
+++ /dev/null
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://lmuidp.lrz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-11-11T14:59:40Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://aai.dfn.de/category/vetmed-member</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität München (LMU)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität of Munich (LMU)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity-Provider für die LMU</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for LMU</mdui:Description>
-        <mdui:InformationURL xml:lang="de">https://lmuidp.lrz.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">https://lmuidp.lrz.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lmuidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTsgTANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MjEwWhcNMTQxMDI1MDk0MjEwWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1sbXVpZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhzrmmgBYwmHk0WZ2XN29+af
-5L/vgWpOT6qFmwzMJYPVSRHHPbQTi8JfQobiPa4Je9ALGG0UqhkFvF9UoSJgUVnu
-qkCZBtC7HpFE17lVba0esD187B5tQau3XAzWzEZ4LFLi78YBCrTVDF8PdwvONhA6
-D0Rxau0heMsHhwCREnZrk0Gh96QmEZ92AKyvoy1Ybnk0iS3HmB2LgfgKIiBGUlNm
-0a/8MHk3+tZ8+IHZ7VVxQqy9D0C/Urms1zykWLVpsx4Tjl3jcsByCfDA6e3azK+H
-Y1FZLMkH2yxSz9A5TH2+VMkj0Q+v14fs370XYOhvdqkJpQFmkmi/f6cxmYmcvwID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQGh/UP98In37gZLuIuyRRjzlNX
-kjAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1sbXVpZHAubHJ6LmRlghZs
-bXVpZHAubHJ6LW11ZW5jaGVuLmRlgg5sbXVpZHAyLmxyei5kZYIXbG11aWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAILHpnrVkK+wGrpMhJqdVXJplhe5HOVUzBHP/cG8jCff
-haKVePFGYsT4ltxjjW86UYlfPMB4s5iyYwl4MMyoukIxp/lePJ1lNk56Iq8p3ktt
-chpu6wzgph3Hr/88A01cy/hEgfl9l/xT5jK8WBbJnrsKD6rBZw/9V0GnlfhKbeOr
-qWC0iTUAYXXFtCi3kVcqFKHPDexLnVsw2qS5cUFpYXZGke5wrUCkYaq/uTvK2kzu
-KQlM32M46hDxPvig8RnwMCgX6lEsvXYvdKutj0RCDoimRV2o1vB48Jqmu1CW+wJs
-OBzmQ6Dm9pv8U0O159CUXtw4TeXiKNL0+E7LXkVRkH4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://lmuidp.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://lmuidp.lrz.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lmuidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">lmu.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>lmuidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=lmuidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTsgTANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MjEwWhcNMTQxMDI1MDk0MjEwWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw1sbXVpZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuhzrmmgBYwmHk0WZ2XN29+af
-5L/vgWpOT6qFmwzMJYPVSRHHPbQTi8JfQobiPa4Je9ALGG0UqhkFvF9UoSJgUVnu
-qkCZBtC7HpFE17lVba0esD187B5tQau3XAzWzEZ4LFLi78YBCrTVDF8PdwvONhA6
-D0Rxau0heMsHhwCREnZrk0Gh96QmEZ92AKyvoy1Ybnk0iS3HmB2LgfgKIiBGUlNm
-0a/8MHk3+tZ8+IHZ7VVxQqy9D0C/Urms1zykWLVpsx4Tjl3jcsByCfDA6e3azK+H
-Y1FZLMkH2yxSz9A5TH2+VMkj0Q+v14fs370XYOhvdqkJpQFmkmi/f6cxmYmcvwID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBQGh/UP98In37gZLuIuyRRjzlNX
-kjAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg1sbXVpZHAubHJ6LmRlghZs
-bXVpZHAubHJ6LW11ZW5jaGVuLmRlgg5sbXVpZHAyLmxyei5kZYIXbG11aWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAILHpnrVkK+wGrpMhJqdVXJplhe5HOVUzBHP/cG8jCff
-haKVePFGYsT4ltxjjW86UYlfPMB4s5iyYwl4MMyoukIxp/lePJ1lNk56Iq8p3ktt
-chpu6wzgph3Hr/88A01cy/hEgfl9l/xT5jK8WBbJnrsKD6rBZw/9V0GnlfhKbeOr
-qWC0iTUAYXXFtCi3kVcqFKHPDexLnVsw2qS5cUFpYXZGke5wrUCkYaq/uTvK2kzu
-KQlM32M46hDxPvig8RnwMCgX6lEsvXYvdKutj0RCDoimRV2o1vB48Jqmu1CW+wJs
-OBzmQ6Dm9pv8U0O159CUXtw4TeXiKNL0+E7LXkVRkH4=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://lmuidp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e29</OrganizationName>
-    <OrganizationName xml:lang="en">e29</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Ludwig-Maximilians-Universität München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">https://lmuidp.lrz.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">https://lmuidp.lrz.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>LMU-Helpdesk</GivenName>
-    <SurName>LMU-Helpdesk</SurName>
-    <EmailAddress>mailto:helpdesk@campus.lmu.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login-idp.auth.gr.xml b/swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml
index a8173518..a8173518 100644
--- a/swamid-interfederations-2.0/login-idp.auth.gr.xml
+++ b/swamid-interfederations-2.0/login-idp.auth.gr-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml b/swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml
index 6457e51e..6457e51e 100644
--- a/swamid-interfederations-2.0/login.aai.pionier.net.pl.xml
+++ b/swamid-interfederations-2.0/login.aai.pionier.net.pl-IdP-saml2-idp-metadata.php.xml
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..d6ea4e2f
--- /dev/null
+++ b/swamid-interfederations-2.0/login.aaiedu.hr-edugain-saml2-idp-metadata.php.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.aaiedu.hr/edugain/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.srce.hr" registrationInstant="2012-01-01T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="hr">http://www.aaiedu.hr/docs/AAI@EduHr-pravilnik-ver1.3.1.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">acmt.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">adu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">agr.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">alu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">apuri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arhitekt.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">arhiv.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">asoo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">aspira.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">azoo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">azvo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bernays.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bfm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bicro.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">boginst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-karlovac.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-srebrnjak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bolnica-zadar.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">carnet.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dhz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diplomacija.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">diu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">djkbf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">dkd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">efzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eihp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eizg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">erf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">evtos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fer.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fesb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffdi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ffzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkit.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fkz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">foi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">foozos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fpzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fsb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fthm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ftidi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">galapagos-ic.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">geof.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gfv.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkka.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkpz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkvk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gkzd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grad.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gradri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gradst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">gskos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">h-r-z.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hatz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hazu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hck.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hera.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hgi-cgs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hhi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hpm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrbi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrstud.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hrzz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hsin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">hzjz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iarh.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">idi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ief.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">igh.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ihjj.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ijf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">imz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">inantro.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iptpo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ipv-zg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">irmo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">isp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">izor.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iztzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kb-merkur.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbc-rijeka.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbc-zagreb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbcsm.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbf-st.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbsd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kbsplit.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kif.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">kifst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">koncar-institut.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">krs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ktf-split.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">libertas.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">lzmk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">matica.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medils.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">medri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mef.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mefos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mefst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mev.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mobilnost.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">muza.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mzos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ncvvo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nsk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">nsz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obhpknin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obrtnicko-uciliste.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oikon.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">par.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pbf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pfst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pharma.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pilar.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pmfst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">politehnika-pula.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">poljinos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pou-amc.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pou.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pozeska-bolnica.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">pravst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ptfos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">public.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">racunarstvo.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">rgn.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">riteh.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scsi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">scvz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sczg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfsb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sfzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">simet.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skole.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">skolski-sport.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">snz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">srce.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stampar.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stucos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">stucsb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sumfak.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sumins.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">suvag.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkatarina.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">svkst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tcs.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tera.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tfmvi.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">thalassotherapia-opatija.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ttf.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tvz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uaos.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uciliste-umag.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ufzg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">umas.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unicath.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unidu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unios.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uniri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unist.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unizg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vef.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veinst.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">velegs-nikolatesla.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veleknin.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">veleri.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vernnet.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vevu.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vguk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vhzk.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">visoka-skola-rrif.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vps-minerva.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vpsvisnjan.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vpsz.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsa.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsfp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsikmp.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsite.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vsmti.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vss.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vszrinski.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vtsbj.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vuka.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vup.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vus.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vusb.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">vvg.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zkzd.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zsem.hr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">zvu.hr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">AAI@EduHr Single Sign-On Service</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="hr">AAI@EduHr sustav jedinstvene autentikacije korisnika</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Central Login Service for the AAI@EduHr Federation with implemented Single Sign-On Feature</mdui:Description>
+        <mdui:Description xml:lang="hr">Centralni autentikacijski servis AAI@EduHr federacije s implementiranim sustavom jedinstvene autentikacije korisnika</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEbDCCA1SgAwIBAgIRAMJdD3IJBmpJHEQG+rTMyXwwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xMzAzMDUwMDAwMDBaFw0xNjAzMDQyMzU5NTlaMD0xITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9naW4uYWFpZWR1LmhyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApy7oHZwX71g3azW6La+cLUi+IQ30SheA6BQy2QDpeYc8CfD88mdNqq7m9ZMg81bKS0YH+dsx4/SRfus1XeyvJpFnYeEbfjk4HMbowkgn8L7ChaepbpVvEjGOE951WtDmRhhmrI7YmxOZLH4b+gI0cVkM6Ui/H4WnhbH48/I5azEtOlxFhMsknDkkKisla4scnzAQh66Cn3+BTPMD23GrrH9Rw5fqR4FiE6Ktyh8x+5m6UdReqz69lV4R5wsaO42LWDig6/xA20QAqM5RGvLCF+aJJir2tX/Lt3ZquEw7GEm6fmmvFkusiFo5ltj0DAWTrfefyDS3FyOJnyY8bZS3SQIDAQABo4IBbDCCAWgwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFD5Y+Ju72FzuaCJlvwPZEYpU/T9SMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dpbi5hYWllZHUuaHIwDQYJKoZIhvcNAQEFBQADggEBABfnS6qVN+xKNaG6FYggkorFWcSGe5L/ff00AFxkYRZfaWn+UfX3bxUF3zGzbhTw7aW95cfyI6ACs8N/WiK5ACbU8H+BoAZqbceuTbEjuyEFlXOqXTX/BGkE9cU9FT9RKV/BOVBQZDGFEGi0lidYqtj8A51kyYIRVDb6MkfUQ3TnB7Iv7yD1ut9eqhq/ifrPvyG8dDwUMEir/iUosdVQBiNyXkGqrL7Wo2VCfAGEmWeeHmDCdEIWktUv+L/b1e0k1Jd9Zvf1vRxHCQNMkUXGbY3OHNircf1wySgccgiCUHKT00armIaw4lbpd98m5ZnaOl6ZhrsZGsvYk/iCoo+sfug=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/edugain/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.aaiedu.hr/edugain/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">AAI@EduHr</md:OrganizationName>
+    <md:OrganizationName xml:lang="hr">AAI@EduHr</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">AAI@EduHr - Croatian Research and Education Federation</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="hr">AAI@EduHr - Autentikacijska i autorizacijska infrastruktura sustava znanosti i visokog obrazovanja u Republici Hrvatskoj</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.aaiedu.hr</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="hr">http://www.aaiedu.hr</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Dubravko</md:GivenName>
+    <md:SurName>Voncina</md:SurName>
+    <md:EmailAddress>dubravko.voncina@srce.hr</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.aaiedu.hr.xml b/swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml
index cbc2b884..cbc2b884 100644
--- a/swamid-interfederations-2.0/login.aaiedu.hr.xml
+++ b/swamid-interfederations-2.0/login.aaiedu.hr-wayf-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-interfederations-2.0/login.athena-innovation.gr.xml b/swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml
index 05545b55..05545b55 100644
--- a/swamid-interfederations-2.0/login.athena-innovation.gr.xml
+++ b/swamid-interfederations-2.0/login.athena-innovation.gr-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/login.bme.hu.xml b/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml
index 586bc6ca..f390bf1c 100644
--- a/swamid-interfederations-2.0/login.bme.hu.xml
+++ b/swamid-interfederations-2.0/login.bme.hu-idp-shibboleth.xml
@@ -11,6 +11,12 @@
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">bme.hu</shibmd:Scope>
       <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Budapest University of Technology and Economics</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">Budapesti Műszaki és Gazdaságtudományi Egyetem</mdui:Description>
+        <mdui:Description xml:lang="en">Budapest University of Technology and Economics</mdui:Description>
+      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
diff --git a/swamid-interfederations-2.0/login.du.se.xml b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
index 35a2ac7c..35a2ac7c 100644
--- a/swamid-interfederations-2.0/login.du.se.xml
+++ b/swamid-interfederations-2.0/login.du.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/login.feld.cvut.cz.xml b/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
index 6606d778..d9b1a1c7 100644
--- a/swamid-interfederations-2.0/login.feld.cvut.cz.xml
+++ b/swamid-interfederations-2.0/login.feld.cvut.cz-idp-shibboleth.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.feld.cvut.cz/idp/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T12:33:26Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:Extensions>
diff --git a/swamid-interfederations-2.0/login.fhv.at.xml b/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml
index 4374e65a..4220f9ad 100644
--- a/swamid-interfederations-2.0/login.fhv.at.xml
+++ b/swamid-interfederations-2.0/login.fhv.at-shibboleth.xml
@@ -21,7 +21,7 @@
         <mdui:Logo height="16" width="16">https://login.fhv.at/favicon.ico</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
diff --git a/swamid-interfederations-2.0/login.helsinki.fi.xml b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
index 1ea67fec..1ea67fec 100644
--- a/swamid-interfederations-2.0/login.helsinki.fi.xml
+++ b/swamid-interfederations-2.0/login.helsinki.fi-shibboleth.xml
diff --git a/swamid-interfederations-2.0/login.idp.hhs.se.xml b/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
index a25f5b38..a25f5b38 100644
--- a/swamid-interfederations-2.0/login.idp.hhs.se.xml
+++ b/swamid-interfederations-2.0/login.idp.hhs.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/login.insa-lyon.fr.xml b/swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml
index 14441471..eb33e517 100644
--- a/swamid-interfederations-2.0/login.insa-lyon.fr.xml
+++ b/swamid-interfederations-2.0/login.insa-lyon.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-lyon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..e77f1d5b
--- /dev/null
+++ b/swamid-interfederations-2.0/login.ktu.lt-simplesaml-saml2-idp-metadata.php.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.ktu.lt/simplesaml/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2014-05-01T11:00:03Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://federacija.litnet.lt/en</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="lt">https://federacija.litnet.lt/lt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Kaunas University of Technology</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="lt">Kauno technologijos universitetas</mdui:DisplayName>
+        <mdui:Description xml:lang="en">KTU Single Sign On</mdui:Description>
+        <mdui:Description xml:lang="lt">KTU vieningas prisijungimas</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://ktu.edu</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="lt">http://ktu.edu</mdui:InformationURL>
+        <mdui:Keywords xml:lang="en">Kaunas Kaunas+University+of+Technology</mdui:Keywords>
+        <mdui:Keywords xml:lang="lt">Kaunas Kauno+technologijos+universitetas</mdui:Keywords>
+        <mdui:Logo height="88" width="80" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
+        <mdui:Logo height="88" width="80" xml:lang="lt">https://tinklas.ktu.lt/images/logo/ktu_80x88.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="lt">https://tinklas.ktu.lt/images/logo/ktu_16x16.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>158.129.0.0/19</mdui:IPHint>
+        <mdui:IPHint>158.129.32.0/21</mdui:IPHint>
+        <mdui:IPHint>83.171.8.0/22</mdui:IPHint>
+        <mdui:IPHint>83.171.15.0/24</mdui:IPHint>
+        <mdui:IPHint>83.171.18.0/23</mdui:IPHint>
+        <mdui:IPHint>83.171.20.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.32.0/22</mdui:IPHint>
+        <mdui:IPHint>193.219.36.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.61.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.63.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.66.0/23</mdui:IPHint>
+        <mdui:IPHint>193.219.68.0/22</mdui:IPHint>
+        <mdui:IPHint>193.219.74.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.154.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.156.0/22</mdui:IPHint>
+        <mdui:IPHint>193.219.160.0/24</mdui:IPHint>
+        <mdui:IPHint>193.219.170.0/23</mdui:IPHint>
+        <mdui:IPHint>193.219.174.0/23</mdui:IPHint>
+        <mdui:IPHint>193.219.176.0/25</mdui:IPHint>
+        <mdui:IPHint>193.219.184.0/24</mdui:IPHint>
+        <mdui:IPHint>2001:778:200::/48</mdui:IPHint>
+        <mdui:DomainHint>ktu.lt</mdui:DomainHint>
+        <mdui:DomainHint>ktu.edu</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:54.9049679,23.956717000000026</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:54.8988679,23.91259100000002</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:54.898964, 23.921850</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIElTCCA32gAwIBAgIJALYznSATuns+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0MB4XDTE0MDgwNDEzMDY0MFoXDTI0MDgwMzEzMDY0MFowgY0xCzAJBgNVBAYTAkxUMQ8wDQYDVQQIEwZLYXVuYXMxDzANBgNVBAcTBkthdW5hczEqMCgGA1UEChMhS2F1bm8gdGVjaG5vbG9naWpvcyB1bml2ZXJzaXRldGFzMRUwEwYDVQQDEwxsb2dpbi5rdHUubHQxGTAXBgkqhkiG9w0BCQEWCnNzb0BrdHUubHQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr3YT9UZdS87hoUW2O+nElhco6e1mSJnCVfDXliqaOAv421+khPEqJuKeL1pCeDNHpSlcbVlmdNiwb3SZGUxaXoenTFxaqCZPV09Ggny5f9YBkEzaDOJpB3yGfvbhyrmoRM6zeziATUJiHcns395XuJwd2nwbkNGwY4u4BO7ennVZeQR2r9GOyL+yz3Kly+q8YhIEw0DBXYoPXKhfHBr+otszV9CRXCgnDgVQ7lqqMbxJiK/n7skd1WLRjxxIuTBh3UfTSKmmy3RqwA/NlUYl5Uh42GFE/D0UlKYwzNoBjsV7QXkkmMf8vUiy/x7Tj6PM4zsg716AOafJCPESSuKQJAgMBAAGjgfUwgfIwHQYDVR0OBBYEFMCp68JzkZdFKWHkjPn0XTCo98WhMIHCBgNVHSMEgbowgbeAFMCp68JzkZdFKWHkjPn0XTCo98WhoYGTpIGQMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0ggkAtjOdIBO6ez4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAdpZ936wIu3ArrlB0/+RL5FreCZnnXhvxSOGWUZzrzq143BXnClnd/i9oZMMz5C4apRk6f7USWQZFeYrzSb8dpSjgJUYXPcCT5REf+u2aMOoPtmwGGg+zkQKY18WZYC3BW4LPwzNocH3YYBhPrxTkKX/d+xjGM9/b0yOCwdJjj0BlwXq5unq0LIK49aSIyuHwA23d+drva9TON936JL4SEqchA2hbnws1elOJNIiykHUJfKqYy/dY9rqRSx+Hf8gsa2TNLU3sl57neVdLF6p6w/3g4mjB111B4U382kXULKO7Y+J1uffkJ71sGBdRWsvH09i0ReJWzbWxAtF2jtzfkw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIElTCCA32gAwIBAgIJALYznSATuns+MA0GCSqGSIb3DQEBBQUAMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0MB4XDTE0MDgwNDEzMDY0MFoXDTI0MDgwMzEzMDY0MFowgY0xCzAJBgNVBAYTAkxUMQ8wDQYDVQQIEwZLYXVuYXMxDzANBgNVBAcTBkthdW5hczEqMCgGA1UEChMhS2F1bm8gdGVjaG5vbG9naWpvcyB1bml2ZXJzaXRldGFzMRUwEwYDVQQDEwxsb2dpbi5rdHUubHQxGTAXBgkqhkiG9w0BCQEWCnNzb0BrdHUubHQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCr3YT9UZdS87hoUW2O+nElhco6e1mSJnCVfDXliqaOAv421+khPEqJuKeL1pCeDNHpSlcbVlmdNiwb3SZGUxaXoenTFxaqCZPV09Ggny5f9YBkEzaDOJpB3yGfvbhyrmoRM6zeziATUJiHcns395XuJwd2nwbkNGwY4u4BO7ennVZeQR2r9GOyL+yz3Kly+q8YhIEw0DBXYoPXKhfHBr+otszV9CRXCgnDgVQ7lqqMbxJiK/n7skd1WLRjxxIuTBh3UfTSKmmy3RqwA/NlUYl5Uh42GFE/D0UlKYwzNoBjsV7QXkkmMf8vUiy/x7Tj6PM4zsg716AOafJCPESSuKQJAgMBAAGjgfUwgfIwHQYDVR0OBBYEFMCp68JzkZdFKWHkjPn0XTCo98WhMIHCBgNVHSMEgbowgbeAFMCp68JzkZdFKWHkjPn0XTCo98WhoYGTpIGQMIGNMQswCQYDVQQGEwJMVDEPMA0GA1UECBMGS2F1bmFzMQ8wDQYDVQQHEwZLYXVuYXMxKjAoBgNVBAoTIUthdW5vIHRlY2hub2xvZ2lqb3MgdW5pdmVyc2l0ZXRhczEVMBMGA1UEAxMMbG9naW4ua3R1Lmx0MRkwFwYJKoZIhvcNAQkBFgpzc29Aa3R1Lmx0ggkAtjOdIBO6ez4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAdpZ936wIu3ArrlB0/+RL5FreCZnnXhvxSOGWUZzrzq143BXnClnd/i9oZMMz5C4apRk6f7USWQZFeYrzSb8dpSjgJUYXPcCT5REf+u2aMOoPtmwGGg+zkQKY18WZYC3BW4LPwzNocH3YYBhPrxTkKX/d+xjGM9/b0yOCwdJjj0BlwXq5unq0LIK49aSIyuHwA23d+drva9TON936JL4SEqchA2hbnws1elOJNIiykHUJfKqYy/dY9rqRSx+Hf8gsa2TNLU3sl57neVdLF6p6w/3g4mjB111B4U382kXULKO7Y+J1uffkJ71sGBdRWsvH09i0ReJWzbWxAtF2jtzfkw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ktu.lt/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.ktu.lt/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Kaunas University of Technology</md:OrganizationName>
+    <md:OrganizationName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Kaunas University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="lt">Kauno technologijos universitetas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://ktu.edu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="lt">http://ktu.edu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>KTU</md:GivenName>
+    <md:SurName>SSO</md:SurName>
+    <md:EmailAddress>sso@ktu.lt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.liu.se.xml b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
index 4ce953b8..4ce953b8 100644
--- a/swamid-interfederations-2.0/login.liu.se.xml
+++ b/swamid-interfederations-2.0/login.liu.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/login.ntua.gr.xml b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
index e55f4396..e55f4396 100644
--- a/swamid-interfederations-2.0/login.ntua.gr.xml
+++ b/swamid-interfederations-2.0/login.ntua.gr-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml
new file mode 100644
index 00000000..59a880b6
--- /dev/null
+++ b/swamid-interfederations-2.0/login.services.uu.nl-nidp-saml2-metadata.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.services.uu.nl/nidp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-01T16:50:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Universiteit Utrecht</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universiteit Utrecht</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Universiteit Utrecht</mdui:Description>
+        <mdui:Description xml:lang="en">Universiteit Utrecht</mdui:Description>
+        <mdui:Logo height="36" width="108">https://static.surfconext.nl/media/idp/uu.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">Universiteit Utrecht UU</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">Universiteit Utrecht UU</mdui:Keywords>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
+VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
+A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
+DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
+Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
+dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
+VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
+MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
+efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
+HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
+TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
+n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
+4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
+MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
+FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
+9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
+UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
+7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
+MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/419dd62d92bdaae8aef5a8a97b1c3f77"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universiteit Utrecht</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universiteit Utrecht</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uu.nl/ict</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext-beheer</md:GivenName>
+    <md:EmailAddress>SURFconext-beheer@surfnet.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/login.terena.org.xml b/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
index e92e6a4a..e92e6a4a 100644
--- a/swamid-interfederations-2.0/login.terena.org.xml
+++ b/swamid-interfederations-2.0/login.terena.org-idp-saml2-idp-metadata.php.xml
diff --git a/swamid-interfederations-2.0/login.ufrgs.br.xml b/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml
index 72d3f575..72d3f575 100644
--- a/swamid-interfederations-2.0/login.ufrgs.br.xml
+++ b/swamid-interfederations-2.0/login.ufrgs.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml b/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
new file mode 100644
index 00000000..b46798ad
--- /dev/null
+++ b/swamid-interfederations-2.0/login.utenos-kolegija.lt-SAML-IdP.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://login.utenos-kolegija.lt/SAML/IdP">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2014-10-09T09:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/tvarka</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="lt">Utenos kolegija</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Utena University of Applied Sciences</mdui:DisplayName>
+        <mdui:Description xml:lang="lt">Utenos kolegijos vieningas prisijungimas</mdui:Description>
+        <mdui:Description xml:lang="en">Single sign-on for Utena University of Applied Sciences</mdui:Description>
+        <mdui:InformationURL xml:lang="lt">https://login.utenos-kolegija.lt/?lang=lt</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">https://login.utenos-kolegija.lt/?lang=en</mdui:InformationURL>
+        <mdui:Logo height="256" width="256">https://login.utenos-kolegija.lt/static/logo_tr.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>193.219.181.192/26</mdui:IPHint>
+        <mdui:DomainHint>utenos-kolegija.lt</mdui:DomainHint>
+        <mdui:DomainHint>ukolegija.lt</mdui:DomainHint>
+        <mdui:DomainHint>utenacollege.eu</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:55.5,25.6</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGITCCBAmgAwIBAgICUAEwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEYMBYGA1UEAwwPVXRlbm9zIGtvbGVnaWphMB4XDTE0MDgxMjA2MjYwNFoXDTI0MDgwOTA2MjYwNFowWDELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEMMAoGA1UECwwDSWRQMSEwHwYDVQQDDBhsb2dpbi51dGVub3Mta29sZWdpamEubHQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCs/TqFTWGqdM+1C6I4p5UE4CnXi7h2wcKZ2sHR8RAuPZvfrjFEjLOo72eYiXZ7QTCfg/5m7CIhjRZYerW9GjRoM9UPPmhkJThI9QSClDSXyAhADm7Yehp7n+tB78GeGlMeJoVaw2tskUxmKsjcdylUitSSThKHpl3Xi4SViXQgNK3RmAPMF7nzYZ6SOH2Ufaf1Yg+ky0iX50xsh19s5aQ+gc/JHnvvGNx+XIk0Wf/zj6uD+M0hI5OcK6Y69cUxfeIXaQe2cLNTOMpTKPHcR0R11TvBZnDhhnIHio/EOEx/8Zp0YebWUH9Ol4c6WB85ndqIZ90XnFEqGtCwFLiXPjrSli0JfpZMHkv2iF6xpeJVpTarMVPRzRemqIroDqHcDbUNJ3OAdoWpcZ1EmrkWwlHZa52K6cm8G1WqsSP2ghoWjeNl7gkuF9DTfWx33F4bOWcJ7WM++khTPDBhUTrWoIcjyu63liHGEV0mLvACm85bnje39XTpQ9/c1QLNNitDnt05XOnR6jKnvCXB8Np5MVmG+23gzleaO973xTTaQlhhFzIShEIKGNrqSZCUgh6ehsaXT8osxHxpOXwxd1HWLZj+N5/SXeFT8BUv/sQAwEgXrdA32w8bUf/1uJnHTw1b7KYx1bi+YuejIsfmv5Hh8uRgO1/qoCMFIdBb0G8c7jQrtwIDAQABo4IBCjCCAQYwDwYDVR0TAQH/BAUwAwEBADAdBgNVHQ4EFgQUcvHStojsZcuShVRpNcJkLmFby88wagYDVR0jBGMwYYAUQeWj/Ma9Fu5g3DHHEezH9JZ33A2hRaRDMEExCzAJBgNVBAYTAkxUMRgwFgYDVQQKDA9VdGVub3Mga29sZWdpamExGDAWBgNVBAMMD1V0ZW5vcyBrb2xlZ2lqYYICE4gwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL3d3dy51dGVub3Mta29sZWdpamEubHQvdWtvbGVnaWphLmNybDALBgNVHQ8EBAMCAKgwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4ICAQBFRmlUAfF3RTfhIOay1xKfTKE5NVOnZ1g5bVnMhyci8U76aSs91xThWr4ratbDOmkrujAL/TGCkmgiTgDAztQEt6ZzjSbscHs7W3i7C2XkwsJ2XKFgQmOXHD3IflN6FcxcMCU35pEzGfqBFIEjFeSt45pcJ77GEFGnxWvuSybERyJF/PDFRy9VAaT4FSIOy2OXZdUW0bBuU9nCqKISVnQ8qTJPm2qlC+g+zl5/bmlFu0B0aGyQVvLdeqGwapC8oIuLW9d6LwdUd5bcNSJdbLxOrKJ458/I9wZ69BZA5hOg7uB1YRK8v3XuhFNPQUB8QeVe4L2ae4FY3lypHGdH0iAfr7C3c/1GhuRNbRFqi9sIQOWU/wdSiw7xTax2I5Ncy6CcSjDT1LCFNIU3QnuB/DoAVHY+LG+3CqRIaM6c+hVw5WiIttIQadX94mSSUpCY0Y8tYXvvD0N32Q64cQBlB0vvj2z6925X3UyhUEjLYYIo/+JLo1v17Ta+fdqYtIr+tlT340eUa0Z+YOZ04TIzfer1p6a6kDDz5uSIaGR7KqCUxc+S4eJqqWfkpiZeBV0MOlujel6XVFLC2CIVcb5cAdi7hpUVEHnN1VIkiElj3WHvPCXCQ5g1Y2/cUHTlEKznj9X7OaE5yB8TaJ70N3iVL1dcDebj6FVy4WPNsp66iv3hRA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIGITCCBAmgAwIBAgICUAEwDQYJKoZIhvcNAQEFBQAwQTELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEYMBYGA1UEAwwPVXRlbm9zIGtvbGVnaWphMB4XDTE0MDgxMjA2MjYwNFoXDTI0MDgwOTA2MjYwNFowWDELMAkGA1UEBhMCTFQxGDAWBgNVBAoMD1V0ZW5vcyBrb2xlZ2lqYTEMMAoGA1UECwwDSWRQMSEwHwYDVQQDDBhsb2dpbi51dGVub3Mta29sZWdpamEubHQwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCs/TqFTWGqdM+1C6I4p5UE4CnXi7h2wcKZ2sHR8RAuPZvfrjFEjLOo72eYiXZ7QTCfg/5m7CIhjRZYerW9GjRoM9UPPmhkJThI9QSClDSXyAhADm7Yehp7n+tB78GeGlMeJoVaw2tskUxmKsjcdylUitSSThKHpl3Xi4SViXQgNK3RmAPMF7nzYZ6SOH2Ufaf1Yg+ky0iX50xsh19s5aQ+gc/JHnvvGNx+XIk0Wf/zj6uD+M0hI5OcK6Y69cUxfeIXaQe2cLNTOMpTKPHcR0R11TvBZnDhhnIHio/EOEx/8Zp0YebWUH9Ol4c6WB85ndqIZ90XnFEqGtCwFLiXPjrSli0JfpZMHkv2iF6xpeJVpTarMVPRzRemqIroDqHcDbUNJ3OAdoWpcZ1EmrkWwlHZa52K6cm8G1WqsSP2ghoWjeNl7gkuF9DTfWx33F4bOWcJ7WM++khTPDBhUTrWoIcjyu63liHGEV0mLvACm85bnje39XTpQ9/c1QLNNitDnt05XOnR6jKnvCXB8Np5MVmG+23gzleaO973xTTaQlhhFzIShEIKGNrqSZCUgh6ehsaXT8osxHxpOXwxd1HWLZj+N5/SXeFT8BUv/sQAwEgXrdA32w8bUf/1uJnHTw1b7KYx1bi+YuejIsfmv5Hh8uRgO1/qoCMFIdBb0G8c7jQrtwIDAQABo4IBCjCCAQYwDwYDVR0TAQH/BAUwAwEBADAdBgNVHQ4EFgQUcvHStojsZcuShVRpNcJkLmFby88wagYDVR0jBGMwYYAUQeWj/Ma9Fu5g3DHHEezH9JZ33A2hRaRDMEExCzAJBgNVBAYTAkxUMRgwFgYDVQQKDA9VdGVub3Mga29sZWdpamExGDAWBgNVBAMMD1V0ZW5vcyBrb2xlZ2lqYYICE4gwPAYDVR0fBDUwMzAxoC+gLYYraHR0cDovL3d3dy51dGVub3Mta29sZWdpamEubHQvdWtvbGVnaWphLmNybDALBgNVHQ8EBAMCAKgwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMA0GCSqGSIb3DQEBBQUAA4ICAQBFRmlUAfF3RTfhIOay1xKfTKE5NVOnZ1g5bVnMhyci8U76aSs91xThWr4ratbDOmkrujAL/TGCkmgiTgDAztQEt6ZzjSbscHs7W3i7C2XkwsJ2XKFgQmOXHD3IflN6FcxcMCU35pEzGfqBFIEjFeSt45pcJ77GEFGnxWvuSybERyJF/PDFRy9VAaT4FSIOy2OXZdUW0bBuU9nCqKISVnQ8qTJPm2qlC+g+zl5/bmlFu0B0aGyQVvLdeqGwapC8oIuLW9d6LwdUd5bcNSJdbLxOrKJ458/I9wZ69BZA5hOg7uB1YRK8v3XuhFNPQUB8QeVe4L2ae4FY3lypHGdH0iAfr7C3c/1GhuRNbRFqi9sIQOWU/wdSiw7xTax2I5Ncy6CcSjDT1LCFNIU3QnuB/DoAVHY+LG+3CqRIaM6c+hVw5WiIttIQadX94mSSUpCY0Y8tYXvvD0N32Q64cQBlB0vvj2z6925X3UyhUEjLYYIo/+JLo1v17Ta+fdqYtIr+tlT340eUa0Z+YOZ04TIzfer1p6a6kDDz5uSIaGR7KqCUxc+S4eJqqWfkpiZeBV0MOlujel6XVFLC2CIVcb5cAdi7hpUVEHnN1VIkiElj3WHvPCXCQ5g1Y2/cUHTlEKznj9X7OaE5yB8TaJ70N3iVL1dcDebj6FVy4WPNsp66iv3hRA==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utenos-kolegija.lt/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://login.utenos-kolegija.lt/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="lt">Utenos kolegija</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Utena University of Applied Sciences</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="lt">Utenos kolegija</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Utena University of Applied Sciences</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="lt">http://www.utenos-kolegija.lt/?lang=lt</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.utenos-kolegija.lt/?lang=en</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Mantas</md:GivenName>
+    <md:SurName>Mikulėnas</md:SurName>
+    <md:EmailAddress>mantas@utenos-kolegija.lt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml b/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
new file mode 100644
index 00000000..a5ba47cc
--- /dev/null
+++ b/swamid-interfederations-2.0/logout.uwasa.fi-idp-shibboleth.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://logout.uwasa.fi/idp/shibboleth">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEqDCCA5CgAwIBAgIQcgCjzteE8HeKV2x3ntlDhjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTExNzAwMDAwMFoXDTE0MTExNjIzNTk1OVowgYMxCzAJBgNV
+BAYTAkZJMRIwEAYDVQQIEwlQb2hqYW5tYWExDjAMBgNVBAcTBVZhYXNhMRwwGgYD
+VQQKExNVbml2ZXJzaXR5IG9mIFZhYXNhMRgwFgYDVQQLEw9Db21wdXRlciBDZW50
+cmUxGDAWBgNVBAMTD2xvZ291dC51d2FzYS5maTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOlqHlgGvQm8gVcZPlogrWE4GLRV685h68SRqJlvmyGYhemf
+le48bvk2dKTOjXPZaIf2WcSuJQQZSMUQyeZqMce1yHB1uKW7RW5aitDYPythooWk
+AxT8IMaMRm51Z1mBEZSexkCZdOC6114/e5h69hTLAQyyV5lrallfH7mdPHX6A5iM
+iHNLexj8dwbT3f+ZsYTrlFgBp824m5YjSM1v/7fsDFi1IfQCJQGdeOgNFh6GNHEZ
+Xm+7VE5iMo+moTWGazNrUxrwD4g2GMXQ8xMp75BANG+t5SNgSRnZAJ4V0kBxRYRG
+du2RVmggolzsTCD+5ck1HJ/H1pivPA8L/3sbszsCAwEAAaOCAWIwggFeMB8GA1Ud
+IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQrxB8rmzKHgOIo
+eRFp7RmgK1oPbDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
+HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dvdXQu
+dXdhc2EuZmkwDQYJKoZIhvcNAQEFBQADggEBAG7RlBd8HjkxZsfvOkuwiDfC+I85
+SSFyg83ONrJhyZKn4cOT+Bl3h6tBJRfzGPTeQJJuedw73ZQAKlIuyOla2En8ZUvL
+exmlXhvCTJnMG2EdTFCzKs6gf4hDL1zWCh0GGi7MDNDJ2bB5x9TwrfrEVzdBkGzK
+1ItThd9oaEK6PPAgZ6c36/ZWJE/0jDdpzQWSO8FtQiWSbUT+Ar31FNa1sQgBwxqk
+7oAQfuW9Ixpgt5ex27m8r1X4w6KXs1eoZxZZnF6HaMdEM5qoAYwxkGVMQ9LNLjDM
+OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
+bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
+pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
+jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
+V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
+8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
+4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
+tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
+BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
+c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
+9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
+StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
++4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
+6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
+ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
+yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://logout.uwasa.fi/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://logout.uwasa.fi/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://logout.uwasa.fi/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">student.uwasa.fi</shibmd:Scope>
+      <shibmd:Scope regexp="false">uwasa.fi</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEqDCCA5CgAwIBAgIQcgCjzteE8HeKV2x3ntlDhjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTExNzAwMDAwMFoXDTE0MTExNjIzNTk1OVowgYMxCzAJBgNV
+BAYTAkZJMRIwEAYDVQQIEwlQb2hqYW5tYWExDjAMBgNVBAcTBVZhYXNhMRwwGgYD
+VQQKExNVbml2ZXJzaXR5IG9mIFZhYXNhMRgwFgYDVQQLEw9Db21wdXRlciBDZW50
+cmUxGDAWBgNVBAMTD2xvZ291dC51d2FzYS5maTCCASIwDQYJKoZIhvcNAQEBBQAD
+ggEPADCCAQoCggEBAOlqHlgGvQm8gVcZPlogrWE4GLRV685h68SRqJlvmyGYhemf
+le48bvk2dKTOjXPZaIf2WcSuJQQZSMUQyeZqMce1yHB1uKW7RW5aitDYPythooWk
+AxT8IMaMRm51Z1mBEZSexkCZdOC6114/e5h69hTLAQyyV5lrallfH7mdPHX6A5iM
+iHNLexj8dwbT3f+ZsYTrlFgBp824m5YjSM1v/7fsDFi1IfQCJQGdeOgNFh6GNHEZ
+Xm+7VE5iMo+moTWGazNrUxrwD4g2GMXQ8xMp75BANG+t5SNgSRnZAJ4V0kBxRYRG
+du2RVmggolzsTCD+5ck1HJ/H1pivPA8L/3sbszsCAwEAAaOCAWIwggFeMB8GA1Ud
+IwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQrxB8rmzKHgOIo
+eRFp7RmgK1oPbDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUE
+FjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQIC
+HTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6
+Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAaBgNVHREEEzARgg9sb2dvdXQu
+dXdhc2EuZmkwDQYJKoZIhvcNAQEFBQADggEBAG7RlBd8HjkxZsfvOkuwiDfC+I85
+SSFyg83ONrJhyZKn4cOT+Bl3h6tBJRfzGPTeQJJuedw73ZQAKlIuyOla2En8ZUvL
+exmlXhvCTJnMG2EdTFCzKs6gf4hDL1zWCh0GGi7MDNDJ2bB5x9TwrfrEVzdBkGzK
+1ItThd9oaEK6PPAgZ6c36/ZWJE/0jDdpzQWSO8FtQiWSbUT+Ar31FNa1sQgBwxqk
+7oAQfuW9Ixpgt5ex27m8r1X4w6KXs1eoZxZZnF6HaMdEM5qoAYwxkGVMQ9LNLjDM
+OhihSl/iSFoYuQlobOd1BgGV4B9OVOty2YUFFhcl7oLIR1LO53QU9IKq8dQ=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIQQ5ujEn6A97wMBYf7wCeq2TANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzExMTQyMzU5NTlaMD0xITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEYMBYGA1UEAxMPbG9nb3V0LnV3YXNh
+LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7/bXKuhTHYn3F5KR
+bV8p0HYCsFVL8qFbZQ2dWTEUGdo8TsFHHJDtd3zdyBH1G90vJhMErfESRX10Za3D
+pdY2FmrujdrYMnC1ehTmOkmbfj+48F7vdGeAEZgR4lDRGG7gFwrya0TdnOJqtgqa
+jDo0hBz1efTIoFijRwvV3rV0COi2DlOsQTyn9s4gIETCmBxQua/a1AvUJ5ZGdyue
+V4GX3SpWAC+4mVATaFhs9a2phFnpdgv9PZ+k4TI/4jdIsF6POU85ysDUqgXL3C5O
+8WfEFdAH6utWVpOF/Vp9xvI1/LY024U1zPXPRyghwhkV1CnSQIfd8aXFmeqOkoTR
+4ALaNwIDAQABo4IBazCCAWcwHwYDVR0jBBgwFoAUW9CKHJoyW+C13ZZUG+GGKLD9
+tr0wHQYDVR0OBBYEFBb2Xwqc+A65TiHhvkiWdjkTUI0HMA4GA1UdDwEB/wQEAwIF
+oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
+BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
+LaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5BU1NMQ0EyLmNybDBs
+BggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudXNlcnRydXN0
+LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlodHRwOi8vb2NzcC51
+c2VydHJ1c3QuY29tMBoGA1UdEQQTMBGCD2xvZ291dC51d2FzYS5maTANBgkqhkiG
+9w0BAQsFAAOCAQEAfqqvlPEDeZ6j/8lMXNMsAZQiDJlbfvxBwj9pSwaCEQ69hZyp
+StSyQwXJWN1EpRzQw23Dn4j0+qgxvyVX/o5rPObIezoCbXBqP5fK0pXuHMkGrDco
++4pLXY/xDE5sbGszDu9yy1uKlfUBbvCU2KmTpUqAJ1IAu5P6d+705PFYSJGUdBiL
+6x7F70/NW4zXPigoPlExAgMMroLu+S5eJOroW7XXvpytIal1e0VsWwciPQ17BOfh
+ONX9QOl1soU728FwQYCE1dOGmflU0MRBTCkgZQ6CFyXB5u41LQE5gb0S4nLCzD5Y
+yWnv/dMB+aZQxAaxuHvLIP8NFFGK50CgD63Osw==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://logout.uwasa.fi:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://logout.uwasa.fi:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Vaasan yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Vaasa</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Vasa Universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Vaasan yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Vaasa</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Vasa Universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.uwasa.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uwasa.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.uwasa.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Kinnunen</md:SurName>
+    <md:EmailAddress>mailto:authadm@uwasa.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Sami</md:GivenName>
+    <md:SurName>Kinnunen</md:SurName>
+    <md:EmailAddress>mailto:skk@uwasa.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/lu-idp.lu.lv.xml b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
index 465b2661..5454c0d7 100644
--- a/swamid-interfederations-2.0/lu-idp.lu.lv.xml
+++ b/swamid-interfederations-2.0/lu-idp.lu.lv.xml
@@ -4,6 +4,12 @@
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://laife.lanet.lv/" registrationInstant="2013-10-10T10:10:10Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://laife.lanet.lv/wiki/Latvian-Academic-Identity-Federation-Policy.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      <mdui:GeolocationHint>geo:56.950974,24.116292</mdui:GeolocationHint>
+    </mdui:DiscoHints>
+    <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      <mdui:Logo height="64" width="64">http://net.lu.lv/icon-lu.png</mdui:Logo>
+    </mdui:UIInfo>
   </Extensions>
   <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <md:KeyDescriptor use="signing">
diff --git a/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br.xml b/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml
index 379abf46..379abf46 100644
--- a/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br.xml
+++ b/swamid-interfederations-2.0/marreco.ifsuldeminas.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml
index 3e3c7e64..3e3c7e64 100644
--- a/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br.xml
+++ b/swamid-interfederations-2.0/marte.ifsertao-pe.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/mayumba.msh-paris.fr.xml b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
index 466f678a..466f678a 100644
--- a/swamid-interfederations-2.0/mayumba.msh-paris.fr.xml
+++ b/swamid-interfederations-2.0/mayumba.msh-paris.fr-shibauth.php.xml
diff --git a/swamid-interfederations-2.0/meta.cesnet.cz.xml b/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml
index c9e91c17..cdd71ffe 100644
--- a/swamid-interfederations-2.0/meta.cesnet.cz.xml
+++ b/swamid-interfederations-2.0/meta.cesnet.cz-sp-shibboleth.xml
@@ -4,7 +4,7 @@
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T11:47:38Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/monitor.eduroam.org.xml b/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
index c4b297e9..ebf82a4e 100644
--- a/swamid-interfederations-2.0/monitor.eduroam.org.xml
+++ b/swamid-interfederations-2.0/monitor.eduroam.org-sp-module.php-saml-sp-metadata.php-default-sp.xml
@@ -9,14 +9,14 @@
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIEfDCCA2SgAwIBAgIQTdxQXYGAzoPdJJ3pR03JNjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTExMDgyMzAwMDAwMFoXDTE0MDgyMjIzNTk1OVowVDELMAkGA1UEBhMCTkwxFTATBgNVBAoTDFNVUkZuZXQgQi5WLjEQMA4GA1UECxMHZWR1cm9hbTEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNtb25pdG9yLmVkdXJvYW0ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBEgy308qogrKuvyrPvpFOE7M1twTnJ+cxxkhnezYwDxQpwOOKzyEFazD93r8AYdUieFUqwkz8xtiPzXoQE3jwEajFZoqhIU+LXnXICqX9ZkHExlIwKqbq8bf0T2S8C60jRT52T+i3fcjDTAPi4nGQd/az21IUpHfgAl95D1Geg8LN2kijNkGVuH10dk6wUk0JStmMSrbkI+PC8uE+0ig1HvZ5E0pgo1JFfdo4s+daElwa5FpBYQ+z9uXC+DsdZd4ycRLV/yQJZSzIi69aeive5oIDwlijBDcAohZRfUU+Efv0ltr3/iYFUXnXmEXW8oruKFYLiaQ6Hd+ZqlgFdVIJQ</ds:X509Certificate>
+          <ds:X509Certificate>MIIEdDCCA1ygAwIBAgIRAOFAsS0ZwiDxyrWeqjaDx2owDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MjUwMDAwMDBaFw0xNzA4MjQyMzU5NTlaMEExITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbW9uaXRvci5lZHVyb2FtLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEASYoJQ052RD3Cny9AZhZEhXDLhCHcIKnnvpbVLT8zn6ENZ3QmVJRrBvJynPnstGpsWRNOGprScHYwPxRc/4ec04MtLBdtDuo6R2rBbP5XVP07rSLRW1fz57kYd+8mQdFhbs7hjTEkoAZbWf/whyMm2L+1KIoig0KCQ69pvLtYNUo33HIpBdUhmThMqLK79t9F2NThkvaBFAoIgubiNZcnraq3oCRYhFGsdTkkr3GYS/2DQmsDGEvYd/vJQowK2GLgrzy717L10pbsmWArDD8dL7cq8HCUosF/mYnHe2RjFyM5K2nbYGD7ztTns9NmIPOkMduzJYcxbMCetcg2o2Lf0A==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIEfDCCA2SgAwIBAgIQTdxQXYGAzoPdJJ3pR03JNjANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTExMDgyMzAwMDAwMFoXDTE0MDgyMjIzNTk1OVowVDELMAkGA1UEBhMCTkwxFTATBgNVBAoTDFNVUkZuZXQgQi5WLjEQMA4GA1UECxMHZWR1cm9hbTEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAWYwggFiMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNtb25pdG9yLmVkdXJvYW0ub3JnMA0GCSqGSIb3DQEBBQUAA4IBAQBEgy308qogrKuvyrPvpFOE7M1twTnJ+cxxkhnezYwDxQpwOOKzyEFazD93r8AYdUieFUqwkz8xtiPzXoQE3jwEajFZoqhIU+LXnXICqX9ZkHExlIwKqbq8bf0T2S8C60jRT52T+i3fcjDTAPi4nGQd/az21IUpHfgAl95D1Geg8LN2kijNkGVuH10dk6wUk0JStmMSrbkI+PC8uE+0ig1HvZ5E0pgo1JFfdo4s+daElwa5FpBYQ+z9uXC+DsdZd4ycRLV/yQJZSzIi69aeive5oIDwlijBDcAohZRfUU+Efv0ltr3/iYFUXnXmEXW8oruKFYLiaQ6Hd+ZqlgFdVIJQ</ds:X509Certificate>
+          <ds:X509Certificate>MIIEdDCCA1ygAwIBAgIRAOFAsS0ZwiDxyrWeqjaDx2owDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDA4MjUwMDAwMDBaFw0xNzA4MjQyMzU5NTlaMEExITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEcMBoGA1UEAxMTbW9uaXRvci5lZHVyb2FtLm9yZzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKZEEPPWK3dI4pejrbIg8Ee54wh62ixv9oPeYBwLmiRr2Rdjs+Sd/PkYXstbmGuwrvMkAtHmpv1QEjkwxLGo7WlE7ibEZw7EyaKbAeqfkEjCoQY9IGIxZP4IOUeqGyGMcDE90lKvM+5oS3iTxTOa8fQvjDw+8xyL+SEzbaQ3Ltl51jqbMI88goOGwuaqlgMzPTQgvwnMu5ERxMd3ghZigjFVBKMTk94Bc3SU36NUPzmOTUU0Wz+IplXi0yn/ohlLOvtE6S72vi4rO3UwWWu8DMMJhdyJ6yBq2F3xnIb2tk+cXUueGYEyp4oAI3XuDKKZECbKatiaMyhbwpY6l2yLCr8CAwEAAaOCAXAwggFsMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBRgdssPSBPRcB1pblNsRGZOsfJWYjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwHgYDVR0RBBcwFYITbW9uaXRvci5lZHVyb2FtLm9yZzANBgkqhkiG9w0BAQUFAAOCAQEASYoJQ052RD3Cny9AZhZEhXDLhCHcIKnnvpbVLT8zn6ENZ3QmVJRrBvJynPnstGpsWRNOGprScHYwPxRc/4ec04MtLBdtDuo6R2rBbP5XVP07rSLRW1fz57kYd+8mQdFhbs7hjTEkoAZbWf/whyMm2L+1KIoig0KCQ69pvLtYNUo33HIpBdUhmThMqLK79t9F2NThkvaBFAoIgubiNZcnraq3oCRYhFGsdTkkr3GYS/2DQmsDGEvYd/vJQowK2GLgrzy717L10pbsmWArDD8dL7cq8HCUosF/mYnHe2RjFyM5K2nbYGD7ztTns9NmIPOkMduzJYcxbMCetcg2o2Lf0A==</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </md:KeyDescriptor>
diff --git a/swamid-interfederations-2.0/moodle.helsinki.fi-shibboleth.xml b/swamid-interfederations-2.0/moodle.helsinki.fi-shibboleth.xml
new file mode 100644
index 00000000..02ddf702
--- /dev/null
+++ b/swamid-interfederations-2.0/moodle.helsinki.fi-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.helsinki.fi/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle.helsinki.fi/Shibboleth.sso/HAKALogin" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">University of Helsinki Moodle</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="fi">Helsingin yliopiston Moodle</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Helsinki Moodle learning management system.</mdui:Description>
+        <mdui:Description xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</mdui:Description>
+        <mdui:PrivacyStatementURL xml:lang="fi">https://moodle.helsinki.fi/rekisteriseloste.htm</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFcTCCBFmgAwIBAgIQBs4LDAt4QhHxA6/9vcQV2jANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDQwOTAwMDAwMFoXDTE3MDQwODIzNTk1OVowQDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRswGQYDVQQDExJtb29kbGUuaGVs
+c2lua2kuZmkwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDRJht4CmQi
+9WWU+ep1UhI11GXJTUXY4PzukaXUtO4RbZAnvd0U4Xb5sPDNsCVSIASBX0fkbSZJ
+yQ8FY/PhRk2QIt+erjReWIWA6V3UY6kJIq9IrUh4Z06aGrLvkEjHFbI0VA/AZ/8T
+2BxJrMg3v9mT12B9ueDvybIc6IERiDctRrB+s5nPskvua/2oTq4hDM9mGYTN4ZLB
+fR2OViwPxsGi3V22+iLa66JCmIK8kCeekNhS7OsclWWzIfPpCW1azjUZ2HrRndoi
+A/zJSpmT1rxY8WTchr0xdPdgVDzDZSv/FhRDacbFIC99drSWmg4wiYLvIidDt/zu
+tRoJdUGYPxqljdsyHwftjqqy2YNSMrxD8LDsaF07RZYjpK9GLDXroJzEOhlAJu/c
+qd4+RO+LjF21TWTe4Kw9u4+VNvjrfFDvkj5QAPxti70nOzkqY9Y+T4h1UNkyr8u+
+EGjNLOIE41B5V5MhTkf9x6lQD9IkejHpZA2bP5dmUtBft72UCPCDm2YMkLeXfOI9
+CaBkxLzi4doXmNLjXVEtsVx3qkvyH595ACnSaS/kUfnbgjaMdz15dh7PUPz2OQAE
+P3VijjcTzls96u81aBfHOHY1khqEueKkehJLq7ZFLefy/hcnFDMXWNMSeQaiGDjO
+qMAYHGzjR94Uar2Jvxvwzg2dF3GznzLZeQIDAQABo4IBbzCCAWswHwYDVR0jBBgw
+FoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFB8kuozI2dNLBE+Oy8Ie
+Rp4+GmUeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQG
+CCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgG
+BmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEu
+b3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKG
+KWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsG
+AQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJt
+b29kbGUuaGVsc2lua2kuZmkwDQYJKoZIhvcNAQEFBQADggEBAEkxmg/WVjzPKULi
+7OO3LiKrIgAhRchg8SGfngcgM6E2I8RoLS69/ZC0eWOubAZBJPfvCvaX5u3GWTWd
+dtHeCZWIKOhCFKMj079qWO27O67ys/E//vYakEnSxkpBkQ5u0tyolS7BFQcTWoPR
+BFc/Z+NaZhBmcm7tyFkQsrHTQZTq/s1Anxc7t3sXuUsFl4/LOEwiXkJYoxYOPE7t
+A0iMOwlhJ5VuCIEYZLJ1yA6AZCgJX8TgZvQEdsAxIA6VFJmXsJokBa/wDYQt5fPo
+kBViCHGTlh5cyshXEA2zL/Ywe8EjJkZCDWdoOC+r6CGtxjRxD7tvb/27+1dbYnI0
+Red7UuI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.helsinki.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.helsinki.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Helsingin yliopiston Moodle</md:ServiceName>
+      <md:ServiceName xml:lang="en">University of Helsinki's Moodle</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">Helsingin yliopiston Moodle-oppimisalusta.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">University of Helsinki's Moodle learning management system.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="cn"/>
+      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Helsingin yliopisto</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Helsinki</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Helsingfors universitet</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Helsingin yliopisto</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Helsinki</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Helsingfors universitet</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.helsinki.fi/yliopisto/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Heiko</md:GivenName>
+    <md:SurName>Schach</md:SurName>
+    <md:EmailAddress>mailto:heiko.schach@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Janne</md:GivenName>
+    <md:SurName>Peltonen</md:SurName>
+    <md:EmailAddress>mailto:haka-hy@helsinki.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/moodle.utu.fi.xml b/swamid-interfederations-2.0/moodle.utu.fi.xml
deleted file mode 100644
index 185d9fe6..00000000
--- a/swamid-interfederations-2.0/moodle.utu.fi.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://moodle.utu.fi">
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://moodle.utu.fi/Shibboleth.sso/DS" index="1"/>
-      <saml:Attribute Name="tags">
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
-        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
-      </saml:Attribute>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEZzCCA0+gAwIBAgIQT5QLlkD90BQrkITUEnBTjzANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTEzMTEwMTAwMDAwMFoXDTE2MTAzMTIzNTk1OVowOzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRYwFAYDVQQDEw1tb29kbGUudXR1
-LmZpMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu57V8S33XIdPWR0L
-rBU3P7BUaGjMQQXLIvyJG30hdL6LeVmhgdGLmquH4PstOhkovAyU2oRnV8qgRGTv
-S/dpyjiBgLBZ3bM2RHKYmPTzUxW6yYeQskZeRva28BZPtCo7cI6Z0tzrN0svt6hv
-QAvcQr0hpi4eYmflRcLN+Vogwvo2U67xxIxBEqUPC9ESsiIjh3AppAZcO8QzMIZO
-4CVhrWjyXSNpLtq7CS/n7xbw6/ky8bqFuaYsIBeyubsjp6nWbvMsuFRrUOh/Mjj3
-PLVe3kFOb7ueSjxcfAbl+Nd0T2Qa7KT7yY8zBI3JEoj19eTpSrZzPcBToA+LHUwi
-MfeM0wIDAQABo4IBajCCAWYwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDj
-ue0wHQYDVR0OBBYEFHSb32e0HpXDgKuD31baDigtJobzMA4GA1UdDwEB/wQEAwIF
-oDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAi
-BgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+g
-LaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBt
-BggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVu
-YS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50
-Y3MudGVyZW5hLm9yZzAYBgNVHREEETAPgg1tb29kbGUudXR1LmZpMA0GCSqGSIb3
-DQEBBQUAA4IBAQAqzKnyX9RnkwXwOM1szmj5iCMwTLVKl+ULpwxajHKs3Y8qXpgZ
-qR0JGgdAPE+qpWPQHRy+H0wwoAGwJHayyYVqd0WEUD6ET1YqxLGCbPA6I+gCLwN/
-2Gr2zU+BrPZ+Lbx3libwYEe4DtRhrHGvM+EoK703HLyQbAIFbQQG7xrEFOD4yjFB
-grT2zSpweu6njvXsomDNwjdCcG2sP7xOm5+ECGwB7RS85l6tAhkw/LR3msagUpZ5
-rol41Nc8xtMqDhVlI9K9MBfdGmj4wnvFzYS6bbAuMcOBUEllwtbhzzJf53XKQBZF
-0uKP0MosqHl91zcW2TOx0wxNhL4Hhavhe0hr</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://moodle.utu.fi/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://moodle.utu.fi/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
-    <md:AttributeConsumingService index="1" isDefault="true">
-      <md:ServiceName xml:lang="fi">Turun yliopiston Moodle-oppimisalusta</md:ServiceName>
-      <md:ServiceName xml:lang="en">University of Turku's Moodle learning management system</md:ServiceName>
-      <md:ServiceDescription xml:lang="fi">Moodle-oppimisalusta</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">Moodle learning management system</md:ServiceDescription>
-      <md:RequestedAttribute Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="displayName"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
-      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
-      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacPersonalUniqueCode"/>
-      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="sn"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="fi">Turun yliopisto</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">University of Turku</md:OrganizationName>
-    <md:OrganizationName xml:lang="sv">Åbo universitet</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="fi">Turun yliopisto</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">University of Turku</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="sv">Åbo universitet</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="fi">http://www.utu.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.utu.fi/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="sv">http://www.utu.fi/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Nadja</md:GivenName>
-    <md:SurName>Plankevitch</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Nadja</md:GivenName>
-    <md:SurName>Plankevitch</md:SurName>
-    <md:EmailAddress>mailto:hakajasen@utu.fi</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/neugrid4you.eu.xml b/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml
index 517597ee..517597ee 100644
--- a/swamid-interfederations-2.0/neugrid4you.eu.xml
+++ b/swamid-interfederations-2.0/neugrid4you.eu-saml-metadata.xml.xml
diff --git a/swamid-interfederations-2.0/nrenadmin.redclara.net.xml b/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml
index 1ae7c85a..b33a88d9 100644
--- a/swamid-interfederations-2.0/nrenadmin.redclara.net.xml
+++ b/swamid-interfederations-2.0/nrenadmin.redclara.net-simplesaml-saml2-sp-metadata.php.xml
@@ -21,7 +21,7 @@ http://cofre.reuna.cl/index.php/es/reglas-federacion
     <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIGZjCCBU6gAwIBAgIDCjMMMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMjAxMjEzWhcNMTQwNTAzMjMzMjQyWjBxMRkwFwYDVQQNExAzdVlZSFNvMUxNWHAwek5tMQswCQYDVQQGEwJDTDEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtjtWLKaJ09/KhJ+Fhp7OrF4Tc+hHVStZg2x/mg/qOvQN9936cs01q8MYpYapgzUFlQAffD3AGTURdUKOf9tBVOMdSJwhPWn0ESjBDZX1qmUnpyDhQM7thz1SNm16tHeFYUmp4CGXKhHy+46++Dh7enxfg2GIJ2a7uZsAsB0hIiSQrFq5HHXkG0Ufzy2AsCmue5q56eGcXQS/2zoxug8f73H050edcqwrxJyOV/SlndwHo8fH3Az5qJUk8BJuX8JwZby4FzeP9pVoxsixMsprJ4wWek6TZNdxzrqE4Yccvm8QUWn24EchUykb1JIjr+go27LCOyhwgGH0vbNw1F9HXAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUuV2BgTzQblfR0KTVC0BK0I8TwhQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAUi9eZCmR6ItJvG/EYreKWWOWrwghn4rykYztu3lYE7D8ld0QQhz7V/V3CE3ms6cXckeVGsI0X5UuhAOW+6KD1EjJgYuU1uShPPIqaPjlHNTXqBLIKzej8VvHLE5yC5o6OLZxpoVt06fpWdNF02TQClKyLT2sPQjgWWO0CP1Gw0/QBgIYazm6yfnFVY11D9EMqV6XKi2i/1ifBh+pyeuzTl9f+Utm/yUU/QUtjU3UMPQ1EkCuzEPLIkK2fzpskbxAXOFhmmkipNjSteEJsUQyYXYeYo4SlvIcjt/xUvMknfJVs0SIUB0mE3uT9MsZJoZtfSj+eR9/I3l9w6wGqUVISg==
+          <ds:X509Certificate>MIIGZjCCBU6gAwIBAgIDEAE3MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNDIxMDMwNjU5WhcNMTUwNDIxMTkxMDQ4WjBxMRkwFwYDVQQNExBWUnZXQTEzbkZJakpNc05CMQswCQYDVQQGEwJDTzEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj3XujoWlnyY6hH90qK/WTDpdBH92jVez4ifAJoRCuNssjJP9P1w+5MUSoSakFqMMUFHFPpL46qWxaMnxNkDWDxX4f+kUEcbLgH48CLbK8ILIpa8LF3e5u8cquNvi+jGNRs7iIgm3SQBZcsftFbk/34sVDAgZwX6hY0LlGfy2MKtV/Gt3wpo1tNg/nWjMKc1kDpERmmfW5Yg/hkT61rbCnWOwmqozQLCRXNdcvCUyMrOiY9EvoYaavtnBj3hvUwHlZs1pKs0JXO90yoguHUoyqwR+MPVSIs5ulA0U8xTcHNK9uFSDTYLbY4oHrTtZgADzuF8/9Hp3QnuseVqi099+lAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUAIyfM8+VKauj9FFAwhFdvsdoyEQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAsotw83vyRrTgGEfA6VKVfsDDZT3/dppBTKr+QR62sT3aH4XKWUnl663FZQ3lCofgSVDZvzHsQR2Lubmmku16L+RoSbB7h7/Vh5Qw9K1uhK3DWgnvH915GSB38a53kWZH5Vlc9oVfYlyXFo6/749K7wRy+Nz+2+kq5ab9Sl2OrtqUjNrL+yw4BAwZfxYSyIxi0PMfwB7+6nvS3bKBsfHjSqmo6bwXl8Jp6boEKYIQzkS4luccu7Al8FvG6/lzs5NRMDuH95EDw3fz8HxCSNyn/RtFepG1hLWpeLKRdK4cKU5wB6XcIvApwubFCmyAI4QaWTAAj2UShLzbghXGS7vuaw==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -29,7 +29,7 @@ http://cofre.reuna.cl/index.php/es/reglas-federacion
     <md:KeyDescriptor use="encryption">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
-          <ds:X509Certificate>MIIGZjCCBU6gAwIBAgIDCjMMMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNTAyMjAxMjEzWhcNMTQwNTAzMjMzMjQyWjBxMRkwFwYDVQQNExAzdVlZSFNvMUxNWHAwek5tMQswCQYDVQQGEwJDTDEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCtjtWLKaJ09/KhJ+Fhp7OrF4Tc+hHVStZg2x/mg/qOvQN9936cs01q8MYpYapgzUFlQAffD3AGTURdUKOf9tBVOMdSJwhPWn0ESjBDZX1qmUnpyDhQM7thz1SNm16tHeFYUmp4CGXKhHy+46++Dh7enxfg2GIJ2a7uZsAsB0hIiSQrFq5HHXkG0Ufzy2AsCmue5q56eGcXQS/2zoxug8f73H050edcqwrxJyOV/SlndwHo8fH3Az5qJUk8BJuX8JwZby4FzeP9pVoxsixMsprJ4wWek6TZNdxzrqE4Yccvm8QUWn24EchUykb1JIjr+go27LCOyhwgGH0vbNw1F9HXAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUuV2BgTzQblfR0KTVC0BK0I8TwhQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAUi9eZCmR6ItJvG/EYreKWWOWrwghn4rykYztu3lYE7D8ld0QQhz7V/V3CE3ms6cXckeVGsI0X5UuhAOW+6KD1EjJgYuU1uShPPIqaPjlHNTXqBLIKzej8VvHLE5yC5o6OLZxpoVt06fpWdNF02TQClKyLT2sPQjgWWO0CP1Gw0/QBgIYazm6yfnFVY11D9EMqV6XKi2i/1ifBh+pyeuzTl9f+Utm/yUU/QUtjU3UMPQ1EkCuzEPLIkK2fzpskbxAXOFhmmkipNjSteEJsUQyYXYeYo4SlvIcjt/xUvMknfJVs0SIUB0mE3uT9MsZJoZtfSj+eR9/I3l9w6wGqUVISg==
+          <ds:X509Certificate>MIIGZjCCBU6gAwIBAgIDEAE3MA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJTDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3MgMSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNDIxMDMwNjU5WhcNMTUwNDIxMTkxMDQ4WjBxMRkwFwYDVQQNExBWUnZXQTEzbkZJakpNc05CMQswCQYDVQQGEwJDTzEfMB0GA1UEAxMWbnJlbmFkbWluLnJlZGNsYXJhLm5ldDEmMCQGCSqGSIb3DQEJARYXcG9zdG1hc3RlckByZWRjbGFyYS5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj3XujoWlnyY6hH90qK/WTDpdBH92jVez4ifAJoRCuNssjJP9P1w+5MUSoSakFqMMUFHFPpL46qWxaMnxNkDWDxX4f+kUEcbLgH48CLbK8ILIpa8LF3e5u8cquNvi+jGNRs7iIgm3SQBZcsftFbk/34sVDAgZwX6hY0LlGfy2MKtV/Gt3wpo1tNg/nWjMKc1kDpERmmfW5Yg/hkT61rbCnWOwmqozQLCRXNdcvCUyMrOiY9EvoYaavtnBj3hvUwHlZs1pKs0JXO90yoguHUoyqwR+MPVSIs5ulA0U8xTcHNK9uFSDTYLbY4oHrTtZgADzuF8/9Hp3QnuseVqi099+lAgMBAAGjggLpMIIC5TAJBgNVHRMEAjAAMAsGA1UdDwQEAwIDqDATBgNVHSUEDDAKBggrBgEFBQcDATAdBgNVHQ4EFgQUAIyfM8+VKauj9FFAwhFdvsdoyEQwHwYDVR0jBBgwFoAU60I00Jiwq5/0G2sI98xkLu8OLEUwLwYDVR0RBCgwJoIWbnJlbmFkbWluLnJlZGNsYXJhLm5ldIIMcmVkY2xhcmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcBAgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xpY3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFjY29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBvZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUgaW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBhcnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYBBQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZlci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMvc3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cuc3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAsotw83vyRrTgGEfA6VKVfsDDZT3/dppBTKr+QR62sT3aH4XKWUnl663FZQ3lCofgSVDZvzHsQR2Lubmmku16L+RoSbB7h7/Vh5Qw9K1uhK3DWgnvH915GSB38a53kWZH5Vlc9oVfYlyXFo6/749K7wRy+Nz+2+kq5ab9Sl2OrtqUjNrL+yw4BAwZfxYSyIxi0PMfwB7+6nvS3bKBsfHjSqmo6bwXl8Jp6boEKYIQzkS4luccu7Al8FvG6/lzs5NRMDuH95EDw3fz8HxCSNyn/RtFepG1hLWpeLKRdK4cKU5wB6XcIvApwubFCmyAI4QaWTAAj2UShLzbghXGS7vuaw==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/ns.crous-dijon.fr.xml b/swamid-interfederations-2.0/ns.crous-dijon.fr.xml
deleted file mode 100644
index 9d7976b1..00000000
--- a/swamid-interfederations-2.0/ns.crous-dijon.fr.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ns.crous-dijon.fr/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2011-02-09T10:59:17Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-dijon.fr</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="fr">CROUS Dijon - Etudiants</mdui:DisplayName>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIElzCCA3+gAwIBAgIQPy2p2aIoYIpWK8V4WYOlrTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDExNDAwMDAwMFoXDTE3MDExMzIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFucy5jcm91cy1k
-aWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlULhbUbSZZ
-ik9LO5LVULgpq7eM5tkVzUImTKNOFNtatWJ4rmoyqmRhFou4BcZyWc1On6F5GS9D
-xQf3V6xBVRgAXtzmELYyQq5p4yZNpYIYDNULbQOpZjryJiSreNrW6c561kg3eYHa
-jVEFP0eJGbGg6XXcRPzGbxdPIL3Oc2ahZEs/zmXZcj2pDrHkMR79xrAUBaOYyRIj
-n754kFQEtoKkDL9MSLaZ/NJdqT+QUbl35/cmedIKZTNRdfC4Xa6kvFIZVcdj1UGC
-O3xT53Tad84nadugsGs/0XlbSN7QmYf4kbJtFNlXGuAUeY4SSx0JCNg7s1FKmdiD
-/dgx48vnZtsCAwEAAaOCAZYwggGSMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBQSmA3rsZAkJYNUFNcFHPD6UaQM8DAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwRAYDVR0RBD0wO4IRbnMuY3JvdXMtZGlqb24uZnKC
-EmNhcy5jcm91cy1kaWpvbi5mcoISaWRwLmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3
-DQEBBQUAA4IBAQA9wIxao4C3Oge+045uprk+C2bS2WSCSmFlpuIZbqP5G/VEI/7l
-YCWSI5xD3RgdivsuXmgZvXockOSj91wdFXwYxE7WZxErOdZp4jA+8GJAy2f9Ak5B
-LPor+zf7pe39wFu+zPlzjUMDTql23vukRPDcqb3DWjm0ibTUu0KRvkeYJ0fAMbOU
-1hsjTWkLBGi4LKupWES8WRxzPD/L/BQd4ePDxHgtWItmYnN91MtAzUj2/r+62Zb/
-ZliaTGvV25FhtxaQQm6Chii9JX70Msc15tnF+q3teIwAJlSbeajJ5dbTFh7Fj4uX
-01zcnufjYWR7N9j6OzzH/86anQIp5WXDWAdi
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIErzCCA5egAwIBAgIRAPce78VI0mZGzFqgRgussIEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAxMTIwMDAwMDBaFw0xNDAxMTEyMzU5NTlaMGAxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQHEwVEaWpvbjEXMBUGA1UEChMOQ1JPVVMgZGUgRElKT04x
-DDAKBgNVBAsTA0RTSTEaMBgGA1UEAxMRbnMuY3JvdXMtZGlqb24uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4CnU/wibyinuaPI2EqcrvmaWCV9dz
-Z9zkKanUn0KVoPGaFayhJCI/H0c5D+FEJl/lsA0YKzghi8baSc8L+pmq+LV4DF0k
-k3Ke9Yfn9gDr5Y+IadmSo7nmxiE42LJrFZBSzPrqK7HClDKskkgHu6lIXX3vDwX9
-NTUWOITDsqh+iLziudBc4DLim1brrMVwdpZVwCGWixI+pnx+Mn1KaLkW2migteMW
-TvAj7uf37zucUa0RhHXI5IbsmRXsH04r7Xq2et74nQETmGS861kBfEtqNWs8oZNF
-GGT4y7VCq4XIN2ZFp7xZetyzEkrlaGxJyL+2H0PFy2PJkVgU0BRpEA//AgMBAAGj
-ggGMMIIBiDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUkCg4s3FgI7pzpdqRGT3IeDfAkSUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwRAYDVR0R
-BD0wO4IRbnMuY3JvdXMtZGlqb24uZnKCEmNhcy5jcm91cy1kaWpvbi5mcoISaWRw
-LmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAIUjdnsILs5B0S4r30
-7X842J3m5zaE7xQ2kKKAa8FiF2TNZ+dzQQDbYrB8+nLD85ziWEwLzqGPHulDWbTI
-YxUX6Stt/KMW5frhCXX2i7hEp3gfKazu+jXou9ISXRuqKCU198d2Ic1Pqu8VoxwF
-7BgmqM7TDu+t8FTDF7rufbSKwCIR+yY+3oHtdNlZEdGCvCGOakfBEgqyZ4H6USuH
-WOVN0EpwAIdhLCQfwekeOM9ZulAKFYRB5tEKfmWS1aqo/7wNx71fJdjFV2mOkdcX
-B3ix6dIX1SsZx0ffnk3wPlrx6RGiItqiVD6gPDlUY/BRftSiyH/EEEM00YzHtqO/
-iTNj
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ns.crous-dijon.fr/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ns.crous-dijon.fr/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ns.crous-dijon.fr/idp/profile/Shibboleth/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
-    <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-dijon.fr</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIElzCCA3+gAwIBAgIQPy2p2aIoYIpWK8V4WYOlrTANBgkqhkiG9w0BAQUFADA2
-MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
-U1NMIENBMB4XDTE0MDExNDAwMDAwMFoXDTE3MDExMzIzNTk1OVowPzEhMB8GA1UE
-CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRowGAYDVQQDExFucy5jcm91cy1k
-aWpvbi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALlULhbUbSZZ
-ik9LO5LVULgpq7eM5tkVzUImTKNOFNtatWJ4rmoyqmRhFou4BcZyWc1On6F5GS9D
-xQf3V6xBVRgAXtzmELYyQq5p4yZNpYIYDNULbQOpZjryJiSreNrW6c561kg3eYHa
-jVEFP0eJGbGg6XXcRPzGbxdPIL3Oc2ahZEs/zmXZcj2pDrHkMR79xrAUBaOYyRIj
-n754kFQEtoKkDL9MSLaZ/NJdqT+QUbl35/cmedIKZTNRdfC4Xa6kvFIZVcdj1UGC
-O3xT53Tad84nadugsGs/0XlbSN7QmYf4kbJtFNlXGuAUeY4SSx0JCNg7s1FKmdiD
-/dgx48vnZtsCAwEAAaOCAZYwggGSMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-R+qQ47ntMB0GA1UdDgQWBBQSmA3rsZAkJYNUFNcFHPD6UaQM8DAOBgNVHQ8BAf8E
-BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-c3AudGNzLnRlcmVuYS5vcmcwRAYDVR0RBD0wO4IRbnMuY3JvdXMtZGlqb24uZnKC
-EmNhcy5jcm91cy1kaWpvbi5mcoISaWRwLmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3
-DQEBBQUAA4IBAQA9wIxao4C3Oge+045uprk+C2bS2WSCSmFlpuIZbqP5G/VEI/7l
-YCWSI5xD3RgdivsuXmgZvXockOSj91wdFXwYxE7WZxErOdZp4jA+8GJAy2f9Ak5B
-LPor+zf7pe39wFu+zPlzjUMDTql23vukRPDcqb3DWjm0ibTUu0KRvkeYJ0fAMbOU
-1hsjTWkLBGi4LKupWES8WRxzPD/L/BQd4ePDxHgtWItmYnN91MtAzUj2/r+62Zb/
-ZliaTGvV25FhtxaQQm6Chii9JX70Msc15tnF+q3teIwAJlSbeajJ5dbTFh7Fj4uX
-01zcnufjYWR7N9j6OzzH/86anQIp5WXDWAdi
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIErzCCA5egAwIBAgIRAPce78VI0mZGzFqgRgussIEwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMTAxMTIwMDAwMDBaFw0xNDAxMTEyMzU5NTlaMGAxCzAJBgNV
-BAYTAkZSMQ4wDAYDVQQHEwVEaWpvbjEXMBUGA1UEChMOQ1JPVVMgZGUgRElKT04x
-DDAKBgNVBAsTA0RTSTEaMBgGA1UEAxMRbnMuY3JvdXMtZGlqb24uZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC4CnU/wibyinuaPI2EqcrvmaWCV9dz
-Z9zkKanUn0KVoPGaFayhJCI/H0c5D+FEJl/lsA0YKzghi8baSc8L+pmq+LV4DF0k
-k3Ke9Yfn9gDr5Y+IadmSo7nmxiE42LJrFZBSzPrqK7HClDKskkgHu6lIXX3vDwX9
-NTUWOITDsqh+iLziudBc4DLim1brrMVwdpZVwCGWixI+pnx+Mn1KaLkW2migteMW
-TvAj7uf37zucUa0RhHXI5IbsmRXsH04r7Xq2et74nQETmGS861kBfEtqNWs8oZNF
-GGT4y7VCq4XIN2ZFp7xZetyzEkrlaGxJyL+2H0PFy2PJkVgU0BRpEA//AgMBAAGj
-ggGMMIIBiDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4E
-FgQUkCg4s3FgI7pzpdqRGT3IeDfAkSUwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB
-/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8w
-DQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3Mu
-dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsG
-AQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNy
-dDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwRAYDVR0R
-BD0wO4IRbnMuY3JvdXMtZGlqb24uZnKCEmNhcy5jcm91cy1kaWpvbi5mcoISaWRw
-LmNyb3VzLWRpam9uLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQAIUjdnsILs5B0S4r30
-7X842J3m5zaE7xQ2kKKAa8FiF2TNZ+dzQQDbYrB8+nLD85ziWEwLzqGPHulDWbTI
-YxUX6Stt/KMW5frhCXX2i7hEp3gfKazu+jXou9ISXRuqKCU198d2Ic1Pqu8VoxwF
-7BgmqM7TDu+t8FTDF7rufbSKwCIR+yY+3oHtdNlZEdGCvCGOakfBEgqyZ4H6USuH
-WOVN0EpwAIdhLCQfwekeOM9ZulAKFYRB5tEKfmWS1aqo/7wNx71fJdjFV2mOkdcX
-B3ix6dIX1SsZx0ffnk3wPlrx6RGiItqiVD6gPDlUY/BRftSiyH/EEEM00YzHtqO/
-iTNj
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ns.crous-dijon.fr/idp/AA"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">CROUS Dijon - Etudiants</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">CROUS Dijon - Etudiants</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>PERROT Olivier</SurName>
-    <EmailAddress>olivier.perrot@crous-dijon.fr</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/nte.gemtech.fr.xml b/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml
index c4c15f06..a45e95fc 100644
--- a/swamid-interfederations-2.0/nte.gemtech.fr.xml
+++ b/swamid-interfederations-2.0/nte.gemtech.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emn.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
index f3830d86..6df6866d 100644
--- a/swamid-interfederations-2.0/openskos.meertens.knaw.nl.xml
+++ b/swamid-interfederations-2.0/openskos.meertens.knaw.nl-shibboleth.xml
@@ -5,11 +5,6 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/openwiki.uninett.no.xml b/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
index 0d66e714..0d66e714 100644
--- a/swamid-interfederations-2.0/openwiki.uninett.no.xml
+++ b/swamid-interfederations-2.0/openwiki.uninett.no-simplesaml-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml b/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
new file mode 100644
index 00000000..339d63b4
--- /dev/null
+++ b/swamid-interfederations-2.0/owncloud.cesnet.cz-saml-sp.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://owncloud.cesnet.cz/saml/sp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-19T21:13:48Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">OwnCloud</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">OwnCloud</mdui:DisplayName>
+        <mdui:Description xml:lang="en">CESNETs servis for sharing files.</mdui:Description>
+        <mdui:Description xml:lang="cs">Cesnetí služba pro sdílení souborů.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://owncloud.cesnet.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://owncloud.cesnet.cz/</mdui:InformationURL>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEcjCCA1qgAwIBAgIRAPQ1mOW1ZRv5p0ikek6IvdEwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDAyMTkwMDAwMDBaFw0xNzAyMTgyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSb3duY2xvdWQuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv79fWh8u/3sVzPN6yxyosMnAxKXqR5DfXnI29E8KOFF5yP+yj23FJqzbEuGsLNKUHZZ4sNcJTcTXi53U78t8pAyerwbPou+vVhxEL+a6wnpqJ/Q2XJ2jJ+OvbFRG4T+5oWyY/KOSqddzlEJhKplm0uMKkuZxC6kn+tUei58rexj4NwUPHTAFsMcLc997hn3yPmwEE0YQ2O9Vn+MuVYxGq+ytAEyBE97Gle1kbQreZ66Gn5R63FxcD6NN/Uvm/gX8Go04L+BPos+nhMD7VvcgbKPkHu/LNYPODaS0/zRUxjDsWiTsma8DbsdrmKdXxcqEkv+IHQaLOTNkwN4sh236yQIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLVNdYAnQ4MAHsI0R854KPZHpdmhMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJvd25jbG91ZC5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBADqbluvi3u51NAFwIZli9b/d/oX6X56uZjs81nu8jniC6r9Wt4dGKDF6t3VIoqpFJ1ZtT1Kj+xr5c3g2UJ6HLXiPwcipjtJ5YckfTZAcoKMtAJAxI82SiHBMO5jgqEtvZJuw9FjStNxDIt1JkcmZVpsvoMCOJk3jqonypoKHbG0nq7jg52Ahp2sI/fFcyDmdYwLpV5f3j5DpACol4/anu02Li7Nf7VrnQLsKhvXqNkV8sGDoPJcA1zuseszaPV9RTONMzcZHoWAtzK3Fd5rT5sr+7qVpm+lmEi0TNhFSSW68Yp+4XqDvKLviDkhv1R/Yjqi5XRlMo0KjBerAbs1Un6Q=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEcjCCA1qgAwIBAgIRAPQ1mOW1ZRv5p0ikek6IvdEwDQYJKoZIhvcNAQEFBQAwNjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5BIFNTTCBDQTAeFw0xNDAyMTkwMDAwMDBaFw0xNzAyMTgyMzU5NTlaMEAxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSb3duY2xvdWQuY2VzbmV0LmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv79fWh8u/3sVzPN6yxyosMnAxKXqR5DfXnI29E8KOFF5yP+yj23FJqzbEuGsLNKUHZZ4sNcJTcTXi53U78t8pAyerwbPou+vVhxEL+a6wnpqJ/Q2XJ2jJ+OvbFRG4T+5oWyY/KOSqddzlEJhKplm0uMKkuZxC6kn+tUei58rexj4NwUPHTAFsMcLc997hn3yPmwEE0YQ2O9Vn+MuVYxGq+ytAEyBE97Gle1kbQreZ66Gn5R63FxcD6NN/Uvm/gX8Go04L+BPos+nhMD7VvcgbKPkHu/LNYPODaS0/zRUxjDsWiTsma8DbsdrmKdXxcqEkv+IHQaLOTNkwN4sh236yQIDAQABo4IBbzCCAWswHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFLVNdYAnQ4MAHsI0R854KPZHpdmhMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREEFjAUghJvd25jbG91ZC5jZXNuZXQuY3owDQYJKoZIhvcNAQEFBQADggEBADqbluvi3u51NAFwIZli9b/d/oX6X56uZjs81nu8jniC6r9Wt4dGKDF6t3VIoqpFJ1ZtT1Kj+xr5c3g2UJ6HLXiPwcipjtJ5YckfTZAcoKMtAJAxI82SiHBMO5jgqEtvZJuw9FjStNxDIt1JkcmZVpsvoMCOJk3jqonypoKHbG0nq7jg52Ahp2sI/fFcyDmdYwLpV5f3j5DpACol4/anu02Li7Nf7VrnQLsKhvXqNkV8sGDoPJcA1zuseszaPV9RTONMzcZHoWAtzK3Fd5rT5sr+7qVpm+lmEi0TNhFSSW68Yp+4XqDvKLviDkhv1R/Yjqi5XRlMo0KjBerAbs1Un6Q=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://owncloud6.cesnet.cz/simplesamlphp/module.php/saml/sp/saml1-acs.php/default-sp/artifact" index="3"/>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">CESNET</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.ces.net/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.cesnet.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Lubos</md:GivenName>
+    <md:SurName>Kopecky - administrator</md:SurName>
+    <md:EmailAddress>du-support@cesnet.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/pan.unifei.edu.br.xml b/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml
index 76f1cf1e..76f1cf1e 100644
--- a/swamid-interfederations-2.0/pan.unifei.edu.br.xml
+++ b/swamid-interfederations-2.0/pan.unifei.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/papi.kfki.hu.xml b/swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml
index cd1cb14f..26de1e87 100644
--- a/swamid-interfederations-2.0/papi.kfki.hu.xml
+++ b/swamid-interfederations-2.0/papi.kfki.hu-idp-shibboleth.xml
@@ -25,6 +25,12 @@
         <mdui:IPHint>2001:738:5001::/48</mdui:IPHint>
         <mdui:GeolocationHint>geo:47.48945,18.9497</mdui:GeolocationHint>
       </mdui:DiscoHints>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+        <mdui:DisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">WIGNER Research Centre for Physics</mdui:DisplayName>
+        <mdui:Description xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</mdui:Description>
+        <mdui:Description xml:lang="en">WIGNER Research Centre for Physics</mdui:Description>
+      </mdui:UIInfo>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -50,12 +56,12 @@
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://papi.kfki.hu/idp/profile/SAML2/Redirect/SSO"/>
   </IDPSSODescriptor>
   <Organization>
-    <OrganizationName xml:lang="hu">MTA KFKI - Magyar Tudományos Akadémia Központi Fizikai Kutató Intézet</OrganizationName>
-    <OrganizationName xml:lang="en">Central Research Institute for Physics of the Hungarian Academy of Sciences</OrganizationName>
-    <OrganizationDisplayName xml:lang="hu">MTA KFKI Csillebérc</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">MTA KFKI Csillebérc</OrganizationDisplayName>
-    <OrganizationURL xml:lang="hu">http://www.kfki.hu</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.kfki.hu</OrganizationURL>
+    <OrganizationName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</OrganizationName>
+    <OrganizationName xml:lang="en">WIGNER Research Centre for Physics</OrganizationName>
+    <OrganizationDisplayName xml:lang="hu">MTA Wigner Fizikai Kutatóközpont</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">WIGNER Research Centre for Physics</OrganizationDisplayName>
+    <OrganizationURL xml:lang="hu">http://wigner.mta.hu</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://wigner.mta.hu</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <SurName>KFKI AAI</SurName>
diff --git a/swamid-interfederations-2.0/perun-dev.ics.muni.cz.xml b/swamid-interfederations-2.0/perun-dev.ics.muni.cz.xml
deleted file mode 100644
index b43bb071..00000000
--- a/swamid-interfederations-2.0/perun-dev.ics.muni.cz.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://perun-dev.ics.muni.cz/shibboleth">
-  <md:Extensions>
-    <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-      <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-    </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/Login" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">Masaryk University</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Masarykova univerzita</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Perun devel instance for MU</mdui:Description>
-        <mdui:Description xml:lang="cs">Devel instance Peruna pro MU</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.muni.cz/?lang=en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.muni.cz/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>perun-dev.ics.muni.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=perun-dev.ics.muni.cz,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEeDCCA2CgAwIBAgIRAJPHnlhYYXpFQ/jdVvQLJg8wDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xNDA4MDQwMDAwMDBaFw0xNzA4MDMyMzU5NTlaMEMxITAfBgNV
-BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVcGVydW4tZGV2
-Lmljcy5tdW5pLmN6MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzku/
-HV4qVOC/0mZOblorgHTh3InHdp5Q+x2Ra7jxIkv0UDmU6o59oOk6OL0C1ojcPfYB
-PLX0MskupNGVjcCz825FxB3zHlQRdU86ayRRsa//Yo0JbOn1k+/cl/wL0OsJf2kk
-Ks71ldyfO6HvhGWzAMMXw3CmDFwRFCoHd8ANl3ZxDJxzPtga9i7aHpFTs8sDZ00R
-NoM/87kOow48LuNa53VQyoFsg4EsERWykHRzHYW7nPB+qGZjYUrpGr9ALvPPR80X
-NvK1z93cLCeDfnI402FUPt89T4tfa0D3KqFgLNRTLQkzpzWskJTkVjeatVnMqYbJ
-FHU2eUCs7//g14gHdwIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
-SWsrN1dH6pDjue0wHQYDVR0OBBYEFKkVFJJczlQBmoNzt8V/Tos6djRHMA4GA1Ud
-DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
-BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
-HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
-TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
-dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
-Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVwZXJ1bi1kZXYuaWNz
-Lm11bmkuY3owDQYJKoZIhvcNAQEFBQADggEBAHD+Ji1bk7FLaoEot4tOF0DRPiNw
-DpsJY5OPrJSxpHnHeX3B46cqnmZHeifjbbiEOiZvXhjQPbQ2uGAuVKgAPbhWQ80s
-r2KQ6GzvWzDhpo0mVy9dKZ8SKinAmE71U1w4/66ToaJ3rpkokHbry/Xsl6QzTmAM
-Gevgp3tusOn3Ixs6VY4qO3Vr1N6HcFwZCaDx1BbUsdlFnnmEfT1W5UkguWydPRcb
-JLGAX70RggRScicuTrTD7MvBCQAExJciD2Nh/7oAihzfEGjaoTXwSOgB3PtnT00b
-m/TIaT98RnX+oWtKZ0cq8f8dukjowwizjBd2n7yr0oscWPslHUIFc1WKq+M=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/Artifact/SOAP" index="0"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML2/POST" index="0"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://perun-dev.ics.muni.cz/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Perun MU Devel</md:ServiceName>
-      <md:ServiceName xml:lang="cs">Perun MU Devel</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Perun devel instance for MU</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="cs">Devel instance Peruna pro MU</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="cs">Masarykova univerzita</md:OrganizationName>
-    <md:OrganizationName xml:lang="en">Masaryk University</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="cs">Masarykova univerzita</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="en">Masaryk University</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="cs">http://www.muni.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="en">http://www.muni.cz/?lang=en</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Slavek</md:GivenName>
-    <md:SurName>Licehammer</md:SurName>
-    <md:EmailAddress>perun@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Michal</md:GivenName>
-    <md:SurName>Prochazka</md:SurName>
-    <md:EmailAddress>perun@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portail.u-picardie.fr.xml b/swamid-interfederations-2.0/portail.u-picardie.fr.xml
new file mode 100644
index 00000000..b2f42f93
--- /dev/null
+++ b/swamid-interfederations-2.0/portail.u-picardie.fr.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://portail.u-picardie.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-09-02T16:43:49Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Captive Portal UPJV</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Eduspot</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Portail Captif UPJV</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Eduspot</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEeDCCA2CgAwIBAgIRAI8ATZBA7Bnw3Q1sS4vt94owDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA5MDIwMDAwMDBaFw0xNzA5MDEyMzU5NTlaMEMxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVcG9ydGFpbC51
+LXBpY2FyZGllLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnBM
+cAhCPXC9pBbPm3er4NW+GudXQ7RdSSbjcwvdrTJaZYz87cHLW9S9Z8IT1U0yMUF5
+GWpY3QJdZD7sqWRmbbqSPTRocfStRu1BCXeBFhSDmO7BStGYcFNOLEM0m85ltHY9
+8gqegGoWM1khQmIBNZJAzGQXRs9lOG0ot08mPW/XyZGoo5yvCO4VWNpkd1wlZ7Jg
+TiXyPsqRm4R7+YHwn1R8UMWVMsUUvF2CQNxW8+Ghg/OVn7YrvLb+36vQHznSz1iK
+NYTtRUwXlxM5+o2eIdNWlmZJ3TagRLqWvmUSxbWPZMQ6TTQ0yAyoqqwo2uI3SLw5
+Qz9y2Qmb27YCL88i2QIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFBOVnqjQVT5ecFN5XpHZFMjTE6qvMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVwb3J0YWlsLnUtcGlj
+YXJkaWUuZnIwDQYJKoZIhvcNAQEFBQADggEBAKWOzDpu8ZDdABvbqfqVypK26AuS
+KZQgRWrbhjWXO6beNP1vgv2zkG45tlStDR/IsyJdhif96xUrtHIMNrIJHAX7bO8A
+INrL50AL/tmfSBMrc6zAP4XZyX0MG8PXhMHyZjxuI7mLM/woxXCkn4OiKMZhWVbD
+Fw5YllIUfrdyDXq8Y11DJ/vvZ8fezanidQX1QOtf3YqB6E6XB0iDebyaw92FMe2K
+CWc9pJ6KeATZnLv6m4m3+cfGRD9Oczou7iHD6nt2Cc2NMlfKJXBy8l1FlLMJgzAF
+Jeo/JF+pa6rXH5QzpgLaL56jnm2C62ghYn4OMZlD1hzzTRGsoq2qWguZnyk=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEeDCCA2CgAwIBAgIRAI8ATZBA7Bnw3Q1sS4vt94owDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA5MDIwMDAwMDBaFw0xNzA5MDEyMzU5NTlaMEMxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEeMBwGA1UEAxMVcG9ydGFpbC51
+LXBpY2FyZGllLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtnBM
+cAhCPXC9pBbPm3er4NW+GudXQ7RdSSbjcwvdrTJaZYz87cHLW9S9Z8IT1U0yMUF5
+GWpY3QJdZD7sqWRmbbqSPTRocfStRu1BCXeBFhSDmO7BStGYcFNOLEM0m85ltHY9
+8gqegGoWM1khQmIBNZJAzGQXRs9lOG0ot08mPW/XyZGoo5yvCO4VWNpkd1wlZ7Jg
+TiXyPsqRm4R7+YHwn1R8UMWVMsUUvF2CQNxW8+Ghg/OVn7YrvLb+36vQHznSz1iK
+NYTtRUwXlxM5+o2eIdNWlmZJ3TagRLqWvmUSxbWPZMQ6TTQ0yAyoqqwo2uI3SLw5
+Qz9y2Qmb27YCL88i2QIDAQABo4IBcjCCAW4wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFBOVnqjQVT5ecFN5XpHZFMjTE6qvMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAgBgNVHREEGTAXghVwb3J0YWlsLnUtcGlj
+YXJkaWUuZnIwDQYJKoZIhvcNAQEFBQADggEBAKWOzDpu8ZDdABvbqfqVypK26AuS
+KZQgRWrbhjWXO6beNP1vgv2zkG45tlStDR/IsyJdhif96xUrtHIMNrIJHAX7bO8A
+INrL50AL/tmfSBMrc6zAP4XZyX0MG8PXhMHyZjxuI7mLM/woxXCkn4OiKMZhWVbD
+Fw5YllIUfrdyDXq8Y11DJ/vvZ8fezanidQX1QOtf3YqB6E6XB0iDebyaw92FMe2K
+CWc9pJ6KeATZnLv6m4m3+cfGRD9Oczou7iHD6nt2Cc2NMlfKJXBy8l1FlLMJgzAF
+Jeo/JF+pa6rXH5QzpgLaL56jnm2C62ghYn4OMZlD1hzzTRGsoq2qWguZnyk=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://portail.u-picardie.fr/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AttributeConsumingService index="0">
+      <ServiceName xml:lang="fr">Portail Captif UPJV</ServiceName>
+      <ServiceName xml:lang="en">Captive Portal UPJV</ServiceName>
+      <ServiceDescription xml:lang="fr">Eduspot</ServiceDescription>
+      <ServiceDescription xml:lang="en">Eduspot</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true">
+        <saml:AttributeValue xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion">eppn</saml:AttributeValue>
+      </RequestedAttribute>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Picardie Jules Verne</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Picardie Jules Verne</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Christophe Dupreuil</SurName>
+    <EmailAddress>christophe.dupreuil@u-picardie.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/portal.clarin.inl.nl.xml b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
index 152c3742..152c3742 100644
--- a/swamid-interfederations-2.0/portal.clarin.inl.nl.xml
+++ b/swamid-interfederations-2.0/portal.clarin.inl.nl-.xml
diff --git a/swamid-interfederations-2.0/portal.moonshot.ja.net.xml b/swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml
index 7657599e..7657599e 100644
--- a/swamid-interfederations-2.0/portal.moonshot.ja.net.xml
+++ b/swamid-interfederations-2.0/portal.moonshot.ja.net-shibboleth.xml
diff --git a/swamid-interfederations-2.0/portofranco.ufma.br.xml b/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
index e3899df6..e3899df6 100644
--- a/swamid-interfederations-2.0/portofranco.ufma.br.xml
+++ b/swamid-interfederations-2.0/portofranco.ufma.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/qub.ac.uk.xml b/swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml
index 162bb663..162bb663 100644
--- a/swamid-interfederations-2.0/qub.ac.uk.xml
+++ b/swamid-interfederations-2.0/qub.ac.uk-shibboleth.xml
diff --git a/swamid-interfederations-2.0/quod.lib.umich.edu.xml b/swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml
index 51ed22fd..51ed22fd 100644
--- a/swamid-interfederations-2.0/quod.lib.umich.edu.xml
+++ b/swamid-interfederations-2.0/quod.lib.umich.edu-shibboleth-sp-acls.xml
diff --git a/swamid-interfederations-2.0/rastreador.ifba.edu.br.xml b/swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml
index ade79d7c..ade79d7c 100644
--- a/swamid-interfederations-2.0/rastreador.ifba.edu.br.xml
+++ b/swamid-interfederations-2.0/rastreador.ifba.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/registration.dariah.eu.xml b/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml
index 3b426353..3b426353 100644
--- a/swamid-interfederations-2.0/registration.dariah.eu.xml
+++ b/swamid-interfederations-2.0/registration.dariah.eu-shibboleth.xml
diff --git a/swamid-interfederations-2.0/rems.elixir-finland.org.xml b/swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml
index d3bdd0b3..d3bdd0b3 100644
--- a/swamid-interfederations-2.0/rems.elixir-finland.org.xml
+++ b/swamid-interfederations-2.0/rems.elixir-finland.org-shibboleth.xml
diff --git a/swamid-interfederations-2.0/repos.ids-mannheim.de.xml b/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
index fbef3e5f..fbef3e5f 100644
--- a/swamid-interfederations-2.0/repos.ids-mannheim.de.xml
+++ b/swamid-interfederations-2.0/repos.ids-mannheim.de-shibboleth.xml
diff --git a/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml b/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml
new file mode 100644
index 00000000..ea3f863f
--- /dev/null
+++ b/swamid-interfederations-2.0/ricevi.ct.infn.it-shibboleth.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://ricevi.ct.infn.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-10-03T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">RICeVI portal</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">RICeVI portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</mdui:Description>
+        <mdui:Description xml:lang="it">Questo servizio fornisce servizi sperimentali per l'e-Learning e l'e-Collaboration</mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j
+dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI
+uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv
+3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E
+TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU
+7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt
+F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy
+BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr
+N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB
+/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF
+BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0
+LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u
+cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p
+bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp
+Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy
+aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp
+bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB
+BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0
+VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO
+nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY
+JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA
+2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN
+W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">RICeVI portal</ServiceName>
+      <ServiceDescription xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</OrganizationName>
+    <OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">INFN Catania</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">INFN Catania</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Marco</GivenName>
+    <SurName>Fargetta</SurName>
+    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Riccardo</GivenName>
+    <SurName>Rotondo</SurName>
+    <EmailAddress>mailto:riccardo.rotondo@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Giuseppe</GivenName>
+    <SurName>Platania</SurName>
+    <EmailAddress>mailto:giuseppe.platania@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Carlo</GivenName>
+    <SurName>Rocca</SurName>
+    <EmailAddress>mailto:carlo.rocca@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Roberto</GivenName>
+    <SurName>Barbera</SurName>
+    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ricevi.ct.infn.it.xml b/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
deleted file mode 100644
index 4eaceaa3..00000000
--- a/swamid-interfederations-2.0/ricevi.ct.infn.it.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ricevi.ct.infn.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-12-22T11:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
-                </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">RICeVI portal</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">RICeVI portal</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio fornisce servizi sperimentali per l'e-Learning e l'e-Collaboration</mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://ricevi.ct.infn.it/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>applications.eu-decide.eu</ds:KeyName>
-        <ds:KeyName>applications.eumedgrid.eu</ds:KeyName>
-        <ds:KeyName>gisela-gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gilda.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gw.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gweather.ct.infn.it</ds:KeyName>
-        <ds:KeyName>gwlib.ct.infn.it</ds:KeyName>
-        <ds:KeyName>indicate-gw.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>liferay.ct.infn.it</ds:KeyName>
-        <ds:KeyName>ricevi.ct.infn.it</ds:KeyName>
-        <ds:KeyName>viralgrid.ct.infn.it</ds:KeyName>
-        <ds:KeyName>www.chain-project.eu</ds:KeyName>
-        <ds:KeyName>www.special-project.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509Certificate>
-MIIFhDCCBGygAwIBAgIRAOyXU1f6GS689kEaSDAhQPYwDQYJKoZIhvcNAQEFBQAw NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B IFNTTCBDQTAeFw0xNDA1MTkwMDAwMDBaFw0xNzA1MTgyMzU5NTlaMEAxITAfBgNV BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEbMBkGA1UEAxMSbGlmZXJheS5j dC5pbmZuLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApizyvtMI uoSnnz/fvk7lcXwoDUk11NVAlg5w4zh01YKNvy5SzBu0eRIzRos/ALs4CwmxrmCv 3JQPA4xxItxVd8x9Q+YElQteEcX+mWXXW5LI5XE3xhPzkdFeQrhkinAK2JreSn6E TQk8YO1rOxW3qCpKeYZ2VQF3grAU/JRWbvLF+r2j4zE27n+RzBxnYeZ9rtJ/67gU 7t1S39DRDTyKit7dJIYl50n9g3atWGALb56QoVnlR+RPRxVI9EFd2hEXfrxWXGdt F2v6YIMSAAM5l2/SlEmhQSSkmQ4zXcmPrzC6pte9NWoPOTsQnCnocwMJ16aXsnQy BxaoywMtq8NsdwIDAQABo4ICgTCCAn0wHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsr N1dH6pDjue0wHQYDVR0OBBYEFCy5dq76F94vaAuznAys6UmGxySTMA4GA1UdDwEB /wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEF BQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8E MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v b2NzcC50Y3MudGVyZW5hLm9yZzCCAS0GA1UdEQSCASQwggEgghJsaWZlcmF5LmN0 LmluZm4uaXSCGWFwcGxpY2F0aW9ucy5ldS1kZWNpZGUuZXWCGWFwcGxpY2F0aW9u cy5ldW1lZGdyaWQuZXWCEGdpbGRhLmN0LmluZm4uaXSCFGdpc2VsYS1ndy5jdC5p bmZuLml0gg1ndy5jdC5pbmZuLml0ghNnd2VhdGhlci5jdC5pbmZuLml0ghBnd2xp Yi5jdC5pbmZuLml0gh9pbmRpY2F0ZS1ndy5jb25zb3J6aW8tY29tZXRhLml0ghFy aWNldmkuY3QuaW5mbi5pdIIUdmlyYWxncmlkLmN0LmluZm4uaXSCFHd3dy5jaGFp bi1wcm9qZWN0LmV1ghZ3d3cuc3BlY2lhbC1wcm9qZWN0Lml0MA0GCSqGSIb3DQEB BQUAA4IBAQCEZIHNNQPD5WkGSlUhCN/BRSharmQ6dT0NiwjQNmRODCpVqBgwVZY0 VUlAobHaF186QXeiNYge8ZYSpYY2VhBa4znL7IjFODE3FsaJNseKgsyNFqKR8xNO nsOCM//SN9N79hwH8yAxLhGyxbnInpOhE6rEkbhtowTjqhDq26cGGlH8JTTPuYvY JhgPGGkxo1286x1nuN4ELKvwZ7RF+YTH/WPOIBMNi+ee+vxrIhWbU6iy97f7k4PA 2e35ZQ6gutnmX2v/ybFWh0ruO4zszYKiMo+zGyLvYmIpV/+Mjs26KbqqrBOS1jjN W3MiH8HMxzzYHExNCvzrAgN1TfB+SCiB
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ricevi.ct.infn.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">RICeVI portal</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">This service provides experimental facilities for e-Learnign and e-Collaboration</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">INFN - the National Institute of Nuclear Physics. Catania division</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">INFN - Istituto Nazionale di Fisica Nucleare. Sezione di Catania</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">RICeVI portal provided by INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">RICeVI portal erogato da INFN Catania</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.ct.infn.it/en/home</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.ct.infn.it/it/home</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Riccardo</md:GivenName>
-    <md:SurName>Rotondo</md:SurName>
-    <md:EmailAddress>mailto:riccardo.rotondo@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Giuseppe</md:GivenName>
-    <md:SurName>Platania</md:SurName>
-    <md:EmailAddress>mailto:giuseppe.platania@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="support">
-    <md:GivenName>Carlo</md:GivenName>
-    <md:SurName>Rocca</md:SurName>
-    <md:EmailAddress>mailto:carlo.rocca@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/rigal.enpc.fr.xml b/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml
index 92381fad..6f2cf774 100644
--- a/swamid-interfederations-2.0/rigal.enpc.fr.xml
+++ b/swamid-interfederations-2.0/rigal.enpc.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enpc.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/rir.dariah.eu.xml b/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
index 3dc2d159..3dc2d159 100644
--- a/swamid-interfederations-2.0/rir.dariah.eu.xml
+++ b/swamid-interfederations-2.0/rir.dariah.eu-shibboleth.xml
diff --git a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml
index a2584668..a2584668 100644
--- a/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br.xml
+++ b/swamid-interfederations-2.0/rnp-cafe.ifs.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/ross.impa.br.xml b/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
index 149d9622..9028b7af 100644
--- a/swamid-interfederations-2.0/ross.impa.br.xml
+++ b/swamid-interfederations-2.0/ross.impa.br-idp-shibboleth.xml
@@ -23,22 +23,25 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIC2DCCAcACAQAwDQYJKoZIhvcNAQEFBQAwMjEMMAoGA1UECxMDQ0lOMQswCQYD
-VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDQwOTE2NDEzMloX
-DTE5MDQwODE2NDEzMlowMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
-A1UEAxMMcm9zcy5pbXBhLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArp0q2Ul3/nuj8q0Ut/eYQn++cD+6PuSoxtIn9d/ZHGiGo0roJOk8/piqMy3P
-OrdUhWPEJhkOsi6xd0scmnYdo4dIdQWpnuB9fmTqziBRoI8YBWlsN+ha1/I0TiVA
-HmXoEQGK9EY9vZ06Gj8mtD9AqyG/VNLc9q9kyqIoBxYtQ7GLBk3vXrW7/o5ARIiA
-Ktr+4AQ9vhNt01XiMURyMU9erD42q4ZJxLg47H1Wl49dQUUJD2dxrOBDYhVKRZRn
-mbQe2pkwQlSuZOGU1kA0yi317kvIwEV2bpOGDh1SJ3Ywf8nfqlVqSHNo5zm8tqJT
-W4qBjuRUMmMPhSkoTi0MLAuf5QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAJAeBE
-/EyeWED6UkuhWLEW285gvSKjjFTVuhWLYvAzx4A0OtFLI7ZLw4Bsqrxf/yBGKK/G
-WWBL+ZTWXyL7HeiegGQdYUZxhfRvSN2qoMhU640EmfYkhvrR1Wvg/AyROdbI0Dhy
-7cRome00Rbxg0FybCP3QkWv2BYVb1Y9VL2mndRotr3tqOKmNoErveXUgeckqM/x1
-Bm3wud/MnqBDAOgU3e+IPOzkFYFPo2l4r1KaqQFyAyv4hsZoMHMZYOhye2lVTzp/
-+ad4ZSLQCwNXcPiXoeXm6MKAQjGLb+9zXtxOpm0NYPmTs2ynEhj5tR8OttA3rP6o
-4He60DRLixet6KjP
+    MIIDijCCAnICAQAwDQYJKoZIhvcNAQEFBQAwgYoxDTALBgNVBAoTBElNUEExDDAK
+BgNVBAsTA0NJTjEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEuYnIxFzAVBgNV
+BAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkG
+A1UEBhMCQlIxDTALBgNVBAMTBHJvc3MwHhcNMTQwOTMwMTg0MjE1WhcNMTcwOTI5
+MTg0MjE1WjCBijENMAsGA1UEChMESU1QQTEMMAoGA1UECxMDQ0lOMR0wGwYJKoZI
+hvcNAQkBFg5uZXRhZG1AaW1wYS5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
+cm9zczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZqzra9igATlWYM
+nWpR0mCkXBwbB1mMRmr7vJF9A9ZfKeF4ztOmG+6YRmCLZk8rbd+mhp4bPJ504hL5
+rSjixTm2IXf9XJHcFIQKZLkq77ZquBcdeYKGjkkRqlyFv4YdptJEgViamXqyL9Oj
+U3lbO5I7QLL5l255KUdsiYRxlAAdXJGv+7tglOXkcSf3c7+M3bgM151LruzoHRqM
+x8i5m5PL0Ve8hvUvPiuaPUxKEDRzqgxTCcyeoFTbgXV/P6vt+/LaNNFQia8mrmVV
+2w0LwoLF1NkFbbrSfFuxiMpPCV7voI0F8BLAjHZgZYCgj+e490QfdUCUscVR5xZc
+SssOYGUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQYIyUBaYYa+BI7KF3xLb2C6K
+J4PY4GkCxtWEYnaBZYRSsef85OgMT7r1F4finTBY3KfoCOt5Yti5TIkXtwxvoCTN
+nF68zBR55rLFO67LJWJ+B/aAazptn17X53wky+x7pdKASE54GcWhTxW9QEWVLaWD
+xu2Y7bPNIthUtiW9wmbWB+4fY4LhTVhcuh+/4xaFx/MVoTRhf2tFS6hBFeaUcsWT
+m/XJf5kBpLpV1G983akqJtH2D2IMJckYSQ67tUwWVpdXq3B1b8fwpnsl9H075UAD
+qwTl09UClG9hVUE5fDKSwyKE6DCq8Whg3Zb1EdVjTOncky3d7DkzttgD8YDqmA==
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -61,22 +64,25 @@ Bm3wud/MnqBDAOgU3e+IPOzkFYFPo2l4r1KaqQFyAyv4hsZoMHMZYOhye2lVTzp/
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIC2DCCAcACAQAwDQYJKoZIhvcNAQEFBQAwMjEMMAoGA1UECxMDQ0lOMQswCQYD
-VQQGEwJCUjEVMBMGA1UEAxMMcm9zcy5pbXBhLmJyMB4XDTE0MDQwOTE2NDEzMloX
-DTE5MDQwODE2NDEzMlowMjEMMAoGA1UECxMDQ0lOMQswCQYDVQQGEwJCUjEVMBMG
-A1UEAxMMcm9zcy5pbXBhLmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC
-AQEArp0q2Ul3/nuj8q0Ut/eYQn++cD+6PuSoxtIn9d/ZHGiGo0roJOk8/piqMy3P
-OrdUhWPEJhkOsi6xd0scmnYdo4dIdQWpnuB9fmTqziBRoI8YBWlsN+ha1/I0TiVA
-HmXoEQGK9EY9vZ06Gj8mtD9AqyG/VNLc9q9kyqIoBxYtQ7GLBk3vXrW7/o5ARIiA
-Ktr+4AQ9vhNt01XiMURyMU9erD42q4ZJxLg47H1Wl49dQUUJD2dxrOBDYhVKRZRn
-mbQe2pkwQlSuZOGU1kA0yi317kvIwEV2bpOGDh1SJ3Ywf8nfqlVqSHNo5zm8tqJT
-W4qBjuRUMmMPhSkoTi0MLAuf5QIDAQABMA0GCSqGSIb3DQEBBQUAA4IBAQAJAeBE
-/EyeWED6UkuhWLEW285gvSKjjFTVuhWLYvAzx4A0OtFLI7ZLw4Bsqrxf/yBGKK/G
-WWBL+ZTWXyL7HeiegGQdYUZxhfRvSN2qoMhU640EmfYkhvrR1Wvg/AyROdbI0Dhy
-7cRome00Rbxg0FybCP3QkWv2BYVb1Y9VL2mndRotr3tqOKmNoErveXUgeckqM/x1
-Bm3wud/MnqBDAOgU3e+IPOzkFYFPo2l4r1KaqQFyAyv4hsZoMHMZYOhye2lVTzp/
-+ad4ZSLQCwNXcPiXoeXm6MKAQjGLb+9zXtxOpm0NYPmTs2ynEhj5tR8OttA3rP6o
-4He60DRLixet6KjP
+MIIDijCCAnICAQAwDQYJKoZIhvcNAQEFBQAwgYoxDTALBgNVBAoTBElNUEExDDAK
+BgNVBAsTA0NJTjEdMBsGCSqGSIb3DQEJARYObmV0YWRtQGltcGEuYnIxFzAVBgNV
+BAcTDlJpbyBkZSBKYW5laXJvMRcwFQYDVQQIEw5SaW8gZGUgSmFuZWlybzELMAkG
+A1UEBhMCQlIxDTALBgNVBAMTBHJvc3MwHhcNMTQwOTMwMTg0MjE1WhcNMTcwOTI5
+MTg0MjE1WjCBijENMAsGA1UEChMESU1QQTEMMAoGA1UECxMDQ0lOMR0wGwYJKoZI
+hvcNAQkBFg5uZXRhZG1AaW1wYS5icjEXMBUGA1UEBxMOUmlvIGRlIEphbmVpcm8x
+FzAVBgNVBAgTDlJpbyBkZSBKYW5laXJvMQswCQYDVQQGEwJCUjENMAsGA1UEAxME
+cm9zczCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALZqzra9igATlWYM
+nWpR0mCkXBwbB1mMRmr7vJF9A9ZfKeF4ztOmG+6YRmCLZk8rbd+mhp4bPJ504hL5
+rSjixTm2IXf9XJHcFIQKZLkq77ZquBcdeYKGjkkRqlyFv4YdptJEgViamXqyL9Oj
+U3lbO5I7QLL5l255KUdsiYRxlAAdXJGv+7tglOXkcSf3c7+M3bgM151LruzoHRqM
+x8i5m5PL0Ve8hvUvPiuaPUxKEDRzqgxTCcyeoFTbgXV/P6vt+/LaNNFQia8mrmVV
+2w0LwoLF1NkFbbrSfFuxiMpPCV7voI0F8BLAjHZgZYCgj+e490QfdUCUscVR5xZc
+SssOYGUCAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAQYIyUBaYYa+BI7KF3xLb2C6K
+J4PY4GkCxtWEYnaBZYRSsef85OgMT7r1F4finTBY3KfoCOt5Yti5TIkXtwxvoCTN
+nF68zBR55rLFO67LJWJ+B/aAazptn17X53wky+x7pdKASE54GcWhTxW9QEWVLaWD
+xu2Y7bPNIthUtiW9wmbWB+4fY4LhTVhcuh+/4xaFx/MVoTRhf2tFS6hBFeaUcsWT
+m/XJf5kBpLpV1G983akqJtH2D2IMJckYSQ67tUwWVpdXq3B1b8fwpnsl9H075UAD
+qwTl09UClG9hVUE5fDKSwyKE6DCq8Whg3Zb1EdVjTOncky3d7DkzttgD8YDqmA==
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/rr.funet.fi.xml b/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
index 52415d75..52415d75 100644
--- a/swamid-interfederations-2.0/rr.funet.fi.xml
+++ b/swamid-interfederations-2.0/rr.funet.fi-attribute-test.xml
diff --git a/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml b/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml
deleted file mode 100644
index 4729be33..00000000
--- a/swamid-interfederations-2.0/rtrvirshib.ifmt.edu.br.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://rtrvirshib.ifmt.edu.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ifmt.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IFMT - Instituto Federal de Mato Grosso</mdui:Description>
-        <mdui:Description xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.ifmt.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.ifmt.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBElGTVQxDTAL
-BgNVBAsTBERHVEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzAN
-BgNVBAcTBkN1aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJS
-MR8wHQYDVQQDExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMB4XDTE0MDQxNzEyMzIw
-N1oXDTE5MDQxNjEyMzIwN1owgZQxDTALBgNVBAoTBElGTVQxDTALBgNVBAsTBERH
-VEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzANBgNVBAcTBkN1
-aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJSMR8wHQYDVQQD
-ExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA2eCAjelNjPyH/68OkUNA7eZF2Edd1saA5wL3uYVu7sF3+JeJ/VnL
-th4oBh/AEvoP6GribfKu9kL3la0j3M92Y0R50t/U/oesWlP571lmtt/ktGcrjXsG
-F//9EukOVOhN58kMF9D2ZAxvE2oTrlmwrzZk3ZdxAdmY4BxchfJms8EH9osCfiYC
-kIY/7lc2w3X9OME67Dvg9Z+5EF+KvYs8mkueMQh7azrXXHtcxG8RSpZsaORza6mc
-eA5nsPLpXp0/fr6rj47EZ0LHZdE74jGAdqMYheLwhH0BqlCdNrU+G2DhrsHXMK/A
-XFiaB9OluEe8Ofr41TxnAXrEkwA6CKlOhQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCRb5yEkQ9X4IuihBjIb/dI+BN08UCNdASV8qM7kdZU8JmlOyg8QgI6L8rhAEpO
-xY5xIBsfSHm50zgtHvSA8OW2SBL0TOOHQvvIyWDBpaUdy6kneJSqlzibpsOYfB92
-DguqBhy6NfQN+m1aSf7nqxbk0cIbj76eQiq139Gf1tHR9T/bR+ui9Qch4gKvEcxb
-JbfovcHp8joKV/PdoQ3Ibmu5JCwr8lvzgrsxyzO+x74LXE2DTY+eslmIZkBW4/xv
-vJ5FdfQheB90r4to4riv5EjWadshdQBgHaCHqLOrRgaFqHY4r6C6Ot8D8i26FXHq
-mmlVzkmXDVDPlyf/vhWQDReo
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://rtrvirshib.ifmt.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">ifmt.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIIDnjCCAoYCAQAwDQYJKoZIhvcNAQEFBQAwgZQxDTALBgNVBAoTBElGTVQxDTAL
-BgNVBAsTBERHVEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzAN
-BgNVBAcTBkN1aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJS
-MR8wHQYDVQQDExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMB4XDTE0MDQxNzEyMzIw
-N1oXDTE5MDQxNjEyMzIwN1owgZQxDTALBgNVBAoTBElGTVQxDTALBgNVBAsTBERH
-VEkxHzAdBgkqhkiG9w0BCQEWEGRndGlAaWZtdC5lZHUuYnIxDzANBgNVBAcTBkN1
-aWFiYTEUMBIGA1UECBMLTWF0byBHcm9zc28xCzAJBgNVBAYTAkJSMR8wHQYDVQQD
-ExZydHJ2aXJzaGliLmlmbXQuZWR1LmJyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA2eCAjelNjPyH/68OkUNA7eZF2Edd1saA5wL3uYVu7sF3+JeJ/VnL
-th4oBh/AEvoP6GribfKu9kL3la0j3M92Y0R50t/U/oesWlP571lmtt/ktGcrjXsG
-F//9EukOVOhN58kMF9D2ZAxvE2oTrlmwrzZk3ZdxAdmY4BxchfJms8EH9osCfiYC
-kIY/7lc2w3X9OME67Dvg9Z+5EF+KvYs8mkueMQh7azrXXHtcxG8RSpZsaORza6mc
-eA5nsPLpXp0/fr6rj47EZ0LHZdE74jGAdqMYheLwhH0BqlCdNrU+G2DhrsHXMK/A
-XFiaB9OluEe8Ofr41TxnAXrEkwA6CKlOhQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQCRb5yEkQ9X4IuihBjIb/dI+BN08UCNdASV8qM7kdZU8JmlOyg8QgI6L8rhAEpO
-xY5xIBsfSHm50zgtHvSA8OW2SBL0TOOHQvvIyWDBpaUdy6kneJSqlzibpsOYfB92
-DguqBhy6NfQN+m1aSf7nqxbk0cIbj76eQiq139Gf1tHR9T/bR+ui9Qch4gKvEcxb
-JbfovcHp8joKV/PdoQ3Ibmu5JCwr8lvzgrsxyzO+x74LXE2DTY+eslmIZkBW4/xv
-vJ5FdfQheB90r4to4riv5EjWadshdQBgHaCHqLOrRgaFqHY4r6C6Ot8D8i26FXHq
-mmlVzkmXDVDPlyf/vhWQDReo
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://rtrvirshib.ifmt.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</OrganizationName>
-    <OrganizationName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">IFMT - Instituto Federal de Mato Grosso</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">IFMT - Instituto Federal de Mato Grosso</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.ifmt.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.ifmt.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Diretoria de Gestao da Tecnologia da Informacao</SurName>
-    <EmailAddress>dgti@ifmt.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/saml-1.sys.kth.se.xml b/swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
index db7932d1..db7932d1 100644
--- a/swamid-interfederations-2.0/saml-1.sys.kth.se.xml
+++ b/swamid-interfederations-2.0/saml-1.sys.kth.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml
new file mode 100644
index 00000000..44e94517
--- /dev/null
+++ b/swamid-interfederations-2.0/saml.ps-ui-test.qalab.geant.net-perfsonar-ui.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="http://saml.ps-ui-test.qalab.geant.net/perfsonar-ui">
+  <!--
+		This is a perfsonarUI SP for Delivery of Advanced Network Technology to Europe Limited.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-10-17T10:07:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">GÉANT perfSONAR UI Test</mdui:DisplayName>
+        <mdui:Description xml:lang="en">GÉANT perfSONAR UI - testing instance</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRzCCAi+gAwIBAgIJAPW0ygzcXbqIMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MTAxNTE1MzQxMloX
+						DTE3MTAxNTE1MzQxMlowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
+						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC98MhL6OnVYsRP
+						WXeQsxSmCCKvfovv0fG9p7m0BmUe2ZIYYYgq/jM1A8mvnebREWRnJhTzpRMjvUNi
+						6hQE5poxBQk77MGzTbjNFVC4C8u0yvSrWqv5JxbsgBu+V9rRoOVaemlm3+LRpfqP
+						CBi0aeo1oImivuaaT5mnzBp6cNmT2CpiF/obM6r2m1GBquKUu533CnAks46gPTpP
+						zNufB0g9kIRq4FRE/Uk9Si1HkEfqOSKCMWwoOnM2KteZdh/Es87aOcvVAW+sS5Xg
+						kc8BGHA50reChQJMk1XwZa2dqVCT8V/0XzRBDTw5SzDayNE9k9dPxApkMotelhiC
+						Y6T4eZFRAgMBAAGjejB4MFcGA1UdEQRQME6CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
+						bnQubmV0hjBodHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
+						b25hci11aS8wHQYDVR0OBBYEFLXYmn/M+mCCItbU6rYMlxHSZxqUMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCKT4IkHvxOFluo5D/aNp+02GqjP0YY4dJFAuzfhBBq1XMkPyPV
+						lyiiPxy4aOeTPgslc44bZzyCgVGZ5REXi667pcs03fpRMu74VSnMknrq/rwt6D3A
+						/s/dLQia27XeAI8g3NWgIeJ/Gg3RHPUeRL7Eus0nc9KSOeX6+hXiHti3Gsbe72lb
+						an/pPnEB3tlAZCbeecFyBM4XdIddT7F7fJxAQKi/bqqGVWcRBXc9UmvbU/GvTfhe
+						GlIu7tlcr20dwyEFKAxGqQVwA+3ozJZGOq+slVI2m279Won2U02j2dhZ9NR+eq5L
+						IkmaapKEWWS06DA57QiaHmqefKuOxprx3cZR
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDRzCCAi+gAwIBAgIJAPW0ygzcXbqIMA0GCSqGSIb3DQEBBQUAMCUxIzAhBgNV
+						BAMTGnBzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0MB4XDTE0MTAxNTE1MzQxMloX
+						DTE3MTAxNTE1MzQxMlowJTEjMCEGA1UEAxMacHMtdWktdGVzdC5xYWxhYi5nZWFu
+						dC5uZXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC98MhL6OnVYsRP
+						WXeQsxSmCCKvfovv0fG9p7m0BmUe2ZIYYYgq/jM1A8mvnebREWRnJhTzpRMjvUNi
+						6hQE5poxBQk77MGzTbjNFVC4C8u0yvSrWqv5JxbsgBu+V9rRoOVaemlm3+LRpfqP
+						CBi0aeo1oImivuaaT5mnzBp6cNmT2CpiF/obM6r2m1GBquKUu533CnAks46gPTpP
+						zNufB0g9kIRq4FRE/Uk9Si1HkEfqOSKCMWwoOnM2KteZdh/Es87aOcvVAW+sS5Xg
+						kc8BGHA50reChQJMk1XwZa2dqVCT8V/0XzRBDTw5SzDayNE9k9dPxApkMotelhiC
+						Y6T4eZFRAgMBAAGjejB4MFcGA1UdEQRQME6CGnBzLXVpLXRlc3QucWFsYWIuZ2Vh
+						bnQubmV0hjBodHRwczovL3BzLXVpLXRlc3QucWFsYWIuZ2VhbnQubmV0L3BlcmZz
+						b25hci11aS8wHQYDVR0OBBYEFLXYmn/M+mCCItbU6rYMlxHSZxqUMA0GCSqGSIb3
+						DQEBBQUAA4IBAQCKT4IkHvxOFluo5D/aNp+02GqjP0YY4dJFAuzfhBBq1XMkPyPV
+						lyiiPxy4aOeTPgslc44bZzyCgVGZ5REXi667pcs03fpRMu74VSnMknrq/rwt6D3A
+						/s/dLQia27XeAI8g3NWgIeJ/Gg3RHPUeRL7Eus0nc9KSOeX6+hXiHti3Gsbe72lb
+						an/pPnEB3tlAZCbeecFyBM4XdIddT7F7fJxAQKi/bqqGVWcRBXc9UmvbU/GvTfhe
+						GlIu7tlcr20dwyEFKAxGqQVwA+3ozJZGOq+slVI2m279Won2U02j2dhZ9NR+eq5L
+						IkmaapKEWWS06DA57QiaHmqefKuOxprx3cZR
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ps-ui-test.qalab.geant.net/perfsonar-ui/saml/SAMLAssertionConsumer" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">GÉANT perfSONAR UI Test</ServiceName>
+      <ServiceDescription xml:lang="en">GÉANT perfSONAR UI - testing instance</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.geant.net/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <Company>DANTE IT Support</Company>
+    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>DANTE IT</Company>
+    <EmailAddress>mailto:it@dante.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml b/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml
index f4ba77d0..f4ba77d0 100644
--- a/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br.xml
+++ b/swamid-interfederations-2.0/sau09ret.ifbaiano.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml b/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
new file mode 100644
index 00000000..5e686e42
--- /dev/null
+++ b/swamid-interfederations-2.0/science-gateway.chain-project.eu-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://science-gateway.chain-project.eu/shibboleth">
+  <Extensions>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmlenc#sha256"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha224"/>
+    <alg:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha512"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha384"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2001/04/xmldsig-more#rsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2009/xmldsig11#dsa-sha256"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
+    <alg:SigningMethod Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T07:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">CHAIN-REDS Science Gateway</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">CHAIN-REDS Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The CHAIN-REDS Science Gateway is a standard-based web 2.0 platform to show the use cases and other demonstrative applications identified by the CHAIN-REDS project (www.chain-project.eu) and execute them on a worldwide e-Infrastructure based on different paradigms (Grid, Cloud and local HPC Cluster Computing)</mdui:Description>
+        <mdui:Description xml:lang="it">Il Sciece Gateway del progetto CHAIN-REDS e' una piattaforma web 2.0 basata su standard avente la finilita'  di mostrare speciali casi d'uso ed appicazioni identificate all'interno del progetto (www.chain-project.eu) ed eseguire queste su una infrastruttura di calcolo distribuita su base mondiale e con differenti paradigmi (grid, cloud, HPC)</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://science-gateway.chain-project.eu/service</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://science-gateway.chain-project.eu/service</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://science-gateway.chain-project.eu/policy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://science-gateway.chain-project.eu/policy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIE6TCCA9GgAwIBAgIRANEjD1aUdtcPPWqsYvlNii0wDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjA1MTUwMDAwMDBaFw0xNTA1MTUyMzU5NTlaMHoxCzAJBgNV
+BAYTAklUMS4wLAYDVQQKEyVJc3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51
+Y2xlYXJlMRMwEQYDVQQLEwpJTkZOLVJPTUEzMSYwJAYDVQQDEx1zY2llbmNlLWdh
+dGV3YXkucm9tYTMuaW5mbi5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAMuILctwFvSF9Yr4Nm5pWLH5WYaUBIA7rv0AN4pMaB9hnvuqq8I4Tmi+FlkG
+sI0EmsCO99y+6yo9C8MpALmJSkna2G/+yw9e7C3Ze0nYUXgvR7PEk14ad3d699zM
+Wk8NN/6wrwx5H99wkIs9xygXqXvYZkv5jp8wfGIXhf5UBCp4a8JR+v2ztOsWpC9T
+oLUDFZdd1Ho7aV9DDqyVyHvVhRqkMKXsKJEZ0D5QJMNAcoRChWncs7xJnNUTh4ZZ
+Od0vqp7hqSlI+fX82QHjN6f4lnKAytcBczG5RTfXqYkaxkH/AXVSMfI2gw3zx18s
+XayRZZsutAZhLabY05URI2Ni5fMCAwEAAaOCAawwggGoMB8GA1UdIwQYMBaAFAy9
+k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQoCA4lGZcVFGnG4UnclARLBiwF
+rjAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEF
+BQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8E
+MzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENB
+LmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNz
+LnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8v
+b2NzcC50Y3MudGVyZW5hLm9yZzBkBgNVHREEXTBbgh1zY2llbmNlLWdhdGV3YXku
+cm9tYTMuaW5mbi5pdIIYZ3JpZHNydi0wMy5yb21hMy5pbmZuLml0giBzY2llbmNl
+LWdhdGV3YXkuY2hhaW4tcHJvamVjdC5ldTANBgkqhkiG9w0BAQUFAAOCAQEAg4oZ
+gRrEtULAKSkLPZrmmESdqUdVmgMooDo5sknJ9FClzqEHBCVgMp0R/Lu3oZw9kM/2
+F8ImmlWB6oLEkuArS892zIiurvfqEVDRT0Va7UN1tbbC1u8MtzrO3fqJkCtN3lP7
++AP9hKxecl638JNYqMnVGPq7bgAUIq4bkiJMWrymmbYp/Ru0ZhNXCUt8dH54SMKc
+73DGb2MPM2kDVwtfWci9zMrgRgz2EgYU8coHbgap+pTN/It3I4Swlx7tTtDScQ6Q
++3BiBRBlmvGinE8WshaUxHGcZ7k84AykVo99TMQPgjPJ3JHlFihk3dTtdXnOHH51
+uYYzGifeDE10paSw+w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://science-gateway.chain-project.eu/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">CHAIN-REDS Science Gateway</ServiceName>
+      <ServiceDescription xml:lang="en">The CHAIN-REDS Science Gateway is a standard-based web 2.0 platform to show the use cases and other demonstrative applications identified by the CHAIN-REDS project (www.chain-project.eu) and execute them on a worldwide e-Infrastructure based on different paradigms (Grid, Cloud and local HPC Cluster Computing)</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">INFN ROMA3</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">INFN ROMA3</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.roma3.infn.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml b/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml
index c5dbbd20..c5dbbd20 100644
--- a/swamid-interfederations-2.0/sdauth.sciencedirect.com.xml
+++ b/swamid-interfederations-2.0/sdauth.sciencedirect.com-.xml
diff --git a/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml b/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
new file mode 100644
index 00000000..a83caf47
--- /dev/null
+++ b/swamid-interfederations-2.0/sds.geschkult.fu-berlin.de-shibboleth.xml
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sds.geschkult.fu-berlin.de/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-11-06T13:57:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Kunst und Funktion</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Kunst und Funktion</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</mdui:Description>
+        <mdui:Description xml:lang="en">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.kunst-und-funktion.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.kunst-und-funktion.de/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sds.geschkult.fu-berlin.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sds.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFsTCCBJmgAwIBAgIHE7TkxI/mSTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
+ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
+A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
+HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTQyOTA4WhcN
+MTcwNDIyMTQyOTA4WjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
+MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
+bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
+d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMTGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
+LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxQiC2Eb0zNzFtrlQ
+FMqNF4v5tTD2G4MRUDCu6j2q44u6KIq8MmUj0kmEEEwPp+SM2KgBjvWGFbi6JRxo
+KVPgqo7lSMSOxWzvPtdpMet5FNWl1fMCRff35GsWHb9eM7eE6QZDc4zNyyOCWHYk
+f/fwzWk4a5asHg00+92I1WI9+6Qud5IR4jrvoMG7Jbt3vZQLJeCxiwdiNaK+5QxO
+p/H4zXwqrUZsGCovnpgTYXJ70blUzgScyeDc0mceFActrimEfWgSM0jCIsqSALDF
+PSeQLDrLYmFsp/qWN/UeTU2KvO05CQc88f4OcwwTyZ9Bz8M2XElXT9g47eZQDImh
+PFl+PwIDAQABo4IBxDCCAcAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIw
+CQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
+AQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSMEGDAW
+gBQG4T30b/Qwt3o7V7AxBYl7DVhabDAfBgNVHREEGDAWgRRqLnBvc2VsQGZ1LWJl
+cmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCB
+gDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIv
+Y2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5k
+Zm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
+A4IBAQAfB2BcEnVLU64XzvGRlQsoBDONqU0V47hoYMp+fazwwrFpnd4abnN9afd9
+6WTw+w8iPtouHwDBk2ug+y/O9qKWQ/xcnpHxY/8kTFFfL/l4kqTez1+YlPdcSBOc
+xvUVpkOhTzz/NHnOugGURzx0yr5Ed+qjizYuRXY+b5rCpQuvL+XqeHlCE68sPvpK
+T25BX08SdKK4f0oRnXWWh2QCYQ/4NIWv08ONldVPdtAxk8PBmDuoCG/YIlx9dYiN
+XWJJd+8bBwrHOLmMkpGeRTPkylm/xxzaiar+bcLgovnoDgYHtdwLsFqfz6udseTN
+hxwSl97R2/aZr5SYew488kLknAEp
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sds.geschkult.fu-berlin.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sds.geschkult.fu-berlin.de,OU=Fachbereich Geschichts- und Kulturwissenschaften,O=Freie Universitaet Berlin,L=Berlin,ST=Berlin,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIFsTCCBJmgAwIBAgIHE7TkxI/mSTANBgkqhkiG9w0BAQUFADCBtTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJlcmxpbjEPMA0GA1UEBxMGQmVybGluMSIwIAYDVQQK
+ExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVybGluMQ4wDAYDVQQLEwVaRURBVDEwMC4G
+A1UEAxMnRnJlaWUgVW5pdmVyc2l0YWV0IEJlcmxpbiAtIEZVLUNBIC0gRzAxMR4w
+HAYJKoZIhvcNAQkBFg9jYUBGVS1CZXJsaW4uREUwHhcNMTIwNDIzMTQyOTA4WhcN
+MTcwNDIyMTQyOTA4WjCBszELMAkGA1UEBhMCREUxDzANBgNVBAgTBkJlcmxpbjEP
+MA0GA1UEBxMGQmVybGluMSIwIAYDVQQKExlGcmVpZSBVbml2ZXJzaXRhZXQgQmVy
+bGluMTkwNwYDVQQLEzBGYWNoYmVyZWljaCBHZXNjaGljaHRzLSB1bmQgS3VsdHVy
+d2lzc2Vuc2NoYWZ0ZW4xIzAhBgNVBAMTGnNkcy5nZXNjaGt1bHQuZnUtYmVybGlu
+LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxQiC2Eb0zNzFtrlQ
+FMqNF4v5tTD2G4MRUDCu6j2q44u6KIq8MmUj0kmEEEwPp+SM2KgBjvWGFbi6JRxo
+KVPgqo7lSMSOxWzvPtdpMet5FNWl1fMCRff35GsWHb9eM7eE6QZDc4zNyyOCWHYk
+f/fwzWk4a5asHg00+92I1WI9+6Qud5IR4jrvoMG7Jbt3vZQLJeCxiwdiNaK+5QxO
+p/H4zXwqrUZsGCovnpgTYXJ70blUzgScyeDc0mceFActrimEfWgSM0jCIsqSALDF
+PSeQLDrLYmFsp/qWN/UeTU2KvO05CQc88f4OcwwTyZ9Bz8M2XElXT9g47eZQDImh
+PFl+PwIDAQABo4IBxDCCAcAwHAYDVR0gBBUwEzARBg8rBgEEAYGtIYIsAQEEAgIw
+CQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsG
+AQUFBwMBMB0GA1UdDgQWBBS+8dPy2YsDwhLcALXLrUDmTPk7oTAfBgNVHSMEGDAW
+gBQG4T30b/Qwt3o7V7AxBYl7DVhabDAfBgNVHREEGDAWgRRqLnBvc2VsQGZ1LWJl
+cmxpbi5kZTB1BgNVHR8EbjBsMDSgMqAwhi5odHRwOi8vY2RwMS5wY2EuZGZuLmRl
+L2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDSgMqAwhi5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL2Z1LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGQBggrBgEFBQcBAQSBgzCB
+gDA+BggrBgEFBQcwAoYyaHR0cDovL2NkcDEucGNhLmRmbi5kZS9mdS1jYS9wdWIv
+Y2FjZXJ0L2NhY2VydC5jcnQwPgYIKwYBBQUHMAKGMmh0dHA6Ly9jZHAyLnBjYS5k
+Zm4uZGUvZnUtY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUA
+A4IBAQAfB2BcEnVLU64XzvGRlQsoBDONqU0V47hoYMp+fazwwrFpnd4abnN9afd9
+6WTw+w8iPtouHwDBk2ug+y/O9qKWQ/xcnpHxY/8kTFFfL/l4kqTez1+YlPdcSBOc
+xvUVpkOhTzz/NHnOugGURzx0yr5Ed+qjizYuRXY+b5rCpQuvL+XqeHlCE68sPvpK
+T25BX08SdKK4f0oRnXWWh2QCYQ/4NIWv08ONldVPdtAxk8PBmDuoCG/YIlx9dYiN
+XWJJd+8bBwrHOLmMkpGeRTPkylm/xxzaiar+bcLgovnoDgYHtdwLsFqfz6udseTN
+hxwSl97R2/aZr5SYew488kLknAEp
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Artifact"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SLO/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/NIM/SOAP"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML/POST" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/Artifact" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sds.geschkult.fu-berlin.de/Shibboleth.sso/SAML2/POST-SimpleSign" index="11"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">Kunst und Funktion</ServiceName>
+      <ServiceName xml:lang="en">Kunst und Funktion</ServiceName>
+      <ServiceDescription xml:lang="de">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</ServiceDescription>
+      <ServiceDescription xml:lang="en">Die Geschichte der Kunst im Wandel ihrer Funktionen", kurz "Kunst und Funktion" genannt, ist ein Internet-Lernprogramm, das einen Überblick über die Kunstgeschichte in 30 Kapiteln unter der besonderen Fragestellung der Funktion von Kunst bietet.</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e5</OrganizationName>
+    <OrganizationName xml:lang="en">e5</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Freie Universität Berlin</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Freie Universität Berlin</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
+    <OrganizationURL xml:lang="en">https://identity.fu-berlin.de/idp-fub/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Johannes</GivenName>
+    <SurName>Posel</SurName>
+    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Steffen</GivenName>
+    <SurName>Hofmann</SurName>
+    <EmailAddress>mailto:fudis@zedat.fu-berlin.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Johannes</GivenName>
+    <SurName>Posel</SurName>
+    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Johannes</GivenName>
+    <SurName>Posel</SurName>
+    <EmailAddress>mailto:support@geschkult.fu-berlin.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml b/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml
new file mode 100644
index 00000000..eb612c83
--- /dev/null
+++ b/swamid-interfederations-2.0/search.de.dariah.eu-schereg.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://search.de.dariah.eu/schereg">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-04-11T07:22:30Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://search.de.dariah.eu/schereg/saml/login/alias/schereg?disco=true" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">DARIAH Schema Registry</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">DARIAH Schema Registry</mdui:DisplayName>
+        <mdui:Description xml:lang="de">DARIAH Schema Registry</mdui:Description>
+        <mdui:Description xml:lang="en">DARIAH Schema Registry</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://dariah.eu/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://dariah.eu/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
+NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
+VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
+nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
+pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
+PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
+TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
+wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
+ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
+Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
+N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
+3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
+CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
+Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
+VJ2CRsza
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>search.de.dariah.eu</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=search.de.dariah.eu,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGAjCCBOqgAwIBAgIHF0FMzwiCfDANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xNDAzMTMxNTMxMTJaFw0xOTAzMTIx
+NTMxMTJaMIGHMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMRwwGgYDVQQDExNzZWFyY2guZGUuZGFyaWFoLmV1
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu7pmrlhefv+M2gPqsZGL
+VcaIqF4WYCm6UGO6P2CzjPCMXOoXdHI5dCTAPl0moSDoTLIJ9PHrCsel5qpdblfh
+nuB7b2TbeehaE/kZqduvcbZn3/TTOdax6dwmlbQbbkwEjPcLTiII1co9vccN3OJj
+pClCGbM+g4iPYtqRcSJlmgh6sbyEi8GaRSt/hrVjLz7LgLA4zlwFNCWvwWnapNOw
+PgVINO1PUW7/gUuqaXD4nigvvJueyj5vI17/7XTOJNVOQGdx+WnPutdJupqFR967
+TGKMCYwZivzMh+a36onE+N81dMRERNa+xUbaef0JmWodMRRJX/XINEmNMtvGgB3A
+wQIDAQABo4ICSDCCAkQwOQYDVR0gBDIwMDARBg8rBgEEAYGtIYIsAQEEAwEwEQYP
+KwYBBAGBrSGCLAIBBAMBMAgGBmeBDAECAjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIE
+8DAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwHQYDVR0OBBYEFCCZUdbp
+ix/yKKub4Cu5WlpydwXbMB8GA1UdIwQYMBaAFB29c8xt7m4cdHDZoxs6uqgn3rzr
+MB4GA1UdEQQXMBWCE3NlYXJjaC5kZS5kYXJpYWguZXUwgY8GA1UdHwSBhzCBhDBA
+oD6gPIY6aHR0cDovL2NkcDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9w
+dWIvY3JsL2NhY3JsLmNybDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNybDCB3QYIKwYBBQUHAQEE
+gdAwgc0wMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NTUC1T
+ZXJ2ZXIvT0NTUDBKBggrBgEFBQcwAoY+aHR0cDovL2NkcDEucGNhLmRmbi5kZS91
+bmktZ29ldHRpbmdlbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQCATCaFTv5NkXiH
+Gqk6O1y9Zkt7MtJheq1ATf2itAeCHVIapN6damvsHhb5IUwKu4pSAyT4h5c6PCiK
+N7f+C0KJPSbH7yEz62BdSa2n+Ut+L8rdz2KjxYC3LMtZgJDOCqVP9c3JL6zGQItA
+3RaIPoIzrB4kD/pJz3I2Tl7JfbnYSDtTaLVzysHtuApY5N+zjLJ54GokAlB5hjcm
+CTn74yz2sDJeQUgUC5DqgxOsPHcnqbNd999xBtDgHZ6xIJwVGhGaTKd1dp7XqH/b
+Lw95jxPRFCuuzadG3QQwB3TtR4fzqDp1envPT4sfv3fvuMd9uKd1AVZhQT4Ekknp
+VJ2CRsza
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/schereg/saml/SingleLogout/alias/schereg"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://search.de.dariah.eu/schereg/saml/SingleLogout/alias/schereg"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://search.de.dariah.eu/schereg/saml/SSO/alias/schereg" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://search.de.dariah.eu/schereg/saml/SSO/alias/schereg" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">DARIAH Schema Registry</ServiceName>
+      <ServiceName xml:lang="en">DARIAH Schema Registry</ServiceName>
+      <ServiceDescription xml:lang="de">DARIAH Schema Registry</ServiceDescription>
+      <ServiceDescription xml:lang="en">DARIAH Schema Registry</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e112</OrganizationName>
+    <OrganizationName xml:lang="en">e112</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Tobias</GivenName>
+    <SurName>Gradl</SurName>
+    <EmailAddress>mailto:tobias.gradl@uni-bamberg.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Dariah</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:register@dariah.eu</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/search.de.dariah.eu.xml b/swamid-interfederations-2.0/search.de.dariah.eu-search.xml
index c2382cfd..c2382cfd 100644
--- a/swamid-interfederations-2.0/search.de.dariah.eu.xml
+++ b/swamid-interfederations-2.0/search.de.dariah.eu-search.xml
diff --git a/swamid-interfederations-2.0/sesame.ifsttar.fr.xml b/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml
index c24c4337..ac384ef7 100644
--- a/swamid-interfederations-2.0/sesame.ifsttar.fr.xml
+++ b/swamid-interfederations-2.0/sesame.ifsttar.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ifsttar.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml b/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
new file mode 100644
index 00000000..b0714fb8
--- /dev/null
+++ b/swamid-interfederations-2.0/sgw.africa-grid.org-shibboleth.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://sgw.africa-grid.org/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-27T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">
+                        Africa Grid Science Gateway
+                    </mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">
+                        Africa Grid Science Gateway
+                    </mdui:DisplayName>
+        <mdui:Description xml:lang="en">
+                        This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
+                    </mdui:Description>
+        <mdui:Description xml:lang="it">
+                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi Grid sviluppati per il progetto eI4Africa
+                    </mdui:Description>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
+VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
+EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
+c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
+T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
+3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
+O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
+i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
+LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
+TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
+AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
+BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
+A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
+IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
+KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
+AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
+Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
+ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
+ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
+bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
+LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
+ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
+cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
+iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
+PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
+n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
+zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
+2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
+j/MCNlE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Africa Grid Science Gateway</ServiceName>
+      <ServiceDescription xml:lang="en">
+                    This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
+                </ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Consorzio COMETA</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">COMETA</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Marco</GivenName>
+    <SurName>Fargetta</SurName>
+    <EmailAddress>mailto:marco.fargetta@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Roberto</GivenName>
+    <SurName>Barbera</SurName>
+    <EmailAddress>mailto:roberto.barbera@ct.infn.it</EmailAddress>
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.africa-grid.org.xml b/swamid-interfederations-2.0/sgw.africa-grid.org.xml
deleted file mode 100644
index 85fc870f..00000000
--- a/swamid-interfederations-2.0/sgw.africa-grid.org.xml
+++ /dev/null
@@ -1,113 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.africa-grid.org/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-27T09:58:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">
-                        Africa Grid Science Gateway
-                    </mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">
-                        Africa Grid Science Gateway
-                    </mdui:DisplayName>
-        <mdui:Description xml:lang="en">
-                        This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
-                    </mdui:Description>
-        <mdui:Description xml:lang="it">
-                        Questo servizio permette l'accesso e l'uso delle applicazioni/servizi Grid sviluppati per il progetto eI4Africa
-                    </mdui:Description>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.africa-grid.org/Shibboleth.sso/DS" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www.catania-science-gateways.it</ds:KeyName>
-        <ds:KeyName>aginfra-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>cogito-med.ct.infn.it</ds:KeyName>
-        <ds:KeyName>earthserver-sg.consorzio-cometa.it</ds:KeyName>
-        <ds:KeyName>ecsg.dch-rp.eu</ds:KeyName>
-        <ds:KeyName>garr-sg.ct.infn.it</ds:KeyName>
-        <ds:KeyName>klios.ct.infn.it</ds:KeyName>
-        <ds:KeyName>liferay2.ct.infn.it</ds:KeyName>
-        <ds:KeyName>sgw.africa-grid.org</ds:KeyName>
-        <ds:KeyName>www.progetto-icaro.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www.catania-science-gateways.it,OU=COMETA,O=Istituto Nazionale di Fisica Nucleare,street=Via S.Sofia n.64,L=Catania,ST=Italy,postalCode=95123,C=IT</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF0TCCBLmgAwIBAgIRAJjvs9uxU/ydSPVPqQh6szEwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzAxMDcwMDAwMDBaFw0xNjAxMDcyMzU5NTlaMIHFMQswCQYD
-                            VQQGEwJJVDEOMAwGA1UEERMFOTUxMjMxDjAMBgNVBAgTBUl0YWx5MRAwDgYDVQQH
-                            EwdDYXRhbmlhMRkwFwYDVQQJExBWaWEgUy5Tb2ZpYSBuLjY0MS4wLAYDVQQKEyVJ
-                            c3RpdHV0byBOYXppb25hbGUgZGkgRmlzaWNhIE51Y2xlYXJlMQ8wDQYDVQQLEwZD
-                            T01FVEExKDAmBgNVBAMTH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0ZXdheXMuaXQw
-                            ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDMR2RMw4cNImWSKdvZjDhz
-                            3JuO7/pMOnGw4hF6uu09cqX8qqBpkU/gd33xq7J254ojywwiIlLT7QaTce4YQU2W
-                            O5mPyqdHjnpA+C0fJWrQgRyJEXsOzwpxyUG42tim/9jgNNDaUuNSGgrMLGlzl0sU
-                            i3Cq04AY0hukrtFGe6DFvDsm8xoNwfV8jmO3IipWJdJdezRnCGDgTZqgIWj3yrHo
-                            LjfgLbs85AJ31plMahcEni1jDZYgzu7FurbKpO4FGSLUEI8VUxncdYx3IWidqYBD
-                            TjxFGIiRIcD59DTIBxZYT4IgGHhG1whnUtE7nZhtuxFvnxfH4gPi7mPcRwidNHg9
-                            AgMBAAGjggJIMIICRDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAd
-                            BgNVHQ4EFgQU+qOkofxo+Ei3aGD2lLEkM4L7LS0wDgYDVR0PAQH/BAQDAgWgMAwG
-                            A1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMCIGA1Ud
-                            IAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQICMDoGA1UdHwQzMDEwL6AtoCuG
-                            KWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsG
-                            AQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9y
-                            Zy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50
-                            ZXJlbmEub3JnMIH1BgNVHREEge0wgeqCH3d3dy5jYXRhbmlhLXNjaWVuY2UtZ2F0
-                            ZXdheXMuaXSCFWFnaW5mcmEtc2cuY3QuaW5mbi5pdIIVY29naXRvLW1lZC5jdC5p
-                            bmZuLml0giJlYXJ0aHNlcnZlci1zZy5jb25zb3J6aW8tY29tZXRhLml0gg5lY3Nn
-                            LmRjaC1ycC5ldYISZ2Fyci1zZy5jdC5pbmZuLml0ghBrbGlvcy5jdC5pbmZuLml0
-                            ghNsaWZlcmF5Mi5jdC5pbmZuLml0ghNzZ3cuYWZyaWNhLWdyaWQub3JnghV3d3cu
-                            cHJvZ2V0dG8taWNhcm8uaXQwDQYJKoZIhvcNAQEFBQADggEBAIzikPZKDI8rXlUU
-                            iF8KUeEVYZMyBfRtl0sQYBZCprDoVpCr74CPTxQ72Jrh2mD8oAz0ZYVgOA19AbM8
-                            PskJlhx4bmDJvWU/C2FrOgYDNg9Tl7dqLnr18GDt7DuC0KXCDupgtBmwy7mayNgA
-                            n2jbIaYsfMI7k1msS1XoaVX7kBMgmeGY3V11Om9Te7iMWKFOhpavI2hbf741ODtV
-                            zBen58Q2WzjVEKVQYbY7UgtcYzOM44GhMcdS65lLsBviK7HzyB6I5Iu3TR0bcpFE
-                            2V4bd6L5foq3Qn+WO9wqOwnOk3qfD/TQId7NWv0ZE2vp8fPPaaRF2XcA7Qh5xltt
-                            j/MCNlE=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.africa-grid.org/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Africa Grid Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">
-                    This service allows to use on a Grid infrastructure the lighthouse applications of the eI4Africa project
-                </md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consorzio COMETA</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">COMETA</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.consorzio-cometa.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Marco</md:GivenName>
-    <md:SurName>Fargetta</md:SurName>
-    <md:EmailAddress>mailto:marco.fargetta@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="administrative">
-    <md:GivenName>Roberto</md:GivenName>
-    <md:SurName>Barbera</md:SurName>
-    <md:EmailAddress>mailto:roberto.barbera@ct.infn.it</md:EmailAddress>
-    <md:EmailAddress>mailto:credentials-admin@ct.infn.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml b/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
new file mode 100644
index 00000000..cc954d3f
--- /dev/null
+++ b/swamid-interfederations-2.0/sgw.garr.it-shibboleth.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://sgw.garr.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-09T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.garr.it/Shibboleth.sso/DS"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.garr.it/Shibboleth.sso/DS" index="1"/>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="it">GARR - Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud
+                    </mdui:Description>
+        <mdui:InformationURL xml:lang="it">http://sgw.garr.it</mdui:InformationURL>
+        <mdui:DisplayName xml:lang="en">GARR - Science Gateway</mdui:DisplayName>
+        <mdui:Description xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.
+                    </mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://sgw.garr.it</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIE6DCCA9CgAwIBAgIQDb4u4turk6L4quPPEEv+kjANBgkqhkiG9w0BAQUFADA/
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEg
+ZVNjaWVuY2UgU1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE1MDExMjIzNTk1OVow
+gYIxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmEx
+EzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZh
+bGlkYXRlZDEbMBkGA1UEAxMSc2ctbGlmZXJheS5nYXJyLml0MIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyBpspPbjl5JERSur4StdxTTFFaObxEY/opI9
+17VRD4KmiPcPfbSUYEfgI4h1e6fSylMwg2sVws1uISJm9mYrzFivRX62N92ALgfS
+nUn8/YOryuRaGUi2VWD2k93uP0wwY+4uOj0my0KWKI5maZ22pTyzjTmq+vmm9IQL
+T1e4SInE/p1KQQYdmdeQ1IHu/M0yxOuo6evQ6o4x6asDFXYiAc8n/KJbZmwj7y9b
+3pVH3Ra5v8dmvlEaii17T7UdyKL4y+70Wntm6gU4vAaGwVn9r7V9hbbIPbK8jndO
+fjlXa5ze2naHKqTcIpWAYx787G333EviWMlMZwUB+GaEN4R76wIDAQABo4IBmjCC
+AZYwHwYDVR0jBBgwFoAUI9OXvcDYoZRhiA2Ftsx1n8l5O5IwHQYDVR0OBBYEFDrj
+WiJIiSmHLfoC++tXo3MW9s0iMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAwBgNVHSAEKTAnMA0GCysG
+AQQBsjEBAgIdMAwGCiqGSIb3TAUCAgEwCAYGZ4EMAQIBMEIGA1UdHwQ7MDkwN6A1
+oDOGMWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xD
+QS5jcmwwdQYIKwYBBQUHAQEEaTBnMD0GCCsGAQUFBzAChjFodHRwOi8vY3J0LnRj
+cy50ZXJlbmEub3JnL1RFUkVOQWVTY2llbmNlU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
+hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAqBgNVHREEIzAhghJzZy1saWZl
+cmF5LmdhcnIuaXSCC3Nndy5nYXJyLml0MA0GCSqGSIb3DQEBBQUAA4IBAQBfUy8v
+GupDJmcDTmNSx5kse8NfmSB1kbwM96IE7Eap+/VgNiIeOwjAyfK2gafLfD4QCYao
+1WQvBPqoqY3h14Wsbl5SRRRS+G6oj4x51YVvm7D6kgh4E5wlqfMPbDsZtGnkfh/m
+ZsTEL1Ixz6dT6PSzsqu5tPa9RnwNtBL+rRCW7OUfs6MPxofNmu+GCry8/6gZy2Rd
+yxyH2bHQkbZCMSil/2cvX/3ib2mg+eYrlZQywmRtWL92UtJoKlt96K1RYUKXdfIq
+Pm6o7CRIyLzXCIKWimG/PIPiJ0GNH1K2+X54yM/tV+bsjBCHlQe8RpUVKxzm5dtG
+zkkOSinydr85B7LG
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
+      <EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="it">GARR Science Gateway</ServiceName>
+      <ServiceName xml:lang="en">GARR Science Gateway</ServiceName>
+      <ServiceDescription xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud</ServiceDescription>
+      <ServiceDescription xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="it">Consortium GARR</OrganizationName>
+    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
+    <OrganizationDisplayName xml:lang="it">GARR Science Gateway erogato da Consortium GARR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">GARR Science Gateway provided by Consortium GARR</OrganizationDisplayName>
+    <OrganizationURL xml:lang="it">http://www.garr.it/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.garr.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>sgwadmin@garr.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sgw.garr.it.xml b/swamid-interfederations-2.0/sgw.garr.it.xml
deleted file mode 100644
index 17b98bd2..00000000
--- a/swamid-interfederations-2.0/sgw.garr.it.xml
+++ /dev/null
@@ -1,98 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sgw.garr.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-05-11T00:45:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sgw.garr.it/Shibboleth.sso/DS"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sgw.garr.it/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="it">GARR - Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud
-                    </mdui:Description>
-        <mdui:InformationURL xml:lang="it">http://sgw.garr.it</mdui:InformationURL>
-        <mdui:DisplayName xml:lang="en">GARR - Science Gateway</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.
-                    </mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://sgw.garr.it</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://sgw.garr.it/policy/</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>sg-liferay.garr.it</ds:KeyName>
-        <ds:KeyName>sgw.garr.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=sg-liferay.garr.it,OU=Domain Control Validated,DC=tcs,DC=terena,DC=org</ds:X509SubjectName>
-          <ds:X509Certificate>MIIE6DCCA9CgAwIBAgIQDb4u4turk6L4quPPEEv+kjANBgkqhkiG9w0BAQUFADA/
-                            MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMR8wHQYDVQQDExZURVJFTkEg
-                            ZVNjaWVuY2UgU1NMIENBMB4XDTEzMTIxMzAwMDAwMFoXDTE1MDExMjIzNTk1OVow
-                            gYIxEzARBgoJkiaJk/IsZAEZFgNvcmcxFjAUBgoJkiaJk/IsZAEZFgZ0ZXJlbmEx
-                            EzARBgoJkiaJk/IsZAEZFgN0Y3MxITAfBgNVBAsTGERvbWFpbiBDb250cm9sIFZh
-                            bGlkYXRlZDEbMBkGA1UEAxMSc2ctbGlmZXJheS5nYXJyLml0MIIBIjANBgkqhkiG
-                            9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyBpspPbjl5JERSur4StdxTTFFaObxEY/opI9
-                            17VRD4KmiPcPfbSUYEfgI4h1e6fSylMwg2sVws1uISJm9mYrzFivRX62N92ALgfS
-                            nUn8/YOryuRaGUi2VWD2k93uP0wwY+4uOj0my0KWKI5maZ22pTyzjTmq+vmm9IQL
-                            T1e4SInE/p1KQQYdmdeQ1IHu/M0yxOuo6evQ6o4x6asDFXYiAc8n/KJbZmwj7y9b
-                            3pVH3Ra5v8dmvlEaii17T7UdyKL4y+70Wntm6gU4vAaGwVn9r7V9hbbIPbK8jndO
-                            fjlXa5ze2naHKqTcIpWAYx787G333EviWMlMZwUB+GaEN4R76wIDAQABo4IBmjCC
-                            AZYwHwYDVR0jBBgwFoAUI9OXvcDYoZRhiA2Ftsx1n8l5O5IwHQYDVR0OBBYEFDrj
-                            WiJIiSmHLfoC++tXo3MW9s0iMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
-                            MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAwBgNVHSAEKTAnMA0GCysG
-                            AQQBsjEBAgIdMAwGCiqGSIb3TAUCAgEwCAYGZ4EMAQIBMEIGA1UdHwQ7MDkwN6A1
-                            oDOGMWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BZVNjaWVuY2VTU0xD
-                            QS5jcmwwdQYIKwYBBQUHAQEEaTBnMD0GCCsGAQUFBzAChjFodHRwOi8vY3J0LnRj
-                            cy50ZXJlbmEub3JnL1RFUkVOQWVTY2llbmNlU1NMQ0EuY3J0MCYGCCsGAQUFBzAB
-                            hhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAqBgNVHREEIzAhghJzZy1saWZl
-                            cmF5LmdhcnIuaXSCC3Nndy5nYXJyLml0MA0GCSqGSIb3DQEBBQUAA4IBAQBfUy8v
-                            GupDJmcDTmNSx5kse8NfmSB1kbwM96IE7Eap+/VgNiIeOwjAyfK2gafLfD4QCYao
-                            1WQvBPqoqY3h14Wsbl5SRRRS+G6oj4x51YVvm7D6kgh4E5wlqfMPbDsZtGnkfh/m
-                            ZsTEL1Ixz6dT6PSzsqu5tPa9RnwNtBL+rRCW7OUfs6MPxofNmu+GCry8/6gZy2Rd
-                            yxyH2bHQkbZCMSil/2cvX/3ib2mg+eYrlZQywmRtWL92UtJoKlt96K1RYUKXdfIq
-                            Pm6o7CRIyLzXCIKWimG/PIPiJ0GNH1K2+X54yM/tV+bsjBCHlQe8RpUVKxzm5dtG
-                            zkkOSinydr85B7LG
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes128-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes192-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#aes256-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#tripledes-cbc"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2009/xmlenc11#rsa-oaep"/>
-      <md:EncryptionMethod Algorithm="http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p"/>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sgw.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sgw.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sgw.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sgw.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="it">GARR Science Gateway</md:ServiceName>
-      <md:ServiceName xml:lang="en">GARR Science Gateway</md:ServiceName>
-      <md:ServiceDescription xml:lang="it">Questo servizio permette di eseguire applicazioni scientifiche appartenenti a domini diversi su risorse di calcolo e di storage distribuite sul territorio italiano e in altre regioni del mondo. Attraverso il GARR Science Gateway, gli utenti possono accedere in maniera trasparente ed uniforme a risorse locali, grid e cloud</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="en">This service allows to run scientific applications belonging to several domains on computational and storage resources distributed all over Italy and other regions of the world. Through the GARR Science Gateway, local, grid and cloud based resources can be accessed in a seamless and uniform way.</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <Organization xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <OrganizationName xml:lang="it">Consortium GARR</OrganizationName>
-    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
-    <OrganizationDisplayName xml:lang="it">GARR Science Gateway erogato da Consortium GARR</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">GARR Science Gateway provided by Consortium GARR</OrganizationDisplayName>
-    <OrganizationURL xml:lang="it">http://www.garr.it/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.garr.it/</OrganizationURL>
-  </Organization>
-  <ContactPerson xmlns="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
-    <EmailAddress>sgwadmin@garr.it</EmailAddress>
-  </ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml b/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
index 38ec5524..38ec5524 100644
--- a/swamid-interfederations-2.0/shib-idp-1.oru.se.xml
+++ b/swamid-interfederations-2.0/shib-idp-1.oru.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml
index 9e05635a..9e05635a 100644
--- a/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de.xml
+++ b/swamid-interfederations-2.0/shib-idp.cms.hu-berlin.de-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml
index 5164f2a5..5164f2a5 100644
--- a/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib-sp-dev.cf.ac.uk-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml b/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml
new file mode 100644
index 00000000..700c4b40
--- /dev/null
+++ b/swamid-interfederations-2.0/shib-sp.mediacore.tv.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib-sp.mediacore.tv">
+  <!--
+		This is a "MediaCore Video Learning Platform" Shibboleth SP for Mediacore (EMEA) Ltd.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-23T09:25:15Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Login" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIFYTCCBEmgAwIBAgIQaRrqhKKBIbJHb1Xg3FKffDANBgkqhkiG9w0BAQsFADCB
+						kDELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+						A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxNjA0BgNV
+						BAMTLUNPTU9ETyBSU0EgRG9tYWluIFZhbGlkYXRpb24gU2VjdXJlIFNlcnZlciBD
+						QTAeFw0xNDA0MTYwMDAwMDBaFw0xNTA0MTYyMzU5NTlaMFgxITAfBgNVBAsTGERv
+						bWFpbiBDb250cm9sIFZhbGlkYXRlZDEUMBIGA1UECxMLUG9zaXRpdmVTU0wxHTAb
+						BgNVBAMTFHNoaWItc3AubWVkaWFjb3JlLnR2MIIBIjANBgkqhkiG9w0BAQEFAAOC
+						AQ8AMIIBCgKCAQEAuXfsOw3NXRphz0NrcmK38BwoV1eeEGsv7gMI79ofGWRQHBbx
+						Pddu5yDiz5G6pVdQRjo/ykhWaDhocIKKhhv2e3n/hLBnQFsdvgGFfZB2cb+Z/qvs
+						/iqOxgmefQ+zSynS6x/2YSd9e8IV6gZuPtCuS8ccMPZhpnohBvs92senZRadaqa1
+						IQdj6N3ygXulr7CW/yy2I6fhNAlPkWwb6OmuQgxRkJdm7ueo1d9HmSyOMCbI+7Ry
+						z0ubrtzN9yxvkOGZo88U0vJH5ERQkLkhaVbRkZJsNUcr/H7VpkOAEurBSquPHn2v
+						pP/KfAfRDOtBFB+gFzJpGBpyo5FA3YQO5Rh3lQIDAQABo4IB7DCCAegwHwYDVR0j
+						BBgwFoAUkK9qOpRaC9iQ6hJWc99DtDoo2ucwHQYDVR0OBBYEFOttslYJv2/qFQUt
+						NmYx4u0eBeggMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQW
+						MBQGCCsGAQUFBwMBBggrBgEFBQcDAjBQBgNVHSAESTBHMDsGDCsGAQQBsjEBAgED
+						BDArMCkGCCsGAQUFBwIBFh1odHRwczovL3NlY3VyZS5jb21vZG8ubmV0L0NQUzAI
+						BgZngQwBAgEwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL2NybC5jb21vZG9jYS5j
+						b20vQ09NT0RPUlNBRG9tYWluVmFsaWRhdGlvblNlY3VyZVNlcnZlckNBLmNybDCB
+						hQYIKwYBBQUHAQEEeTB3ME8GCCsGAQUFBzAChkNodHRwOi8vY3J0LmNvbW9kb2Nh
+						LmNvbS9DT01PRE9SU0FEb21haW5WYWxpZGF0aW9uU2VjdXJlU2VydmVyQ0EuY3J0
+						MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIw
+						MIIUc2hpYi1zcC5tZWRpYWNvcmUudHaCGHd3dy5zaGliLXNwLm1lZGlhY29yZS50
+						djANBgkqhkiG9w0BAQsFAAOCAQEAW/hU+rvp5DuoqeW163U/YudsHv9RU9Hn2yIF
+						p1FGo1h3MOgalR+dtVkXjyFXLpK+d1Iu/n2Fh0V6y125NQCnR+vl2f94NEsv3OhF
+						58qUbEDR4DymDvqgfmF+e2IZaCgASp4HC5UilyeETbBZvM5kOwEAWI6UOhuGEfHp
+						uWjlO3wYo2i1jCvaHxi9XgVK/PmQyOWWPnCCnmptyp4q9Mhz8Rv1hAEdQYM62R8L
+						/2NDnY4jkkQJOGXz1bqfE0moBc0zFZQ7/QQi3y0/AKJeGCG3q5gR/7cYyyQwappV
+						5matq67waWoBg35C0yaj9gEDi3KaTs1KOLbzqyVUcmP0FtB7rw==
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib-sp.mediacore.tv/Shibboleth.sso/SAML/Artifact" index="5"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Mediacore (EMEA) Ltd</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">MediaCore Video Learning Platform</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://mediacore.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Maddy</GivenName>
+    <SurName>Bentley</SurName>
+    <EmailAddress>mailto:support@mediacore.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>James</GivenName>
+    <SurName>Cross</SurName>
+    <EmailAddress>mailto:james@mediacore.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml b/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
new file mode 100644
index 00000000..5e7b0e58
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.comune.trieste.it-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shib.comune.trieste.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-12-17T09:30:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Wi-Fi Libero - Comune di Trieste - TriesteFreeSpoTS</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Free Wi-Fi connection for people with smartphone, tablet, notebook and other mobile devices that supports Wi-Fi</mdui:Description>
+        <mdui:Description xml:lang="it">Connessione Wi-Fi libera per chi possiede Smartphone, tablet, pc portatili e qualsiasi altro dispositivo mobile dotato di Wi-Fi.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.retecivica.trieste.it/triestefreespots</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.retecivica.trieste.it/triestefreespots</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacyen.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacy.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
+MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
+GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
+oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
+dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
+lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
+OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
+AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
+czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
+5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
+Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
+NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
+fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
+P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
+xEb0XXxzdH8=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
+MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
+GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
+oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
+dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
+lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
+OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
+AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
+czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
+5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
+Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
+NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
+fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
+P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
+xEb0XXxzdH8=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</ServiceName>
+      <ServiceName xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</ServiceName>
+      <ServiceDescription xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</ServiceDescription>
+      <ServiceDescription xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Municipality of Trieste</OrganizationName>
+    <OrganizationName xml:lang="it">Comune di Trieste</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">TriesteFreeSpoTS provided by Municipality of Trieste</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Servizio TriesteFreeSpoTS erogato da Comune di Trieste</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.retecivica.trieste.it/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.retecivica.trieste.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>triestefreespots@comune.trieste.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.comune.trieste.it.xml b/swamid-interfederations-2.0/shib.comune.trieste.it.xml
deleted file mode 100644
index c4d9b76c..00000000
--- a/swamid-interfederations-2.0/shib.comune.trieste.it.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.comune.trieste.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-12-17T09:30:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Wi-Fi Libero - Comune di Trieste - TriesteFreeSpoTS</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Free Wi-Fi connection for people with smartphone, tablet, notebook and other mobile devices than supports Wi-Fi</mdui:Description>
-        <mdui:Description xml:lang="it">Connessione Wi-Fi libera per chi possiede Smartphone, tablet, pc portatili e qualsiasi altro dispositivo mobile dotato di Wi-Fi.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.retecivica.trieste.it/triestefreespots/en/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.retecivica.trieste.it/triestefreespots/it/</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacyen.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.retecivica.trieste.it/TriesteFreeSpoTS/privacy.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://shib.comune.trieste.it/shibboleth</ds:KeyName>
-        <ds:KeyName>shib.comune.trieste.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.comune.trieste.it</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-                            BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
-                            MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
-                            IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
-                            GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
-                            oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
-                            dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
-                            lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
-                            OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
-                            AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
-                            czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-                            gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
-                            5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
-                            Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
-                            NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
-                            fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
-                            P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
-                            xEb0XXxzdH8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>https://shib.comune.trieste.it/shibboleth</ds:KeyName>
-        <ds:KeyName>shib.comune.trieste.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=shib.comune.trieste.it</ds:X509SubjectName>
-          <ds:X509Certificate>MIIDNDCCAhygAwIBAgIJAJPOWX6jxm8nMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
-                            BAMTFnNoaWIuY29tdW5lLnRyaWVzdGUuaXQwHhcNMTMxMTE5MTMyNzM1WhcNNDMx
-                            MTEyMTMyNzM1WjAhMR8wHQYDVQQDExZzaGliLmNvbXVuZS50cmllc3RlLml0MIIB
-                            IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA0Y+CScWVXs3Hl2gxmGp5D1Co
-                            GdHbRD9LShZ7fCeEpcjxJjZ2apGnXXuQc7DpTthfkiYw+10SvgspjpOsT0T2fPGg
-                            oL6FIS4AUGKkspcGqmlHJjdj2d0bzVcyEpthd4LQmPajX5vNfiTFL01ZlJC4kBbE
-                            dFVobxxZPaeeMhxBFAwkf0vfmXBgJrUU4+zQoXE2VD/BOsK/tQStqrQH0uIGMR54
-                            lCkdFmiAaedYkdjsteZvKtxgb8TslE+ULxK0HAl9MmuHPSs/duaHmiM0Huybztj7
-                            OCgoa2hXKT9G867xB8kdFKwJgfyTZ2f9bIuPwcJEsVd6p5NBZFvd9qG1ILFWpQID
-                            AQABo28wbTBMBgNVHREERTBDghZzaGliLmNvbXVuZS50cmllc3RlLml0hilodHRw
-                            czovL3NoaWIuY29tdW5lLnRyaWVzdGUuaXQvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
-                            gYEe61royxEPHxue0/dBHfj4x0swDQYJKoZIhvcNAQEFBQADggEBAMvNk6mztqu3
-                            5fKoBZNYhJTdVcC9C4MqjcgrgNtiCCltJt9KrFyok7M+/DUKbBOLAVuGyr+W+Lmk
-                            Gk4CXXAv222AlsZxuOW73uF21H1mUBcCbEWfXphKHkzjGlTlbrqXjop8IHeTD9XO
-                            NEirAqDB1j/4PAgFsTFBl0We5vJ/96mEYHjk4Ouk5/mn+Tpc2FgVgoe5tizQJ9Lv
-                            fpXa1oNeZP/WXEwNEVMJjfyqL2Nu9P8t4+5+cTZG/UrVT8JqZ7R/CjxWUwiw+hdI
-                            P0+J1ansVzeWtND1V+yxrY0kokEbQC/1aoHMnQSRxPLNORe9SRKBkOp+Ci0ROW45
-                            xEb0XXxzdH8=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://shib.comune.trieste.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
-      <md:ServiceName xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Wi-Fi Free - Trieste Municipality - TriesteFreeSpoTS</md:ServiceDescription>
-      <md:ServiceDescription xml:lang="it">Wi-Fi Libero - Trieste Municipality - TriesteFreeSpoTS</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Municipality of Trieste</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Comune di Trieste</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">TriesteFreeSpoTS provided by Municipality of Trieste</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Servizio TriesteFreeSpoTS erogato da Comune di Trieste</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.retecivica.trieste.it/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.retecivica.trieste.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>triestefreespots@comune.trieste.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml b/swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml
index d71d04d4..d71d04d4 100644
--- a/swamid-interfederations-2.0/shib.ifgoiano.edu.br.xml
+++ b/swamid-interfederations-2.0/shib.ifgoiano.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml b/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
index d9b4bb4d..d9b4bb4d 100644
--- a/swamid-interfederations-2.0/shib.manchester.ac.uk.xml
+++ b/swamid-interfederations-2.0/shib.manchester.ac.uk-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shib.mines-albi.fr.xml b/swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml
index 245d8ae8..aa801c33 100644
--- a/swamid-interfederations-2.0/shib.mines-albi.fr.xml
+++ b/swamid-interfederations-2.0/shib.mines-albi.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-albi.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shib.u-paris10.fr.xml b/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml
index 9e7380cf..7b3acd44 100644
--- a/swamid-interfederations-2.0/shib.u-paris10.fr.xml
+++ b/swamid-interfederations-2.0/shib.u-paris10.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-paris10.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shib.ufg.br.xml b/swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml
index 43b565af..43b565af 100644
--- a/swamid-interfederations-2.0/shib.ufg.br.xml
+++ b/swamid-interfederations-2.0/shib.ufg.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shib.unibo.it.xml b/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
index 05ede1cf..83a039a8 100644
--- a/swamid-interfederations-2.0/shib.unibo.it.xml
+++ b/swamid-interfederations-2.0/shib.unibo.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shib.unibo.it/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shib.unibo.it/idp/shibboleth">
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-04-26T15:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
@@ -7,8 +7,8 @@
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibo.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">unibo.it</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="it">Università di Bologna</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Bologna</mdui:DisplayName>
         <mdui:Description xml:lang="it">Università di Bologna</mdui:Description>
@@ -23,7 +23,7 @@
         <mdui:PrivacyStatementURL xml:lang="en">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
         <mdui:PrivacyStatementURL xml:lang="it">http://www.unibo.it/Portale/Privacy.htm</mdui:PrivacyStatementURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:DomainHint>unibo.it</mdui:DomainHint>
         <mdui:DomainHint>www.unibo.it</mdui:DomainHint>
         <mdui:IPHint>137.204.0.0/16</mdui:IPHint>
@@ -35,26 +35,27 @@
       </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
-                            BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
-                            MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
-                            SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
-                            PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
-                            cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
-                            0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
-                            K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
-                            /Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
-                            MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
-                            dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
-                            DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
-                            ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
-                            I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
-                            vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
-                            tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
-                            WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
+MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
+PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
+cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
+0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
+K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
+/Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
+DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
+ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
+I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
+vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
+tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
+WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -67,29 +68,30 @@
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unibo.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">unibo.it</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
-                            BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
-                            MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
-                            SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
-                            PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
-                            cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
-                            0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
-                            K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
-                            /Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
-                            MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
-                            dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
-                            DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
-                            ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
-                            I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
-                            vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
-                            tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
-                            WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUckjOBnjDyzW3TnsQ+ZAfn867Dh4wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc2hpYi51bmliby5pdDAeFw0xMzAzMDcxMTI2MTJaFw0y
+MzAzMDcxMTI2MTJaMBgxFjAUBgNVBAMTDXNoaWIudW5pYm8uaXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCgeiI39V0e9g2iI6g7xdn6lDpiRQaN5ZpH
+PN3QkBIFQcpsEk824owXGp6AkONgTucUADDJ2QUu0EvaQ2LZE77LFAIqr6sPm+3b
+cUogUFHPAk/Dc5MXA3fk+G3ot40V1VOnBYJCiGhZY8cQjQl74MmvbVJqt3Xj46Bn
+0175RSwWX2U9MYsq1+Dx3y25w66BqjvzegC6xgCUqHDQoKi60kX7d5OQ85Nm9bYb
+K18Py2v4YsS48sn7P78VhShgTzDD1MLqtExBd0Rer3VSgCWeB9YblkBlamQAqk6+
+/Xsg2eRwrAbeb0PlL5MEbCXP+sjhf3yVAIcRpS3Ep9N59UOsxiXtAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNoaWIudW5pYm8uaXSGJGh0dHBzOi8vc2hpYi51bmliby5p
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUjAf6KRUx3TaBHIBCT8R3u0p3PUcw
+DQYJKoZIhvcNAQEFBQADggEBACrvNM6+6LFPF9y9lV1ODuPQjv4Vi15QBWqSC1ut
+ttb9Drp8YGTx1O3+h8u1xUaXj6eCci2CZHr5XY0ER8jRwQKueNBGmA75ZVElJLV5
+I+H/b8NbMbUHmN3XKOFJHBR/vo/SDN78Llm+7TiIZm2QzXjUOZLKti9uZtKxW6we
+vVf/0pN8vfaYTPuO3wLwLxHynRopb2qcNYTleFzLDvvxC5ZB6XbE8ni1o1U7NmNQ
+tORMcp/kCLQ38hkhPqJCWH8eIts4Ek5IU7+zJ+1rTYKLzjK7qVi5aX73dVHHVKSu
+WvjIS+CtzsnouYcpjQ5b0jRIkQwPbUCVODfiJ/COYxE0+Yw=
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
diff --git a/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..eee5ab80
--- /dev/null
+++ b/swamid-interfederations-2.0/shib.zcu.cz-idp-shibboleth.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shib.zcu.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T14:22:17Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">zcu.cz</shibmd:Scope>
+      <shibmd:Scope regexp="false">gapps.zcu.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of West Bohemia</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Západočeská univerzita v Plzni</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for students and staff of the University of West Bohemia.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro studenty a zaměstance Západočeské univerzity v Plzni.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.zcu.cz/en/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.zcu.cz/</mdui:InformationURL>
+        <mdui:Logo height="40" width="40">https://shib.zcu.cz/icons/zcu_logo_40px.png</mdui:Logo>
+        <mdui:Logo height="102" width="102">https://shib.zcu.cz/icons/zcu_logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUCDrOzILCIUYr3TrnUQPEsHWa+wMwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLc2hpYi56Y3UuY3owHhcNMTIwNjE1MTIwNzE1WhcNMzIw
+NjE1MTIwNzE1WjAWMRQwEgYDVQQDEwtzaGliLnpjdS5jejCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIZDgPqv9Pzl5boNk7nXJpoxPt4AVs++zbuJNPU8
+kJWFdeXrjB2m2wGSDm+1X33NrnkGs2LrNqSqjfXdoPM7UwBKUzqZx6qNSsDssrKt
+S3vK8RfyOss31NXhY6tgG4nw1YhO4324spqFIA7oXMR/QxuPXHnRxUMZjln0XgeM
+hAeHcJJYU/c8ZbLPr4M7eVeQSnzccvkdIc1Hil5qpsdpvb48yvUCOKl7Flm/iVLM
+OKlj1i4IKGSQNd8cUnZZukWK62/H1pr7Al6368zJqkYKvUJbRNfRiXEeV3c9pcg/
+/bx/j66ebUulE4A4ITpE5oQvMpgx/1w2h76mY9rHzTHBMp0CAwEAAaNdMFswOgYD
+VR0RBDMwMYILc2hpYi56Y3UuY3qGImh0dHBzOi8vc2hpYi56Y3UuY3ovaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFHLlm9ZAYoCIoT1NQsdo7sPzShFWMA0GCSqGSIb3
+DQEBBQUAA4IBAQAHtEngv7KaSiRJxFaLn3VdzH6f3SC4xNGKTPyGVq0pBrwUitf4
+kMl17K3Hg73ef1D+wInl3+9IuoCDsTH2wKKD3tUSZsL+xgekRGiIu3LIFcoa+U+o
+5n1nnfZ7xfvh8lgmsRZ7TVC3dXFl9wU+BmsVvOWEjneOA5oZQ2MUkKDC9+5sh6jV
+BXl4hMGBSLfs19/xa81PR7nkC9e6N0ri6nq6rT/SwoXXsAxHMHRz9M9gSq5lwxYO
+d+orcDxYVF3fdNbigr2b4qcgMeVygTsdcroU8EncIRMRLw0Wdb5Pk86KmCj74dRq
+C9OOk807XNhUC499735YXOv2kFUlCx5mZeOk
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shib.zcu.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shib.zcu.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shib.zcu.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shib.zcu.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">zcu.cz</shibmd:Scope>
+      <shibmd:Scope regexp="false">gapps.zcu.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDFzCCAf+gAwIBAgIUCDrOzILCIUYr3TrnUQPEsHWa+wMwDQYJKoZIhvcNAQEF
+BQAwFjEUMBIGA1UEAxMLc2hpYi56Y3UuY3owHhcNMTIwNjE1MTIwNzE1WhcNMzIw
+NjE1MTIwNzE1WjAWMRQwEgYDVQQDEwtzaGliLnpjdS5jejCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAIZDgPqv9Pzl5boNk7nXJpoxPt4AVs++zbuJNPU8
+kJWFdeXrjB2m2wGSDm+1X33NrnkGs2LrNqSqjfXdoPM7UwBKUzqZx6qNSsDssrKt
+S3vK8RfyOss31NXhY6tgG4nw1YhO4324spqFIA7oXMR/QxuPXHnRxUMZjln0XgeM
+hAeHcJJYU/c8ZbLPr4M7eVeQSnzccvkdIc1Hil5qpsdpvb48yvUCOKl7Flm/iVLM
+OKlj1i4IKGSQNd8cUnZZukWK62/H1pr7Al6368zJqkYKvUJbRNfRiXEeV3c9pcg/
+/bx/j66ebUulE4A4ITpE5oQvMpgx/1w2h76mY9rHzTHBMp0CAwEAAaNdMFswOgYD
+VR0RBDMwMYILc2hpYi56Y3UuY3qGImh0dHBzOi8vc2hpYi56Y3UuY3ovaWRwL3No
+aWJib2xldGgwHQYDVR0OBBYEFHLlm9ZAYoCIoT1NQsdo7sPzShFWMA0GCSqGSIb3
+DQEBBQUAA4IBAQAHtEngv7KaSiRJxFaLn3VdzH6f3SC4xNGKTPyGVq0pBrwUitf4
+kMl17K3Hg73ef1D+wInl3+9IuoCDsTH2wKKD3tUSZsL+xgekRGiIu3LIFcoa+U+o
+5n1nnfZ7xfvh8lgmsRZ7TVC3dXFl9wU+BmsVvOWEjneOA5oZQ2MUkKDC9+5sh6jV
+BXl4hMGBSLfs19/xa81PR7nkC9e6N0ri6nq6rT/SwoXXsAxHMHRz9M9gSq5lwxYO
+d+orcDxYVF3fdNbigr2b4qcgMeVygTsdcroU8EncIRMRLw0Wdb5Pk86KmCj74dRq
+C9OOk807XNhUC499735YXOv2kFUlCx5mZeOk
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shib.zcu.cz:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shib.zcu.cz:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of West Bohemia</OrganizationName>
+    <OrganizationName xml:lang="cs">Západočeská univerzita v Plzni</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of West Bohemia</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Západočeská univerzita v Plzni</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.zcu.cz/en/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.zcu.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Petr</GivenName>
+    <SurName>Grolmus</SurName>
+    <EmailAddress>indy@civ.zcu.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibb-prod.eseo.fr.xml b/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml
index 9212b954..4342b49f 100644
--- a/swamid-interfederations-2.0/shibb-prod.eseo.fr.xml
+++ b/swamid-interfederations-2.0/shibb-prod.eseo.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">eseo.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibb.crous-amiens.fr.xml b/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml
index 3d1ba732..26f5e2ce 100644
--- a/swamid-interfederations-2.0/shibb.crous-amiens.fr.xml
+++ b/swamid-interfederations-2.0/shibb.crous-amiens.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-amiens.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibb1.hj.se.xml b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
index 3dfba952..3dfba952 100644
--- a/swamid-interfederations-2.0/shibb1.hj.se.xml
+++ b/swamid-interfederations-2.0/shibb1.hj.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibbo.ec-nantes.fr.xml b/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml
index 2a1f23f7..d1f6ba58 100644
--- a/swamid-interfederations-2.0/shibbo.ec-nantes.fr.xml
+++ b/swamid-interfederations-2.0/shibbo.ec-nantes.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ec-nantes.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibbo.emse.fr.xml b/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml
index 319865b6..c8fe3453 100644
--- a/swamid-interfederations-2.0/shibbo.emse.fr.xml
+++ b/swamid-interfederations-2.0/shibbo.emse.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">emse.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -49,11 +49,6 @@ mG4EGyP6qUE1uSrPxMk9GFtp+QkIXdDDGi5u9iIkLzHPYUMB4IfI
     <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <SurName>Dominique BERTHET</SurName>
-    <EmailAddress>dberthet@emse.fr</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <SurName>Elisabeth THONNERIEUX</SurName>
-    <EmailAddress>thonnerieux@emse.fr</EmailAddress>
+    <EmailAddress>dsi-admin@emse.fr</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibbo.enise.fr.xml b/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml
index 3fb19317..b63a80a1 100644
--- a/swamid-interfederations-2.0/shibbo.enise.fr.xml
+++ b/swamid-interfederations-2.0/shibbo.enise.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">enise.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibbo.ephe.fr.xml b/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml
index e4958e08..1982a323 100644
--- a/swamid-interfederations-2.0/shibbo.ephe.fr.xml
+++ b/swamid-interfederations-2.0/shibbo.ephe.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ephe.sorbonne.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.ephe.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/shibbo.ltu.se.xml b/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
index e2ee06e5..e2ee06e5 100644
--- a/swamid-interfederations-2.0/shibbo.ltu.se.xml
+++ b/swamid-interfederations-2.0/shibbo.ltu.se-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibbo.tul.cz.xml b/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
index fa9d57d1..8649b592 100644
--- a/swamid-interfederations-2.0/shibbo.tul.cz.xml
+++ b/swamid-interfederations-2.0/shibbo.tul.cz-idp-shibboleth.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibbo.tul.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-20T11:45:42Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml
index bdd723d3..bdd723d3 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.dti.ufv.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
index e1d30e7b..e1d30e7b 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.gwdg.de.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.gwdg.de-gwdg-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
index acd1e65d..acd1e65d 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.mpg.de.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.mpg.de-mpg-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml b/swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml
index 0b60efea..365929e4 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.pucrs.br.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.pucrs.br-idp-shibboleth.xml
@@ -23,31 +23,22 @@
       <ds:KeyInfo>
         <ds:X509Data>
           <ds:X509Certificate>
-    MIIEoDCCA4gCAQAwDQYJKoZIhvcNAQEFBQAwggEUMUYwRAYDVQQKEz1QVUNSUyAt
-IFBvbnRpZmljaWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRvIFJpbyBHcmFuZGUg
-ZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0gR2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVuaWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFz
-ZWN1cml0eUBwdWNycy5icjEVMBMGA1UEBxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQI
-ExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJi
-b2xldGgtaWRwLnB1Y3JzLmJyMB4XDTEzMTEyODE1MDgxM1oXDTE4MTEyNzE1MDgx
-M1owggEUMUYwRAYDVQQKEz1QVUNSUyAtIFBvbnRpZmljaWEgVW5pdmVyc2lkYWRl
-IENhdG9saWNhIGRvIFJpbyBHcmFuZGUgZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0g
-R2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVu
-aWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFzZWN1cml0eUBwdWNycy5icjEVMBMGA1UE
-BxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG
-A1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6
-V8CtSEs8GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3
-nvWJwkImqNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU
-+16+ceqGF75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEX
-aYFb2jl0piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4a
-eb9YEQJaNWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQBWgaGE0pkFuzO+YgGdUwsr22f/mhlJ2QbyN+XP
-UP+Ra1uKrE572YdXHpl4jhHhncMyDLJX/adNeLF80r/QmkoiWZeagW3ItRDjwK+m
-5Zt7tYYsyf9CoJq+oCXo90yZupzBQX5PSln5AowM1lvY5/eB2MRkdVvfV7ZgwgK+
-4LNNFiqsTc8hjLRnrZwnAggnoOFHw1azsRZ9+VvK0zdpFlp4yznKukcuBu5Oylly
-1VY/foKEsd3XeKk+u53rhOw6KlGRH7cW6umSzZGuThg7KS9f1KRC7F9vqndGcmkP
-3GdRNnUePk9OmIeNHL6yBjA+ryz2A4uSy99h2JOLf/IhcAAH
+    MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEKMAgGA1UECxMBIDELMAkGA1UE
+BhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMB4XDTE0MDkw
+MzE2NTAyNloXDTE5MDkwMjE2NTAyNlowOzEKMAgGA1UECxMBIDELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6V8CtSEs8
+GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3nvWJwkIm
+qNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU+16+ceqG
+F75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEXaYFb2jl0
+piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4aeb9YEQJa
+NWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQDRcEBWeU30bZBS/mtcDGdhsbxjLmd1IhHAio/iuHrVvfv6
+0RJv9BtOokGbtsGLInxH/HEqUAm7+I3lm2UH/ah5oSEreumLPpNnGwtqsK+z/oN3
+we03FEd0WUl8GkMsLapmbaQ/NlP8oQDVWTjfYsrUSak42uW8LZ88OUz30NHhYFwo
+2UCXamrmbHrnlCKZFKjWypn2GCwPMZ+liM1Yfxdlp6yVzgTDKpAI8fU/bEwgc3V4
+OIw0tlAwW9X8O7oWvd7h9dfyqCCmHee2LzqZaC+uAb0XPEDeEN+rhgwZPGsjlxpJ
+Zc48iq/nJ5myburOM8iFHNedgaLhTDDuTXIM0EWL
             </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -70,31 +61,22 @@ UP+Ra1uKrE572YdXHpl4jhHhncMyDLJX/adNeLF80r/QmkoiWZeagW3ItRDjwK+m
         <ds:X509Data>
           <ds:X509Certificate>
       
-MIIEoDCCA4gCAQAwDQYJKoZIhvcNAQEFBQAwggEUMUYwRAYDVQQKEz1QVUNSUyAt
-IFBvbnRpZmljaWEgVW5pdmVyc2lkYWRlIENhdG9saWNhIGRvIFJpbyBHcmFuZGUg
-ZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0gR2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBk
-YSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVuaWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFz
-ZWN1cml0eUBwdWNycy5icjEVMBMGA1UEBxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQI
-ExFSaW8gR3JhbmRlIGRvIFN1bDELMAkGA1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJi
-b2xldGgtaWRwLnB1Y3JzLmJyMB4XDTEzMTEyODE1MDgxM1oXDTE4MTEyNzE1MDgx
-M1owggEUMUYwRAYDVQQKEz1QVUNSUyAtIFBvbnRpZmljaWEgVW5pdmVyc2lkYWRl
-IENhdG9saWNhIGRvIFJpbyBHcmFuZGUgZG8gU3VsMUYwRAYDVQQLEz1HVElUIC0g
-R2VyZW5jaWEgZGUgVGVjbm9sb2dpYSBkYSBJbmZvcm1hY2FvIGUgVGVsZWNvbXVu
-aWNhY2FvMSAwHgYJKoZIhvcNAQkBFhFzZWN1cml0eUBwdWNycy5icjEVMBMGA1UE
-BxMMUG9ydG8gQWxlZ3JlMRowGAYDVQQIExFSaW8gR3JhbmRlIGRvIFN1bDELMAkG
-A1UEBhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjAN
-BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6
-V8CtSEs8GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3
-nvWJwkImqNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU
-+16+ceqGF75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEX
-aYFb2jl0piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4a
-eb9YEQJaNWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQAB
-MA0GCSqGSIb3DQEBBQUAA4IBAQBWgaGE0pkFuzO+YgGdUwsr22f/mhlJ2QbyN+XP
-UP+Ra1uKrE572YdXHpl4jhHhncMyDLJX/adNeLF80r/QmkoiWZeagW3ItRDjwK+m
-5Zt7tYYsyf9CoJq+oCXo90yZupzBQX5PSln5AowM1lvY5/eB2MRkdVvfV7ZgwgK+
-4LNNFiqsTc8hjLRnrZwnAggnoOFHw1azsRZ9+VvK0zdpFlp4yznKukcuBu5Oylly
-1VY/foKEsd3XeKk+u53rhOw6KlGRH7cW6umSzZGuThg7KS9f1KRC7F9vqndGcmkP
-3GdRNnUePk9OmIeNHL6yBjA+ryz2A4uSy99h2JOLf/IhcAAH
+MIIC6jCCAdICAQAwDQYJKoZIhvcNAQEFBQAwOzEKMAgGA1UECxMBIDELMAkGA1UE
+BhMCQlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMB4XDTE0MDkw
+MzE2NTAyNloXDTE5MDkwMjE2NTAyNlowOzEKMAgGA1UECxMBIDELMAkGA1UEBhMC
+QlIxIDAeBgNVBAMTF3NoaWJib2xldGgtaWRwLnB1Y3JzLmJyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1iilPh8rOxBD8ceqrAb8KcN3WRX6V8CtSEs8
+GBAKjDt9nRYpFavkJcW6w6+w6ZJz1KlJndy6sgleGjsXR1za5nK3gKe3nvWJwkIm
+qNX/nAjBegCnvxq8VSJ4VspLYZQYoTIbAiGvSs7pP++/7OBimb424JHU+16+ceqG
+F75C9tXeA3vOJzHS/bLgxhRwyhhug25DHkTl8wVDuCU0q/P8Y0D6sLEXaYFb2jl0
+piXWK7dz/5LhX2AyyKtrYlQEzgndR/SkANY5iIFiXqJ7/q5tQTOQQN4aeb9YEQJa
+NWJfoa4co8LTmHki6KQvPCmtaBBAjSU7kk9s3+mXJL8lgtRI6QIDAQABMA0GCSqG
+SIb3DQEBBQUAA4IBAQDRcEBWeU30bZBS/mtcDGdhsbxjLmd1IhHAio/iuHrVvfv6
+0RJv9BtOokGbtsGLInxH/HEqUAm7+I3lm2UH/ah5oSEreumLPpNnGwtqsK+z/oN3
+we03FEd0WUl8GkMsLapmbaQ/NlP8oQDVWTjfYsrUSak42uW8LZ88OUz30NHhYFwo
+2UCXamrmbHrnlCKZFKjWypn2GCwPMZ+liM1Yfxdlp6yVzgTDKpAI8fU/bEwgc3V4
+OIw0tlAwW9X8O7oWvd7h9dfyqCCmHee2LzqZaC+uAb0XPEDeEN+rhgwZPGsjlxpJ
+Zc48iq/nJ5myburOM8iFHNedgaLhTDDuTXIM0EWL
                     
             </ds:X509Certificate>
         </ds:X509Data>
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
index bc7996fb..bc7996fb 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-goettingen.de-uni-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de.xml b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
index e1548cd7..e1548cd7 100644
--- a/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de.xml
+++ b/swamid-interfederations-2.0/shibboleth-idp.uni-regensburg.de-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibboleth.ac-limoges.fr.xml b/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml
index a0b24689..836c05db 100644
--- a/swamid-interfederations-2.0/shibboleth.ac-limoges.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.ac-limoges.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ac-limoges.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml b/swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml
index 0179e708..0179e708 100644
--- a/swamid-interfederations-2.0/shibboleth.ad.cybera.ca.xml
+++ b/swamid-interfederations-2.0/shibboleth.ad.cybera.ca-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
new file mode 100644
index 00000000..8ceef1b3
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.bbaw.de-shibboleth.xml
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://shibboleth.bbaw.de/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://shibboleth.bbaw.de/Shibboleth.sso/Login" index="1"/>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFEjCCA/qgAwIBAgIEDxpjazANBgkqhkiG9w0BAQUFADCBnDELMAkGA1UEBhMC
+REUxPDA6BgNVBAoTM0Jlcmxpbi1CcmFuZGVuYnVyZ2lzY2hlIEFrYWRlbWllIGRl
+ciBXaXNzZW5zY2hhZnRlbjEgMB4GA1UECxMXSW5mb3JtYXRpb25zdGVjaG5vbG9n
+aWUxEjAQBgNVBAMTCUJCQVctQ0EgMTEZMBcGCSqGSIb3DQEJARYKY2FAYmJhdy5k
+ZTAeFw0wOTExMTExNjI3MDdaFw0xNDExMTAxNjI3MDdaMGgxCzAJBgNVBAYTAkRF
+MTwwOgYDVQQKEzNCZXJsaW4tQnJhbmRlbmJ1cmdpc2NoZSBBa2FkZW1pZSBkZXIg
+V2lzc2Vuc2NoYWZ0ZW4xGzAZBgNVBAMTEnNoaWJib2xldGguYmJhdy5kZTCCASIw
+DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKqdL1VpZaKldYSwvu4z+8iXzy+j
++6tpAq1lED8CDcXRJsbgL/F4sioQ9uNylJgX4aromN5kTT8nfmtEN84C9s5ExVg6
+29bkxSPEWviJzdDxKstRqWbl7PzpipFa9Th2b7jOwX4ec3nirC4ijoTACQBge7qd
+GNniTFM/2k5E7D8NPTJg2d9ITWs8JW7Qbx0ezFpKlg1eVWZNZs86L3UShdXWnwrT
+oNtZwKm309EbdDNGDvsAgHseFNhmQIV+rOuMxv44nVMxDUSymARAKhzbeJ4CUWth
+gYjByHbQM45twUdQKGO01vQX+DwS+9RmA34PDZ8nRSktRtlG/Llr9SRXf9ECAwEA
+AaOCAY0wggGJMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsG
+AQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUoy4g7ejcIv8AoY2/BQx6coBR6EIw
+HwYDVR0jBBgwFoAUjKaP8T8UOwK1+SdUTKs8odgbkJgweQYDVR0fBHIwcDA2oDSg
+MoYwaHR0cDovL2NkcDEucGNhLmRmbi5kZS9iYmF3LWNhL3B1Yi9jcmwvY2Fjcmwu
+Y3JsMDagNKAyhjBodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2Ny
+bC9jYWNybC5jcmwwgZQGCCsGAQUFBwEBBIGHMIGEMEAGCCsGAQUFBzAChjRodHRw
+Oi8vY2RwMS5wY2EuZGZuLmRlL2JiYXctY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0
+MEAGCCsGAQUFBzAChjRodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2JiYXctY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBrAUHthoQFOwKU
+a8KybrhK1NofkstRQxhVR2jcNWQDhFB+ife+kXdindHuh6OeWgys07llwmPqACQ9
+T6ccWjVBVyV7DqFwuRCn/Ui/4E+c6EHtJEJ6nktXj4jCRla7a7gxmdnBqBKvjoPJ
+7AdIQbn9kpuWDN+2hoiGPdAz+ZBp1zcY28SJhtHoNHdLmAjyNlrCj3fWsppLL7/k
+znAYO9ZznwCtBE+BWq+rxu0TJhYBf84+fn0kwBruvHWgpCrb+57XpX3RN1HxNbvR
+9lvp1UltizFA44damYGbbKBKOLCHFvJbBg6v81WGKxZB+dv9TcZSMDNaj1oqBxUW
+eQj7ACg8</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://shibboleth.bbaw.de/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">German NLP tools from the BBAW/DWDS</md:ServiceName>
+      <md:ServiceName xml:lang="en">German NLP tools from the BBAW/DWDS</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">Tokenizer, Tagger (Moot), Shallow Parser (SynCop) and Named Entity Recognition for historic texts. For Humanities and Social Sciences researchers.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="o"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Kai</md:GivenName>
+    <md:SurName>Zimmer</md:SurName>
+    <md:EmailAddress>mailto:zimmer@bbaw.de</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.cndp.fr.xml b/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml
index d5828d81..068d6776 100644
--- a/swamid-interfederations-2.0/shibboleth.cndp.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.cndp.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cndp.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr.xml b/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml
index 4b040a4e..33c2a23a 100644
--- a/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.crous-poitiers.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-poitiers.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml
index 00f471dc..464a49d7 100644
--- a/swamid-interfederations-2.0/shibboleth.ens-lyon.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.ens-lyon.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lyon.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr.xml b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml
index dac83ddd..7842fe45 100644
--- a/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.ensi-bourges.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensi-bourges.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.ensicaen.fr.xml b/swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml
index ee26501b..969f0486 100644
--- a/swamid-interfederations-2.0/shibboleth.ensicaen.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.ensicaen.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensicaen.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.ensiie.fr.xml b/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml
index 3c698f2d..2dbc12c2 100644
--- a/swamid-interfederations-2.0/shibboleth.ensiie.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.ensiie.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ensiie.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.envt.fr.xml b/swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml
index 8b377512..5512babd 100644
--- a/swamid-interfederations-2.0/shibboleth.envt.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.envt.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">envt.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml
index f522e4cf..3ae21cc5 100644
--- a/swamid-interfederations-2.0/shibboleth.fhwn.ac.at.xml
+++ b/swamid-interfederations-2.0/shibboleth.fhwn.ac.at-idp-shibboleth.xml
@@ -25,7 +25,7 @@
         <mdui:GeolocationHint>geo:47.83902,16.24842</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
@@ -65,7 +65,7 @@ aTYBUwf6LPKYdpVL5MFq35/cnQ==</ds:X509Certificate>
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">fhwn.ac.at</shibmd:Scope>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>MIIDPzCCAiegAwIBAgIULHX3aIs7dO97h9UxvhHJhQksVhMwDQYJKoZIhvcNAQEF
diff --git a/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr.xml b/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml
index 9f53d9bb..c5d56d68 100644
--- a/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.grenoble-inp.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">grenoble-inp.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.ifpr.edu.br.xml b/swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml
index 951b1db0..951b1db0 100644
--- a/swamid-interfederations-2.0/shibboleth.ifpr.edu.br.xml
+++ b/swamid-interfederations-2.0/shibboleth.ifpr.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibboleth.im.jku.at.xml b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
index 1100ae88..904c960a 100644
--- a/swamid-interfederations-2.0/shibboleth.im.jku.at.xml
+++ b/swamid-interfederations-2.0/shibboleth.im.jku.at-idp-shibboleth.xml
@@ -21,7 +21,7 @@
         <mdui:Logo height="16" width="16">https://shibboleth.im.jku.at/logos/favicon.ico</mdui:Logo>
       </mdui:UIInfo>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
@@ -62,7 +62,7 @@ lkm+eYJRFwZraUdycAffqQ==
     <md:Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">jku.at</shibmd:Scope>
     </md:Extensions>
-    <md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
diff --git a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr.xml b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
index 8e651a3b..4a780fd9 100644
--- a/swamid-interfederations-2.0/shibboleth.insa-cvl.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.insa-cvl.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-cvl.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.insa-rouen.fr.xml b/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml
index 70b089a8..e056e2fe 100644
--- a/swamid-interfederations-2.0/shibboleth.insa-rouen.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.insa-rouen.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-rouen.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
new file mode 100644
index 00000000..6d5e7776
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.medvik.cz-idp-shibboleth.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth.medvik.cz/idp/shibboleth">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-10-16T11:08:52Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="true">medvik.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">National Medical Library, Prague - Medvik</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for users of Medvik system.</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro uživatele systému Medvik.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.nlk.cz/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.nlk.cz/</mdui:InformationURL>
+        <mdui:Logo height="75" width="108">https://www.medvik.cz/images/medvik-logo.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
+NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
+aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
+OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
+cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
+Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
+PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
+1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
+WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
+BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
+ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
+aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
+9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
+FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
+Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
+IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
+0WzVDPkawhmccTbRUyqTcQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.medvik.cz/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="true">medvik.cz</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+
+MIIDPDCCAiSgAwIBAgIVALhNUzUSgsNOgW9LDvjMF1eO3MVfMA0GCSqGSIb3DQEB
+BQUAMB8xHTAbBgNVBAMMFHNoaWJib2xldGgubWVkdmlrLmN6MB4XDTE0MTAwNjEy
+NDAyMFoXDTM0MTAwNjEyNDAyMFowHzEdMBsGA1UEAwwUc2hpYmJvbGV0aC5tZWR2
+aWsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDbFpOdyzUFOL+l
+OfkXH3elU8ELBA4HPJxhmnbC0HLcOhtG7F1cpeeHn1qEW8VmTpdrjcXc1+cy7tBo
+cJOtkSYxWPU8SPzSnSXEoxpvaFfLjmQScJ4BnbTj03pItD+ZxBodSwS1MCI0LjJw
+Al1KI2fnV3hCsJ11PW35bhRqyl0zdTrne2Y7s5eQ6lnYOVcxNQBwY5Pz72TuNrvz
+PjyCD9v1iHozseTc+tkhl1EgWtr7NX9uvYqhh0IiowvjWQzhJbKH710mrhtyazYV
+1QsjU/M28FJJh8OY8zwaCN6xKTc+JONGdFMonK4yjrbzZUw8OUfktl4rAMyLtbA2
+WuLV9fRRAgMBAAGjbzBtMB0GA1UdDgQWBBSIZSVLqhf/EKsXe5yziqT5xbGAijBM
+BgNVHREERTBDghRzaGliYm9sZXRoLm1lZHZpay5jeoYraHR0cHM6Ly9zaGliYm9s
+ZXRoLm1lZHZpay5jei9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEA
+aliUWOCr/uziYYSeLmJbKRcNwQVyYhGZOVpaar2LpgVo1NfS7+MRjZCEWg+oXPKF
+9ixygW/vaxBeXtXR5/FMgBkzP4NmlRMUVYL8paMqqUqBvJ7Do0yrGOBKf/enm0iJ
+FPk29vsRDXPZtqchryyFgQcubaItqzMjV1tDGNeKKcWXk7DtdXWYX8zYw/9ANWjz
+Avi9oeMfp7Q/w76zUkcHl5PiV8Mr7cxF4InWUWhR/+jbDKL0B22R0je0Jw9QUD2d
+IBOVCjh6ZnQwMUpNxRVeU1zEvy1CHYLyc/jhFnxxmgS0k24qlyQ6BuB76t++E1a5
+0WzVDPkawhmccTbRUyqTcQ==
+
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.medvik.cz/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.medvik.cz/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">National Medical Library</OrganizationName>
+    <OrganizationName xml:lang="cs">Národní lékařská knihovna</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">National Medical Library, Prague - Medvik</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="cs">Národní lékařská knihovna - Medvik</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.nlk.cz/</OrganizationURL>
+    <OrganizationURL xml:lang="cs">http://www.nlk.cz/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Filip</GivenName>
+    <SurName>Kriz</SurName>
+    <EmailAddress>medvik@nlk.cz</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mines-ales.fr.xml b/swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml
index b84e494e..d4f137fa 100644
--- a/swamid-interfederations-2.0/shibboleth.mines-ales.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.mines-ales.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">mines-ales.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml b/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml
new file mode 100644
index 00000000..87cda6ff
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.mzk.cz-simplesaml-metadata.xml.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mzk.cz/simplesaml/metadata.xml">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2011-08-10T11:54:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">mzk.cz</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">The Moravian Library in Brno</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="cs">Moravská zemská knihovna</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for employees and readers of the Moravian Library in Brno</mdui:Description>
+        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a čtenáře Moravské zemské knihovny</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.mzk.cz/en</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="cs">http://www.mzk.cz/</mdui:InformationURL>
+        <mdui:Logo height="68" width="92">https://www2.eduid.cz/idp-loga/mzk.png</mdui:Logo>
+      </mdui:UIInfo>
+      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
+        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
+      </eduidmd:RepublishRequest>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIE9zCCA9+gAwIBAgIQdHGSoLeaV4jnLePN/TAq4TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowTDELMAkGA1UEBhMCQ1oxKDAmBgNVBAoTH01vcmF2c2thIHplbXNrYSBrbmlob3ZuYSB2IEJybmUxEzARBgNVBAMTCnd3dy5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHpMIIB5TAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwgaAGA1UdEQSBmDCBlYIKd3d3Lm16ay5jeoILYmV0YS5temsuY3qCC2R1aGEubXprLmN6gg9oZWxwZGVzay5temsuY3qCD2ludHJhbmV0Lm16ay5jeoIGbXprLmN6ghFwbGF5Z3JvdW5kLm16ay5jeoIMc2FmZXEubXprLmN6ghFzaGliYm9sZXRoLm16ay5jeoIPc3Bpc292a2EubXprLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCtIwmPzQ97KOX2Mul/EeDbM2Rz5lXrw54sGKg7xB8l9RUf7ttt94AdNoduPL7es6qrByspdK8XwgC0Et8QWEZ1OJhJlgVtqEvb9dzgv93QAaSNwDL/PZyXrfkoR+iBM4nAbnTn/joInC2Dbyl2KOUsb42V8qmHoIAWZAhRwqKMEtXhbxQArtL98RJRaIW0lkXVN4r8ep1/jF7kua4dIzeK2XpKiXxi77rW8lAkSXcTBitG7RhXwbTPB8MroQ9QVSBq/RS9ArCHap6+wCMmy5H6+0KJ9nsVi4AOqfwh79vx0AuKGL2sEqnniw17UExbcwM1s7ZI/NynOvs1I/HL6Yjg
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIE9zCCA9+gAwIBAgIQdHGSoLeaV4jnLePN/TAq4TANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDEzMDAwMDAwMFoXDTE2MDEzMDIzNTk1OVowTDELMAkGA1UEBhMCQ1oxKDAmBgNVBAoTH01vcmF2c2thIHplbXNrYSBrbmlob3ZuYSB2IEJybmUxEzARBgNVBAMTCnd3dy5temsuY3owggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOcSiUXQ2KY7dO4ImB2hokEwDxG3UlAXfH4XBGn417uzrG6VLcSh/OqiEpljmLSaOMkTAQ8C6oT7HqwxnAmheuDgYCCCsAA1ltTdaoWEhyG7D8ForDbnJVGcCOjOSqQpfzP91NrrHNVvPTIqecsGg8cEstubYhAP0jiRXZMa4Xt53WXUvO9FrBpT81WWgJ44Npy1SgDbflgd2YXT9GZCpNoNlL78NE+/m64Ccx4pvheMp/7tTqBzpo1IRUrjYr8eGVPYfu5rSRUTCQaEySfmLkbdIEKr7BMRZxf01DaW17MqK0srOUbarGNSilJ5sfv+h3C5lpoVfaMGFelBuV8DWtAgMBAAGjggHpMIIB5TAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUre4x48667NN4iCQRNTZfTXIGadAwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwgaAGA1UdEQSBmDCBlYIKd3d3Lm16ay5jeoILYmV0YS5temsuY3qCC2R1aGEubXprLmN6gg9oZWxwZGVzay5temsuY3qCD2ludHJhbmV0Lm16ay5jeoIGbXprLmN6ghFwbGF5Z3JvdW5kLm16ay5jeoIMc2FmZXEubXprLmN6ghFzaGliYm9sZXRoLm16ay5jeoIPc3Bpc292a2EubXprLmN6MA0GCSqGSIb3DQEBBQUAA4IBAQCtIwmPzQ97KOX2Mul/EeDbM2Rz5lXrw54sGKg7xB8l9RUf7ttt94AdNoduPL7es6qrByspdK8XwgC0Et8QWEZ1OJhJlgVtqEvb9dzgv93QAaSNwDL/PZyXrfkoR+iBM4nAbnTn/joInC2Dbyl2KOUsb42V8qmHoIAWZAhRwqKMEtXhbxQArtL98RJRaIW0lkXVN4r8ep1/jF7kua4dIzeK2XpKiXxi77rW8lAkSXcTBitG7RhXwbTPB8MroQ9QVSBq/RS9ArCHap6+wCMmy5H6+0KJ9nsVi4AOqfwh79vx0AuKGL2sEqnniw17UExbcwM1s7ZI/NynOvs1I/HL6Yjg
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEmDCCA4CgAwIBAgIJAP7tUyCsoo2RMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejAeFw0xMTA3MjAwNjUyMjFaFw0xNDA3MTkwNjUyMjFaMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3A8vApmQ5m5S+vblZKdVzA7z3ef+3jqE5XfdVX9ehRTuQ1FZfjcooX6G7/Y3cR4ylFBwQSJ1TNm8vX1s8w/sbmuP6t40HLezMiwdj7gDr6HY8roXF2I+UQPxsCM+c0SleOAoZiVNQsWGAi9w0jU8AN+VsmPuRqeAUdkVGFzaiS2lsWPiriP/EOWBxo0i4rc1jE0bwam4/hJEfUub6n+11YmmKFTtieYVRomWmlwuCOMQ30xwXJwrF7p8rMNhKLohBQKU/3BhDZC1U269AAlAa9WVF1hhXjypkzFXdwKA42rGVKl5G17tWwmhv9kTmgZnLtK1KDq1mBYfo9VUOysA8CAwEAAaOB9jCB8zAdBgNVHQ4EFgQUK1gE2KOVHyAUVS5m/2wK40F0ohkwgcMGA1UdIwSBuzCBuIAUK1gE2KOVHyAUVS5m/2wK40F0ohmhgZSkgZEwgY4xCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzENMAsGA1UEBxMEQnJubzEZMBcGA1UEChMQTW9yYXZpYW4gTGlicmFyeTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3oxIDAeBgkqhkiG9w0BCQEWEXNoaWJib2xldGhAbXprLmN6ggkA/u1TIKyijZEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAvkpXj3KlQ+dRxqvw5WX338tepnd070CV0cEIf06e4BBDkdOKsKxwKuY+26/G8kYLdok22GCZPDkpOe0j+IDXWfjy48X65+anIY75jEOZRBIgQkjeNMC9+PkRxV9w7k1qlWsQ8sJVNX9d7npkhA6fNItrWSm79nPRoT6GURgDvRRRddIyPS+RHtQIPe7a/bbWD4Sw7RdqZw0BEWiVEg6odFK1XQ72XYeIxfWvpCqcsLtlb6zCjOH5X31UYPrccoKKUGPs7IMP4NFkCnS28FpCAxRMqOEdwt7iWhedJFr51k+vX6wKGI/AiyHkhHm97+w7OsrwIZfpX4yUDfALdaN10Q==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mzk.cz/simplesaml/shib13/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Moravian Library</md:OrganizationName>
+    <md:OrganizationName xml:lang="cs">Moravská zemská knihovna</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Moravian Library</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="cs">Moravská zemská knihovna</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.mzk.cz/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="cs">http://www.mzk.cz/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:SurName>Administrator</md:SurName>
+    <md:EmailAddress>shibboleth@mzk.cz</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.mzk.cz.xml b/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
deleted file mode 100644
index 6eb513b5..00000000
--- a/swamid-interfederations-2.0/shibboleth.mzk.cz.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.mzk.cz/simplesaml/metadata.xml">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
-      </mdasrt:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope regexp="false">mzk.cz</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">The Moravian Library in Brno</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">Moravská zemská knihovna</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for employees and readers of the Moravian Library in Brno</mdui:Description>
-        <mdui:Description xml:lang="cs">Identity Provider pro zaměstnance a čtenáře Moravské zemské knihovny</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.mzk.cz/en</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://www.mzk.cz/</mdui:InformationURL>
-        <mdui:Logo height="68" width="92">https://www2.eduid.cz/idp-loga/mzk.png</mdui:Logo>
-      </mdui:UIInfo>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIJAP7tUyCsoo2RMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejAeFw0xMTA3MjAwNjUyMjFaFw0xNDA3MTkwNjUyMjFaMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3A8vApmQ5m5S+vblZKdVzA7z3ef+3jqE5XfdVX9ehRTuQ1FZfjcooX6G7/Y3cR4ylFBwQSJ1TNm8vX1s8w/sbmuP6t40HLezMiwdj7gDr6HY8roXF2I+UQPxsCM+c0SleOAoZiVNQsWGAi9w0jU8AN+VsmPuRqeAUdkVGFzaiS2lsWPiriP/EOWBxo0i4rc1jE0bwam4/hJEfUub6n+11YmmKFTtieYVRomWmlwuCOMQ30xwXJwrF7p8rMNhKLohBQKU/3BhDZC1U269AAlAa9WVF1hhXjypkzFXdwKA42rGVKl5G17tWwmhv9kTmgZnLtK1KDq1mBYfo9VUOysA8CAwEAAaOB9jCB8zAdBgNVHQ4EFgQUK1gE2KOVHyAUVS5m/2wK40F0ohkwgcMGA1UdIwSBuzCBuIAUK1gE2KOVHyAUVS5m/2wK40F0ohmhgZSkgZEwgY4xCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzENMAsGA1UEBxMEQnJubzEZMBcGA1UEChMQTW9yYXZpYW4gTGlicmFyeTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3oxIDAeBgkqhkiG9w0BCQEWEXNoaWJib2xldGhAbXprLmN6ggkA/u1TIKyijZEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAvkpXj3KlQ+dRxqvw5WX338tepnd070CV0cEIf06e4BBDkdOKsKxwKuY+26/G8kYLdok22GCZPDkpOe0j+IDXWfjy48X65+anIY75jEOZRBIgQkjeNMC9+PkRxV9w7k1qlWsQ8sJVNX9d7npkhA6fNItrWSm79nPRoT6GURgDvRRRddIyPS+RHtQIPe7a/bbWD4Sw7RdqZw0BEWiVEg6odFK1XQ72XYeIxfWvpCqcsLtlb6zCjOH5X31UYPrccoKKUGPs7IMP4NFkCnS28FpCAxRMqOEdwt7iWhedJFr51k+vX6wKGI/AiyHkhHm97+w7OsrwIZfpX4yUDfALdaN10Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIEmDCCA4CgAwIBAgIJAP7tUyCsoo2RMA0GCSqGSIb3DQEBBQUAMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejAeFw0xMTA3MjAwNjUyMjFaFw0xNDA3MTkwNjUyMjFaMIGOMQswCQYDVQQGEwJDWjEXMBUGA1UECBMOQ3plY2ggUmVwdWJsaWMxDTALBgNVBAcTBEJybm8xGTAXBgNVBAoTEE1vcmF2aWFuIExpYnJhcnkxGjAYBgNVBAMTEXNoaWJib2xldGgubXprLmN6MSAwHgYJKoZIhvcNAQkBFhFzaGliYm9sZXRoQG16ay5jejCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM3A8vApmQ5m5S+vblZKdVzA7z3ef+3jqE5XfdVX9ehRTuQ1FZfjcooX6G7/Y3cR4ylFBwQSJ1TNm8vX1s8w/sbmuP6t40HLezMiwdj7gDr6HY8roXF2I+UQPxsCM+c0SleOAoZiVNQsWGAi9w0jU8AN+VsmPuRqeAUdkVGFzaiS2lsWPiriP/EOWBxo0i4rc1jE0bwam4/hJEfUub6n+11YmmKFTtieYVRomWmlwuCOMQ30xwXJwrF7p8rMNhKLohBQKU/3BhDZC1U269AAlAa9WVF1hhXjypkzFXdwKA42rGVKl5G17tWwmhv9kTmgZnLtK1KDq1mBYfo9VUOysA8CAwEAAaOB9jCB8zAdBgNVHQ4EFgQUK1gE2KOVHyAUVS5m/2wK40F0ohkwgcMGA1UdIwSBuzCBuIAUK1gE2KOVHyAUVS5m/2wK40F0ohmhgZSkgZEwgY4xCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzENMAsGA1UEBxMEQnJubzEZMBcGA1UEChMQTW9yYXZpYW4gTGlicmFyeTEaMBgGA1UEAxMRc2hpYmJvbGV0aC5temsuY3oxIDAeBgkqhkiG9w0BCQEWEXNoaWJib2xldGhAbXprLmN6ggkA/u1TIKyijZEwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAvkpXj3KlQ+dRxqvw5WX338tepnd070CV0cEIf06e4BBDkdOKsKxwKuY+26/G8kYLdok22GCZPDkpOe0j+IDXWfjy48X65+anIY75jEOZRBIgQkjeNMC9+PkRxV9w7k1qlWsQ8sJVNX9d7npkhA6fNItrWSm79nPRoT6GURgDvRRRddIyPS+RHtQIPe7a/bbWD4Sw7RdqZw0BEWiVEg6odFK1XQ72XYeIxfWvpCqcsLtlb6zCjOH5X31UYPrccoKKUGPs7IMP4NFkCnS28FpCAxRMqOEdwt7iWhedJFr51k+vX6wKGI/AiyHkhHm97+w7OsrwIZfpX4yUDfALdaN10Q==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.mzk.cz/simplesaml/shib13/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.mzk.cz/simplesaml/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Moravian Library</md:OrganizationName>
-    <md:OrganizationName xml:lang="cs">Moravská zemská knihovna</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Moravian Library</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">Moravská zemská knihovna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.mzk.cz/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="cs">http://www.mzk.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>Administrator</md:SurName>
-    <md:EmailAddress>shibboleth@mzk.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.nkp.cz.xml b/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml
index b0f15f2f..0a987cd0 100644
--- a/swamid-interfederations-2.0/shibboleth.nkp.cz.xml
+++ b/swamid-interfederations-2.0/shibboleth.nkp.cz-idp-shibboleth.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth.nkp.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T15:29:31Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
-      </mdasrt:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-interfederations-2.0/shibboleth.obspm.fr.xml b/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml
index df432a25..1498886c 100644
--- a/swamid-interfederations-2.0/shibboleth.obspm.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.obspm.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">obspm.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
index 24762193..24762193 100644
--- a/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br.xml
+++ b/swamid-interfederations-2.0/shibboleth.reitoria.unesp.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr.xml b/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml
index a660493a..41bc164b 100644
--- a/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.sciencespo-grenoble.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sciencespo-grenoble.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.techlib.cz.xml b/swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml
index 44f37f3a..5f2ce733 100644
--- a/swamid-interfederations-2.0/shibboleth.techlib.cz.xml
+++ b/swamid-interfederations-2.0/shibboleth.techlib.cz-idp-shibboleth.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth.techlib.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-08-05T12:59:38Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <mdasrt:AttributeValue>http://eduid.cz/uri/idp-group/library</mdasrt:AttributeValue>
-      </mdasrt:Attribute>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/library</saml:AttributeValue>
+      </saml:Attribute>
     </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
diff --git a/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr.xml b/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml
index 1e68a569..ada43b2c 100644
--- a/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.u-bourgogne.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-bourgogne.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr.xml b/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml
index 5cb50ff0..61e7e7ee 100644
--- a/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.u-grenoble3.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-grenoble3.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.ufsc.br.xml b/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml
index f5549781..f5549781 100644
--- a/swamid-interfederations-2.0/shibboleth.ufsc.br.xml
+++ b/swamid-interfederations-2.0/shibboleth.ufsc.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr.xml b/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml
index 644c3412..e06845a5 100644
--- a/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.ujf-grenoble.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ujf-grenoble.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.unb.br.xml b/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml
index 3013a11e..3013a11e 100644
--- a/swamid-interfederations-2.0/shibboleth.unb.br.xml
+++ b/swamid-interfederations-2.0/shibboleth.unb.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
new file mode 100644
index 00000000..f33bcb43
--- /dev/null
+++ b/swamid-interfederations-2.0/shibboleth.unifi.it-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shibboleth.unifi.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-23T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unifi.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">University of Florence</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università di Firenze</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider for University of Florence users </mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università di Firenze</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5
+MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3
+nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6z
+HVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scc
+eiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM
+4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQz
+H+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20w
+azBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJi
+b2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Y
+o/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyM
+qNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURu
+saq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD
+0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9T
+r8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18
+OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unifi.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unifi.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unifi.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5
+MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3
+nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6z
+HVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scc
+eiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM
+4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQz
+H+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20w
+azBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJi
+b2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Y
+o/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyM
+qNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURu
+saq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD
+0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9T
+r8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18
+OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Studies of Florence</OrganizationName>
+    <OrganizationName xml:lang="it">Università degli Studi di Firenze</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Florence</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Università di Firenze</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unifi.it</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.unifi.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>idem@unifi.it.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.unifi.it.xml b/swamid-interfederations-2.0/shibboleth.unifi.it.xml
deleted file mode 100644
index 4349f7c5..00000000
--- a/swamid-interfederations-2.0/shibboleth.unifi.it.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibboleth.unifi.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2011-06-23T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Florence</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università di Firenze</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity provider for University of Florence users </mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università di Firenze</mdui:Description>
-        <mdui:InformationURL xml:lang="en">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">https://shibboleth.unifi.it/info/index.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.siaf.unifi.it/CMpro-v-p-606.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6zHVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scceiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQzH+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJib2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Yo/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyMqNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURusaq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9Tr8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.unifi.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibboleth.unifi.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.unifi.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unifi.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIJAPWvhnhnIM07MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNVBAMTE3NoaWJib2xldGgudW5pZmkuaXQwHhcNMTEwNTA5MTI0MTMyWhcNMzEwNTA5MTI0MTMyWjAeMRwwGgYDVQQDExNzaGliYm9sZXRoLnVuaWZpLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAlTYplVQaIDgOLjhY6W0ysUneVOsAhdD3nKOLZC6NO1CFlFB8gINO2i+SkTVkhQ2jFAjq9XXb9WBsqx2Ta4skroyM1I039R6zHVFAmtib4Ea8spGXhg87OnxiPaXijJ81d6ka3At+g0VQYJ5w7jC/cuRaT4sk3scceiQlViLn1kdcUYyXQo54gtwBjEoNvlPfF/S9ljdyo/yU7/oz4SQrDuYThqV+xXCM4ZTRt0gWcEAdd+d3mpfohNrEuGptbVoD6gpBkG9ytl/UVnKpkd32JDWLxeDDNOQzH+PWA1KbjR2aM//87u7rq9WBgjufjwYzTT4nulbzl/Mur+eyUFF80QIDAQABo20wazBKBgNVHREEQzBBghNzaGliYm9sZXRoLnVuaWZpLml0hipodHRwczovL3NoaWJib2xldGgudW5pZmkuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFHnEVLfzRW+Yo/M/MOvtO3S+knB3MA0GCSqGSIb3DQEBBQUAA4IBAQCM8asqBBYAnVvJXtFEfuyMqNAqiwomAQ1YPTPj4tD0w9EK9aMqJN4OCo/3Dy4fuHx4F9xAtWApP8cRvUswCURusaq1eUJ4Oay+ck1AxKl93EueGJxk46ZLUjizspod/N5U342IYKAIMTV2EZxKaLGD0yF4A47fZKHJSY+L0MaonVdOleDN1dsICwYbCo5xvhaV+QlW+10orfGhe+JqMm9Tr8mC7l26BgX42zsxXS6O5cGQpu9YBa9fiL5wqhxet2xvHBI0mOekpH0+PGRvwe18OFmZKVHYQGnUEfIKGWoFZSeZhO9UJsWJNdRxSkDf9m71otdlbfFSJ8BqkOm3AElL</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibboleth.unifi.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Studies of Florence</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Firenze</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Florence</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Firenze</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unifi.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unifi.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>idem@unifi.it.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-corse.fr.xml b/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml
index 8a99fac9..206b969d 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-corse.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-corse.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-corse.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.univ-evry.fr.xml b/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml
index 58080912..57df4e38 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-evry.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-evry.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-evry.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr.xml b/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml
index 081fdd83..fccb0c47 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-paris-est.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris-est.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.univ-savoie.fr.xml b/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml
index 50d3bb6d..ef0b1a20 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-savoie.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-savoie.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-savoie.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
@@ -38,39 +38,6 @@ fRpaYtLzzvazSNT3CXWP0kJT5+P6Ck0s8cpcMlV7frEEnL4u
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>
-					      MIIEozCCA4ugAwIBAgIRAI4l0qeSwD721XynyynW3cMwDQYJKoZIhvcNAQEFBQAw
-NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-IFNTTCBDQTAeFw0xMDAxMDgwMDAwMDBaFw0xMzAxMDcyMzU5NTlaMHIxCzAJBgNV
-BAYTAkZSMREwDwYDVQQHEwhHcmVub2JsZTEqMCgGA1UECgwhVW5pdmVyc2l0w6kg
-UGllcnJlIE1lbmTDqHMgRnJhbmNlMSQwIgYDVQQDExtmZWRlcmF0aW9uLnVwbWYt
-Z3Jlbm9ibGUuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC1LOes
-Rv4NAi3lZrezozKe/hb2w9zVX5VuxIIx+aoQmjnNtcXPJOmafyE14e1vEtMpo1hU
-/RheUZeTI/ErvWxPh+1OTaYHkaOB8cwpIDSz1EgJp6lQv/nEex/iNSH/cocCCNcc
-qQLdpKaeDk37l41CiCL04BAB6D9oauBf7LAXv+nfCD9kBkEcu2HXqNn0jdSlUZhA
-BEHcqXOusqWFu/+DFx81CZQxgpz69aCszYmgul+0mjo9JQA7YuPfYPUbDeGwkseM
-ZTDRuavRPN8kAecUdEyWhNxyiHmAoTF0MpcUWS6lcgbBvtyjws4/7D2IgrEkXvw+
-VhE6qZokMRVFniv3AgMBAAGjggFuMIIBajAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
-ays3V0fqkOO57TAdBgNVHQ4EFgQUBu+XcJzseO2x3VqaW3AStmtIBH0wDgYDVR0P
-AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
-AQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2g
-K4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYI
-KwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEu
-b3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNz
-LnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbZmVkZXJhdGlvbi51cG1mLWdyZW5vYmxl
-LmZyMA0GCSqGSIb3DQEBBQUAA4IBAQB54CGL7v56BQCGQnx2i1IwwNMaHGBeRkaa
-uoZhl/rCVa+T8J2f/3GvsqqP6ebixhbM6vb6cAdj1LZ7zeQ+MoMtRvwCSK1l6CVL
-Qvkel4O5LJ8NtNn2kN4YSfqs2lfNAn7pBNvbPHf+2+AHJeEW0b/N0g8WWN0Tlfm5
-qaw9j+NslVtHqIrFktO3uMqQf4MxsMpExYfJBfQo5K9iWvmsYKYcxyurUDfd/DM2
-foqI/gQjYsBDs0kX8KvSyw6qBdmwLbWjn8MXv7Kujt+WCn6avYGogj2y6gCe5oMU
-1/tCmqjXVgNZfBz5hWp7Zku7qvEMbAwUOH8vQlFrn1+BMPLsjZ8F
-					    </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
     <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-savoie.fr/idp/profile/SAML2/POST/SSO"/>
diff --git a/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr.xml b/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml
index 9adb3833..827d4de5 100644
--- a/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.univ-toulouse.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-toulouse.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr.xml b/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml
index 0bd54ea7..ca952660 100644
--- a/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.upmf-grenoble.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">upmf-grenoble.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.ups-tlse.fr.xml b/swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml
index 26586043..a5fbdb29 100644
--- a/swamid-interfederations-2.0/shibboleth.ups-tlse.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.ups-tlse.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse3.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth.utb.cz.xml b/swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml
index 1a5a2236..dfea2da6 100644
--- a/swamid-interfederations-2.0/shibboleth.utb.cz.xml
+++ b/swamid-interfederations-2.0/shibboleth.utb.cz-idp-shibboleth.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://shibboleth.utb.cz/idp/shibboleth">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2013-12-19T16:42:51Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/shibboleth.uvsq.fr.xml b/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml
index 9467bc3b..1c57c813 100644
--- a/swamid-interfederations-2.0/shibboleth.uvsq.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth.uvsq.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uvsq.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr.xml b/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml
index b8b7256f..cb8afa64 100644
--- a/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr.xml
+++ b/swamid-interfederations-2.0/shibboleth2.crous-poitiers.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-poitiers.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibboleth2.ufms.br.xml b/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml
index eab2ef6e..eab2ef6e 100644
--- a/swamid-interfederations-2.0/shibboleth2.ufms.br.xml
+++ b/swamid-interfederations-2.0/shibboleth2.ufms.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml b/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
new file mode 100644
index 00000000..ef163336
--- /dev/null
+++ b/swamid-interfederations-2.0/shibidp.cca.unipd.it-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shibidp.cca.unipd.it/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unipd.it</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">University of Padova</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Università degli Studi di Padova</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity Provider for users affiliated to the University of Padova</mdui:Description>
+        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Padova</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.unipd.it/en/idem</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.unipd.it/idem</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipd.it/en/idem</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipd.it/idem</mdui:PrivacyStatementURL>
+        <mdui:Logo height="16" width="16" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
+        <mdui:Logo height="16" width="16" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgz
+NjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlw
+ZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69H
+sIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlA
+YkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj3
+1K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq
+7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKA
+erlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQ
+kKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSG
+K2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAM
+OKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95K
+HSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgted
+d1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsG
+d/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe
+48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zml
+G+DXFhqRaj5xn2FulnFc
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.cca.unipd.it/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">unipd.it</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEF
+BQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgz
+NjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlw
+ZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69H
+sIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlA
+YkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj3
+1K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq
+7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKA
+erlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQ
+kKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSG
+K2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYD
+VR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAM
+OKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95K
+HSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgted
+d1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsG
+d/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe
+48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zml
+G+DXFhqRaj5xn2FulnFc
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">University of Padova</OrganizationName>
+    <OrganizationName xml:lang="it">Università degli Studi di Padova</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">University of Padova</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Università di Padova</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.unipd.it/en/</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.unipd.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>supporto.sso@unipd.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml b/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml
deleted file mode 100644
index e114a2bb..00000000
--- a/swamid-interfederations-2.0/shibidp.cca.unipd.it.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.cca.unipd.it/idp/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">University of Padova</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Università degli Studi di Padova</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Identity Provider for users affiliated to the University of Padova</mdui:Description>
-        <mdui:Description xml:lang="it">Identity provider per gli utenti dell'Università degli Studi di Padova</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unipd.it/en/idem</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.unipd.it/idem</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.unipd.it/en/idem</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.unipd.it/idem</mdui:PrivacyStatementURL>
-        <mdui:Logo height="16" width="16" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
-        <mdui:Logo height="16" width="16" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd16x16.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="en">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">https://bandi.didattica.unipd.it/logo-unipd80x60.png</mdui:Logo>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEFBQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgzNjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlwZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69HsIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlAYkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj31K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKAerlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQkKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSGK2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAMOKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95KHSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgtedd1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsGd/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zmlG+DXFhqRaj5xn2FulnFc</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibidp.cca.unipd.it/idp/profile/Shibboleth/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibidp.cca.unipd.it/idp/profile/SAML2/Redirect/SSO"/>
-  </md:IDPSSODescriptor>
-  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipd.it</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDOzCCAiOgAwIBAgIUTSdt0Dt8swpFu9qJLBfnEV09alwwDQYJKoZIhvcNAQEFBQAwHzEdMBsGA1UEAxMUc2hpYmlkcC5jY2EudW5pcGQuaXQwHhcNMTAxMjI5MTgzNjIyWhcNMzAxMjI5MTgzNjIyWjAfMR0wGwYDVQQDExRzaGliaWRwLmNjYS51bmlwZC5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJMiK2A2ZC6vp69HsIR2wqYEMMkDfhs91u1UhDibfc1kT3LZEPN42L6B95s1TZb6+f1M5YDCmDzmHrlAYkFbK/yW2jSHXuTR+dSP071d+Xa+00qrokGotUYyqstfqOjiAhVyC4vDVwDgAPj31K9wCjrZcazt3NZC6mPD9XJBQ1YJ6sDvk6y+UVQfeHoKKrAC9MSoFMRwoLI9izIq7NbqOLV9pDjV4GvspxJs00krQiATzoYblatuR4xtSHcSpmYFqD6VCTosKwISLqKAerlsKlyfKSBF7xuan+lgzJLSLWvvhj+Bv0oRfOJnQEsP1vjG/s9J8RQPee/HdmjQkKiHOF0CAwEAAaNvMG0wTAYDVR0RBEUwQ4IUc2hpYmlkcC5jY2EudW5pcGQuaXSGK2h0dHBzOi8vc2hpYmlkcC5jY2EudW5pcGQuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYTCKzj5155S2lqpPV5/6I1jePjMA0GCSqGSIb3DQEBBQUAA4IBAQAMOKvcKfl2rMZS1ivnvOcDNNwgXEaa27Vre4D6PxMhR4dM3UvdS+qP2pL6M2guI95KHSR4VUoHXw4Hnq5Hk9yyCBp38xmPs7AefGcbYvgf3nx75CEtXE9jDG35tL9lgtedd1Ksu3uT3jxKcPTVqdNWnTB7N2TYoWJhbGOmC1US4iMzp5UEGrvdZUvcZI+6/VsGd/CKd1tzg3Io4xevtARfgavjvQ5VDbyGdzMg9GD3h5zNsTDDqEjFyylYlay7cUCe48QsT4K0vJexMVAd/xf3jNCQmcFmgmE/pgq+4636NURxTV39x3TxwjQv6Wa57zmlG+DXFhqRaj5xn2FulnFc</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://shibidp.cca.unipd.it:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-  </md:AttributeAuthorityDescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">University of Padova</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Università degli Studi di Padova</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">University of Padova</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Università di Padova</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.unipd.it/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.unipd.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>supporto.sso@unipd.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/shibidp.oca.eu.xml b/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
index 86c18810..13fd7e93 100644
--- a/swamid-interfederations-2.0/shibidp.oca.eu.xml
+++ b/swamid-interfederations-2.0/shibidp.oca.eu-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">oca.eu</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/shibidp.unipr.it.xml b/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
index 3cc0dae7..435168c5 100644
--- a/swamid-interfederations-2.0/shibidp.unipr.it.xml
+++ b/swamid-interfederations-2.0/shibidp.unipr.it-idp-shibboleth.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://shibidp.unipr.it/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://shibidp.unipr.it/idp/shibboleth">
   <Extensions>
     <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2009-12-31T15:00:00Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
@@ -7,8 +7,8 @@
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipr.it</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <shibmd:Scope regexp="false">unipr.it</shibmd:Scope>
+      <mdui:UIInfo>
         <mdui:DisplayName xml:lang="it">Università degli Studi di Parma</mdui:DisplayName>
         <mdui:DisplayName xml:lang="en">University of Parma</mdui:DisplayName>
         <mdui:Description xml:lang="it">Identity Provider per gli utenti dell'Università degli Studi di Parma</mdui:Description>
@@ -18,16 +18,32 @@
         <mdui:InformationURL xml:lang="it">http://www.unipr.it/idem</mdui:InformationURL>
         <mdui:InformationURL xml:lang="en">http://en.unipr.it/idem</mdui:InformationURL>
       </mdui:UIInfo>
-      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+      <mdui:DiscoHints>
         <mdui:GeolocationHint>geo:44.76630697035048,10.314061939716339</mdui:GeolocationHint>
       </mdui:DiscoHints>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMzWhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2vzK0+t0DPv0CugzVEeroctEN4VdJggVTqeQVexIM4sFW7q3kVQvmA8kgVMmcZ9RHYyZac6Uw3Dj0ooO+DjYsJBgYRB4eN13gCpeWZQ1gcbbgV9FhLZGs9r+SRPtWgOjPb1Sns88XFBftjy9fZ7RJqQovbvklEOHgWhhuz4xy6YMOItT01Z+amabYrh6pDG0007vPZjhT10LqcEExwvZjo6I5xd5s0w8z84EtDry2FhSaWs5AX3sQZYIiPONp/11uRZSvBBFKmCMDEIA32bGEcEODQLUNKNPs/9AYdj+JFhehtILdVFVmHj3U76P9z6x7Brhrr6bMZ+wdvj+t+kabQIDAQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLnVuaXByLml0hidodHRwczovL3NoaWJpZHAudW5pcHIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlXoLjlhaJDmLtp1r0Upn1PYpYlMA0GCSqGSIb3DQEBBQUAA4IBAQCzfKVH8RL3qOrpo6ZAh/AV2vYGkeV1RlSc1yc07K/hKG3HKkBim5HvGxeT5jMRNLlXZRkWEnrzmfCoyeyTgbis4YWyqKT4VKLCqsOGBdn00mbRUVDhQSH2MSTEy6Iqa+3SDeQ8iyolKinYnBu0LDg7aU+b3F6vQHeLEdJvX1V6c/
-                            z7gV3YdNEA3Z9dCQavw47LLDB5QlCKtWuKklpBrQaoddU75GdAb8W4csgACMgqBSU30w/yJ79q8O9ajffJta01wOXXJhvtlGtNnV42ACg4Pqwh2EyQjPtYYja8SrAmwgp4k705jtn+QNLUs1VD6hw9LmoRFpxn1zb21fL3rZAs 
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMz
+WhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2vzK0+t0DPv0CugzVEeroctE
+N4VdJggVTqeQVexIM4sFW7q3kVQvmA8kgVMmcZ9RHYyZac6Uw3Dj0ooO+DjYsJBg
+YRB4eN13gCpeWZQ1gcbbgV9FhLZGs9r+SRPtWgOjPb1Sns88XFBftjy9fZ7RJqQo
+vbvklEOHgWhhuz4xy6YMOItT01Z+amabYrh6pDG0007vPZjhT10LqcEExwvZjo6I
+5xd5s0w8z84EtDry2FhSaWs5AX3sQZYIiPONp/11uRZSvBBFKmCMDEIA32bGEcEO
+DQLUNKNPs/9AYdj+JFhehtILdVFVmHj3U76P9z6x7Brhrr6bMZ+wdvj+t+kabQID
+AQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLnVuaXByLml0hidodHRwczovL3No
+aWJpZHAudW5pcHIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlXoLjlhaJD
+mLtp1r0Upn1PYpYlMA0GCSqGSIb3DQEBBQUAA4IBAQCzfKVH8RL3qOrpo6ZAh/AV
+2vYGkeV1RlSc1yc07K/hKG3HKkBim5HvGxeT5jMRNLlXZRkWEnrzmfCoyeyTgbis
+4YWyqKT4VKLCqsOGBdn00mbRUVDhQSH2MSTEy6Iqa+3SDeQ8iyolKinYnBu0LDg7
+aU+b3F6vQHeLEdJvX1V6c/z7gV3YdNEA3Z9dCQavw47LLDB5QlCKtWuKklpBrQao
+ddU75GdAb8W4csgACMgqBSU30w/yJ79q8O9ajffJta01wOXXJhvtlGtNnV42ACg4
+Pqwh2EyQjPtYYja8SrAmwgp4k705jtn+QNLUs1VD6hw9LmoRFpxn1zb21fL3rZAs
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
@@ -42,14 +58,30 @@
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unipr.it</shibmd:Scope>
+      <shibmd:Scope regexp="false">unipr.it</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+      <ds:KeyInfo>
         <ds:X509Data>
-          <ds:X509Certificate>MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEBBQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMzWhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2vzK0+t0DPv0CugzVEeroctEN4VdJggVTqeQVexIM4sFW7q3kVQvmA8kgVMmcZ9RHYyZac6Uw3Dj0ooO+DjYsJBgYRB4eN13gCpeWZQ1gcbbgV9FhLZGs9r+SRPtWgOjPb1Sns88XFBftjy9fZ7RJqQovbvklEOHgWhhuz4xy6YMOItT01Z+amabYrh6pDG0007vPZjhT10LqcEExwvZjo6I5xd5s0w8z84EtDry2FhSaWs5AX3sQZYIiPONp/11uRZSvBBFKmCMDEIA32bGEcEODQLUNKNPs/9AYdj+JFhehtILdVFVmHj3U76P9z6x7Brhrr6bMZ+wdvj+t+kabQIDAQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLnVuaXByLml0hidodHRwczovL3NoaWJpZHAudW5pcHIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlXoLjlhaJDmLtp1r0Upn1PYpYlMA0GCSqGSIb3DQEBBQUAA4IBAQCzfKVH8RL3qOrpo6ZAh/AV2vYGkeV1RlSc1yc07K/hKG3HKkBim5HvGxeT5jMRNLlXZRkWEnrzmfCoyeyTgbis4YWyqKT4VKLCqsOGBdn00mbRUVDhQSH2MSTEy6Iqa+3SDeQ8iyolKinYnBu0LDg7aU+b3F6vQHeLEdJvX1V6c/
-                            z7gV3YdNEA3Z9dCQavw47LLDB5QlCKtWuKklpBrQaoddU75GdAb8W4csgACMgqBSU30w/yJ79q8O9ajffJta01wOXXJhvtlGtNnV42ACg4Pqwh2EyQjPtYYja8SrAmwgp4k705jtn+QNLUs1VD6hw9LmoRFpxn1zb21fL3rZAs 
-                        </ds:X509Certificate>
+          <ds:X509Certificate>
+MIIDLDCCAhSgAwIBAgIVANMt6NQyQVgOzMWv6tQmeV5iMyCNMA0GCSqGSIb3DQEB
+BQUAMBsxGTAXBgNVBAMTEHNoaWJpZHAudW5pcHIuaXQwHhcNMDkwOTAyMDgwMjMz
+WhcNMjkwOTAyMDgwMjMzWjAbMRkwFwYDVQQDExBzaGliaWRwLnVuaXByLml0MIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA2vzK0+t0DPv0CugzVEeroctE
+N4VdJggVTqeQVexIM4sFW7q3kVQvmA8kgVMmcZ9RHYyZac6Uw3Dj0ooO+DjYsJBg
+YRB4eN13gCpeWZQ1gcbbgV9FhLZGs9r+SRPtWgOjPb1Sns88XFBftjy9fZ7RJqQo
+vbvklEOHgWhhuz4xy6YMOItT01Z+amabYrh6pDG0007vPZjhT10LqcEExwvZjo6I
+5xd5s0w8z84EtDry2FhSaWs5AX3sQZYIiPONp/11uRZSvBBFKmCMDEIA32bGEcEO
+DQLUNKNPs/9AYdj+JFhehtILdVFVmHj3U76P9z6x7Brhrr6bMZ+wdvj+t+kabQID
+AQABo2cwZTBEBgNVHREEPTA7ghBzaGliaWRwLnVuaXByLml0hidodHRwczovL3No
+aWJpZHAudW5pcHIuaXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFMlXoLjlhaJD
+mLtp1r0Upn1PYpYlMA0GCSqGSIb3DQEBBQUAA4IBAQCzfKVH8RL3qOrpo6ZAh/AV
+2vYGkeV1RlSc1yc07K/hKG3HKkBim5HvGxeT5jMRNLlXZRkWEnrzmfCoyeyTgbis
+4YWyqKT4VKLCqsOGBdn00mbRUVDhQSH2MSTEy6Iqa+3SDeQ8iyolKinYnBu0LDg7
+aU+b3F6vQHeLEdJvX1V6c/z7gV3YdNEA3Z9dCQavw47LLDB5QlCKtWuKklpBrQao
+ddU75GdAb8W4csgACMgqBSU30w/yJ79q8O9ajffJta01wOXXJhvtlGtNnV42ACg4
+Pqwh2EyQjPtYYja8SrAmwgp4k705jtn+QNLUs1VD6hw9LmoRFpxn1zb21fL3rZAs
+</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
     </KeyDescriptor>
diff --git a/swamid-interfederations-2.0/si.crous-rouen.fr.xml b/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml
index 27454f79..8919a65f 100644
--- a/swamid-interfederations-2.0/si.crous-rouen.fr.xml
+++ b/swamid-interfederations-2.0/si.crous-rouen.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crous-rouen.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/siaiap08.univali.br.xml b/swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml
index 0ca3c63b..0ca3c63b 100644
--- a/swamid-interfederations-2.0/siaiap08.univali.br.xml
+++ b/swamid-interfederations-2.0/siaiap08.univali.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml b/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
new file mode 100644
index 00000000..88dd8652
--- /dev/null
+++ b/swamid-interfederations-2.0/signon.rug.nl-nidp-saml2-metadata.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://signon.rug.nl/nidp/saml2/metadata">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-10-09T11:57:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Rijksuniversiteit Groningen</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Groningen</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Rijksuniversiteit Groningen</mdui:Description>
+        <mdui:Description xml:lang="en">Rijksuniversiteit Groningen</mdui:Description>
+        <mdui:Logo height="25" width="108">https://static.surfconext.nl/media/idp/rug.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">University of Groningen Rijksuniversiteit Groningen RUG</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">University of Groningen Rijksuniversiteit Groningen RUG</mdui:Keywords>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
+VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
+A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
+DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
+Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
+dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
+VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
+MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
+efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
+HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
+TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
+n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
+4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
+MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
+FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
+9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
+UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
+7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
+MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/56d78f05c751aeb3d57b29caff8510e3"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Rijksuniversiteit Groningen</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RUG</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rug.nl</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sistemas.uepg.br.xml b/swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml
index 3ffe26c5..3ffe26c5 100644
--- a/swamid-interfederations-2.0/sistemas.uepg.br.xml
+++ b/swamid-interfederations-2.0/sistemas.uepg.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/sivic.redclara.net.xml b/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml
index d5e66362..d5e66362 100644
--- a/swamid-interfederations-2.0/sivic.redclara.net.xml
+++ b/swamid-interfederations-2.0/sivic.redclara.net-shibboleth.xml
diff --git a/swamid-interfederations-2.0/software.msdnaa.dk-.xml b/swamid-interfederations-2.0/software.msdnaa.dk-.xml
new file mode 100644
index 00000000..7306b3e2
--- /dev/null
+++ b/swamid-interfederations-2.0/software.msdnaa.dk-.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://software.msdnaa.dk/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDgDCCAumgAwIBAgIDEzx+MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNjA2MDkyMDM3WhcNMTIwNzA4MDcxMjI0WjCB6zEpMCcGA1UEBRMgLWhiZTRROUFVcWItUFRhc2lCSkxwdnYvRUlIcGc0bksxCzAJBgNVBAYTAkRLMRswGQYDVQQKExJzb2Z0d2FyZS5tc2RuYWEuZGsxEzARBgNVBAsTCkdUMDc5NTQ3NjIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTAxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRswGQYDVQQDExJzb2Z0d2FyZS5tc2RuYWEuZGswgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAFv3keVCtJjzg1taFiriiPjTMWHmVdYSsW9ZSBA38CXKm9I4Du3SiiX+TuXW65+1WwPSX1AxpTMCluFfIEzs2IvHLAMdU5+AyCZLEE627ux7dClGzwd9A9fpqrU4XI2Cq2GdlaxTrFfsfIw00CUv+PYlohLHXM96D8H6B46uRfAgMBAAGjgc0wgcowHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gjIBBPM5iQn9QwDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHREEFjAUghJzb2Z0d2FyZS5tc2RuYWEuZGswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9zZWN1cmVjYS5jcmwwHQYDVR0OBBYEFOMgzsyArmCbYFjO+X4rJFgvplLTMA0GCSqGSIb3DQEBBQUAA4GBAIQVfBTbp8SBQI7B/04g5ExQlLO5HW1Y6AbCZ09rbMMJjX6PwDS/HAI4BOrTpe49kB3jxPcmT/IWQrYbBod2I+hIBNP+W/AfAexL2exVxjzFo14kMJ3oBsxpzeC1IuSNrwQTmxHz5Bfa7LPtZU5O7LfTvzvKppGeewAzW6u7pG4I</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDgDCCAumgAwIBAgIDEzx+MA0GCSqGSIb3DQEBBQUAME4xCzAJBgNVBAYTAlVTMRAwDgYDVQQKEwdFcXVpZmF4MS0wKwYDVQQLEyRFcXVpZmF4IFNlY3VyZSBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcNMTAwNjA2MDkyMDM3WhcNMTIwNzA4MDcxMjI0WjCB6zEpMCcGA1UEBRMgLWhiZTRROUFVcWItUFRhc2lCSkxwdnYvRUlIcGc0bksxCzAJBgNVBAYTAkRLMRswGQYDVQQKExJzb2Z0d2FyZS5tc2RuYWEuZGsxEzARBgNVBAsTCkdUMDc5NTQ3NjIxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTAxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRswGQYDVQQDExJzb2Z0d2FyZS5tc2RuYWEuZGswgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMAFv3keVCtJjzg1taFiriiPjTMWHmVdYSsW9ZSBA38CXKm9I4Du3SiiX+TuXW65+1WwPSX1AxpTMCluFfIEzs2IvHLAMdU5+AyCZLEE627ux7dClGzwd9A9fpqrU4XI2Cq2GdlaxTrFfsfIw00CUv+PYlohLHXM96D8H6B46uRfAgMBAAGjgc0wgcowHwYDVR0jBBgwFoAUSOZo+SvSspXXR9gjIBBPM5iQn9QwDgYDVR0PAQH/BAQDAgTwMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAdBgNVHREEFjAUghJzb2Z0d2FyZS5tc2RuYWEuZGswOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC5nZW90cnVzdC5jb20vY3Jscy9zZWN1cmVjYS5jcmwwHQYDVR0OBBYEFOMgzsyArmCbYFjO+X4rJFgvplLTMA0GCSqGSIb3DQEBBQUAA4GBAIQVfBTbp8SBQI7B/04g5ExQlLO5HW1Y6AbCZ09rbMMJjX6PwDS/HAI4BOrTpe49kB3jxPcmT/IWQrYbBod2I+hIBNP+W/AfAexL2exVxjzFo14kMJ3oBsxpzeC1IuSNrwQTmxHz5Bfa7LPtZU5O7LfTvzvKppGeewAzW6u7pG4I</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://software.msdnaa.dk/login.ashx"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://software.msdnaa.dk/login.ashx" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">MSDNAA</md:ServiceName>
+      <md:ServiceName xml:lang="da">MSDNAA</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to provide access to relevant Microsoft products for qualified students. The student will, for selected products, be notified by e-mail with product registration/activation information</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at give adgang til relevante Microsoft-produkter for udvalgte studerende. Den studerende vil for udvalgte produkter modtage e-mail vedrørende produktregistrering og aktiveringsinformation</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sourcesup.cru.fr.xml b/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml
index 92ecfb7f..8b3d3469 100644
--- a/swamid-interfederations-2.0/sourcesup.cru.fr.xml
+++ b/swamid-interfederations-2.0/sourcesup.cru.fr-shibboleth.xml
@@ -18,23 +18,23 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-					      MIIDAzCCAeugAwIBAgIJAKuk6oRKZz4uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTEyMTIxMDE1MDMyMloXDTIyMTIw
-ODE1MDMyMlowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlfCY6MZquL5Lk6KBnaT4pItD6AQKr
-T2GY8CwNhFeCqbeg1UbUvYo/a/4uGq7S+HeDK+/AIoapC5AzG4E+0Ca+uVkiWRld
-dpaQx5rPPCfdoI6WtutWrlkNYmmMFzoxOEaOv9YIa0sVHy6zJyghHAhK/PiSqt26
-sYCJRW2vTWJ5PKGhLG3UunQxPfa9N2GO19g/pKyPvX19bi43HgZEGj8GvmcEgAVu
-eJeeGlSXxTzPOLuyvDzt9zvRTIHirHp++K5+l8vhkDTJza7ODcTsiS8SOEP5v5Fk
-BJS6a+HNJm/N22xhrBcshwXfvXMmESsdaUEtIMzQf66r1OTmbgeAeHZZAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQx
-TfD1M0AVI4lWqvsJdklkJv1INTANBgkqhkiG9w0BAQUFAAOCAQEAOMr0aTllYChc
-I3nffrxNj6xyWlI35AlzWmgQqLwScSDDWPwgHD81Maazbq0SSo+4A42/x7P3Jz1u
-R5t73qphmBgzLmX3HA/FGUhbyevzr0zsLf5b+LDi0ncIZ0PM5L8ZMZDTv/k7DVZE
-JwoA1/fFU4st7EU0NjemkE9SCgzqyZc8GRuEs8As7mK7p4slpaZo6kXG9A2dKsmZ
-s0R+Iuj8q0ccUHFb1n92kS4gqSxJCKmbtcIcFk3QdC2o+IXdaDB8RHxKaS8kfFS1
-Am6Gl2+CfY5FrK1p9pIYU0YoTIqma1498HOq3f82/aO61mxzfUMu2vH/Fds0BhM8
-WVDj2hrySg==
+					      MIIDAzCCAeugAwIBAgIJAKFZlPlWzzteMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTE0MTAxNTE0NTAwMVoXDTI0MTAx
+MjE0NTAwMVowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmTMazqkrQ4bXYeC9QVeNhrsGdiblc
+QadYtbfOaXthSjbb+r3jXFUb6TY7/oaHFak+KltcgpzaRMRKicIB81rHBjp3eaXz
+AB1kBU1goo7qznlODkyTso3wftIstcXF8SEZGB5jHTBcZloZsNVJEO9ZsUDNfiI6
+ZBjvgKxKuhfMaH2rsIuv+ioOyTtsIyKq0OWSI4zcVranZw8/rctYRJ3uOH0VJ49u
+PKVteO2gp5vC+y1gDA1WnFfSi13IUwqk0IQliDPX53kV267M+Zk6GpbL2GJMu2lg
+8jdaa7+r739i0EoUk7qwHBqVNnT2M8Gu1a3ipxK4HduUKGYD1ynfkzGVAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQK
+FmZfmEm0YVmRRt+HIA11jgYFIzANBgkqhkiG9w0BAQUFAAOCAQEAeGrTotOtswlQ
+ftuvhhyLALdVDNXSner08S2A51MbI97REIYpvBmGPzWpcBY0mTnI4YHExtgMjcis
+S5lWSg6a8WZgABRIGJpaOMzUrp6LToRyL0qWpcSR91nUZum6gHaZKfuNc3q7n4C7
+QW4WCvzD+mT2H+gVFpkcmkFsViZ+jWJPzNhmY6O5YZolcF9dhAz9hBSTbCRqhOjo
+iqiun1xo89/hxIYaIvlQpRAXlmykiBs8DeEooIP9KiUPhloaEcFkfx73JqT59b6/
+Q6I7TVBscvDAl+9Q9oB9akTeqhktBupWmJUgOxqeFOPlorir8ezn/AX+WSwZ9fPo
+6e4sAmYv7w==
 					    </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -43,23 +43,23 @@ WVDj2hrySg==
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-					      MIIDAzCCAeugAwIBAgIJAKuk6oRKZz4uMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
-BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTEyMTIxMDE1MDMyMloXDTIyMTIw
-ODE1MDMyMlowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
-CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDlfCY6MZquL5Lk6KBnaT4pItD6AQKr
-T2GY8CwNhFeCqbeg1UbUvYo/a/4uGq7S+HeDK+/AIoapC5AzG4E+0Ca+uVkiWRld
-dpaQx5rPPCfdoI6WtutWrlkNYmmMFzoxOEaOv9YIa0sVHy6zJyghHAhK/PiSqt26
-sYCJRW2vTWJ5PKGhLG3UunQxPfa9N2GO19g/pKyPvX19bi43HgZEGj8GvmcEgAVu
-eJeeGlSXxTzPOLuyvDzt9zvRTIHirHp++K5+l8vhkDTJza7ODcTsiS8SOEP5v5Fk
-BJS6a+HNJm/N22xhrBcshwXfvXMmESsdaUEtIMzQf66r1OTmbgeAeHZZAgMBAAGj
-QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQx
-TfD1M0AVI4lWqvsJdklkJv1INTANBgkqhkiG9w0BAQUFAAOCAQEAOMr0aTllYChc
-I3nffrxNj6xyWlI35AlzWmgQqLwScSDDWPwgHD81Maazbq0SSo+4A42/x7P3Jz1u
-R5t73qphmBgzLmX3HA/FGUhbyevzr0zsLf5b+LDi0ncIZ0PM5L8ZMZDTv/k7DVZE
-JwoA1/fFU4st7EU0NjemkE9SCgzqyZc8GRuEs8As7mK7p4slpaZo6kXG9A2dKsmZ
-s0R+Iuj8q0ccUHFb1n92kS4gqSxJCKmbtcIcFk3QdC2o+IXdaDB8RHxKaS8kfFS1
-Am6Gl2+CfY5FrK1p9pIYU0YoTIqma1498HOq3f82/aO61mxzfUMu2vH/Fds0BhM8
-WVDj2hrySg==
+					      MIIDAzCCAeugAwIBAgIJAKFZlPlWzzteMA0GCSqGSIb3DQEBBQUAMB8xHTAbBgNV
+BAMTFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB4XDTE0MTAxNTE0NTAwMVoXDTI0MTAx
+MjE0NTAwMVowHzEdMBsGA1UEAxMUc291cmNlc3VwLnJlbmF0ZXIuZnIwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDmTMazqkrQ4bXYeC9QVeNhrsGdiblc
+QadYtbfOaXthSjbb+r3jXFUb6TY7/oaHFak+KltcgpzaRMRKicIB81rHBjp3eaXz
+AB1kBU1goo7qznlODkyTso3wftIstcXF8SEZGB5jHTBcZloZsNVJEO9ZsUDNfiI6
+ZBjvgKxKuhfMaH2rsIuv+ioOyTtsIyKq0OWSI4zcVranZw8/rctYRJ3uOH0VJ49u
+PKVteO2gp5vC+y1gDA1WnFfSi13IUwqk0IQliDPX53kV267M+Zk6GpbL2GJMu2lg
+8jdaa7+r739i0EoUk7qwHBqVNnT2M8Gu1a3ipxK4HduUKGYD1ynfkzGVAgMBAAGj
+QjBAMB8GA1UdEQQYMBaCFHNvdXJjZXN1cC5yZW5hdGVyLmZyMB0GA1UdDgQWBBQK
+FmZfmEm0YVmRRt+HIA11jgYFIzANBgkqhkiG9w0BAQUFAAOCAQEAeGrTotOtswlQ
+ftuvhhyLALdVDNXSner08S2A51MbI97REIYpvBmGPzWpcBY0mTnI4YHExtgMjcis
+S5lWSg6a8WZgABRIGJpaOMzUrp6LToRyL0qWpcSR91nUZum6gHaZKfuNc3q7n4C7
+QW4WCvzD+mT2H+gVFpkcmkFsViZ+jWJPzNhmY6O5YZolcF9dhAz9hBSTbCRqhOjo
+iqiun1xo89/hxIYaIvlQpRAXlmykiBs8DeEooIP9KiUPhloaEcFkfx73JqT59b6/
+Q6I7TVBscvDAl+9Q9oB9akTeqhktBupWmJUgOxqeFOPlorir8ezn/AX+WSwZ9fPo
+6e4sAmYv7w==
 					    </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -100,7 +100,7 @@ HaaOGqD8nCkO3t3qaIPP4CTmE+GS72ooHHntvoGy/RDn32aVVg==
   <Organization>
     <OrganizationName xml:lang="en">RENATER</OrganizationName>
     <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.renater.fr</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <EmailAddress>support@renater.fr</EmailAddress>
diff --git a/swamid-interfederations-2.0/sp-test.swamid.se.xml b/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
index a563d053..a563d053 100644
--- a/swamid-interfederations-2.0/sp-test.swamid.se.xml
+++ b/swamid-interfederations-2.0/sp-test.swamid.se-shibboleth.xml
diff --git a/swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml b/swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml
new file mode 100644
index 00000000..f1ee1523
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.dev.clarin.inl.nl-shibboleth.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://sp.dev.clarin.inl.nl/shibboleth">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFWDCCBECgAwIBAgIQJ/7FXBoKUGe92mfIdkjkTzANBgkqhkiG9w0BAQUFADCB
+iTELMAkGA1UEBhMCR0IxGzAZBgNVBAgTEkdyZWF0ZXIgTWFuY2hlc3RlcjEQMA4G
+A1UEBxMHU2FsZm9yZDEaMBgGA1UEChMRQ09NT0RPIENBIExpbWl0ZWQxLzAtBgNV
+BAMTJkNPTU9ETyBIaWdoIEFzc3VyYW5jZSBTZWN1cmUgU2VydmVyIENBMB4XDTA5
+MDYxNTAwMDAwMFoXDTE0MDYxNTIzNTk1OVowgdkxCzAJBgNVBAYTAk5MMRAwDgYD
+VQQREwcyMzExIEJaMRUwEwYDVQQIEwxadWlkLUhvbGxhbmQxDzANBgNVBAcTBkxl
+aWRlbjEhMB8GA1UECRMYTWF0dGhpYXMgZGUgVnJpZXNob2YgMi0zMTIwMAYDVQQK
+EylTdCBJbnN0aXR1dXQgdm9vciBOZWRlcmxhbmRzZSBMZXhpY29sb2dpZTEaMBgG
+A1UECxMRQ29tb2RvIEluc3RhbnRTU0wxHTAbBgNVBAMTFHNwLmRldi5jbGFyaW4u
+aW5sLm5sMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCo9rdfDu13+/wOF5/f
+AyUVKFtr2lTIEXdafTiYNzddM4A8adWmpaMxhkUeGdviz97L4m23KxI/Pf/J/wq2
+mmHtOEAYwmQgXb+ltT8Gf9aknvyphzEiH/hNYp+qoOxQ1RSFMCnX3QLl5VMrLyHM
+orAwTQL0uLr/EuzMcViolKcOnwIDAQABo4IB7DCCAegwHwYDVR0jBBgwFoAUYFnN
+gMfF46uML/xr5VsK9Q/eS/8wHQYDVR0OBBYEFC7a6OPUS99Y35xiMz3fPk2ilJTF
+MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMDQGA1UdJQQtMCsGCCsGAQUF
+BwMBBggrBgEFBQcDAgYKKwYBBAGCNwoDAwYJYIZIAYb4QgQBMEYGA1UdIAQ/MD0w
+OwYMKwYBBAGyMQECAQMEMCswKQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNv
+bW9kby5uZXQvQ1BTME4GA1UdHwRHMEUwQ6BBoD+GPWh0dHA6Ly9jcmwuY29tb2Rv
+Y2EuY29tL0NvbW9kb0hpZ2hBc3N1cmFuY2VTZWN1cmVTZXJ2ZXJDQS5jcmwwfwYI
+KwYBBQUHAQEEczBxMEkGCCsGAQUFBzAChj1odHRwOi8vY3J0LmNvbW9kb2NhLmNv
+bS9Db21vZG9IaWdoQXNzdXJhbmNlU2VjdXJlU2VydmVyQ0EuY3J0MCQGCCsGAQUF
+BzABhhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wOQYDVR0RBDIwMIIUc3AuZGV2
+LmNsYXJpbi5pbmwubmyCGHd3dy5zcC5kZXYuY2xhcmluLmlubC5ubDANBgkqhkiG
+9w0BAQUFAAOCAQEAjtEgHw+TblkdTK5utNytnxEuQ3lPT5eEMyN+o6V00L51u+F6
+uh+yPdTH5UBXnTWbAc+RRlfYQDE+5x6v8FDyyO1Znf5pKYFoquO9ym8JqjHXEZQY
+s9z/lt6TM7NKiCZO7S7FC8HHzPrnU0kwzgmf6f+Y7fRzOAuDfLxnUZwlpAaGs1R6
+nS2MgFakP+X/ZNjrWETQriNNGSBGbYfcdB1QuoMgJuXkU6zs7DhmHP838uFAQjYi
+OC/70RsuE1f4nsgjJ+jT9x/DoVqV2YbW0gGNyGpWPTH4csvE23Z1dFINIymVUlt9
+MLV2RZ8HHAgA9AeBjEdJIavF9Q9H6a59eFcx4A==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML2/POST" index="1" isDefault="true"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp.dev.clarin.inl.nl/Shibboleth.sso/SAML/POST" index="2" isDefault="false"/>
+    <md:AttributeConsumingService index="1" isDefault="true">
+      <md:ServiceName xml:lang="fi">Browsable TST-LRs</md:ServiceName>
+      <md:ServiceName xml:lang="en">Browsable TST-LRs</md:ServiceName>
+      <md:ServiceName xml:lang="sv">Browsable TST-LRs</md:ServiceName>
+      <md:ServiceDescription xml:lang="fi">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="en">This website gives you access to the IMDI-based language resources (LRs) housed at the TST-centrale.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="mail"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="schacHomeOrganization"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">CLARIN Service Provider Federation/MPI</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.clarin.eu</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.clarin.eu</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Marco</md:GivenName>
+    <md:SurName>Van der Laan</md:SurName>
+    <md:EmailAddress>mailto:systeembeheer@inl.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.ebrary.com.xml b/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml
index f9e6bb92..f9e6bb92 100644
--- a/swamid-interfederations-2.0/sp.ebrary.com.xml
+++ b/swamid-interfederations-2.0/sp.ebrary.com-shibboleth.xml
diff --git a/swamid-interfederations-2.0/sp.edina.ac.uk.xml b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.xml
index 6c235ad8..6c235ad8 100644
--- a/swamid-interfederations-2.0/sp.edina.ac.uk.xml
+++ b/swamid-interfederations-2.0/sp.edina.ac.uk-shibboleth-kbplus.xml
diff --git a/swamid-interfederations-2.0/sp.korp.csc.fi.xml b/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
index 147f3e7e..147f3e7e 100644
--- a/swamid-interfederations-2.0/sp.korp.csc.fi.xml
+++ b/swamid-interfederations-2.0/sp.korp.csc.fi-.xml
diff --git a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
index f1f30699..36d31b9f 100644
--- a/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
+++ b/swamid-interfederations-2.0/sp.lux17.mpi.nl.xml
@@ -5,11 +5,6 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml
index 04f4e03d..04f4e03d 100644
--- a/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com.xml
+++ b/swamid-interfederations-2.0/sp.onlinelibrary.wiley.com-shibboleth.xml
diff --git a/swamid-interfederations-2.0/sp.swamid.se.xml b/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
index 19654dcb..19654dcb 100644
--- a/swamid-interfederations-2.0/sp.swamid.se.xml
+++ b/swamid-interfederations-2.0/sp.swamid.se-shibboleth.xml
diff --git a/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml b/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml
new file mode 100644
index 00000000..3a7ec7ba
--- /dev/null
+++ b/swamid-interfederations-2.0/sp.textgridlab.org-shibboleth.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp.textgridlab.org/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2011-11-02T09:05:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://textgridlab.org/1.0/Shibboleth.sso/Login" index="1"/>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">TextGridLab</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">TextGridLab</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</mdui:Description>
+        <mdui:Description xml:lang="en">TextGridLab virtual research environment</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.textgrid.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.textgrid.de</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="de">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://de.dariah.eu/ServicePrivacyPolicy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>textgridlab.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=textgridlab.org,OU=TextGrid,OU=Niedersaechsische Staats- und Universitaetsbibliothek,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGHjCCBQagAwIBAgIHEzj8sz7gpzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMjAxMjAxNDUwMTJaFw0xNzAxMTgx
+NDUwMTJaMIHWMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMT4wPAYDVQQLEzVOaWVkZXJzYWVjaHNpc2NoZSBT
+dGFhdHMtIHVuZCBVbml2ZXJzaXRhZXRzYmlibGlvdGhlazERMA8GA1UECxMIVGV4
+dEdyaWQxGDAWBgNVBAMTD3RleHRncmlkbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANDyVAH2OTXsKccRpix/jGx2GRR2YH2Od8IAD/wf36Ep
+ypnqUN7iOCEUh9lB7SMAn/CQjwZ+zFWz+W/HjvlAlFSVZvMVlOF4qh5xiNaCF/bz
+ttSnoXoY0r8VxIooSLi7d+uDRcg44Ck+JpIaJcEh+2JJDLa12bsDbzS0/d1bgKLr
+FLPKKzo+XJjwYe6U0PtqDvuZCfXr1VFw6P2GckFRYd/xfuxWjhRvyRxTD2fmUkXV
+WhmgEhzf3cwxnHqQoUdlxS7iCPcaMrNeSBJMkxneOuYk/H2q0uA6Y+zWNdh6ss0R
+I1avpYOozbaMmY/aD7Avnyp6eby6NYUCPNMPpRPIRbcCAwEAAaOCAhUwggIRMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
+BQcDATAdBgNVHQ4EFgQUsQ1Bhym48J36cebaA4fsHlU8etcwHwYDVR0jBBgwFoAU
+Hb1zzG3ubhx0cNmjGzq6qCfevOswWwYDVR0RBFQwUoIPdGV4dGdyaWRsYWIub3Jn
+ghN3d3cudGV4dGdyaWRsYWIub3JngRBpbmZvQHRleHRncmlkLmRlgRhjYUBzdWIu
+dW5pLWdvZXR0aW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNy
+bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEANgN+eFxmXlaksI2MQH046IM6azOS11ves9ITaOqh
+GH7vac+bgGRDfpgRnZn7FIZ9NIC0S6iXjsMcRZu1ObAwmJWAs1RHJidfC3+c1yY2
++C1Ts0VeFvQiM9fYYIAUpmhl1Ia/vDiRcdwuHyUtte1tq2QN67gSuOKVOj9GtDJk
+Szgxk1cNbqUzIfvhFvt9g5Kzlr5/yo0e2fVPZv7yk8Si19dzQO/9OLMVcVjTMNyM
+Mu0ReSI3dNaEQa5SEiRMTjX0sKwnC4KQmbLLIzgqG9VpD61h0vCfKPJzJ/UqMZBd
+Ayj96g/+2D4+WUpiE5AlAEO2WcgBqxxIHgqvmL1dBNhQwA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>textgridlab.org</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=textgridlab.org,OU=TextGrid,OU=Niedersaechsische Staats- und Universitaetsbibliothek,O=Georg-August-Universitaet Goettingen,L=Goettingen,ST=Niedersachsen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGHjCCBQagAwIBAgIHEzj8sz7gpzANBgkqhkiG9w0BAQUFADCBrjELMAkGA1UE
+BhMCREUxFjAUBgNVBAgTDU5pZWRlcnNhY2hzZW4xEzARBgNVBAcTCkdvZXR0aW5n
+ZW4xLTArBgNVBAoTJEdlb3JnLUF1Z3VzdC1Vbml2ZXJzaXRhZXQgR29ldHRpbmdl
+bjEjMCEGA1UEAxMaVW5pdmVyc2l0YWV0LUdvZXR0aW5nZW4gQ0ExHjAcBgkqhkiG
+9w0BCQEWD2d3ZGctY2FAZ3dkZy5kZTAeFw0xMjAxMjAxNDUwMTJaFw0xNzAxMTgx
+NDUwMTJaMIHWMQswCQYDVQQGEwJERTEWMBQGA1UECBMNTmllZGVyc2FjaHNlbjET
+MBEGA1UEBxMKR29ldHRpbmdlbjEtMCsGA1UEChMkR2VvcmctQXVndXN0LVVuaXZl
+cnNpdGFldCBHb2V0dGluZ2VuMT4wPAYDVQQLEzVOaWVkZXJzYWVjaHNpc2NoZSBT
+dGFhdHMtIHVuZCBVbml2ZXJzaXRhZXRzYmlibGlvdGhlazERMA8GA1UECxMIVGV4
+dEdyaWQxGDAWBgNVBAMTD3RleHRncmlkbGFiLm9yZzCCASIwDQYJKoZIhvcNAQEB
+BQADggEPADCCAQoCggEBANDyVAH2OTXsKccRpix/jGx2GRR2YH2Od8IAD/wf36Ep
+ypnqUN7iOCEUh9lB7SMAn/CQjwZ+zFWz+W/HjvlAlFSVZvMVlOF4qh5xiNaCF/bz
+ttSnoXoY0r8VxIooSLi7d+uDRcg44Ck+JpIaJcEh+2JJDLa12bsDbzS0/d1bgKLr
+FLPKKzo+XJjwYe6U0PtqDvuZCfXr1VFw6P2GckFRYd/xfuxWjhRvyRxTD2fmUkXV
+WhmgEhzf3cwxnHqQoUdlxS7iCPcaMrNeSBJMkxneOuYk/H2q0uA6Y+zWNdh6ss0R
+I1avpYOozbaMmY/aD7Avnyp6eby6NYUCPNMPpRPIRbcCAwEAAaOCAhUwggIRMAkG
+A1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEF
+BQcDATAdBgNVHQ4EFgQUsQ1Bhym48J36cebaA4fsHlU8etcwHwYDVR0jBBgwFoAU
+Hb1zzG3ubhx0cNmjGzq6qCfevOswWwYDVR0RBFQwUoIPdGV4dGdyaWRsYWIub3Jn
+ghN3d3cudGV4dGdyaWRsYWIub3JngRBpbmZvQHRleHRncmlkLmRlgRhjYUBzdWIu
+dW5pLWdvZXR0aW5nZW4uZGUwgY8GA1UdHwSBhzCBhDBAoD6gPIY6aHR0cDovL2Nk
+cDEucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1jYS9wdWIvY3JsL2NhY3JsLmNy
+bDBAoD6gPIY6aHR0cDovL2NkcDIucGNhLmRmbi5kZS91bmktZ29ldHRpbmdlbi1j
+YS9wdWIvY3JsL2NhY3JsLmNybDCBqAYIKwYBBQUHAQEEgZswgZgwSgYIKwYBBQUH
+MAKGPmh0dHA6Ly9jZHAxLnBjYS5kZm4uZGUvdW5pLWdvZXR0aW5nZW4tY2EvcHVi
+L2NhY2VydC9jYWNlcnQuY3J0MEoGCCsGAQUFBzAChj5odHRwOi8vY2RwMi5wY2Eu
+ZGZuLmRlL3VuaS1nb2V0dGluZ2VuLWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDAN
+BgkqhkiG9w0BAQUFAAOCAQEANgN+eFxmXlaksI2MQH046IM6azOS11ves9ITaOqh
+GH7vac+bgGRDfpgRnZn7FIZ9NIC0S6iXjsMcRZu1ObAwmJWAs1RHJidfC3+c1yY2
++C1Ts0VeFvQiM9fYYIAUpmhl1Ia/vDiRcdwuHyUtte1tq2QN67gSuOKVOj9GtDJk
+Szgxk1cNbqUzIfvhFvt9g5Kzlr5/yo0e2fVPZv7yk8Si19dzQO/9OLMVcVjTMNyM
+Mu0ReSI3dNaEQa5SEiRMTjX0sKwnC4KQmbLLIzgqG9VpD61h0vCfKPJzJ/UqMZBd
+Ayj96g/+2D4+WUpiE5AlAEO2WcgBqxxIHgqvmL1dBNhQwA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://textgridlab.org/1.0/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://textgridlab.org/2.0/Shibboleth.sso/SAML2/POST" index="7"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="de">TextGridLab</ServiceName>
+      <ServiceName xml:lang="en">TextGridLab</ServiceName>
+      <ServiceDescription xml:lang="de">Virtuelle Forschungsumgebung TextGridLab</ServiceDescription>
+      <ServiceDescription xml:lang="en">TextGridLab virtual research environment</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e112</OrganizationName>
+    <OrganizationName xml:lang="en">e112</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Gesellschaft für wissenschaftliche Datenverarbeitung mbH</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.gwdg.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.gwdg.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Martin</GivenName>
+    <SurName>Haase</SurName>
+    <EmailAddress>mailto:martin.haase@daasi.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="administrative">
+    <GivenName>Christof</GivenName>
+    <SurName>Pohl</SurName>
+    <EmailAddress>mailto:christof.pohl@gwdg.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>TextGrid</GivenName>
+    <SurName>Support</SurName>
+    <EmailAddress>mailto:support@textgrid.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp.upv.es.xml b/swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml
index 6ccf0396..6ccf0396 100644
--- a/swamid-interfederations-2.0/sp.upv.es.xml
+++ b/swamid-interfederations-2.0/sp.upv.es-saml-module.php-saml-sp-metadata.php-upv-sp-saml.xml
diff --git a/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml b/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
new file mode 100644
index 00000000..a8c4f8c2
--- /dev/null
+++ b/swamid-interfederations-2.0/sp24-test.garr.it-shibboleth.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://sp24-test.garr.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-07T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement
+                </mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Test SP shib 2.4</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Test SP shib 2.4</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Test SP shib 2.4 for attributes release monitoring</mdui:Description>
+        <mdui:Description xml:lang="it">Test SP shib 2.4 per visualizzare il rilascio degli attributi</mdui:Description>
+        <mdui:InformationURL xml:lang="en">https://www.idem.garr.it/en/technical-information/176-servizio-sp-test</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">https://www.idem.garr.it/index.php/it/informazioni-tecniche/176-servizio-sp-test</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">https://www.idem.garr.it/index.php/it/informazioni-tecniche/262</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">https://www.idem.garr.it/index.php/it/informazioni-tecniche/262</mdui:PrivacyStatementURL>
+        <mdui:Logo height="60" width="80" xml:lang="en">https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg</mdui:Logo>
+        <mdui:Logo height="60" width="80" xml:lang="it">https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp24-test.garr.it/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp24-test.garr.it/Shibboleth.sso/Login" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIC3DCCAcSgAwIBAgIJAJ7W+iRwOMUTMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
+BAMTB2NlbnRvczUwHhcNMTEwNDA0MTAxMDU4WhcNMjEwNDAxMTAxMDU4WjASMRAw
+DgYDVQQDEwdjZW50b3M1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+6sjvgmK7cxJ5w1zwtrH1qA+lI1Ej1+KtG9N8bXx56KDj8Bg+xr2oRGB+/d34j8wS
+JI3lEic8dvC35SHULX1CcEIs8Nl2GhZIaAiqmwA8DTq0eReQsz5wg1Vq1p0P1vZ9
+0n8Ys1OoMO0euOSpN0lyWu8wzyeuKKssci8EXY8lcIocPVMaBpTScKJ6JP51zPQW
+ELZWw4OP33wLHshxvvhoSvzNAz2ylmul4cdSVeHOxuRYvunqm5Q4VeVsUP2iTCaG
+JPHG21d5B034qq2cTQAGyd85EowlKmqKoJ3wUVR4PVc0Q3XxMo+hoZcdIGwhNrsH
+M6u9mRKkNixl8OzILOxhMwIDAQABozUwMzASBgNVHREECzAJggdjZW50b3M1MB0G
+A1UdDgQWBBQcMWUI1jE4zye8yRzfx3qXhUwWsDANBgkqhkiG9w0BAQUFAAOCAQEA
+WHlWTANnI7kL0S4u9vE9yZp2inDzGrVhZZfY8NL6mN9oTvGEemsNXLmvj1toDJCx
+Mbqbb5ituCor4wAxfNTh6QnHTZiiZwxIAU+/qi1r2smt/2ZsqosQR48OVZ2cELaj
+uaAboK+B5hXLtcPjOxoZ36iZcHmGDQCCTrHfaxG1CIbuCfs5f3RVgf707xGR/OZu
+2LvpeFy4g0jYx0BjYGWSP+nqL5gmsOW3g8VpthgX8ogiA3JiLBjyFQDAPbl2aK3x
+Vxp7Cw9zAwVPssgq6AhWp6csK/qRVeLsS4etFKHriK1UoC4PUhpqWkMr+bblM1hA
+3Qh4/sKlzs5OMglDOMb5VA==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">SP TEST shib 24 Firenze</ServiceName>
+      <ServiceDescription xml:lang="en">IDEM test sp with optional attributes</ServiceDescription>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="schacPersonalTitle" Name="urn:oid:1.3.6.1.4.1.25178.1.2.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="schacPersonalPosition" Name="urn:oid:1.3.6.1.4.1.25178.1.2.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:1.3.6.1.4.1.1466.115.121.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">SP shib 2.4 di Prova provided by GARR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">SP shib 2.4 di Prova erogato da GARR</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.garr.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>idem-help</SurName>
+    <EmailAddress>idem-help@garr.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sp24-test.garr.it.xml b/swamid-interfederations-2.0/sp24-test.garr.it.xml
deleted file mode 100644
index a5649c87..00000000
--- a/swamid-interfederations-2.0/sp24-test.garr.it.xml
+++ /dev/null
@@ -1,110 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sp24-test.garr.it/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2012-05-07T12:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">Test SP shib 2.4</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">Test SP shib 2.4</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Test SP shib 2.4 for attributes release monitoring</mdui:Description>
-        <mdui:Description xml:lang="it">Test SP shib 2.4 per visualizzare il rilascio degli attributi</mdui:Description>
-        <mdui:InformationURL xml:lang="en">
-https://www.idem.garr.it/en/technical-information/176-servizio-sp-test
-</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">
-https://www.idem.garr.it/index.php/it/informazioni-tecniche/176-servizio-sp-test
-</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">
-https://www.idem.garr.it/index.php/it/informazioni-tecniche/262
-</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">
-https://www.idem.garr.it/index.php/it/informazioni-tecniche/262
-</mdui:PrivacyStatementURL>
-        <mdui:Logo height="60" width="80" xml:lang="en">
-https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg
-</mdui:Logo>
-        <mdui:Logo height="60" width="80" xml:lang="it">
-https://wiki.garr.it/wiki/pub/main/mappegarr/logo-garr.jpg
-</mdui:Logo>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://sp24-test.garr.it/Shibboleth.sso/Login"/>
-      <idpdisc:DiscoveryResponse xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://sp24-test.garr.it/Shibboleth.sso/Login" index="1"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>centos5</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=centos5</ds:X509SubjectName>
-          <ds:X509Certificate>MIIC3DCCAcSgAwIBAgIJAJ7W+iRwOMUTMA0GCSqGSIb3DQEBBQUAMBIxEDAOBgNV
-                            BAMTB2NlbnRvczUwHhcNMTEwNDA0MTAxMDU4WhcNMjEwNDAxMTAxMDU4WjASMRAw
-                            DgYDVQQDEwdjZW50b3M1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
-                            6sjvgmK7cxJ5w1zwtrH1qA+lI1Ej1+KtG9N8bXx56KDj8Bg+xr2oRGB+/d34j8wS
-                            JI3lEic8dvC35SHULX1CcEIs8Nl2GhZIaAiqmwA8DTq0eReQsz5wg1Vq1p0P1vZ9
-                            0n8Ys1OoMO0euOSpN0lyWu8wzyeuKKssci8EXY8lcIocPVMaBpTScKJ6JP51zPQW
-                            ELZWw4OP33wLHshxvvhoSvzNAz2ylmul4cdSVeHOxuRYvunqm5Q4VeVsUP2iTCaG
-                            JPHG21d5B034qq2cTQAGyd85EowlKmqKoJ3wUVR4PVc0Q3XxMo+hoZcdIGwhNrsH
-                            M6u9mRKkNixl8OzILOxhMwIDAQABozUwMzASBgNVHREECzAJggdjZW50b3M1MB0G
-                            A1UdDgQWBBQcMWUI1jE4zye8yRzfx3qXhUwWsDANBgkqhkiG9w0BAQUFAAOCAQEA
-                            WHlWTANnI7kL0S4u9vE9yZp2inDzGrVhZZfY8NL6mN9oTvGEemsNXLmvj1toDJCx
-                            Mbqbb5ituCor4wAxfNTh6QnHTZiiZwxIAU+/qi1r2smt/2ZsqosQR48OVZ2cELaj
-                            uaAboK+B5hXLtcPjOxoZ36iZcHmGDQCCTrHfaxG1CIbuCfs5f3RVgf707xGR/OZu
-                            2LvpeFy4g0jYx0BjYGWSP+nqL5gmsOW3g8VpthgX8ogiA3JiLBjyFQDAPbl2aK3x
-                            Vxp7Cw9zAwVPssgq6AhWp6csK/qRVeLsS4etFKHriK1UoC4PUhpqWkMr+bblM1hA
-                            3Qh4/sKlzs5OMglDOMb5VA==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://sp24-test.garr.it/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">SP TEST shib 24 Firenze</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">IDEM test sp with optional attributes</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacMotherTongue" Name="urn:oid:1.3.6.1.4.1.25178.1.2.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacPersonalTitle" Name="urn:oid:1.3.6.1.4.1.25178.1.2.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="schacPersonalPosition" Name="urn:oid:1.3.6.1.4.1.25178.1.2.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:1.3.6.1.4.1.1466.115.121.1.22" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <md:RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">SP shib 2.4 di Prova provided by GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">SP shib 2.4 di Prova erogato da GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:SurName>idem-help</md:SurName>
-    <md:EmailAddress>idem-help@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr.xml b/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml
index 5cbaf94d..e1bdba76 100644
--- a/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr.xml
+++ b/swamid-interfederations-2.0/srv-cr-idp.crdp-aquitaine.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">crdp-aquitaine.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr.xml b/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml
index a6990be5..d4cd1517 100644
--- a/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr.xml
+++ b/swamid-interfederations-2.0/srv-fii.insa-toulouse.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">insa-toulouse.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml b/swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml
index 76bfe293..76bfe293 100644
--- a/swamid-interfederations-2.0/srvcafe.ifma.edu.br.xml
+++ b/swamid-interfederations-2.0/srvcafe.ifma.edu.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/srvcafe.uniso.br.xml b/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml
index bb200bc5..bb200bc5 100644
--- a/swamid-interfederations-2.0/srvcafe.uniso.br.xml
+++ b/swamid-interfederations-2.0/srvcafe.uniso.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
new file mode 100644
index 00000000..aa88c9ec
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.dshs-koeln.de-idp-shibboleth.xml
@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.dshs-koeln.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2014-10-01T10:15:58Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dshs-koeln.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Deutsche Sporthochschule Köln</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">German Sport University Cologne</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Die Deutsche Sporthochschule Köln, 1947 in Köln gegründet, vereint qualifizierte Lehre, internationale Forschung und Spitzensport auf höchstem Niveau. Sie ist Deutschlands einzige Universität, die sich ausschließlich dem Themenfeld Sport und Bewegung widmet. Während an anderen Universitäten die Sportwissenschaft neben vielen weiteren Fachgebieten besteht, findet man in Köln eine außergewöhnliche Situation vor: An 21 Instituten, vier An-Instituten und neun wissenschaftlichen Zentren wird das vielfältige und spannende Gebiet der Sportwissenschaft in allen seinen Facetten detailliert unter die Lupe genommen.</mdui:Description>
+        <mdui:Description xml:lang="en">The University is recognized internationally for its research: the Faculty of Biochemistry’s renowned testing laboratory has been a part of the international fight against doping, experiments conducted at the Faculty of Physiology and Anatomy have soared with the astronauts into space, and the Research Centre for Performance Sport has brought together the combined efforts of multiple departments to coach and supervise elite athletes. The 21 faculties at the German Sport University Cologne – from education and humanities to social sciences and biomedicine – offer a diverse array of teaching and research opportunities to the university’s some 5,300 students from more than 60 countries. The campus, located directly across from the Muengersdorf Sport Park, provides students and staff alike a first-class environment for learning, working, and living.</mdui:Description>
+        <mdui:Logo height="16" width="16">https://sso.dshs-koeln.de/logo_dshs_kl.png</mdui:Logo>
+        <mdui:Logo height="66" width="65">https://sso.dshs-koeln.de/logo_dshs_gr.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.dshs-koeln.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.dshs-koeln.de/english/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
+BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
+MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
+b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
+b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
+NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
+A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
+BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
+ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
+z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
+bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
+hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
+js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
+pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
+ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
+AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
+JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
+cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
+hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
+YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
+cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
+ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
+vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
+fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
+rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
+IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
+G6UwcO6gyha4+bma6xJXYLqJqPE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.dshs-koeln.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.dshs-koeln.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">dshs-koeln.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>sso.dshs-koeln.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=sso.dshs-koeln.de,OU=Dezernat 5.3,O=Deutsche Sporthochschule Koeln,L=Koeln,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGQDCCBSigAwIBAgIHGEspqdzPezANBgkqhkiG9w0BAQsFADCBwzELMAkGA1UE
+BhMCREUxJzAlBgNVBAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjE7
+MDkGA1UECxMySW5mb3JtYXRpb25zLSB1bmQgS29tbXVuaWthdGlvbnN0ZWNobm9s
+b2dpZXplbnRydW0xLDAqBgNVBAMTI0RldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBL
+b2VsbiAtIENBMSAwHgYJKoZIhvcNAQkBFhFpdWtAZHNocy1rb2Vsbi5kZTAeFw0x
+NDEwMDEwNzI0MDlaFw0xOTA3MDkyMzU5MDBaMIGXMQswCQYDVQQGEwJERTEcMBoG
+A1UECBMTTm9yZHJoZWluLVdlc3RmYWxlbjEOMAwGA1UEBxMFS29lbG4xJzAlBgNV
+BAoTHkRldXRzY2hlIFNwb3J0aG9jaHNjaHVsZSBLb2VsbjEVMBMGA1UECxMMRGV6
+ZXJuYXQgNS4zMRowGAYDVQQDExFzc28uZHNocy1rb2Vsbi5kZTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL2riKeEOiwcQmimbBWijXL5rg2SZJ+qWeqU
+z7S0FWoJnmVxWiDbI2+oxPILr1KDDa30ka/V985R31PJnHkf0vu8l+AIC9yBg51x
+bSml9vAeWhlxXczWw/KTGTxhIwdPOndIvvyaOsuBWQ9FLfJpx76d+MRiwiF5O1S8
+hVVytEOeJ4SvjL7z8kLXZ7G7jqS7yXzP4XY4jo4xzZuQMiXh8o8pD8vVK8dR2Cge
+js3F66inRV3FcWzt0XToYiFUGBTvDUpFVf62mS33xca9qSGmmxRgEDEN9zj2HAtc
+pq6bKYTSvTzvEBDzcoJqj7ZWe2ie9KGbckZfgG5ZKR1wALoiNGkCAwEAAaOCAmEw
+ggJdME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEGDysGAQQBga0hgiwC
+AQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiweMAkGA1UdEwQCMAAw
+CwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNV
+HQ4EFgQUnr4i0Cl7HcLzIJgupNIWDcJr3RMwHwYDVR0jBBgwFoAUzq4uABegkDVE
+JDZfI3unKqZmtWswMwYDVR0RBCwwKoIRc3NvLmRzaHMta29lbG4uZGWBFXN1cHBv
+cnRAZHNocy1rb2Vsbi5kZTCBhQYDVR0fBH4wfDA8oDqgOIY2aHR0cDovL2NkcDEu
+cGNhLmRmbi5kZS9kc2hzLWtvZWxuLWNhL3B1Yi9jcmwvY2FjcmwuY3JsMDygOqA4
+hjZodHRwOi8vY2RwMi5wY2EuZGZuLmRlL2RzaHMta29lbG4tY2EvcHViL2NybC9j
+YWNybC5jcmwwgdUGCCsGAQUFBwEBBIHIMIHFMDMGCCsGAQUFBzABhidodHRwOi8v
+b2NzcC5wY2EuZGZuLmRlL09DU1AtU2VydmVyL09DU1AwRgYIKwYBBQUHMAKGOmh0
+dHA6Ly9jZHAxLnBjYS5kZm4uZGUvZHNocy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2Nh
+Y2VydC5jcnQwRgYIKwYBBQUHMAKGOmh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvZHNo
+cy1rb2Vsbi1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJKoZIhvcNAQELBQAD
+ggEBACm4urG18LsstWwUGDNyqslC0YKihGbClQKXHR6i9Ugmo30JnvpzrUNGLx20
+vM6lxmEGAZjs/l4JfPS8zSXvlU7YkHkoe6CaFqGLqfiXgbDvdydlPe6HmnW6xbI2
+fG+4lt5v58MmN7q30ttxTCiZWN83JwFj2xNIVpf07AdKZJuG/7MG+Lp7LLw56hpe
+rVDHH6cFq6xSr3qPv4NSJf+iHCa0MkpoqEENLXLFnrtan5l5sHYAJcr7smR2h9oS
+IvDoviW6Ttfq6uEFX0ymhUa7KPkTaU2+ywlqjlvNYEENl+V2Pa7m+Mmh4Df550WD
+G6UwcO6gyha4+bma6xJXYLqJqPE=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.dshs-koeln.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e421</OrganizationName>
+    <OrganizationName xml:lang="en">e421</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Deutsche Sporthochschule Köln</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">German Sport University Cologne</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.dshs-koeln.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.dshs-koeln.de/english/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Helpdesk</GivenName>
+    <SurName>DSHS</SurName>
+    <EmailAddress>mailto:support@dshs-koeln.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Silke</GivenName>
+    <SurName>Knorr</SurName>
+    <EmailAddress>mailto:s.knorr@dshs-koeln.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.institutoptique.fr.xml b/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml
index 1d7a2d86..1ab9794b 100644
--- a/swamid-interfederations-2.0/sso.institutoptique.fr.xml
+++ b/swamid-interfederations-2.0/sso.institutoptique.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">institutoptique.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/sso.ird.fr.xml b/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml
index 85922f1f..bb75c263 100644
--- a/swamid-interfederations-2.0/sso.ird.fr.xml
+++ b/swamid-interfederations-2.0/sso.ird.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ird.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml
new file mode 100644
index 00000000..2653064b
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.man.poznan.pl-idp-shibboleth.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.man.poznan.pl/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-02-11T00:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">man.poznan.pl</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The PSNC Identity Provider is used by PSNC staff members.</mdui:Description>
+        <mdui:Description xml:lang="pl">Centralny Punkt Logowania dla pracowników PCSS.</mdui:Description>
+        <mdui:Logo height="110" width="300" xml:lang="en">https://sso.man.poznan.pl/logo/psnc.png</mdui:Logo>
+        <mdui:Logo height="110" width="300" xml:lang="pl">https://sso.man.poznan.pl/logo/pcss.png</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:IPHint>150.254.0.0/16</mdui:IPHint>
+        <mdui:DomainHint>man.poznan.pl</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:52.411793,16.917208</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIiHfqRGuhN+o7Ms3VgcU94Sn4aaMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNzby5tYW4ucG96bmFuLnBsMB4XDTEyMDIxNzE1MDAx
+NVoXDTMyMDIxNzE1MDAxNVowHDEaMBgGA1UEAxMRc3NvLm1hbi5wb3puYW4ucGww
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCsfe3J1Kxj8jL697Vw7r7
+tGu6li0IDa/8JecsxjRTFkMxl/6qrzs5A8x1i1jWO3Q58xYMjgrlBp4cevH1dbHn
+QxZ2o/FaE5Ww2eHsFmeR7nLZSJN3LukcxEjtA40evwEZPN+p/4DZD/bBMh7Hyw9s
+8Y6YdYCF0xNLUwEFhHo2yDVPZYhWrC6yx6fwY5/NXZZCA9b91W8mRfWTGPFBY9PK
+dVS0m923P/CkudYG3o3+w34gpxkYHca3i6syI9zHOvsE1GRdbwHW1xcqRWMLece+
+dhxL/I1AnlpCvuLqG0CpMxn5nAy19QqoODrH9zVtZeOUISIzb0UhSrlk29fFe6CV
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNzby5tYW4ucG96bmFuLnBshihodHRwczov
+L3Nzby5tYW4ucG96bmFuLnBsL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTroN0C
+2g3I0ikT1kP7hjwsQbJpTDANBgkqhkiG9w0BAQUFAAOCAQEAUQXUBQQIg4UXJrCp
+9H0zd65C58uH1fAdcwjYcZUojsftYg5Uc2OIH/TVq2rcB+ZiC9ZRx1x677+WuRq5
+lA85YUQHsPYKD/mOsxU69nIdkFuJcICSZIYBQA4bq4WAsWaD4Z75doqgR2MGoQBb
+vWAAetQH90HyK98XR37vQgkndTHSt+bvwH+9M8URXk10jC4wqwYeVd9bGbIi2opk
+BRF64iGC5zaSIWqhdfyv6XZH7lmIHdydCn/PMD0bAmUDB9oKb4Wr4Dk/52xeErus
+PxMzLl9jowOTlfNZJtlecP1jazd+Hzpen8DHldiRWsH3Hel12OapCsiVfKlb1yrx
+IxWl2w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/SLO"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.man.poznan.pl/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.man.poznan.pl/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">man.poznan.pl</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDMDCCAhigAwIBAgIVAIiHfqRGuhN+o7Ms3VgcU94Sn4aaMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEXNzby5tYW4ucG96bmFuLnBsMB4XDTEyMDIxNzE1MDAx
+NVoXDTMyMDIxNzE1MDAxNVowHDEaMBgGA1UEAxMRc3NvLm1hbi5wb3puYW4ucGww
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCCsfe3J1Kxj8jL697Vw7r7
+tGu6li0IDa/8JecsxjRTFkMxl/6qrzs5A8x1i1jWO3Q58xYMjgrlBp4cevH1dbHn
+QxZ2o/FaE5Ww2eHsFmeR7nLZSJN3LukcxEjtA40evwEZPN+p/4DZD/bBMh7Hyw9s
+8Y6YdYCF0xNLUwEFhHo2yDVPZYhWrC6yx6fwY5/NXZZCA9b91W8mRfWTGPFBY9PK
+dVS0m923P/CkudYG3o3+w34gpxkYHca3i6syI9zHOvsE1GRdbwHW1xcqRWMLece+
+dhxL/I1AnlpCvuLqG0CpMxn5nAy19QqoODrH9zVtZeOUISIzb0UhSrlk29fFe6CV
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNzby5tYW4ucG96bmFuLnBshihodHRwczov
+L3Nzby5tYW4ucG96bmFuLnBsL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTroN0C
+2g3I0ikT1kP7hjwsQbJpTDANBgkqhkiG9w0BAQUFAAOCAQEAUQXUBQQIg4UXJrCp
+9H0zd65C58uH1fAdcwjYcZUojsftYg5Uc2OIH/TVq2rcB+ZiC9ZRx1x677+WuRq5
+lA85YUQHsPYKD/mOsxU69nIdkFuJcICSZIYBQA4bq4WAsWaD4Z75doqgR2MGoQBb
+vWAAetQH90HyK98XR37vQgkndTHSt+bvwH+9M8URXk10jC4wqwYeVd9bGbIi2opk
+BRF64iGC5zaSIWqhdfyv6XZH7lmIHdydCn/PMD0bAmUDB9oKb4Wr4Dk/52xeErus
+PxMzLl9jowOTlfNZJtlecP1jazd+Hzpen8DHldiRWsH3Hel12OapCsiVfKlb1yrx
+IxWl2w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.man.poznan.pl/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.man.poznan.pl/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Poznan Supercomputing and Networking Center</OrganizationName>
+    <OrganizationName xml:lang="pl">Poznańskie Centrum Superkomputerowo-Sieciowe</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">PSNC - Poznan Supercomputing and Networking Center</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="pl">PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.man.poznan.pl/online/en/</OrganizationURL>
+    <OrganizationURL xml:lang="pl">http://www.man.poznan.pl/online/pl/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>PSNC</GivenName>
+    <SurName>SSO Team</SurName>
+    <EmailAddress>mailto:sso@man.poznan.pl</EmailAddress>
+  </ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.man.poznan.pl.xml b/swamid-interfederations-2.0/sso.man.poznan.pl.xml
deleted file mode 100644
index 5d7a98be..00000000
--- a/swamid-interfederations-2.0/sso.man.poznan.pl.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.man.poznan.pl/pozman/saml2/idp/metadata.php">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://aai.pionier.net.pl" registrationInstant="2014-02-11T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://aai.pionier.net.pl/en/index.php?page=rps</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">POZMAN - Poznan Metropolitan Network Identity Provider</mdui:DisplayName>
-        <mdui:Description xml:lang="en">POZMAN - Poznan Metropolitan Network Identity Provider</mdui:Description>
-      </mdui:UIInfo>
-      <shibmd:Scope regexp="false">man.poznan.pl</shibmd:Scope>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSDCCAjACCQDWFXjbKgnTwjANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJQTDENMAsGA1UECAwEV0xLUDEPMA0GA1UEBwwGUG96bmFuMQ0wCwYDVQQKDARQQ1NTMQwwCgYDVQQLDANEVVMxGjAYBgNVBAMMEXNzby5tYW4ucG96bmFuLnBsMB4XDTEzMDExNTExNTAzMVoXDTIzMDExMzExNTAzMVowZjELMAkGA1UEBhMCUEwxDTALBgNVBAgMBFdMS1AxDzANBgNVBAcMBlBvem5hbjENMAsGA1UECgwEUENTUzEMMAoGA1UECwwDRFVTMRowGAYDVQQDDBFzc28ubWFuLnBvem5hbi5wbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMMrEGzIWNAQo0Q0wow6rkgRSS6rqKLbZPA9UzW6Pq6If4ZTSV56MMgh/ULVunQV1nKPXUEOHwltinS+z9JpfWupLIBaFajGplv/mikki5IAdC1xgrp22OZVLpjQU/014RMNt/dVE6EybRrE8Qv4RLyM5OrQ+2yrq9PY6FfQ4lerSqUKT5GMF/YO839Tg03XAZav1wj2EuXB4LHT76SvWo37lzyDlwRNaa4XEvtWl9cHd4jT978hWGLwd+spEYiwBLyuNTTBCd1W8pTRgd5pF9VxoQtBWEgZtzE6xsK2tj5SqkpK2PJj2mEN+dySrKGdfitUOx9GhD6wmjWyuHzIX5ECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAP7DHqYxjrAiLDsvyqEHpvGnR/1zr5NIkhwgM4D8ewzSjBTV/ydr05kRnl0CUq0B/t0u9vYQjVtTc+R5eMVe2o0lcyDJb/qkbJbJWFnLzFFzW7wo952c2/omYoLieMv1olMMWhJnzj/LKWW98qd+tnDX0G506Dlqo86iJ7tOepWYCUR1i1/5YQ38l+43KsKqaF+RRONHG6yvpBJysFt2AKPAiSRVgYiNWAcWJsKKiwRFOG0yQErwX/0AJ1YbjKaw3eYUV15gIEKh4UZzx6CEIuyJRZo/uO7SX44wrWsIpI51SS6a2frTfz1GzflLr9vqJro8Ts3+4SkA9QCXbY4Ucig==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>MIIDSDCCAjACCQDWFXjbKgnTwjANBgkqhkiG9w0BAQUFADBmMQswCQYDVQQGEwJQTDENMAsGA1UECAwEV0xLUDEPMA0GA1UEBwwGUG96bmFuMQ0wCwYDVQQKDARQQ1NTMQwwCgYDVQQLDANEVVMxGjAYBgNVBAMMEXNzby5tYW4ucG96bmFuLnBsMB4XDTEzMDExNTExNTAzMVoXDTIzMDExMzExNTAzMVowZjELMAkGA1UEBhMCUEwxDTALBgNVBAgMBFdMS1AxDzANBgNVBAcMBlBvem5hbjENMAsGA1UECgwEUENTUzEMMAoGA1UECwwDRFVTMRowGAYDVQQDDBFzc28ubWFuLnBvem5hbi5wbDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMMrEGzIWNAQo0Q0wow6rkgRSS6rqKLbZPA9UzW6Pq6If4ZTSV56MMgh/ULVunQV1nKPXUEOHwltinS+z9JpfWupLIBaFajGplv/mikki5IAdC1xgrp22OZVLpjQU/014RMNt/dVE6EybRrE8Qv4RLyM5OrQ+2yrq9PY6FfQ4lerSqUKT5GMF/YO839Tg03XAZav1wj2EuXB4LHT76SvWo37lzyDlwRNaa4XEvtWl9cHd4jT978hWGLwd+spEYiwBLyuNTTBCd1W8pTRgd5pF9VxoQtBWEgZtzE6xsK2tj5SqkpK2PJj2mEN+dySrKGdfitUOx9GhD6wmjWyuHzIX5ECAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAP7DHqYxjrAiLDsvyqEHpvGnR/1zr5NIkhwgM4D8ewzSjBTV/ydr05kRnl0CUq0B/t0u9vYQjVtTc+R5eMVe2o0lcyDJb/qkbJbJWFnLzFFzW7wo952c2/omYoLieMv1olMMWhJnzj/LKWW98qd+tnDX0G506Dlqo86iJ7tOepWYCUR1i1/5YQ38l+43KsKqaF+RRONHG6yvpBJysFt2AKPAiSRVgYiNWAcWJsKKiwRFOG0yQErwX/0AJ1YbjKaw3eYUV15gIEKh4UZzx6CEIuyJRZo/uO7SX44wrWsIpI51SS6a2frTfz1GzflLr9vqJro8Ts3+4SkA9QCXbY4Ucig==</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/pozman/saml2/idp/SingleLogoutService.php"/>
-    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
-    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.man.poznan.pl/pozman/saml2/idp/SSOService.php"/>
-  </md:IDPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">POZMAN / PSNC - Poznan Supercomputing and Networking Center</md:OrganizationName>
-    <md:OrganizationName xml:lang="pl">POZMAN / PCSS - Poznańskie Centrum Superkomputerowo-Sieciowe</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">POZMAN - Poznan Metropolitan Network</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="pl">POZMAN - Poznańska Sieć Metropolitalna</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.man.poznan.pl/online/en/</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="pl">http://www.man.poznan.pl/online/pl/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>SSO</md:GivenName>
-    <md:SurName>Team</md:SurName>
-    <md:EmailAddress>sso@man.poznan.pl</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.nikhef.nl.xml b/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
index 5d30a10a..5d30a10a 100644
--- a/swamid-interfederations-2.0/sso.nikhef.nl.xml
+++ b/swamid-interfederations-2.0/sso.nikhef.nl-sso-saml2-idp-metadata.php.xml
diff --git a/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml
new file mode 100644
index 00000000..35f0a01f
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.sbg.ac.at-idp-shibboleth.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.sbg.ac.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2010-04-26T14:16:34Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbg.ac.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Salzburg</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Salzburg</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVAM/a3obaebb4N7KALoWgPOwQKFPuMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDXNzby5zYmcuYWMuYXQwHhcNMTAwNDEwMTgxMzU0WhcN
+MzAwNDEwMTgxMzU0WjAYMRYwFAYDVQQDEw1zc28uc2JnLmFjLmF0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso8F1k1Z3subIMuyqXHpPCNJogiv3GQ1
+uNXHNUL31ToqkIxcL+yL7QBLgnB8pZKmOaDOnveSllrTI8lArzJUbIYTRq/q8vjC
+35I5elBDktrOAAIeoogwdyhtau/AyiNvbZmPZGlcgBmWAPIUPoFjVF+U5+CbiQ8q
+iAzvdJn+yJvX+dkRQGg33Ebvh0pnlvD5qWeiwqWlJgFk4zUFNK40p3FFDMETNkTk
+7/U+bt/xMdwYdHI3wvb42ZBXTajsTsXnSlSA5B695dfpHfGbeIqTae32XsWHm77p
++Nrl7flUJNGtTm8SNPx7K4CJIdRhdhKiuIX+5sOSxZg8iVDghZC4pwIDAQABo2Ew
+XzA+BgNVHREENzA1gg1zc28uc2JnLmFjLmF0hiRodHRwczovL3Nzby5zYmcuYWMu
+YXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCr2Q6zhfulYa7kl0Pm752frFiF9
+MA0GCSqGSIb3DQEBBQUAA4IBAQB/AyjefKCO1cP806UO/L2olnsnD0VA50smzTto
+p72RH8sBCosRwkeyHI3/aqjSPEqsB1p1IcEEeOR4b+07PgtWmOMbZ6l9zOGDB7zB
+RCK2tq1P1avux6RGlj1q3vHlllfcdUnVFe3U6TOfk3faTeVBTLTpssBQOv0Y/W2k
+mWnkiKSHMFPlwWqllohGFuTfhSRLLDmX4lshBmC2WWPa/GmpqNnvY97oEYe0F/pV
+m/boLPgSS4HU06/UyTL75mHgtC9iCj4iLpDPJPDp8XcfwO62QogFU3+U7qqezqmV
+VfvOxPSoIdhmoHDf8FyFGq6FOVs0pSd+7RFboe5lAvmp6PrI
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.sbg.ac.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.sbg.ac.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.sbg.ac.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.sbg.ac.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">sbg.ac.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDIDCCAgigAwIBAgIVAM/a3obaebb4N7KALoWgPOwQKFPuMA0GCSqGSIb3DQEB
+BQUAMBgxFjAUBgNVBAMTDXNzby5zYmcuYWMuYXQwHhcNMTAwNDEwMTgxMzU0WhcN
+MzAwNDEwMTgxMzU0WjAYMRYwFAYDVQQDEw1zc28uc2JnLmFjLmF0MIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAso8F1k1Z3subIMuyqXHpPCNJogiv3GQ1
+uNXHNUL31ToqkIxcL+yL7QBLgnB8pZKmOaDOnveSllrTI8lArzJUbIYTRq/q8vjC
+35I5elBDktrOAAIeoogwdyhtau/AyiNvbZmPZGlcgBmWAPIUPoFjVF+U5+CbiQ8q
+iAzvdJn+yJvX+dkRQGg33Ebvh0pnlvD5qWeiwqWlJgFk4zUFNK40p3FFDMETNkTk
+7/U+bt/xMdwYdHI3wvb42ZBXTajsTsXnSlSA5B695dfpHfGbeIqTae32XsWHm77p
++Nrl7flUJNGtTm8SNPx7K4CJIdRhdhKiuIX+5sOSxZg8iVDghZC4pwIDAQABo2Ew
+XzA+BgNVHREENzA1gg1zc28uc2JnLmFjLmF0hiRodHRwczovL3Nzby5zYmcuYWMu
+YXQvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFCr2Q6zhfulYa7kl0Pm752frFiF9
+MA0GCSqGSIb3DQEBBQUAA4IBAQB/AyjefKCO1cP806UO/L2olnsnD0VA50smzTto
+p72RH8sBCosRwkeyHI3/aqjSPEqsB1p1IcEEeOR4b+07PgtWmOMbZ6l9zOGDB7zB
+RCK2tq1P1avux6RGlj1q3vHlllfcdUnVFe3U6TOfk3faTeVBTLTpssBQOv0Y/W2k
+mWnkiKSHMFPlwWqllohGFuTfhSRLLDmX4lshBmC2WWPa/GmpqNnvY97oEYe0F/pV
+m/boLPgSS4HU06/UyTL75mHgtC9iCj4iLpDPJPDp8XcfwO62QogFU3+U7qqezqmV
+VfvOxPSoIdhmoHDf8FyFGq6FOVs0pSd+7RFboe5lAvmp6PrI
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.sbg.ac.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Universität Salzburg</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Salzburg</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Salzburg</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Salzburg</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-salzburg.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-salzburg.at/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Clemens</md:GivenName>
+    <md:SurName>Renzl</md:SurName>
+    <md:EmailAddress>mailto:clemens.renzl@sbg.ac.at</md:EmailAddress>
+    <md:TelephoneNumber>+43 662 8044 6761</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.siropglobal.org.xml b/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml
index 1a7bd13c..705620b5 100644
--- a/swamid-interfederations-2.0/sso.siropglobal.org.xml
+++ b/swamid-interfederations-2.0/sso.siropglobal.org-shibboleth.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.siropglobal.org/shibboleth">
   <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2013-12-18T14:48:17Z">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://rr.aai.switch.ch/" registrationInstant="2014-10-29T08:23:57Z">
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.switch.ch/aai/federation/switchaai/metadata-registration-practice-statement-20110711.txt</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
@@ -16,23 +16,23 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:X509Data>
           <ds:X509Certificate>
-MIIDKDCCAhCgAwIBAgIJAJWTpV8oESWTMA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
-BAMTE3Nzby5zaXJvcGdsb2JhbC5vcmcwHhcNMTExMTA4MTU1NDE0WhcNMTQxMTA3
-MTU1NDE0WjAeMRwwGgYDVQQDExNzc28uc2lyb3BnbG9iYWwub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEArPs/gtSV28ZTUV8g20L6nE3DFkUH2UcW
-iKl3LRQT9m+e7ExNkGLJTm2NBa+fHsLGFZUWWswvGTwKNOsI/hAjUEevqXblhpbB
-TLvWFwthXO4KVLaFtodDDfPY3LMaj4nYf+/SnTEGKFUoXTVB+BUNZ9wZU853WbZa
-UVyV7kRMwQFP4uaPeIIwwjEV1bE+p+d7ya9yNIlJRhFFqyqr5Yllof3hChZqh8u7
-4FUS1qlUUxJMBSqJmcNsViTlexCHcgcjpj1Y9/tCzB4cF2Z4tZ3/oleERSdgGRiZ
-vIMEly+9dmLMELOeO7uXzt9iM+m86PhHilYmU2Dzq9QcRbRk5IkqvwIDAQABo2kw
+MIIDKDCCAhCgAwIBAgIJALzQmVldx2A3MA0GCSqGSIb3DQEBBQUAMB4xHDAaBgNV
+BAMTE3Nzby5zaXJvcGdsb2JhbC5vcmcwHhcNMTQxMDI4MDgxNzI5WhcNMTcxMDI3
+MDgxNzI5WjAeMRwwGgYDVQQDExNzc28uc2lyb3BnbG9iYWwub3JnMIIBIjANBgkq
+hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx64WLavrAOUS3hrtNy48EdBVdzwbYcDg
+0HmBm6inH9I4yASQp+QSPXJ+5l3FymRLigGKt2HcLzNMsO7h7ptaMd+A3PI1UKT7
+yTu7kzOjsE+9iHgTQ4nbGhQt3yl5xjjBdYdqqQrEj5FWEbvYhA/Wt+iVQMMG+zoW
+dXDwyz9TTqL/UiE02mSt0Ro9ApmLk/kj/1MxUO5miBBuGyRrFUGdXNPgt1OSjPlI
+5VDjAXdg9CYDJffHUMhq6l/QextaQy1yFNDras8A8bGxTUe84VcAAjLIcnCtv827
+mWbwunc4mk4SDTUvVD0lEiB2xBujYPDbztE/DEzChiythqzU1mDDhwIDAQABo2kw
 ZzBGBgNVHREEPzA9ghNzc28uc2lyb3BnbG9iYWwub3JnhiZodHRwczovL3Nzby5z
-aXJvcGdsb2JhbC5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUhWvrjYWWW1NKLpSe
-I7Sk2ipB0yAwDQYJKoZIhvcNAQEFBQADggEBAGe5Qh3X+fQvQd8EPYP94b+XSfBJ
-tbvHyi6gBUkBMmnafb5Hzjh0901/Vb8AnKt2Ix4fpqreyIIPHI+03XaZBC8qETtN
-XIQEqHPpuTLZn+GcuF0M/twQHq1Gtn+XBC9wVlHsEw5LhI9ZsxauDQVXOvHJkSCF
-xoE4PKbmRhdC/yEleLcHkqJRZm2ghvQq8cXkz1y+dlWmNFbHxbwGVUyiXPKH9VXm
-7uHDTq8TquEldY5/NB0w+wk5fkizj0c5xV391YjOhbIHKJ27cZ12+/7iyjJJ0shj
-DP4gOoktkZlkyPT0AUi/samZ1GKtYrOGd9Z1/7fLlYYeFyA1QdFbBX5qxPM=
+aXJvcGdsb2JhbC5vcmcvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUUHYB3v8YkZziQywd
+6zbzQeks38UwDQYJKoZIhvcNAQEFBQADggEBAGKoO/l+amYeu2+/uI57e52A9PX1
+JhjburFtSrayQizXS4zFSIbu9H8SUGzo7UQ2wLEM9uI/rAlmn4Z5VnvkstkODfFj
+I29JZYw3d817h4Jqi20lasU++TfHMYGmnN7Wv9OjIQbOHIIZBGqyL7z7cTLYybT3
+7EI41ClPlg1xYunxMCEcVueS5VCVDpi/iRRgbtf8GefqPWe6nZxcbpmADIPMO8q4
+L7afxqiM5NYZ1c/id4cxXS2tptR943z6Kzfyw6pEClx/1QOWd+muOiE87QTv8ACS
+KnGGy1QRuuesWG8bve/GvCzKfjPNQDlJZv69Hchj3OmVnUVfVBhFKXjlCEQ=
 						</ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml b/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
new file mode 100644
index 00000000..ae54a3cb
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.tugraz.at-idp-shibboleth.xml
@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.tugraz.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-07-15T16:30:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tugraz.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Technische Universität Graz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Graz University of Technology</mdui:DisplayName>
+        <mdui:Logo height="77" width="200">https://bigmail.tugraz.at/source/images/logo_head.gif</mdui:Logo>
+        <mdui:Logo height="16" width="16">https://bigmail.tugraz.at/favicon.ico</mdui:Logo>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUG6ra0BvXswfyErcCDmzw3AV+uI0wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc3NvLnR1Z3Jhei5hdDAeFw0xMDAzMjkxNzEzMTZaFw0z
+MDAzMjkxODEzMTZaMBgxFjAUBgNVBAMTDXNzby50dWdyYXouYXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEyQxHIM1zxbBnXn60Ksg7B7HcPLPcN7bX
+LrLPOFXtkZxm0YkHY5Rxignm7wHD7C81U09DFS2eT8qRCcVtVz+kuwdgS54fC/al
+g9oLxXk4CgKjhtZZ2ECLdTHfUXOA5uOLlpoN1LY6VpIjSYe3UEX3HxfhXx/fPeE8
+VInGCKnml8Too22G30htB/EU44A2yqrR3LUngJIaq//N0QbeMYitNh02o6xB5+bp
+6k6noM7DH6S9phe0kCEibaiLaCf7k9LpNnAz9bPtQVth0gdJqoUry/iK1QBTFTEX
+vvJynFEp0+5Wz/XFmEcFhsaK8OcHd0R9FfpX5Z2fewA2Q0SLKz+bAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNzby50dWdyYXouYXSGJGh0dHBzOi8vc3NvLnR1Z3Jhei5h
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXd76PcSiXR6wFna5qQi+S0W/9Y0w
+DQYJKoZIhvcNAQEFBQADggEBACgkQqxBtYY1OcuoAUP/P+ukJW7XyofK89qs2dkG
+Clx7s0hR/1zImWgljgfguLJOSfC/CWE1wfNK9bTi4Fu9809PmOoaCxkNmniFRAya
+OiBoUz5XIpJniW7wBo+YBpBlXZXi5PmU2DOsfZxo7fs4se32dHO1WqgJodqkK2Wa
+4HDiigh42trZ9i3uS73uHSSCeIJYQNj84BMJ+ifgj3Zi/TgLS+IX7Ayy2bkDzIzI
+Rnj7ULQ/MgfacGXQXJPHyp+w+YvydQalPAWc43+5DkNacN34K8cE3XjHq1kx/BgY
+OtQ7M2Xa1oApLzPoHO4D2kaf6FCgGR8Mx7GVAz0aQVxfB8I=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.tugraz.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.tugraz.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://sso.tugraz.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://sso.tugraz.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://sso.tugraz.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.tugraz.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">tugraz.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIDHzCCAgegAwIBAgIUG6ra0BvXswfyErcCDmzw3AV+uI0wDQYJKoZIhvcNAQEF
+BQAwGDEWMBQGA1UEAxMNc3NvLnR1Z3Jhei5hdDAeFw0xMDAzMjkxNzEzMTZaFw0z
+MDAzMjkxODEzMTZaMBgxFjAUBgNVBAMTDXNzby50dWdyYXouYXQwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQCEyQxHIM1zxbBnXn60Ksg7B7HcPLPcN7bX
+LrLPOFXtkZxm0YkHY5Rxignm7wHD7C81U09DFS2eT8qRCcVtVz+kuwdgS54fC/al
+g9oLxXk4CgKjhtZZ2ECLdTHfUXOA5uOLlpoN1LY6VpIjSYe3UEX3HxfhXx/fPeE8
+VInGCKnml8Too22G30htB/EU44A2yqrR3LUngJIaq//N0QbeMYitNh02o6xB5+bp
+6k6noM7DH6S9phe0kCEibaiLaCf7k9LpNnAz9bPtQVth0gdJqoUry/iK1QBTFTEX
+vvJynFEp0+5Wz/XFmEcFhsaK8OcHd0R9FfpX5Z2fewA2Q0SLKz+bAgMBAAGjYTBf
+MD4GA1UdEQQ3MDWCDXNzby50dWdyYXouYXSGJGh0dHBzOi8vc3NvLnR1Z3Jhei5h
+dC9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQUXd76PcSiXR6wFna5qQi+S0W/9Y0w
+DQYJKoZIhvcNAQEFBQADggEBACgkQqxBtYY1OcuoAUP/P+ukJW7XyofK89qs2dkG
+Clx7s0hR/1zImWgljgfguLJOSfC/CWE1wfNK9bTi4Fu9809PmOoaCxkNmniFRAya
+OiBoUz5XIpJniW7wBo+YBpBlXZXi5PmU2DOsfZxo7fs4se32dHO1WqgJodqkK2Wa
+4HDiigh42trZ9i3uS73uHSSCeIJYQNj84BMJ+ifgj3Zi/TgLS+IX7Ayy2bkDzIzI
+Rnj7ULQ/MgfacGXQXJPHyp+w+YvydQalPAWc43+5DkNacN34K8cE3XjHq1kx/BgY
+OtQ7M2Xa1oApLzPoHO4D2kaf6FCgGR8Mx7GVAz0aQVxfB8I=
+                    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://sso.tugraz.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://sso.tugraz.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Technische Universität Graz</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Graz University of Technology</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Technische Universität Graz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Graz University of Technology</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.zid.tugraz.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.tugraz.at/en/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SSO</md:GivenName>
+    <md:SurName>Admins</md:SurName>
+    <md:EmailAddress>mailto:sso@tugraz.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/sso.u-psud.fr.xml b/swamid-interfederations-2.0/sso.u-psud.fr-idp.xml
index 8658a667..6f553d74 100644
--- a/swamid-interfederations-2.0/sso.u-psud.fr.xml
+++ b/swamid-interfederations-2.0/sso.u-psud.fr-idp.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">u-psud.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/sso.utu.fi.xml b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
index 7275d47e..7275d47e 100644
--- a/swamid-interfederations-2.0/sso.utu.fi.xml
+++ b/swamid-interfederations-2.0/sso.utu.fi-sso-idp.xml
diff --git a/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml b/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
new file mode 100644
index 00000000..8dd0927d
--- /dev/null
+++ b/swamid-interfederations-2.0/sso.vgtu.lt-saml2-idp-metadata.php.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://sso.vgtu.lt/saml2/idp/metadata.php">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://fedi.litnet.lt" registrationInstant="2013-10-15T09:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="lt">https://fedi.litnet.lt/lt/tvarka</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="en">https://fedi.litnet.lt/en/policy</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="lt">Vilniaus Gedimino technikos universitetas</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Vilnius Gediminas technical university</mdui:DisplayName>
+        <mdui:Description xml:lang="lt">VGTU desc (lt)</mdui:Description>
+        <mdui:Description xml:lang="en">VGTU desc (en)</mdui:Description>
+        <mdui:InformationURL xml:lang="lt">http://www.vgtu.lt/lt</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.vgtu.lt/en</mdui:InformationURL>
+        <mdui:Logo height="256" width="256">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
+        <mdui:Logo height="88" width="80">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
+        <mdui:Logo height="16" width="16">http://www.vgtu.lt/media/VGTU%20tinklapis/pictures/logo2014_pagr.jpg</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:IPHint>158.129.192.0/18</mdui:IPHint>
+        <mdui:DomainHint>vgtu.lt</mdui:DomainHint>
+        <mdui:GeolocationHint>geo:54.683333,25.283333</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID2TCCAsGgAwIBAgIJAJxLaKaVPb80MA0GCSqGSIb3DQEBBQUAMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDAeFw0xMzAzMDUxMDU3NDRaFw0yMzAzMDUxMDU3NDRaMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANPBRmQdW7yE6Ob47RS63wc6eamLrbcZ8d3BHbkTKOg3zvty9kNGlsRHKJKaTxZJHxxJeGyFK7wD1T7esm6H4xlGd/vPkJ8BiJGaYFt+z6AK0U/C24lAUTBme0XE12kVhR2Ld+AbocdKbgRvkQDs2nupi8bT8GrcLPqEVNfrEcuoWPR0VDrn+cc9eQWsnwAi6vqPNG9BP+tXun1mKRNjLwe7xpIU2dEt4kNNvHKHzbuqMOePvURsMLYWM0GiLA5qMXU/plsgEva09gSONJqUo5PiF5CkcFZqyyJNKznIAZnLuFWJR7a3G4ArQ0BEuGzv7nchzVf+ffdClMlYOflWas0CAwEAAaNQME4wHQYDVR0OBBYEFHaPCulJCIz/U1G0e7fraytboJPGMB8GA1UdIwQYMBaAFHaPCulJCIz/U1G0e7fraytboJPGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACoR6yldDCdkFwAM/UvbmAAhYizDFszWNi53//exw4Q7LYFFExl7h6jjnZphO8/JpYBQ8gqthhEyQe1QRs/3ZBkWJC6mhUu9V6pv/n+10wPew8fm2W6FIgprTmjfz98BCff/Bk7SAqssJRGSKKmgqetMcBXQDEcAQ9i1RpFK/j51mQ6+ynBRvynN0wpAGbKYnKlH4nZhe9DDhKO+P9MDMzbDrTudjZViRUXYxY0Ay8Kfm3TgjL+Yw8/LGhSXO0k9XfCcLVC+e+4YQEUOCQNgOPDRKmZH/jntqXmfY0Dtak0612n8RmJzwybPFyeNY+yeZhb+XEWT9uwq3YM7Zl85YSg=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIID2TCCAsGgAwIBAgIJAJxLaKaVPb80MA0GCSqGSIb3DQEBBQUAMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDAeFw0xMzAzMDUxMDU3NDRaFw0yMzAzMDUxMDU3NDRaMIGCMQswCQYDVQQGEwJMVDEQMA4GA1UECAwHVmlsbml1czEQMA4GA1UEBwwHVmlsbml1czENMAsGA1UECgwEVkdUVTELMAkGA1UECwwCSVQxFDASBgNVBAMMC3Nzby52Z3R1Lmx0MR0wGwYJKoZIhvcNAQkBFg5maWxzYXZAdmd0dS5sdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANPBRmQdW7yE6Ob47RS63wc6eamLrbcZ8d3BHbkTKOg3zvty9kNGlsRHKJKaTxZJHxxJeGyFK7wD1T7esm6H4xlGd/vPkJ8BiJGaYFt+z6AK0U/C24lAUTBme0XE12kVhR2Ld+AbocdKbgRvkQDs2nupi8bT8GrcLPqEVNfrEcuoWPR0VDrn+cc9eQWsnwAi6vqPNG9BP+tXun1mKRNjLwe7xpIU2dEt4kNNvHKHzbuqMOePvURsMLYWM0GiLA5qMXU/plsgEva09gSONJqUo5PiF5CkcFZqyyJNKznIAZnLuFWJR7a3G4ArQ0BEuGzv7nchzVf+ffdClMlYOflWas0CAwEAAaNQME4wHQYDVR0OBBYEFHaPCulJCIz/U1G0e7fraytboJPGMB8GA1UdIwQYMBaAFHaPCulJCIz/U1G0e7fraytboJPGMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBACoR6yldDCdkFwAM/UvbmAAhYizDFszWNi53//exw4Q7LYFFExl7h6jjnZphO8/JpYBQ8gqthhEyQe1QRs/3ZBkWJC6mhUu9V6pv/n+10wPew8fm2W6FIgprTmjfz98BCff/Bk7SAqssJRGSKKmgqetMcBXQDEcAQ9i1RpFK/j51mQ6+ynBRvynN0wpAGbKYnKlH4nZhe9DDhKO+P9MDMzbDrTudjZViRUXYxY0Ay8Kfm3TgjL+Yw8/LGhSXO0k9XfCcLVC+e+4YQEUOCQNgOPDRKmZH/jntqXmfY0Dtak0612n8RmJzwybPFyeNY+yeZhb+XEWT9uwq3YM7Zl85YSg=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vgtu.lt/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sso.vgtu.lt/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationName>
+    <md:OrganizationName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Vilnius Gediminas Technical University</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="lt">Vilniaus Gedimino technikos universitetas</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.vgtu.lt</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Filip</md:GivenName>
+    <md:SurName>Savin</md:SurName>
+    <md:EmailAddress>sso@vgtu.lt</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ssso.uni-muenster.de.xml b/swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml
index 822c6f5d..9b88decb 100644
--- a/swamid-interfederations-2.0/ssso.uni-muenster.de.xml
+++ b/swamid-interfederations-2.0/ssso.uni-muenster.de-shibboleth-sp.xml
@@ -24,38 +24,40 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>ssso.uni-muenster.de</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=ssso.uni-muenster.de,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFvzCCBKegAwIBAgIHFCkMo05xmTANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UE
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=ssso.uni-muenster.de,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGFeCsvNcBjANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
 WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEyMDcyMDE3
-MDIxMVoXDTE3MDcxOTE3MDIxMVowfTELMAkGA1UEBhMCREUxHDAaBgNVBAgTE05v
-cmRyaGVpbi1XZXN0ZmFsZW4xETAPBgNVBAcTCE11ZW5zdGVyMR4wHAYDVQQKExVV
-bml2ZXJzaXRhZXQgTXVlbnN0ZXIxHTAbBgNVBAMTFHNzc28udW5pLW11ZW5zdGVy
-LmRlMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5ooho1OmPzYpi1Fm
-Eki2gPfFbnrzRlPl+NKU2Q4vfTPYvr3kw4TVc2Zju74QOPfSevEl8LvKKoD0kN+f
-k6jvUDxqYQvzg+7g3r5YzOCyrbfPEfXTcmdE9npsiwAUCUXnYvwPXDFfplZbh4Gh
-U0AXnMsyslNZ87zPzw/tyO+sOhgBhs+VO6EbRaf91qcr3cagVy1JlRU7VdOGfZjg
-WEvWxCYVFBYY80JLAu4uYZSZ5esASTlrxCdZM3VCJYM891/gqkG5NCXDSMesvmKL
-D6d0sGziFPvZxbS/l0NZ3UgsXu/0okQJAHch0vKxKI376BAb8NBuISCpXET7Jqpy
-btCBLQIDAQABo4ICMjCCAi4wLwYDVR0gBCgwJjARBg8rBgEEAYGtIYIsAQEEAgMw
-EQYPKwYBBAGBrSGCLAIBBAIDMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1Ud
-JQQWMBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUN0KPcQA+aQQMs4gA
-IOGr5lwrQ+UwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwOQYDVR0R
-BDIwMIIUc3Nzby51bmktbXVlbnN0ZXIuZGWBGHd3d2FkbWluQHVuaS1tdWVuc3Rl
-ci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3d3
-dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8vY2RwMi5wY2Eu
-ZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggrBgEFBQcBAQSB
-vjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5kZS9PQ1NQLVNl
-cnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2EuZGZuLmRlL3d3
-dS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcwAoY1aHR0cDov
-L2NkcDIucGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQw
-DQYJKoZIhvcNAQEFBQADggEBAGjAt30eQ+pgzCeIYGdqsQQZd0uKk6HM+ddwxHJp
-xJI7RSD0fzcX5NbdziqIh4CM0jxCQmg7p848kiUpkWkyaKWR8TBIgGAih7hh74jx
-bVRufQdHH0mWtHCwX5xyIP8c2rXeBBvHXW8YLunmHXrYjZT4Bjg55APNX6eQoqC9
-8V8d9Cfo7LqzAdIn+l5g01yVCjDIgDApisQUrshnf9PDJE9IAm06A8/SR8q54Hsy
-WlWHVpREkz7XctQ8fMDBP6oOfeVsGSV4uZir591FX6Kl31A2n1emhntVhRWvUcyv
-V9T2iObbqKU1YkNBmgQ61s8Uyqty9zYZQNRknR0Lox4A8h4=
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
+MTExNFoXDTE5MDcwOTIzNTkwMFowgaYxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMR0wGwYDVQQDExRzc3NvLnVuaS1tdWVuc3Rl
+ci5kZTEnMCUGCSqGSIb3DQEJARYYd3d3YWRtaW5AdW5pLW11ZW5zdGVyLmRlMIIB
+IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmQsABvLwuKrHBohtO1U86YQ5
+Opt84fnrE75KDuMGYymx22yesGf+K/hygvJtTXtC+QbFq1wqCvmSL/AoN5Upx1c8
+DAr+F7rOpKsIY3fQzCF5xj1/34azBoxn7gsqXAR7or7SYaqrSkh2ynG/uWECO9PL
+4kfGvUj9PEWLNsQcKeIDxRK9XT1j9ga4LoyghKE+wuAOPNCymFjGDmI08i8jiF9C
+QhfJGNO4rI0sNTC+xrEiJX0ZR48xnc7pWrWcXoLYTyynAhDVjR+wq+NyIZHu4keL
+akDxynHgird1o7kj/jx/2ppf8faKDOqn1D1BPvJP6U+ECranLrzrSQP/bZUGRQID
+AQABo4ICcDCCAmwwTwYDVR0gBEgwRjARBg8rBgEEAYGtIYIsAQEEAwIwEQYPKwYB
+BAGBrSGCLAIBBAMBMA8GDSsGAQQBga0hgiwBAQQwDQYLKwYBBAGBrSGCLB4wCQYD
+VR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUF
+BwMBMB0GA1UdDgQWBBSrZHTvkxxm2VdrB2TKDv9NNFCadTAfBgNVHSMEGDAWgBS+
+nlGiyZJ8u2CL5rBoZHdaUhmhADBXBgNVHREEUDBOghRzc3NvLnVuaS1tdWVuc3Rl
+ci5kZYILc3Nzby53d3UuZGWCGHd3dy5zc3NvLnVuaS1tdWVuc3Rlci5kZYIPd3d3
+LnNzc28ud3d1LmRlMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsG
+AQUFBwEBBIG+MIG7MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
+L09DU1AtU2VydmVyL09DU1AwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
+hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAARlsISgb7Li7l4WssY38waKmDuEl
+zHwy5l74OIiBTX+/TTrOxcSpfYCAyucG6z9rP91e1e73r4q3PbyAhwDj7Q3TV8ki
+bagtnLC6U7d2pKerlIh8yt9m28vBzsOniiHKadqOffy9iGH5FNhkMSRRDZtgRKpp
+VE1gq/ydqHWTm0eLfdk0sHgyxEG4WkafWA0KiIafFbOvhZwAUqygruJjzMlUfxxf
+OL9csVR39I5uyveJQpy+J4omKyte4S+Rp8NpI6DW1d8x9kBm2SqLYqMhYTtEYfhi
+k3o3LoCiTxnN6qevn4y3u2a+q1WFEgbdKc+MiKRKeJqmQdHC4CEB5QYztA==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -64,12 +66,12 @@ V9T2iObbqKU1YkNBmgQ61s8Uyqty9zYZQNRknR0Lox4A8h4=
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Redirect"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/POST"/>
     <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SLO/Artifact"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="0"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="2"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="3"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="4"/>
-    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ssso.uni-muenster.de/-shibboleth.sso/SAML/Artifact" index="6"/>
     <AttributeConsumingService index="1">
       <ServiceName xml:lang="de">Universität Münster</ServiceName>
       <ServiceName xml:lang="en">Universität Münster</ServiceName>
diff --git a/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml b/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml
new file mode 100644
index 00000000..08174104
--- /dev/null
+++ b/swamid-interfederations-2.0/strong.renater.fr-idp-shibboleth.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://strong.renater.fr/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2014-10-06T11:04:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">renater.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RENATER - 2FA</mdui:DisplayName>
+        <mdui:Description xml:lang="en">RENATER 2FA authentication Identity Provider</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">GIP RENATER - Authentification forte</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Fournisseur d'identités à authentification forte pour le personnel du GIP RENATER</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMDCCAhigAwIBAgIVAKDRx8im6zJdLQ5NHz5dmbcaOBjOMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMMEXN0cm9uZy5yZW5hdGVyLmZyMB4XDTE0MTAwNjA3NDIx
+OFoXDTM0MTAwNjA3NDIxOFowHDEaMBgGA1UEAwwRc3Ryb25nLnJlbmF0ZXIuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCcmKoiaTCP4jY9v53P+M5I
+vUAbcaFievc311/2CTLBAucCceVTZ9VwVoucZiQ9ZOebD2DtrxLqNJb/RMh5pyXj
+Qzr86Hwv5Yk3+BVpru02HiOzzGbBqWVjwgZ1HFTSfnqwAYP4zZsu7nx8X/SK+ZJV
+SjxiSpe/Y6Rm+t7gWBfZXYSWvKGu01fbywcVqaeGrGz/UQdi0jvhGwNbK7AUCb+J
+/zSw+tkxxAoDdf/8/uk1LScWt2Uim3HqL9a9E9jrrz6b0s2+6ws8asCL1TD3uAXQ
+IPZAmm3F+TZeJv89+VnI1UM7WsdQaCpZBZXLDXuVDnFFZ/j0Ol+rSTdnYVaws+ev
+AgMBAAGjaTBnMB0GA1UdDgQWBBR7MXxBw9coUGjDO8AWpl+AODh4EDBGBgNVHREE
+PzA9ghFzdHJvbmcucmVuYXRlci5mcoYoaHR0cHM6Ly9zdHJvbmcucmVuYXRlci5m
+ci9pZHAvc2hpYmJvbGV0aDANBgkqhkiG9w0BAQUFAAOCAQEAVdeiyyjO1mbphNLM
+pc9tRSsPVeKkxBv7GFN4FaOivBJn5jTLKgCR3AEulI6ySreL9sgrMsN6LggFsFpW
+kjf4iyilbXeH0EQD05teoVCuaZf0JmT+bfbLGLZuHJckOJQW9WqIh8mog8g58chu
+gk019fVk/DFoPIZXyJZDD8FWLuZk9im8KlCBXNbGAwjwz5tfNkWlMAbaVUqdEvr1
+rlzS4uoe3sVAeC3OBKLjHEWy4/NybEmhfjFbIlqrPc579lsn6mJKvrf82Gx6PDry
+OnHGNIjw12pVU5I3hY1A7X/xRZLG0U90KdPekhyE4KXeutJumdwGYj/pC21jsOzy
+gshHXw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://strong.renater.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://strong.renater.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://strong.renater.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">GIP RENATER - Authentification forte</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">GIP RENATER - Authentification forte</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>support@renater.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml
index 22f98d29..22f98d29 100644
--- a/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de.xml
+++ b/swamid-interfederations-2.0/studienportal.vetmed.uni-muenchen.de-shibboleth.xml
diff --git a/swamid-interfederations-2.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml b/swamid-interfederations-2.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml
new file mode 100644
index 00000000..4d09729f
--- /dev/null
+++ b/swamid-interfederations-2.0/synnefo.sky.deic.dk-astakos-ui-login-shibboleth-.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://synnefo.sky.deic.dk/astakos/ui/login/shibboleth/">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQHz6y/RkaDilUw5CuCTw/mDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDgyODAwMDAwMFoXDTE2MDgyNzIzNTk1OVowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzeW5uZWZvLnNreS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sNrox68GaiB3lOVesL6n1D5C69dAAiaWD50G2PctgjQcSBEAW1zy88OzUEcctTHMDIImdTSb4oj48C+OZ4xGX9KGyU5LzEdRPIOjjHcs9vXeg1kNBIpVdW68cJs1NUYIh7EuuAeTNhGcitH0aUidGtS+2394Wz/BbeD/SBsMrp+R0KWSt4a6uBwoVQDgLKuPxh9ABOytMMvvjahpYzcjRlBRnYuZPS1Kd8z6hQoQkSe0DIoJCJv6bQZiZxHyOaqs/17V3yqG9iox44PgM8FV4vfKwlZi/7ESEkQWoovErRQ+NWfkc3AoUvCgx8WWwgzvg3viBiPTNc1jYyE3J3ghwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFM2VRTEPidBjw2uvUxHjGofaKsAeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNzeW5uZWZvLnNreS5kZWljLmRrMA0GCSqGSIb3DQEBBQUAA4IBAQCg4m6vWsld8NxtxCtlwZNRdFD0V/rWkv8NTOcdY2pSEXAizi7mSg6CZ6qp3vw7IKl1eF302+eNiQr86WdAN6bgr6EC/eoj7gyEC1YbEafnT1GNyxF+PzsRgt1a5lUR7PR9Xvduj/Ujzq8QJXwWxStcsi7fWz5tXnKakCFEqmZizaOgKiTGoc0NEluMBwRsWvcl9/6gDV7fWALdHBp8d8oVGRFHqRHWSps+5NlV9Z48VeDtQBMJd8xdgh+8Qe4xgQbno2mkkBTfsaYZ5Iy+IcB0hx51UzAdbiNFWzxa072ClafVq62XVKmACmjKGZmDTp0WQma6WMJGT8blf5b0o3pH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEczCCA1ugAwIBAgIQHz6y/RkaDilUw5CuCTw/mDANBgkqhkiG9w0BAQUFADA2MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEgU1NMIENBMB4XDTEzMDgyODAwMDAwMFoXDTE2MDgyNzIzNTk1OVowQTEhMB8GA1UECxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMRwwGgYDVQQDExNzeW5uZWZvLnNreS5kZWljLmRrMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8sNrox68GaiB3lOVesL6n1D5C69dAAiaWD50G2PctgjQcSBEAW1zy88OzUEcctTHMDIImdTSb4oj48C+OZ4xGX9KGyU5LzEdRPIOjjHcs9vXeg1kNBIpVdW68cJs1NUYIh7EuuAeTNhGcitH0aUidGtS+2394Wz/BbeD/SBsMrp+R0KWSt4a6uBwoVQDgLKuPxh9ABOytMMvvjahpYzcjRlBRnYuZPS1Kd8z6hQoQkSe0DIoJCJv6bQZiZxHyOaqs/17V3yqG9iox44PgM8FV4vfKwlZi/7ESEkQWoovErRQ+NWfkc3AoUvCgx8WWwgzvg3viBiPTNc1jYyE3J3ghwIDAQABo4IBcDCCAWwwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFM2VRTEPidBjw2uvUxHjGofaKsAeMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAeBgNVHREEFzAVghNzeW5uZWZvLnNreS5kZWljLmRrMA0GCSqGSIb3DQEBBQUAA4IBAQCg4m6vWsld8NxtxCtlwZNRdFD0V/rWkv8NTOcdY2pSEXAizi7mSg6CZ6qp3vw7IKl1eF302+eNiQr86WdAN6bgr6EC/eoj7gyEC1YbEafnT1GNyxF+PzsRgt1a5lUR7PR9Xvduj/Ujzq8QJXwWxStcsi7fWz5tXnKakCFEqmZizaOgKiTGoc0NEluMBwRsWvcl9/6gDV7fWALdHBp8d8oVGRFHqRHWSps+5NlV9Z48VeDtQBMJd8xdgh+8Qe4xgQbno2mkkBTfsaYZ5Iy+IcB0hx51UzAdbiNFWzxa072ClafVq62XVKmACmjKGZmDTp0WQma6WMJGT8blf5b0o3pH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SLO/SOAP"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SAML2/Artifact" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://synnefo.sky.deic.dk/Shibboleth.sso/SAML2/POST" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Synnefo DeIC</md:ServiceName>
+      <md:ServiceName xml:lang="da">Synnefo DeIC</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to put virtual machines and storage at the disposal of people affiliated with any Danish higher educational institution</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at stille virtuelle maskiner og lagerplads til rådighed for personale og studerende ved de højere læreanstalter</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:Company>DeIC</md:Company>
+    <md:GivenName>Istvan</md:GivenName>
+    <md:SurName>Bernath</md:SurName>
+    <md:EmailAddress>isbe@adm.dtu.dk</md:EmailAddress>
+    <md:TelephoneNumber>+45 40142359</md:TelephoneNumber>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index faa10d9b..faa10d9b 100644
--- a/swamid-interfederations-2.0/tcs-escience-portal.terena.org.xml
+++ b/swamid-interfederations-2.0/tcs-escience-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml b/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
index b485ac9f..b485ac9f 100644
--- a/swamid-interfederations-2.0/tcs-personal-portal.terena.org.xml
+++ b/swamid-interfederations-2.0/tcs-personal-portal.terena.org-simplesamlphp-module.php-saml-sp-metadata.php-default-sp.xml
diff --git a/swamid-interfederations-2.0/terena.org.xml b/swamid-interfederations-2.0/terena.org-sp.xml
index 3b1161df..3b1161df 100644
--- a/swamid-interfederations-2.0/terena.org.xml
+++ b/swamid-interfederations-2.0/terena.org-sp.xml
diff --git a/swamid-interfederations-2.0/test-adfs.geant.net.xml b/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
index 6ca45221..6ca45221 100644
--- a/swamid-interfederations-2.0/test-adfs.geant.net.xml
+++ b/swamid-interfederations-2.0/test-adfs.geant.net-adfs-services-trust.xml
diff --git a/swamid-interfederations-2.0/test-bod-gui.geant.net.xml b/swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml
index e351d63e..e351d63e 100644
--- a/swamid-interfederations-2.0/test-bod-gui.geant.net.xml
+++ b/swamid-interfederations-2.0/test-bod-gui.geant.net-autobahn-gui.xml
diff --git a/swamid-interfederations-2.0/test.federation.renater.fr.xml b/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
index e661c3dc..cc09b54f 100644
--- a/swamid-interfederations-2.0/test.federation.renater.fr.xml
+++ b/swamid-interfederations-2.0/test.federation.renater.fr-validation-ressource.xml
@@ -75,69 +75,69 @@ PbS4vQ==
       <ServiceDescription xml:lang="fr">Ressource de validation. Permettant la validation rapide d'un fonctionnement d'un IdP dans la fédération Éducation - Recherche. La ressource ne fait qu'afficher les attributs qui lui sont renvoyés par l'IdP.
 Il faut configurer manuellement les filtres d'attributs pour cette ressource.</ServiceDescription>
       <ServiceDescription xml:lang="en">This SP allows validation of identity providers. The resource prints the list of user attributes received from the identity provider.</ServiceDescription>
-      <RequestedAttribute FriendlyName="supannAutreMail" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuEtape" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.29" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannAutreMail" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.34" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="o" Name="urn:oid:2.5.4.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="telephoneNumber" Name="urn:oid:2.5.4.20" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEtuEtape" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.29" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEtuId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mobile" Name="urn:oid:0.9.2342.19200300.100.1.41" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="schacHomeOrganizationType" Name="urn:oid:1.3.6.1.4.1.25178.1.2.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="supannEtuRegimeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.31" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannMailPerso" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannAutreTelephone" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannMailPerso" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.15" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEtuRegimeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.31" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannAutreTelephone" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="ou" Name="urn:oid:2.5.4.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
       <RequestedAttribute FriendlyName="schacHomeOrganization" Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEmpId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mailForwardingAddress" Name="urn:oid:2.16.840.1.113730.3.1.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuElementPedagogique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.28" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRole" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRoleEntite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannCivilite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannActivite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannCodeINE" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuAnneeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.25" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuSecteurDisciplinaire" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.32" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannListeRouge" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuCursusAnnee" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannRoleGenerique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.30" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="supannEtuTypeDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.33" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
-      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <RequestedAttribute FriendlyName="supannEtuDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.27" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrimaryOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="cn" Name="urn:oid:2.5.4.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgUnitDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEmpId" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.11" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mailForwardingAddress" Name="urn:oid:2.16.840.1.113730.3.1.17" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="labeledURI" Name="urn:oid:1.3.6.1.4.1.250.1.57" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEtuElementPedagogique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.28" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannRole" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.21" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannRoleEntite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.24" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannCivilite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="facsimileTelephoneNumber" Name="urn:oid:2.5.4.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="l" Name="urn:oid:2.5.4.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="preferredLanguage" Name="urn:oid:2.16.840.1.113730.3.1.39" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannActivite" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannCodeINE" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="sn" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonOrgDN" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonNickname" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.2" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="givenName" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEtuAnneeInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.25" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEntiteAffectationPrincipale" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.13" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEtuSecteurDisciplinaire" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.32" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEntiteAffectation" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.8" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannListeRouge" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEtuCursusAnnee" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.26" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannRoleGenerique" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.23" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEtablissement" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.14" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEtuInscription" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.30" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="uid" Name="urn:oid:0.9.2342.19200300.100.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="userCertificate" Name="urn:oid:2.5.4.36" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="postalAddress" Name="urn:oid:2.5.4.16" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduOrgLegalName" Name="urn:oid:1.3.6.1.4.1.5923.1.2.1.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannEtuTypeDiplome" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.33" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="supannOrganisme" Name="urn:oid:1.3.6.1.4.1.7135.1.2.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonEntitlement" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.7" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
     </AttributeConsumingService>
   </SPSSODescriptor>
   <Organization>
     <OrganizationName xml:lang="en">RENATER</OrganizationName>
     <OrganizationDisplayName xml:lang="en">RENATER</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">www.renater.fr</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.renater.fr</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
     <EmailAddress>support@renater.fr</EmailAddress>
diff --git a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml b/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml
index f2627d6f..f2627d6f 100644
--- a/swamid-interfederations-2.0/test.ukfederation.org.uk.xml
+++ b/swamid-interfederations-2.0/test.ukfederation.org.uk-entity.xml
diff --git a/swamid-interfederations-2.0/testssso.uni-muenster.de.xml b/swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml
index 5a5f64dd..4f6cfe48 100644
--- a/swamid-interfederations-2.0/testssso.uni-muenster.de.xml
+++ b/swamid-interfederations-2.0/testssso.uni-muenster.de-shibboleth-sp.xml
@@ -24,39 +24,40 @@
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
         <ds:KeyName>testssso.uni-muenster.de</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>CN=testssso.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIF+DCCBOCgAwIBAgIHFCidFzwGDzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UE
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=testssso.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGJzCCBQ+gAwIBAgIHGFeCs6pz9jANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
 BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
 WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
-MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEyMDcyMDA5
-MDYxNloXDTE3MDcxOTA5MDYxNlowgbExCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
+MTExNloXDTE5MDcwOTIzNTkwMFowgdoxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
 b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
 VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
 b3JtYXRpb25zdmVyYXJiZWl0dW5nMSEwHwYDVQQDExh0ZXN0c3Nzby51bmktbXVl
-bnN0ZXIuZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDCYK4Y7STE
-L8OlunXF0IQl7BqeJQVZ88sfR3yHWqwihuhh5Xy+xqBHpVg07VbOMr9E+cx0zgOO
-wqMkTIA6+B7RfI5EGiIaiUI3TUew1oibfFqwQ7GC34rawnVzYmOiOHoKdBqD8KTN
-hR5zdDK64OdhrmUCCQ9ViSelXoBK9oo7ko3IqmEJrSWc8EqN5/k4/LEQuieJJEok
-YHuIAKTWy5tyglVcN0mlpR+kZOeKf96IO14z71GmMbUSNHepidzSyoTL5Na9uG0u
-dchHkrDRkdJtr9Ou23P75bJLuRJ+K8wo1sT63lCinEhupK91z3vHg0DsA8v6uBit
-UyGfTxnz4izLAgMBAAGjggI2MIICMjAvBgNVHSAEKDAmMBEGDysGAQQBga0hgiwB
-AQQCAzARBg8rBgEEAYGtIYIsAgEEAgMwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAw
-HQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRYwYC2Uz5H
-6Ynz6B811VlykXutszAfBgNVHSMEGDAWgBS+nlGiyZJ8u2CL5rBoZHdaUhmhADA9
-BgNVHREENjA0ghh0ZXN0c3Nzby51bmktbXVlbnN0ZXIuZGWBGHd3d2FkbWluQHVu
-aS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAzhjFodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMIHLBggr
-BgEFBQcBAQSBvjCBuzAzBggrBgEFBQcwAYYnaHR0cDovL29jc3AucGNhLmRmbi5k
-ZS9PQ1NQLVNlcnZlci9PQ1NQMEEGCCsGAQUFBzAChjVodHRwOi8vY2RwMS5wY2Eu
-ZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2FjZXJ0LmNydDBBBggrBgEFBQcw
-AoY1aHR0cDovL2NkcDIucGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2Nh
-Y2VydC5jcnQwDQYJKoZIhvcNAQEFBQADggEBACQHZ+2pf6Lyk2q7Teu2nPxG1uAz
-KmEKY2GkQmDpySrcVn5Gex4b2EtmgcmEOXgzHtYHOlJYcSjHVLZt+41eTsh5si8D
-ozAv2qIJV/RjRg9btBCHYJRsxoP5rRuZZ/ASfCb+stJWgx+1gu0PodosZgFKiM2E
-3zWjeMkqDxP9uS1NLyB+/V8N67cdOYdP/dKx9dIw+rCeAsr0OlFaEX3q/LzA2NWU
-O7HVimoyfRBz43eqdPCoyZ89aMPYdktSICu/kaOXHtAp1j4BrDwr3fnbE+lPpU/1
-EecubiQE8/Mek9uGrP8kBfIyCBKwvjxuXqgCIBhis6wo9C1/uM1c4uiqg7M=
+bnN0ZXIuZGUxJzAlBgkqhkiG9w0BCQEWGHd3d2FkbWluQHVuaS1tdWVuc3Rlci5k
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKSQWHcHeqedu29lqBRD
+VOO/WjA7ELkwwGSPcqtVdJSrunce1HkYWY98X8IKnKOk8OXMjNnHLb1ka6azAvcz
+HX8HPda+X2JeyYGehjGNRCP2AI+6C5tRgCpaySeobrH4nI1bLuP0J1xjwzKzqD8Q
+hjEy8jyIs5S5Pqx9V+4+tHPG6HsHlbTDAhxkZ4CWnyFcpnQwJJiJiXCcwbrlCU5/
+jZ8xeJmPEqACtL41o/d8HfBF2f9zXIlknGR5Lh2pCOy5Pt1GnJACUaCp+VKTsM3Y
+Zn71OASRAmMCp2sR+P/dNs9Awx6CPWyZRacArwTUbobVUKGNtcAw0vPsj/25UDkl
+YD0CAwEAAaOCAjwwggI4ME8GA1UdIARIMEYwEQYPKwYBBAGBrSGCLAEBBAMCMBEG
+DysGAQQBga0hgiwCAQQDATAPBg0rBgEEAYGtIYIsAQEEMA0GCysGAQQBga0hgiwe
+MAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQWMBQGCCsGAQUFBwMCBggr
+BgEFBQcDATAdBgNVHQ4EFgQUEc/OhyNJfLbAplQ81eqmpb8Zy0gwHwYDVR0jBBgw
+FoAUvp5RosmSfLtgi+awaGR3WlIZoQAwIwYDVR0RBBwwGoIYdGVzdHNzc28udW5p
+LW11ZW5zdGVyLmRlMHsGA1UdHwR0MHIwN6A1oDOGMWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwN6A1oDOGMWh0dHA6Ly9j
+ZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jcmwvZ19jYWNybC5jcmwwgcsGCCsG
+AQUFBwEBBIG+MIG7MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2EuZGZuLmRl
+L09DU1AtU2VydmVyL09DU1AwQQYIKwYBBQUHMAKGNWh0dHA6Ly9jZHAxLnBjYS5k
+Zm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQuY3J0MEEGCCsGAQUFBzAC
+hjVodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY2FjZXJ0L2dfY2Fj
+ZXJ0LmNydDANBgkqhkiG9w0BAQsFAAOCAQEAZmamJrBlMURerBb8kNhic4WMrn9r
+O+tQOuWkYnRC7guOQxzI4xIyTwgToNimO+AZ2dCWqDnR+xOE2WPTvQ6MfG313kRO
+X7yOwhoZ0vbpzwBPr2+rVawbSYn/n4gZwoYFgewr5dEG4irT+ULcZMYuW+jEX2Da
+Uq1uiMlySocFWLW0F+yEfHu50NmuNm7sYCjhzB0aIksNQq8oSRdioN7Wk8AeNHUO
+bOH9nkcrbf9+K4i8zJGCCl0e+ekwdSqMjX3bS+JcnonHH76QPiFP7d/ndahgGknK
+FayundglgK5Mny/HWnaA/ugqZLUeGb6N7vcRs20Q3Bm+rrv2y7PBPWH4yw==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml
index a5ca4d59..735eac86 100644
--- a/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz.xml
+++ b/swamid-interfederations-2.0/thalamoss-data.ics.muni.cz-shibboleth.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://thalamoss-data.ics.muni.cz/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-01-07T17:17:02Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/theia.unifei.edu.br.xml b/swamid-interfederations-2.0/theia.unifei.edu.br.xml
deleted file mode 100644
index 1a4aad9d..00000000
--- a/swamid-interfederations-2.0/theia.unifei.edu.br.xml
+++ /dev/null
@@ -1,100 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="https://theia.unifei.edu.br/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://cafe.rnp.br" registrationInstant="2010-01-01T00:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="pt-br">
-                                http://www.rnp.br/_arquivo/servicos/Politica_CAFe_IDP_final.pdf
-                              </mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">unifei.edu.br</shibmd:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:DisplayName>
-        <mdui:Description xml:lang="en">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-        <mdui:Description xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.unifei.edu.br/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="pt-br">http://www.unifei.edu.br/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-    MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzEMMAoGA1UECxMDRFNJMQswCQYD
-VQQGEwJCUjEOMAwGA1UEAxMFdGhlaWEwHhcNMTQwMTIxMTEzMjIxWhcNMTcwMTIw
-MTEzMjIxWjArMQwwCgYDVQQLEwNEU0kxCzAJBgNVBAYTAkJSMQ4wDAYDVQQDEwV0
-aGVpYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALM0tuHkFgdeGbLy
-W3O/y9DiMfdU+/8fHiDAIIpYzP6kG+mLHI66UWRebDIEBMS875A1paBddEvLR3QC
-fOVrS3Ax8y+ssb+T5T9HRtLgNkC9TamhWM4smrItzDooUaM0N1cgyS4re5yo296/
-QRZUSsRBx9g81PMmtqvYpnZWR/aOo8i5N6mFnPPDprIRGqhQs0UK3tBj2Mi8Q4HP
-ZjALVXBtcuTBdiAcVBxtjHsS+RjVVUcbx/K/s9GV7LAv9+UhpoGVzT/N03AMqO4D
-nD4i37ja9xOedn3xQ48N4hiYkfYssObFBTA6jLIQ1GZ2ql6QJhwThhpP7MWvJXHZ
-SQwKwa0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAd193NYgaXZqOCkmcdv6rP+bl
-6nBIEaPH0gbYjKp0ugs+MoAfUrL2ajJgZo6SPEcvlxqbS3p+aEGqX5zPJ9Zdybdt
-UcNDS3mqv5JcCXJeJXhdaYCsPQF59UslfrC6NNdf4kDpdVJQGbOW45p9aB53h/SX
-9Bf2MD4TlAez2k3qzd23v6AniygO0BQLQVqjUM4B8tO17TDK5kKZP1UPZ6/RCQqS
-AcCLVaA6pjEC4v94Sy+XLgmp8d96SOFSIbv6cwzBp2j2emxdLThKqRJFOsF8y78E
-msxBNWg0y3K04JlGPOj9X4RPkVaUgwMK/Xw0sQGxhTCRc+lag0TxYUjMm9dbzg==
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://theia.unifei.edu.br:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://theia.unifei.edu.br:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://theia.unifei.edu.br/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://theia.unifei.edu.br/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://theia.unifei.edu.br/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://theia.unifei.edu.br/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <shibmd:Scope regexp="false">unifei.edu.br</shibmd:Scope>
-    </Extensions>
-    <KeyDescriptor>
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-      
-MIICyjCCAbICAQAwDQYJKoZIhvcNAQEFBQAwKzEMMAoGA1UECxMDRFNJMQswCQYD
-VQQGEwJCUjEOMAwGA1UEAxMFdGhlaWEwHhcNMTQwMTIxMTEzMjIxWhcNMTcwMTIw
-MTEzMjIxWjArMQwwCgYDVQQLEwNEU0kxCzAJBgNVBAYTAkJSMQ4wDAYDVQQDEwV0
-aGVpYTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALM0tuHkFgdeGbLy
-W3O/y9DiMfdU+/8fHiDAIIpYzP6kG+mLHI66UWRebDIEBMS875A1paBddEvLR3QC
-fOVrS3Ax8y+ssb+T5T9HRtLgNkC9TamhWM4smrItzDooUaM0N1cgyS4re5yo296/
-QRZUSsRBx9g81PMmtqvYpnZWR/aOo8i5N6mFnPPDprIRGqhQs0UK3tBj2Mi8Q4HP
-ZjALVXBtcuTBdiAcVBxtjHsS+RjVVUcbx/K/s9GV7LAv9+UhpoGVzT/N03AMqO4D
-nD4i37ja9xOedn3xQ48N4hiYkfYssObFBTA6jLIQ1GZ2ql6QJhwThhpP7MWvJXHZ
-SQwKwa0CAwEAATANBgkqhkiG9w0BAQUFAAOCAQEAd193NYgaXZqOCkmcdv6rP+bl
-6nBIEaPH0gbYjKp0ugs+MoAfUrL2ajJgZo6SPEcvlxqbS3p+aEGqX5zPJ9Zdybdt
-UcNDS3mqv5JcCXJeJXhdaYCsPQF59UslfrC6NNdf4kDpdVJQGbOW45p9aB53h/SX
-9Bf2MD4TlAez2k3qzd23v6AniygO0BQLQVqjUM4B8tO17TDK5kKZP1UPZ6/RCQqS
-AcCLVaA6pjEC4v94Sy+XLgmp8d96SOFSIbv6cwzBp2j2emxdLThKqRJFOsF8y78E
-msxBNWg0y3K04JlGPOj9X4RPkVaUgwMK/Xw0sQGxhTCRc+lag0TxYUjMm9dbzg==
-                    
-            </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://theia.unifei.edu.br:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://theia.unifei.edu.br:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
-    <OrganizationName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationName>
-    <OrganizationDisplayName xml:lang="en">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="pt-br">UNIFEI - Universidade Federal de Itajuba</OrganizationDisplayName>
-    <OrganizationURL xml:lang="en">http://www.unifei.edu.br/</OrganizationURL>
-    <OrganizationURL xml:lang="pt-br">http://www.unifei.edu.br/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <SurName>Everaldo Campos</SurName>
-    <EmailAddress>everaldo@unifei.edu.br</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
new file mode 100644
index 00000000..af807a78
--- /dev/null
+++ b/swamid-interfederations-2.0/ticket.iop.org-shibboleth.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://ticket.iop.org/shibboleth">
+  <!--
+		This is a Shibboleth SP for IOP Publishing Limited.
+		(It has multiple Assertion Consumer Service locations.)
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2012-04-02T16:45:39Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIF/jCCBOagAwIBAgIQM+YpmcylIPDSTgnHfWNmNTANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwMzE5
+						MDAwMDAwWhcNMTgwMzE2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
+						BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
+						IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
+						ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
+						JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
+						AxQOdGlja2V0LmlvcC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC5WcglO3vKPNW09UA2GygrxCcozj67wA8Qd6d7Mu17EPrFzxRUP3h2jqk9wAPn
+						vaIMcNooYHK/CzUawroiINRtdArpRT0lW1aNeXuiZ+9H6SU2KQKfMSI5WoXvIdW9
+						xUUnQyyptaXNVyXINAlkm5y+HTsrbRATRkjJN94Qw4ssRaYfWhOP66rpviu1DfLA
+						Vhhhc/uSme+la90C+bVQ9EHnfF5adHAMsGIiJbqdQCK4Hq5nFlzpW535GRqleHcE
+						9x3HUppIJ32Q1ehYEvzwSIMBp8ACO7hgnSiYPbegpYPdeH+eV1vBmPuSLo/DxaON
+						KCvHtgDOt1QzxMuqiCBfp5QFAgMBAAGjggHTMIIBzzAJBgNVHRMEAjAAMAsGA1Ud
+						DwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZSU2VjdXJlLUczLWNy
+						bC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1UdIAQ/MD0wOwYLYIZI
+						AYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cudmVyaXNpZ24uY28u
+						dWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+						gBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
+						MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
+						L1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBu
+						BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
+						BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
+						b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJo/xmh2qJqsFbNlxD2V
+						whco2sZBjNrNBk12LFGtcFJmeUXPPIcAFeKGlWx/37mKirZ1ryxRbgdEi6ShZo8n
+						HGtdJlw9Wj0otC4Idr7PGPH/BEThfx27NYz2OzKiMvfm5vFfvHUPiSKdFlxleIBr
+						beDsBgKfA6YbhWElH6QIqmL9T6Qg2iMvAHdrgN6afMvuJ4h9iT5ad0LfuRxE3Gvq
+						Y7B/QdOZHDQVZ0KquFe/qnRDrWFhlvdPXRxwgByi9XOmbNVuRnlxfnbUOw8Jgks1
+						H39D5zTQOKl+AEOTomKwTr53TFgDjSw8j9R/8Hi0f++axKR29JCknxBnJltVE+iU
+						m7g=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIF/jCCBOagAwIBAgIQM+YpmcylIPDSTgnHfWNmNTANBgkqhkiG9w0BAQUFADCB
+						tTELMAkGA1UEBhMCVVMxFzAVBgNVBAoTDlZlcmlTaWduLCBJbmMuMR8wHQYDVQQL
+						ExZWZXJpU2lnbiBUcnVzdCBOZXR3b3JrMTswOQYDVQQLEzJUZXJtcyBvZiB1c2Ug
+						YXQgaHR0cHM6Ly93d3cudmVyaXNpZ24uY29tL3JwYSAoYykxMDEvMC0GA1UEAxMm
+						VmVyaVNpZ24gQ2xhc3MgMyBTZWN1cmUgU2VydmVyIENBIC0gRzMwHhcNMTIwMzE5
+						MDAwMDAwWhcNMTgwMzE2MjM1OTU5WjCB6DELMAkGA1UEBhMCR0IxDTALBgNVBAgT
+						BEF2b24xEDAOBgNVBAcUB0JyaXN0b2wxGzAZBgNVBAoUEklPUCBQdWJsaXNoaW5n
+						IEx0ZDE1MDMGA1UECxQsVGVybXMgb2YgdXNlIGF0IHd3dy52ZXJpc2lnbi5jby51
+						ay9ycGEgKGMpMDUxIjAgBgNVBAsTGUF1dGhlbnRpY2F0ZWQgYnkgVmVyaVNpZ24x
+						JzAlBgNVBAsTHk1lbWJlciwgVmVyaVNpZ24gVHJ1c3QgTmV0d29yazEXMBUGA1UE
+						AxQOdGlja2V0LmlvcC5vcmcwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+						AQC5WcglO3vKPNW09UA2GygrxCcozj67wA8Qd6d7Mu17EPrFzxRUP3h2jqk9wAPn
+						vaIMcNooYHK/CzUawroiINRtdArpRT0lW1aNeXuiZ+9H6SU2KQKfMSI5WoXvIdW9
+						xUUnQyyptaXNVyXINAlkm5y+HTsrbRATRkjJN94Qw4ssRaYfWhOP66rpviu1DfLA
+						Vhhhc/uSme+la90C+bVQ9EHnfF5adHAMsGIiJbqdQCK4Hq5nFlzpW535GRqleHcE
+						9x3HUppIJ32Q1ehYEvzwSIMBp8ACO7hgnSiYPbegpYPdeH+eV1vBmPuSLo/DxaON
+						KCvHtgDOt1QzxMuqiCBfp5QFAgMBAAGjggHTMIIBzzAJBgNVHRMEAjAAMAsGA1Ud
+						DwQEAwIFoDBFBgNVHR8EPjA8MDqgOKA2hjRodHRwOi8vU1ZSU2VjdXJlLUczLWNy
+						bC52ZXJpc2lnbi5jb20vU1ZSU2VjdXJlRzMuY3JsMEYGA1UdIAQ/MD0wOwYLYIZI
+						AYb4RQEHFwMwLDAqBggrBgEFBQcCARYeaHR0cHM6Ly93d3cudmVyaXNpZ24uY28u
+						dWsvcnBhMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAfBgNVHSMEGDAW
+						gBQNRFwWU0TBgn4dIKsl9AFj2L55pTB2BggrBgEFBQcBAQRqMGgwJAYIKwYBBQUH
+						MAGGGGh0dHA6Ly9vY3NwLnZlcmlzaWduLmNvbTBABggrBgEFBQcwAoY0aHR0cDov
+						L1NWUlNlY3VyZS1HMy1haWEudmVyaXNpZ24uY29tL1NWUlNlY3VyZUczLmNlcjBu
+						BggrBgEFBQcBDARiMGChXqBcMFowWDBWFglpbWFnZS9naWYwITAfMAcGBSsOAwIa
+						BBRLa7kolgYMu9BSOJsprEsHiyEFGDAmFiRodHRwOi8vbG9nby52ZXJpc2lnbi5j
+						b20vdnNsb2dvMS5naWYwDQYJKoZIhvcNAQEFBQADggEBAJo/xmh2qJqsFbNlxD2V
+						whco2sZBjNrNBk12LFGtcFJmeUXPPIcAFeKGlWx/37mKirZ1ryxRbgdEi6ShZo8n
+						HGtdJlw9Wj0otC4Idr7PGPH/BEThfx27NYz2OzKiMvfm5vFfvHUPiSKdFlxleIBr
+						beDsBgKfA6YbhWElH6QIqmL9T6Qg2iMvAHdrgN6afMvuJ4h9iT5ad0LfuRxE3Gvq
+						Y7B/QdOZHDQVZ0KquFe/qnRDrWFhlvdPXRxwgByi9XOmbNVuRnlxfnbUOw8Jgks1
+						H39D5zTQOKl+AEOTomKwTr53TFgDjSw8j9R/8Hi0f++axKR29JCknxBnJltVE+iU
+						m7g=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://ticket.iop.org/Shibboleth.sso/SAML/POST" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="7"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML/POST" index="8"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="9"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="10"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="11"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://dev.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="12"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="13"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="14"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="15"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="16"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="17"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://pmh.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="18"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="19"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML/POST" index="20"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="21"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="22"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="23"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://czh.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="24"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="25"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML/POST" index="26"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="27"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="28"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="29"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="30"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/Artifact" index="31"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML/POST" index="32"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/ECP" index="33"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST" index="34"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/Artifact" index="35"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://test2.ticket.iop.org/Shibboleth.sso/SAML2/POST-SimpleSign" index="36"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IOP Publishing Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IOP online services</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.iop.org/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>Chris</GivenName>
+    <SurName>Hayes</SurName>
+    <EmailAddress>mailto:Chris.Hayes@iop.org</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Peter</GivenName>
+    <SurName>Haworth</SurName>
+    <EmailAddress>mailto:Peter.Haworth@iop.org</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tonga.univ-tlse2.fr.xml b/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml
index 2270b514..de62fb7b 100644
--- a/swamid-interfederations-2.0/tonga.univ-tlse2.fr.xml
+++ b/swamid-interfederations-2.0/tonga.univ-tlse2.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-tlse2.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tlse2.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/tullbommen.arcada.fi-simplesaml-.xml b/swamid-interfederations-2.0/tullbommen.arcada.fi-simplesaml-.xml
new file mode 100644
index 00000000..7e98ca78
--- /dev/null
+++ b/swamid-interfederations-2.0/tullbommen.arcada.fi-simplesaml-.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://tullbommen.arcada.fi/simplesaml/">
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope regexp="false">arcada.fi</shibmd:Scope>
+      <saml:Attribute Name="tags">
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">kalmar</saml:AttributeValue>
+        <saml:AttributeValue xmlns:xs="http://www.w3.org/2001/XMLSchema" xsi:type="xs:string">finland</saml:AttributeValue>
+      </saml:Attribute>
+    </md:Extensions>
+    <md:KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEdjCCA16gAwIBAgIRANjPKkKEQJwfMHea3kHeKBAwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzEwMzAwMDAwMDBaFw0xNjExMDkyMzU5NTlaMEIxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEdMBsGA1UEAxMUdHVsbGJvbW1l
+bi5hcmNhZGEuZmkwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDUB/mi
+pk7Yn/0yQa9rpQ3AMGmR09/45kBJxos6nS9dCbPZ+efy0dNnvcF/hXCbvbnYXHiA
+ZJg1TjBFOJO6jePNplzs8oDWIk5BV/YaWrnKzZnua66m4dfeFIqLXnTrlnR3bBrN
+9GOdSDHdMEuTIntm+2OVnpJUnVLTBsFjqGcnWISsk7DxSWvJJI5cirawQ+RK3yeX
+QSjg/VXpWQYVTahLe938VaZ7LU2cLeNJ0O2ipv5LEXM5mLX7KSbI+/aSOdXi+0Wd
+D7ThYzrjG1cWwIW8YwU1INIZu1wOvzc+r4LyIix4wFaKIoROHiGr/dMbxgz9oOaC
+kaLl2ZdK4OH2h1n/AgMBAAGjggFxMIIBbTAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJ
+ays3V0fqkOO57TAdBgNVHQ4EFgQUYw143pn/Vha8iT1GD6cNUD36ZxYwDgYDVR0P
+AQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsG
+AQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1Ud
+HwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NM
+Q0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50
+Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6
+Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaCFHR1bGxib21tZW4uYXJj
+YWRhLmZpMA0GCSqGSIb3DQEBBQUAA4IBAQBRld8PJrEUESgRtOrIVYJ9cyPENSki
+Dg5PFCvckLcfo6t0Or6Bfq5T5575x695zuKw6pD7xToO3oadzqgohveIWpN+qyEz
+0uuQahsRq9cRVQfd9SGensZWfem3ujQZXk3sGwd350G7CiCcNJcNtbsb1wUdFPjW
+h0xhzFZPrHiD0hjAfx8nDMIlIdN2wQtok0+XHN2mll05DGLG2CtniIAnHEOVWEyH
+/bbmOj3zhw+kGJza5x7tldQLVsPntuBsvm74rKW+nAGVfyqhgWlB5kcTuVCe33sw
+d0vPK8knVsYNfPg0Ms8UNdm1LuFpkjxWiwJ4y9IFW7zf86tmV+ryxuBy</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tullbommen.arcada.fi/simplesaml/saml2/idp/SSOService.php"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tullbommen.arcada.fi/simplesaml/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="fi">Arcada</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">Arcada</md:OrganizationName>
+    <md:OrganizationName xml:lang="sv">Arcada</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="fi">Arcada</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">Arcada</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="sv">Arcada</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="fi">http://www.arcada.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.arcada.fi/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="sv">http://www.arcada.fi/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>Fredrik</md:GivenName>
+    <md:SurName>Finnberg</md:SurName>
+    <md:EmailAddress>mailto:haka.admin@arcada.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>David</md:GivenName>
+    <md:SurName>Sjoberg</md:SurName>
+    <md:EmailAddress>mailto:haka@arcada.fi</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Harald</md:GivenName>
+    <md:SurName>Hannelius</md:SurName>
+    <md:EmailAddress>mailto:haka.technical@arcada.fi</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml b/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml
new file mode 100644
index 00000000..643e7a04
--- /dev/null
+++ b/swamid-interfederations-2.0/tumidp.lrz.de-idp-shibboleth.xml
@@ -0,0 +1,231 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tumidp.lrz.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tum.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">TU München (TUM)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Munich University of Technology (TUM)</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Technischen Universität München</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider for TUM</mdui:Description>
+        <mdui:InformationURL xml:lang="de">http://www.tum.de</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.tum.de</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
+WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
+NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
+5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
+LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
+h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
+h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
+qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
+XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
+UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
+qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
+EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
+GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
+WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
+NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
+5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
+LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
+h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
+h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
+qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
+XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
+UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
+qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
+EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
+GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tumidp.lrz.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tumidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tumidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tum.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
+WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
+NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
+5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
+LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
+h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
+h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
+qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
+XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
+UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
+qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
+EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
+GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>CN=tumidp.lrz.de,OU=Leibniz-Rechenzentrum,O=Bayerische Akademie der Wissenschaften,L=Garching b. Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGKTCCBRGgAwIBAgIHGEI+5Dgs1DANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNV
+BAoTFUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYD
+VQQDEwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNo
+ZW4uZGUwHhcNMTQwOTI0MTMwNDIxWhcNMTkwNzA5MjM1OTAwWjCBpjELMAkGA1UE
+BhMCREUxDzANBgNVBAgTBkJheWVybjEdMBsGA1UEBxMUR2FyY2hpbmcgYi4gTXVl
+bmNoZW4xLzAtBgNVBAoTJkJheWVyaXNjaGUgQWthZGVtaWUgZGVyIFdpc3NlbnNj
+aGFmdGVuMR4wHAYDVQQLExVMZWlibml6LVJlY2hlbnplbnRydW0xFjAUBgNVBAMT
+DXR1bWlkcC5scnouZGUwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDj
+WPvROHchdCtMHI4Fxr9nNlnLzASonlX8SmuhZ6080jWEYQ+U9/AVyQge6p5kmASc
+NO+4VURn5WpGdT8q1RZeMxHMq0fIb8q8EU8qgC+bvOMgMEEx9tWB5tuOG5+gOPWI
+5NMTvtxRth8EV44DllZunA919Ei7JxvpJ2188y24u4zjs+henD4qir3h0oCiLVwI
+LCme6C0xXYH4aEX65YTfWL2bJqWCyLgWbMeZjxKDHqwDMFJfKZQazEK8la5n2Hzu
+h2bCCT61p1inNjHdxgWXkDYq3YfskDSksOOaY4+DzwGf1MtGiS9LfF7FuLF1uiUO
+h0upAZxiIYQfzCgsbukNAgMBAAGjggJhMIICXTBPBgNVHSAESDBGMBEGDysGAQQB
+ga0hgiwBAQQDAjARBg8rBgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDAN
+BgsrBgEEAYGtIYIsHjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAU
+BggrBgEFBQcDAgYIKwYBBQUHAwEwHQYDVR0OBBYEFByOCp/OHHvM6gbSI9luT2kP
+qEPKMB8GA1UdIwQYMBaAFJZbTHC7b/yc77U/pHr7k/8J6mp2MFAGA1UdEQRJMEeC
+DXR1bWlkcC5scnouZGWCDnR1bWlkcDEubHJ6LmRlgg50dW1pZHAyLmxyei5kZYEW
+emJ2dy1jZXJ0LWFkbWluQGxyei5kZTB3BgNVHR8EcDBuMDWgM6Axhi9odHRwOi8v
+Y2RwMS5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY3JsL2NhY3JsLmNybDA1oDOgMYYv
+aHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmww
+gccGCCsGAQUFBwEBBIG6MIG3MDMGCCsGAQUFBzABhidodHRwOi8vb2NzcC5wY2Eu
+ZGZuLmRlL09DU1AtU2VydmVyL09DU1AwPwYIKwYBBQUHMAKGM2h0dHA6Ly9jZHAx
+LnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jYWNlcnQvY2FjZXJ0LmNydDA/BggrBgEF
+BQcwAoYzaHR0cDovL2NkcDIucGNhLmRmbi5kZS9scnotY2EvcHViL2NhY2VydC9j
+YWNlcnQuY3J0MA0GCSqGSIb3DQEBCwUAA4IBAQAT3As5OcAfO2e8xIYLlLgBED7E
+XewUJNl3fajpXnHHtzj0GmffS3yNX8ACBfnwHLH3pLZB7RUddm8G+ZE9S0uH5KJV
+UZgI+2769+aZGQZXvYpjdozSRWMsax3Dxk0/LM8dVd7ungufjQER6C1htiTPo20k
+qyvaCBDYCmxxwvWKEotIBKJzw9OXo+QrilIUu3EWLFWE0si8y1CoJM+448o60J/a
+EXxQStSJsCeVq8wNA3FPZIwE4N8U4DAxutZ3lbiaP9Poh1aX19Q1k/NyF7SqbnW8
+GZTANTovR7saQi2bnxJrrbSG5L7CgpOUFTpC/ROO+LP2DLXjnMP6fE6Aj0rA
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e8</OrganizationName>
+    <OrganizationName xml:lang="en">e8</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Technische Universität München</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Technische Universität München</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.tum.de</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.tum.de</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>Ralf</GivenName>
+    <SurName>Ebner</SurName>
+    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>TUM IT-Support</GivenName>
+    <SurName>TUM IT-Support</SurName>
+    <EmailAddress>mailto:it-support@tum.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/tumidp.lrz.de.xml b/swamid-interfederations-2.0/tumidp.lrz.de.xml
deleted file mode 100644
index b7e5b56d..00000000
--- a/swamid-interfederations-2.0/tumidp.lrz.de.xml
+++ /dev/null
@@ -1,219 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://tumidp.lrz.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2009-05-26T08:35:04Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tum.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">TU München (TUM)</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Munich University of Technology (TUM)</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Technischen Universität München</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider for TUM</mdui:Description>
-        <mdui:InformationURL xml:lang="de">http://www.tum.de</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.tum.de</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
-9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
-QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
-iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
-iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
-2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
-IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
-dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
-29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
-4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
-cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
-Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
-AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
-9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
-QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
-iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
-iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
-2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
-IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
-dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
-29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
-4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
-cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
-Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
-AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://tumidp.lrz.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://tumidp.lrz.de/idp/profile/SAML2/Redirect/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://tumidp.lrz.de/idp/profile/SAML2/POST/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">tum.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
-9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
-QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
-iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
-iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
-2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
-IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
-dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
-29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
-4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
-cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
-Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
-AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>tumidp.lrz.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=tumidp.lrz.de,O=Leibniz-Rechenzentrum,L=Muenchen,ST=Bayern,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFjDCCBHSgAwIBAgIEDwTswDANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-REUxDzANBgNVBAgTBkJheWVybjERMA8GA1UEBxMITXVlbmNoZW4xHjAcBgNVBAoT
-FUxlaWJuaXotUmVjaGVuemVudHJ1bTEPMA0GA1UECxMGTFJaLUNBMRUwEwYDVQQD
-EwxMUlotQ0EgLSBHMDExIjAgBgkqhkiG9w0BCQEWE3BraUBscnotbXVlbmNoZW4u
-ZGUwHhcNMDkxMDI2MDk0MzEyWhcNMTQxMDI1MDk0MzEyWjBpMQswCQYDVQQGEwJE
-RTEPMA0GA1UECBMGQmF5ZXJuMREwDwYDVQQHEwhNdWVuY2hlbjEeMBwGA1UEChMV
-TGVpYm5pei1SZWNoZW56ZW50cnVtMRYwFAYDVQQDEw10dW1pZHAubHJ6LmRlMIIB
-IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwHFYDVLxJkQMa0O9r75gazc0
-9uHFNYCAC1WISUo/mT5zt+uqKcI7YM9ZlM4+m3HVYOrTyA42trMKHWqVgrOXwjCa
-QTSTKd1CGvheXPEEBjRJ7p/0+oHgEO7ECPreQFoAa03Vq/AOeu6GHn6J6sqNbvh1
-iZ1sU7Xk1od6TJMK3PjLuIQCz9+8TGDb9HtLkaoBdIWrn7kjYVBUxylgXlgDLr0+
-iRCnL26h0CfBKe0FUfgsDRT216OHzcKaptWD4ijequogVlauT2TXnpvjhjW4Odpx
-2YhcaVxIHhPUJ1/tMGAA/wpErqWOoBd95zHCH8SZy+TaD0505MTLCUW/US4/JQID
-AQABo4ICBTCCAgEwCQYDVR0TBAIwADALBgNVHQ8EBAMCBeAwHQYDVR0lBBYwFAYI
-KwYBBQUHAwIGCCsGAQUFBwMBMB0GA1UdDgQWBBRJ+v40ytJfXL0VVGkE2IUx+139
-IzAfBgNVHSMEGDAWgBSWW0xwu2/8nO+1P6R6+5P/CepqdjB6BgNVHREEczBxgR96
-YnZ3LWNlcnQtYWRtaW5AbHJ6LW11ZW5jaGVuLmRlgg10dW1pZHAubHJ6LmRlghZ0
-dW1pZHAubHJ6LW11ZW5jaGVuLmRlgg50dW1pZHAyLmxyei5kZYIXdHVtaWRwMi5s
-cnotbXVlbmNoZW4uZGUwdwYDVR0fBHAwbjA1oDOgMYYvaHR0cDovL2NkcDEucGNh
-LmRmbi5kZS9scnotY2EvcHViL2NybC9jYWNybC5jcmwwNaAzoDGGL2h0dHA6Ly9j
-ZHAyLnBjYS5kZm4uZGUvbHJ6LWNhL3B1Yi9jcmwvY2FjcmwuY3JsMIGSBggrBgEF
-BQcBAQSBhTCBgjA/BggrBgEFBQcwAoYzaHR0cDovL2NkcDEucGNhLmRmbi5kZS9s
-cnotY2EvcHViL2NhY2VydC9jYWNlcnQuY3J0MD8GCCsGAQUFBzAChjNodHRwOi8v
-Y2RwMi5wY2EuZGZuLmRlL2xyei1jYS9wdWIvY2FjZXJ0L2NhY2VydC5jcnQwDQYJ
-KoZIhvcNAQEFBQADggEBAG6mFOUSr/afsrXAByudj11f6ZTt4YTBxk6/HD6SGpUu
-29Fl70ezZZZdcjWNO8hquf3c0S2rcPRWtCTMDiYL1gG+K5E/7456ZVBFtJDXT07Y
-4nUWFC+CdbfhBrm5fmKsgCUKhVHWhNwI01zIZj+8mpk+F6pHz/gUpbhVhtdmU2Xj
-cTuvC723UZSK4747c2EAdcI2UFKvuPi4tYo535md+VWGhsY8WMvblCwKMWCiS5yC
-Uw9vDdL62vquCT+kmiAcpXNYIb4hEzOno2w2rydKwUsj2sC//e70mHcTwqWRZWWc
-AdYhjQntnK4mj9Hq5n4uJE0oR5wggh5OPSH522r/sMw=
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://tumidp.lrz.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://tumidp.lrz.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e8</OrganizationName>
-    <OrganizationName xml:lang="en">e8</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Technische Universität München</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Technische Universität München</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.tum.de</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.tum.de</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="administrative">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="technical">
-    <GivenName>Ralf</GivenName>
-    <SurName>Ebner</SurName>
-    <EmailAddress>mailto:shibboleth@lrz.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>TUM IT-Support</GivenName>
-    <SurName>TUM IT-Support</SurName>
-    <EmailAddress>mailto:it-support@tum.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat-adfs.geant.net.xml b/swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml
index fdee8bc4..fdee8bc4 100644
--- a/swamid-interfederations-2.0/uat-adfs.geant.net.xml
+++ b/swamid-interfederations-2.0/uat-adfs.geant.net-adfs-services-trust.xml
diff --git a/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml b/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml
new file mode 100644
index 00000000..a26aa417
--- /dev/null
+++ b/swamid-interfederations-2.0/uat-bod-gui.geant.net-autobahn-gui.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://uat-bod-gui.geant.net/autobahn-gui">
+  <!--
+		This is a "UAT BoD Portal" autobahn-gui SP for Delivery of Advanced Network Technology to Europe Limited.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-09-19T16:01:38Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor AuthnRequestsSigned="true" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">BoD Portal</mdui:DisplayName>
+        <mdui:Description xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDMjCCAhqgAwIBAgIJAMEuy+eDkc/OMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDAeFw0xNDA0MTExNTEwMTRaFw0xNzA0
+						MTExNTEwMTRaMCAxHjAcBgNVBAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9lmeNqQLqsIvz+9wIHTQ01unef
+						zHS+ydVbDDdDAt9+GbKGtQMzkEKdDCQP/OVR4oFJoy26YZO2wC3LcgfcYsZn2RNV
+						9de4Y/Wyov/LOulVAtxiPBkcMuBpdDiyeHc04dI29BDAk4A9b/oh2DRLOSOr0X6n
+						SxYlVdoRqlsNlvt5P94O5Y+iywszr+fSWkg4wXnBbhU5wz8WiMajAhwSUv/WihTn
+						0kjbBPCC/oB9X4rInBWPavZlq/vLT+Xs90c/ouu+uDC2xtGopR9mk/tZZUw6VT+w
+						x6TOgSPPVBONVYcVn068Ea8L0fIDvKJUglVOhNnLo4SikRNP6Q6o+vSz5LsCAwEA
+						AaNvMG0wTAYDVR0RBEUwQ4IVdWF0LWJvZC1ndWkuZ2VhbnQubmV0hipodHRwczov
+						L3VhdC1ib2QtZ3VpLmdlYW50Lm5ldC9hdXRvYmFobi1ndWkwHQYDVR0OBBYEFDx7
+						wMI5VKSZDqbH18/emvgkpgogMA0GCSqGSIb3DQEBBQUAA4IBAQCxq8PPlNcMoFdK
+						BCMG8N+ZxA540tGHaaiEdBWutqQ29csBJn/c2BKdcP1P+A71lQKQrDOQUIZ0DHTi
+						KyVVjDeavoVZndhGLZuviHK4CJU7uON15fEzz2mu3tBm1H2i7bVDjG3Quh/TAar7
+						VnGDY6tHLG2vktHHIsXWxidajHIilI8XF14wC+Eoe8nt9ot2xJ0GxYzKcgu6wYUc
+						JTse+N5A0mRv40kor80ySUbJ+U4CrvelDlpaj+PmlcR5k4aSQ05prZnjWViRpQo+
+						qayfadpzImYfGj+E07YDQHoTy4kj2u8mVk5VLlC/zpAZ5E6lz8Sf5+ESYL3TYcAa
+						xYkpdcr0
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDMjCCAhqgAwIBAgIJAMEuy+eDkc/OMA0GCSqGSIb3DQEBBQUAMCAxHjAcBgNV
+						BAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDAeFw0xNDA0MTExNTEwMTRaFw0xNzA0
+						MTExNTEwMTRaMCAxHjAcBgNVBAMTFXVhdC1ib2QtZ3VpLmdlYW50Lm5ldDCCASIw
+						DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL9lmeNqQLqsIvz+9wIHTQ01unef
+						zHS+ydVbDDdDAt9+GbKGtQMzkEKdDCQP/OVR4oFJoy26YZO2wC3LcgfcYsZn2RNV
+						9de4Y/Wyov/LOulVAtxiPBkcMuBpdDiyeHc04dI29BDAk4A9b/oh2DRLOSOr0X6n
+						SxYlVdoRqlsNlvt5P94O5Y+iywszr+fSWkg4wXnBbhU5wz8WiMajAhwSUv/WihTn
+						0kjbBPCC/oB9X4rInBWPavZlq/vLT+Xs90c/ouu+uDC2xtGopR9mk/tZZUw6VT+w
+						x6TOgSPPVBONVYcVn068Ea8L0fIDvKJUglVOhNnLo4SikRNP6Q6o+vSz5LsCAwEA
+						AaNvMG0wTAYDVR0RBEUwQ4IVdWF0LWJvZC1ndWkuZ2VhbnQubmV0hipodHRwczov
+						L3VhdC1ib2QtZ3VpLmdlYW50Lm5ldC9hdXRvYmFobi1ndWkwHQYDVR0OBBYEFDx7
+						wMI5VKSZDqbH18/emvgkpgogMA0GCSqGSIb3DQEBBQUAA4IBAQCxq8PPlNcMoFdK
+						BCMG8N+ZxA540tGHaaiEdBWutqQ29csBJn/c2BKdcP1P+A71lQKQrDOQUIZ0DHTi
+						KyVVjDeavoVZndhGLZuviHK4CJU7uON15fEzz2mu3tBm1H2i7bVDjG3Quh/TAar7
+						VnGDY6tHLG2vktHHIsXWxidajHIilI8XF14wC+Eoe8nt9ot2xJ0GxYzKcgu6wYUc
+						JTse+N5A0mRv40kor80ySUbJ+U4CrvelDlpaj+PmlcR5k4aSQ05prZnjWViRpQo+
+						qayfadpzImYfGj+E07YDQHoTy4kj2u8mVk5VLlC/zpAZ5E6lz8Sf5+ESYL3TYcAa
+						xYkpdcr0
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirect" ResponseLocation="https://uat-bod-gui.geant.net/autobahn-gui/saml/LogoutServiceHTTPRedirectResponse"/>
+    <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="0" isDefault="true"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://uat-bod-gui.geant.net/autobahn-gui/saml/SAMLAssertionConsumer" index="1"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">BoD Portal</ServiceName>
+      <ServiceDescription xml:lang="en">A Portal that can be used to access the BoD service for requesting circuit reservations, tracking their status and for administrative operation</ServiceDescription>
+      <RequestedAttribute FriendlyName="email" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonPrincipalName" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+      <RequestedAttribute FriendlyName="displayName" Name="urn:oid:2.16.840.1.113730.3.1.241" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Delivery of Advanced Network Technology to Europe Limited</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">DANTE</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.dante.net</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <Company>DANTE IT Support</Company>
+    <EmailAddress>mailto:DANTEITSupport@dante.net</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <Company>DANTE IT</Company>
+    <EmailAddress>mailto:it@dante.net</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml
index 8d1fdc15..8d1fdc15 100644
--- a/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/uat.leeds1.emeraldinsight.com-entity.xml
diff --git a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
index 4516009c..055e2423 100644
--- a/swamid-interfederations-2.0/ufal-point.mff.cuni.cz.xml
+++ b/swamid-interfederations-2.0/ufal-point.mff.cuni.cz-shibboleth-eduid-sp.xml
@@ -7,10 +7,8 @@
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
       <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+        <saml:AttributeValue>http://eduid.cz/uri/sp-group/clarin</saml:AttributeValue>
       </saml:Attribute>
-      <mdasrt:Attribute xmlns:mdasrt="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <mdasrt:AttributeValue>http://eduid.cz/uri/sp-group/clarin</mdasrt:AttributeValue>
-      </mdasrt:Attribute>
     </mdattr:EntityAttributes>
     <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmlenc#sha512"/>
     <alg:DigestMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#sha384"/>
@@ -28,7 +26,7 @@
     <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2001/04/xmldsig-more#ecdsa-sha1"/>
     <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"/>
     <alg:SigningMethod xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" Algorithm="http://www.w3.org/2000/09/xmldsig#dsa-sha1"/>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-21T15:24:17Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/umbrella.psi.ch.xml b/swamid-interfederations-2.0/umbrella.psi.ch-.xml
index b6fc3c63..b6fc3c63 100644
--- a/swamid-interfederations-2.0/umbrella.psi.ch.xml
+++ b/swamid-interfederations-2.0/umbrella.psi.ch-.xml
diff --git a/swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml b/swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml
new file mode 100644
index 00000000..85e45d15
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-ibistic-prod-dk.ibistic.net.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:dk.ibistic.net">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE3jCCA8agAwIBAgIKVFd/+wAAAAAAVTANBgkqhkiG9w0BAQUFADBoMR0wGwYDVQQKExRJYmlzdGljIFRlY2hub2xvZ2llczEUMBIGA1UECxMLaWJpc3RpYy5uZXQxMTAvBgNVBAMTKEliaXN0aWMgU2VydmljZXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTEwOTEyMTI0MjI0WhcNMzYwMjEwMTEyMzUxWjCBkzELMAkGA1UEBhMCREsxHTAbBgNVBAoTFEliaXN0aWMgVGVjaG5vbG9naWVzMRMwEQYDVQQLEwpPcGVyYXRpb25zMSswKQYDVQQDEyJJYmlzdGljIFNzbyAtIFNlY29uZGFyeSBkYXRhY2VudGVyMSMwIQYJKoZIhvcNAQkBFhRpdGFkbWluc0BpYmlzdGljLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALOlseCtQInKCW4gm1g9z/1wWo7eqr3qhYAgRW/YFD05wO+aP2Q82AF5qXIzJnI+bmi6UIK8WGU0MwcpAfwmY7E4G0kiqxvkY8w+a0eS0bB/9BEP0wGNHCABi5F0k5gccq1gAroHO8KHrvxwC2QdF5bpOtmc5yZhn39F6vW1CMa+1e4szXLRfnNEUcAC9BfP8TBZ468/2n8bAgCooXw6NeLTEsLYWF9ZUtd7oQCoM8Vzh9EQYiP/bkNjI3Espr3IqmsjBU92LND2FCZMd0VnP+09WBALPPqecICSxwU/g0pEBD9gJffoaLB4pr9ytHj345dfZA5gZbFJus83D6bhb8sCAwEAAaOCAVwwggFYMA4GA1UdDwEB/wQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQUEA1cOFio+1n2Gl51vXhc6BxHIeowHwYDVR0jBBgwFoAUk5xu2Q3v2+7MptSjR6/WlKEwYAUwgeIGCCsGAQUFBwEBBIHVMIHSMIHPBggrBgEFBQcwAoaBwmxkYXA6Ly8vQ049SWJpc3RpYyUyMFNlcnZpY2VzJTIwQ2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1pYmlzdGljLERDPWxvY2FsP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0aW9uQXV0aG9yaXR5MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAK+rMn969MQZW98WhCuixX80SxDO7eARBJ2IY6aZRQ/seo/GD4qbis23CqZy7BI20nlcgnVEW4mZY+LkeBJ5sHDOTL9R2oo90/LouMsDsvqYk4oL5PtIH1yMTUod6ZUsGCvY6iXs06zY7KXJWPM5PeDg/z07GsmEhWELiQ+OeXG5UFlgzvt0uFuqE3iRpvKP6NztxDPNx4nhFXh2DIVg1f+pMXRRF8jM5mXSXsD144IvpEkgyHL5CkSRcxNNZt3UPAZl54e6cDfWI6aSQdH2v/TcoeeEJcHPBL3PFeQEtypZTHYdhPdhai0fcKsSNcZ4Ed1qAOwORlC0CorwiXeB57A=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIE3jCCA8agAwIBAgIKVFd/+wAAAAAAVTANBgkqhkiG9w0BAQUFADBoMR0wGwYDVQQKExRJYmlzdGljIFRlY2hub2xvZ2llczEUMBIGA1UECxMLaWJpc3RpYy5uZXQxMTAvBgNVBAMTKEliaXN0aWMgU2VydmljZXMgQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkwHhcNMTEwOTEyMTI0MjI0WhcNMzYwMjEwMTEyMzUxWjCBkzELMAkGA1UEBhMCREsxHTAbBgNVBAoTFEliaXN0aWMgVGVjaG5vbG9naWVzMRMwEQYDVQQLEwpPcGVyYXRpb25zMSswKQYDVQQDEyJJYmlzdGljIFNzbyAtIFNlY29uZGFyeSBkYXRhY2VudGVyMSMwIQYJKoZIhvcNAQkBFhRpdGFkbWluc0BpYmlzdGljLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALOlseCtQInKCW4gm1g9z/1wWo7eqr3qhYAgRW/YFD05wO+aP2Q82AF5qXIzJnI+bmi6UIK8WGU0MwcpAfwmY7E4G0kiqxvkY8w+a0eS0bB/9BEP0wGNHCABi5F0k5gccq1gAroHO8KHrvxwC2QdF5bpOtmc5yZhn39F6vW1CMa+1e4szXLRfnNEUcAC9BfP8TBZ468/2n8bAgCooXw6NeLTEsLYWF9ZUtd7oQCoM8Vzh9EQYiP/bkNjI3Espr3IqmsjBU92LND2FCZMd0VnP+09WBALPPqecICSxwU/g0pEBD9gJffoaLB4pr9ytHj345dfZA5gZbFJus83D6bhb8sCAwEAAaOCAVwwggFYMA4GA1UdDwEB/wQEAwIE8DATBgNVHSUEDDAKBggrBgEFBQcDAjAdBgNVHQ4EFgQUEA1cOFio+1n2Gl51vXhc6BxHIeowHwYDVR0jBBgwFoAUk5xu2Q3v2+7MptSjR6/WlKEwYAUwgeIGCCsGAQUFBwEBBIHVMIHSMIHPBggrBgEFBQcwAoaBwmxkYXA6Ly8vQ049SWJpc3RpYyUyMFNlcnZpY2VzJTIwQ2VydGlmaWNhdGlvbiUyMEF1dGhvcml0eSxDTj1BSUEsQ049UHVibGljJTIwS2V5JTIwU2VydmljZXMsQ049U2VydmljZXMsQ049Q29uZmlndXJhdGlvbixEQz1pYmlzdGljLERDPWxvY2FsP2NBQ2VydGlmaWNhdGU/YmFzZT9vYmplY3RDbGFzcz1jZXJ0aWZpY2F0aW9uQXV0aG9yaXR5MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAK+rMn969MQZW98WhCuixX80SxDO7eARBJ2IY6aZRQ/seo/GD4qbis23CqZy7BI20nlcgnVEW4mZY+LkeBJ5sHDOTL9R2oo90/LouMsDsvqYk4oL5PtIH1yMTUod6ZUsGCvY6iXs06zY7KXJWPM5PeDg/z07GsmEhWELiQ+OeXG5UFlgzvt0uFuqE3iRpvKP6NztxDPNx4nhFXh2DIVg1f+pMXRRF8jM5mXSXsD144IvpEkgyHL5CkSRcxNNZt3UPAZl54e6cDfWI6aSQdH2v/TcoeeEJcHPBL3PFeQEtypZTHYdhPdhai0fcKsSNcZ4Ed1qAOwORlC0CorwiXeB57A=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://dk.ibistic.net/redirector/saml/post/ac" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Ibistic</md:ServiceName>
+      <md:ServiceName xml:lang="da">Ibistic</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-ibistic-prod-services.ibistic.net.xml b/swamid-interfederations-2.0/urn-ibistic-prod-services.ibistic.net.xml
new file mode 100644
index 00000000..89a35ef1
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-ibistic-prod-services.ibistic.net.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="urn:ibistic:prod:services.ibistic.net">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIHOTCCBiGgAwIBAgIQAg/p4rQP3A2b5rG7pJYglTANBgkqhkiG9w0BAQUFADBpMQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3d3cuZGlnaWNlcnQuY29tMSgwJgYDVQQDEx9EaWdpQ2VydCBIaWdoIEFzc3VyYW5jZSBFViBDQS0xMB4XDTEzMDQxMTAwMDAwMFoXDTE1MDUxNTEyMDAwMFowgfUxHTAbBgNVBA8TFFByaXZhdGUgT3JnYW5pemF0aW9uMRMwEQYLKwYBBAGCNzwCAQMTAkRLMREwDwYDVQQFEwgyNzc2ODM5MzEcMBoGA1UECQwTw4VyaHVzZ2FkZSA4OCBTYWwgMTENMAsGA1UEERMEMjEwMDELMAkGA1UEBhMCREsxEzARBgNVBAgMCkvDuGJlbmhhdm4xEzARBgNVBAcMCkvDuGJlbmhhdm4xKTAnBgNVBAoTIEliaXN0aWMgVGVjaG5vbG9naWVzIERlbm1hcmsgQS9TMR0wGwYDVQQDExRzZXJ2aWNlcy5pYmlzdGljLm5ldDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKGGOlp7kpAShy2Duk6H4LhKps7Xveb9HBDRb0701v5dun0g3O1Im5wghIUcYnYuKAnMRQAG+nqlbpw22JKRfQei5snMSqaKiBG7zJl6EB8MeI+Ht1+iWvfn0ijDdU/kkE0U8ZPoJ9z5Wj0SG4KRLu8rkvBlq1V0Fa1sYBJcM9QQIh8GTALbOHkt4rzHXSqt9vb01Hai1hHmQz2Hu+04nGI2AZmTZYDSyyyx9sxSbEJHsyUPrXlEd1WHo8LQuIPmJ7L9SXAVmDmqehRkAKDxrvdi15JOCujpo3wVSbI9TYdZoDQXBQDjkHQliudWHYPHXsadJrkVHhKyk9bnE6lK2GcCAwEAAaOCA04wggNKMB8GA1UdIwQYMBaAFExYyyXwQU9S9CjIgUObpqig5pLlMB0GA1UdDgQWBBScCH5jpiDvtMm0IOrwRYri4+yAtjAfBgNVHREEGDAWghRzZXJ2aWNlcy5pYmlzdGljLm5ldDAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMGMGA1UdHwRcMFowK6ApoCeGJWh0dHA6Ly9jcmwzLmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwK6ApoCeGJWh0dHA6Ly9jcmw0LmRpZ2ljZXJ0LmNvbS9ldmNhMS1nMi5jcmwwggHEBgNVHSAEggG7MIIBtzCCAbMGCWCGSAGG/WwCATCCAaQwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cuZGlnaWNlcnQuY29tL3NzbC1jcHMtcmVwb3NpdG9yeS5odG0wggFkBggrBgEFBQcCAjCCAVYeggFSAEEAbgB5ACAAdQBzAGUAIABvAGYAIAB0AGgAaQBzACAAQwBlAHIAdABpAGYAaQBjAGEAdABlACAAYwBvAG4AcwB0AGkAdAB1AHQAZQBzACAAYQBjAGMAZQBwAHQAYQBuAGMAZQAgAG8AZgAgAHQAaABlACAARABpAGcAaQBDAGUAcgB0ACAAQwBQAC8AQwBQAFMAIABhAG4AZAAgAHQAaABlACAAUgBlAGwAeQBpAG4AZwAgAFAAYQByAHQAeQAgAEEAZwByAGUAZQBtAGUAbgB0ACAAdwBoAGkAYwBoACAAbABpAG0AaQB0ACAAbABpAGEAYgBpAGwAaQB0AHkAIABhAG4AZAAgAGEAcgBlACAAaQBuAGMAbwByAHAAbwByAGEAdABlAGQAIABoAGUAcgBlAGkAbgAgAGIAeQAgAHIAZQBmAGUAcgBlAG4AYwBlAC4wfQYIKwYBBQUHAQEEcTBvMCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5kaWdpY2VydC5jb20wRwYIKwYBBQUHMAKGO2h0dHA6Ly9jYWNlcnRzLmRpZ2ljZXJ0LmNvbS9EaWdpQ2VydEhpZ2hBc3N1cmFuY2VFVkNBLTEuY3J0MAwGA1UdEwEB/wQCMAAwDQYJKoZIhvcNAQEFBQADggEBAKbx9nfzso6MmZijJupklvhCGi3CataD6GraOrki2BcAVfLka/VILsR6Lj8LXIN6zQK1XhiPSDvPaXpGFAtz2+IPUFUFJBT3JHsZ6AZDO8xNUMjfe8EYCVg46xyJF0vSSt6YxRcc7Bp+ksqJkmEEN0n/FfPbVDjhLkRUtU0KgockOhJydkDbCk888Ilhec446VRVIwRcHsfFj/CBOvodin14r7TtYphOOjXVp3xpvDSAgYIrWLkiBTFzPda524UeUOVawhcDhDyagmq8MtQp7os9TnyXRS4csHWNO0Wl77wUJcZ2KKFADUEPTrsbHb1sTcMhWW87neRM6fJa+AdGEp8=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://services.ibistic.net/sso/wayf/saml/post/ac" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Ibistic Services</md:ServiceName>
+      <md:ServiceName xml:lang="da">Ibistic Services</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to handle and approve supplier invoices in a web-based solution</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at håndtere og godkende leverandørfakturarer i en webbaseret løsning</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml b/swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml
new file mode 100644
index 00000000..7d8ae01c
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cnrs.fr-janus.dsi.cnrs.fr.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cnrs.fr:janus.dsi.cnrs.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-10T22:03:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cnrs.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">CNRS</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIICrzCCAhigAwIBAgIBADANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJGUjEN
+MAsGA1UEChMEQ05SUzEQMA4GA1UECxMHTU9ZMTY3ODEaMBgGA1UEAxMRamFudXMu
+ZHNpLmNucnMuZnIwHhcNMDkwNzA2MTM0NTQ5WhcNMjkwNzAxMTM0NTQ5WjBKMQsw
+CQYDVQQGEwJGUjENMAsGA1UEChMEQ05SUzEQMA4GA1UECxMHTU9ZMTY3ODEaMBgG
+A1UEAxMRamFudXMuZHNpLmNucnMuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJ
+AoGBAMWYVMjJRPP/YAq9wTJDr9rkLfm8VpnK/8MM8c2YqVtewBqnOgnlo0k0n7oC
+jnkwpmTa0Wycgbx4wek3TeaDG49KrKlSD2HlyvelLvlMuFXYTyqndBk+7p+RX+h3
+FjC+qqCUWHzEIfWwNNGNrnLza4WHsb0B5oJZMqB7WSfcpL/5AgMBAAGjgaQwgaEw
+HQYDVR0OBBYEFAIowpwjXZw7sNhsQhBxv4ISaaHKMHIGA1UdIwRrMGmAFAIowpwj
+XZw7sNhsQhBxv4ISaaHKoU6kTDBKMQswCQYDVQQGEwJGUjENMAsGA1UEChMEQ05S
+UzEQMA4GA1UECxMHTU9ZMTY3ODEaMBgGA1UEAxMRamFudXMuZHNpLmNucnMuZnKC
+AQAwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCIdgOBuDJQ5nr/kb+u
+oxlXkk9jwQcsmEgAteIhzE9+tA1PLXJ6di60PMq839lcm8v4gVxk/JtWJzrVY1pi
+m+gmLH30NygYX8ACokRdLMvL5FQHBsbQN1VTwmXKYCnWoYtSMauaxr+eUhVDjg/s
+pV1Gt+/saN/LhZGKd3NLvfjacQ==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://janus.dsi.cnrs.fr/shibboleth-idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://janus.dsi.cnrs.fr/shibboleth-idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://janus.dsi.cnrs.fr/shibboleth-idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">CNRS</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">CNRS</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>ListeAdminUNIX@dsi.cnrs.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml
new file mode 100644
index 00000000..588cba0d
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-ens-lsh.fr.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:ens-lsh.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-13T13:13:51Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lsh.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">ENS Lettres et Sciences humaines</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDQzCCAiugAwIBAgIUaXDeZKLpq89kivZfZ//X0NfeRUYwDQYJKoZIhvcNAQEF
+BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIuZW5zLWxzaC5mcjAeFw0wOTA0MjQw
+ODEyMDFaFw0yOTA0MjQwODEyMDFaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmVu
+cy1sc2guZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHNMjdxzFx
+mWO63iu8QH+lMEXiDOjrr8PU+GRKVmThf1S5HZKruPa6l+9gV2mpeKOVDaQTgbGG
+sHui63HhNt4zzV55IXP9j+NHRyHkEpASXQKDeHLCTCHfs1QKmZKk3IfFcWqCCgVU
+byWjqv0vMf1g8/+RjDOpsb0eSU7De6rfPr/T/Rig7LqHH+O8ylB1g9pSaWW/oL5W
+qD+65djAlzlajlL/vmXE5UblgxnPvIpmltpQaRbUCbdJgTDchnRjE3LCFmwaSO7n
+FcBD4JEnYPe7BOqJv/DQcSNpAK/k5r5emnuCQAAh7wmlw+jmbiCFI78wkqBTAmrO
+ASkoj819hENJAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmVucy1s
+c2guZnKGLWh0dHBzOi8vc2hpYmJvbGV0aDIuZW5zLWxzaC5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUo7Hd+mlHXBsrwd5DdoQxDGXouzwwDQYJKoZIhvcNAQEF
+BQADggEBABWfdOgzwxn6Goz9jU/IOk74GkGkeeVxsIKsS4OiXZyGC7ATMRk2kGPA
+vgF+2XUURWXsb93mjdkC7YyHDXTgBFUYsX8tv20j5MjDOBQI4l9XVoJ6cOyxfG2+
+aNLgjEEAYeu7n1bZCU+9mMeeqHnB8f4ovM4r1PdkBT2ttmUX7dU+coPLa/JetOTO
+AVXxYRZY4ty/dx2KdOetIcmD8UypcRVAmkry27l6ybWBEA8vqwPn78jFJeS/s92m
+ALjg3wnfawAlwRtGLxUhf9n7igtjhjrKRL9WVVnMPg08GpB6IDRzNedWjIhE8gmo
+beyt/O7UlYCwegLabizFFtOY7ztDocU=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth2.ens-lsh.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth2.ens-lsh.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth2.ens-lsh.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">ens-lsh.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDQzCCAiugAwIBAgIUaXDeZKLpq89kivZfZ//X0NfeRUYwDQYJKoZIhvcNAQEF
+BQAwITEfMB0GA1UEAxMWc2hpYmJvbGV0aDIuZW5zLWxzaC5mcjAeFw0wOTA0MjQw
+ODEyMDFaFw0yOTA0MjQwODEyMDFaMCExHzAdBgNVBAMTFnNoaWJib2xldGgyLmVu
+cy1sc2guZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDHNMjdxzFx
+mWO63iu8QH+lMEXiDOjrr8PU+GRKVmThf1S5HZKruPa6l+9gV2mpeKOVDaQTgbGG
+sHui63HhNt4zzV55IXP9j+NHRyHkEpASXQKDeHLCTCHfs1QKmZKk3IfFcWqCCgVU
+byWjqv0vMf1g8/+RjDOpsb0eSU7De6rfPr/T/Rig7LqHH+O8ylB1g9pSaWW/oL5W
+qD+65djAlzlajlL/vmXE5UblgxnPvIpmltpQaRbUCbdJgTDchnRjE3LCFmwaSO7n
+FcBD4JEnYPe7BOqJv/DQcSNpAK/k5r5emnuCQAAh7wmlw+jmbiCFI78wkqBTAmrO
+ASkoj819hENJAgMBAAGjczBxMFAGA1UdEQRJMEeCFnNoaWJib2xldGgyLmVucy1s
+c2guZnKGLWh0dHBzOi8vc2hpYmJvbGV0aDIuZW5zLWxzaC5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUo7Hd+mlHXBsrwd5DdoQxDGXouzwwDQYJKoZIhvcNAQEF
+BQADggEBABWfdOgzwxn6Goz9jU/IOk74GkGkeeVxsIKsS4OiXZyGC7ATMRk2kGPA
+vgF+2XUURWXsb93mjdkC7YyHDXTgBFUYsX8tv20j5MjDOBQI4l9XVoJ6cOyxfG2+
+aNLgjEEAYeu7n1bZCU+9mMeeqHnB8f4ovM4r1PdkBT2ttmUX7dU+coPLa/JetOTO
+AVXxYRZY4ty/dx2KdOetIcmD8UypcRVAmkry27l6ybWBEA8vqwPn78jFJeS/s92m
+ALjg3wnfawAlwRtGLxUhf9n7igtjhjrKRL9WVVnMPg08GpB6IDRzNedWjIhE8gmo
+beyt/O7UlYCwegLabizFFtOY7ztDocU=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth2.ens-lsh.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">ENS Lettres et Sciences humaines</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">ENS Lettres et Sciences humaines</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Christophe Girard</SurName>
+    <EmailAddress>Christophe.Girard@ens-lsh.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Christelle Chaput</SurName>
+    <EmailAddress>Christelle.Chaput@ens-lsh.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml
new file mode 100644
index 00000000..7085f9db
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-montpellier.iufm.fr.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:montpellier.iufm.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-08T18:22:46Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier.iufm.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">IUFM de Montpellier</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDZjCCAk6gAwIBAgIVALjF/HJMRzFhyx4QUhGQtfnc/go0MA0GCSqGSIb3DQEB
+BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjAe
+Fw0wOTExMTcxNDM1NTdaFw0yOTExMTcxNDM1NTdaMCkxJzAlBgNVBAMTHmZlZGVy
+YXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIk8UoESjzWA4bGzXWSC96Uc5Y3F2GkWNMcAzqkpEjT6dvY8hWsv
+pSThfyGbsndBb6sUxdsKzkOcq9jgPG5SbKQH7FCf1aGMdrr67g3lYXBo/61N1zoS
+IZ27qCMSWWXKEuCM1J8+XGlKO+v/2NGhhy/y/MGCoq/dVS1CEpQR2WmuZ7T85YGX
+t/8juhUog6qx9luXRp4Vn8AtPjBf8Wx4fa+1fHk2EsbOK+TNmc2S8QMDhrdwEmTO
+FtlLzVzqwTBMCZK6nvuWccjJLQbPqFzpBS7gMNy9Nbc+MCHs2VPEFottHirNCHle
+/dVue+/vEaJnoGat6gNF+xe/OaFUS6aYl78CAwEAAaOBhDCBgTBgBgNVHREEWTBX
+gh5mZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnKGNWh0dHBzOi8vZmVkZXJh
+dGlvbi5tb250cGVsbGllci5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
+BBSSscKMzM8vdFU0r4f8rJnlUjXhRjANBgkqhkiG9w0BAQUFAAOCAQEADkTGJNdk
+VCmgQLEKNXBwLmjzKEaXVN0oDkycey2WzqnVFErveI5WUtUwbyTX6gvX34495dHf
+PpOEHBqBsTLug4ecwWrfurwupVHEpnHXQISO3MfTFuASxSkKg7jCWG1yslmdR6ua
++EYRyYeZT7PsLRDvvsSHfgs29dx+L20LOqTv7KZ2q24TEEjQpzg0umSvfJH6iSwe
+k4efOHibLlXTz1Di9jVrchyw0Ix95i2tRAhkw9MLw37NX7hw73quN3/V1Tg8vNoW
+UwfIvWcdU+rI3r0sj0XzUxvuWt2E34dY7iRDZMqs9x1IBcLg00oRH3Hc2jvF6Ytw
+R4xWKyqWIGnn4g==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEdTCCA12gAwIBAgICDKYwDQYJKoZIhvcNAQEEBQAwUDELMAkGA1UEBhMCRlIx
+DDAKBgNVBAoTA0NSVTETMBEGA1UEAxMKYWMtc2VydmV1cjEeMBwGCSqGSIb3DQEJ
+ARYPY2EtYWRtaW5AY3J1LmZyMB4XDTA3MDIwOTEzNDEwMFoXDTEwMDIwOTEzNDEw
+MFowdDELMAkGA1UEBhMCRlIxETAPBgNVBAoTCDAzNDE4MThTMScwJQYDVQQDEx5m
+ZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnIxKTAnBgkqhkiG9w0BCQEWGmlu
+Zm9ybUBtb250cGVsbGllci5pdWZtLmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQCzkuQU982HLqlyiPNS1KhtfTw3F94aI+GELkvvRy+rtR7z0J9yZy4DfsqW
+OM6rTmWNfw5RafnX5UAoyoNvvvP8f9BMmJ7jQE45D+Q3yzgHmHF2F1tL92eTz7we
+AhaPlZiOXdQO5IBI6LAruUGs5wRdper+6u6lbB+j6z7ylajO1wIDAQABo4IBtzCC
+AbMwDAYDVR0TAQH/BAIwADARBglghkgBhvhCAQEEBAMCBsAwDgYDVR0PAQH/BAQD
+AgXgMCwGCWCGSAGG+EIBDQQfFh1DZXJ0aWZpY2F0IHNlcnZldXIgYWMtc2VydmV1
+cjAdBgNVHQ4EFgQU5hAjNm223ufj8bnpCHS7Gm6wCKswdwYDVR0jBHAwboAUcQc/
+B7Tpf84zBWgE8jSmUL6s9qChU6RRME8xCzAJBgNVBAYTAkZSMQwwCgYDVQQKEwND
+UlUxEjAQBgNVBAMTCWFjLXJhY2luZTEeMBwGCSqGSIb3DQEJARYPY2EtYWRtaW5A
+Y3J1LmZyggEDMEsGA1UdHwREMEIwQKA+oDyGOmh0dHA6Ly9pZ2MuY3J1LmZyL2Nn
+aS1iaW4vbG9hZGNybD9DQT1hYy1zZXJ2ZXVyJmZvcm1hdD1ERVIwHQYDVR0lBBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCME4GA1UdIARHMEUwQwYOKQMGAQQAAbdfAwEE
+AAQwMTAvBggrBgEFBQcCARYjaHR0cDovL2lnYy5jcnUuZnIvcmVmZXJlbmNlcy9w
+Yy5wZGYwDQYJKoZIhvcNAQEEBQADggEBAMdTx24FtReSqJ4TpDYYHkLQFp3m1lNn
+wwTJXDsmqyuVgG+UDC/2ob3M/fB3ffV7trmBMYDp/36SK9sdOM+KAeJTkFbDiBVr
+O0uozxNSHj13VqGw7UHcFCX1AykmoYCrSDVL2U8NovZsb9lZfu+dI9JtvLDAF0Sq
+3BCJEzlOjHfwWq8rzQYzhXKVeXRZ3nKd1iKLQdg1biltlbgh+IXzj0P9W++TBSEa
+7XBGhp2qum5kAy76u2NwWcunMJM7fmExJF+SjGUXtKQ6wxnXQ1zcAJ7atuyPPfEA
+ST1d3qLq8ftDvKa7Edva60Iw8nCcEd5b4I7ZSlYhFpX7KlK/HNZu6Mk=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.montpellier.iufm.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">montpellier.iufm.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDZjCCAk6gAwIBAgIVALjF/HJMRzFhyx4QUhGQtfnc/go0MA0GCSqGSIb3DQEB
+BQUAMCkxJzAlBgNVBAMTHmZlZGVyYXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjAe
+Fw0wOTExMTcxNDM1NTdaFw0yOTExMTcxNDM1NTdaMCkxJzAlBgNVBAMTHmZlZGVy
+YXRpb24ubW9udHBlbGxpZXIuaXVmbS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAIk8UoESjzWA4bGzXWSC96Uc5Y3F2GkWNMcAzqkpEjT6dvY8hWsv
+pSThfyGbsndBb6sUxdsKzkOcq9jgPG5SbKQH7FCf1aGMdrr67g3lYXBo/61N1zoS
+IZ27qCMSWWXKEuCM1J8+XGlKO+v/2NGhhy/y/MGCoq/dVS1CEpQR2WmuZ7T85YGX
+t/8juhUog6qx9luXRp4Vn8AtPjBf8Wx4fa+1fHk2EsbOK+TNmc2S8QMDhrdwEmTO
+FtlLzVzqwTBMCZK6nvuWccjJLQbPqFzpBS7gMNy9Nbc+MCHs2VPEFottHirNCHle
+/dVue+/vEaJnoGat6gNF+xe/OaFUS6aYl78CAwEAAaOBhDCBgTBgBgNVHREEWTBX
+gh5mZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnKGNWh0dHBzOi8vZmVkZXJh
+dGlvbi5tb250cGVsbGllci5pdWZtLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQW
+BBSSscKMzM8vdFU0r4f8rJnlUjXhRjANBgkqhkiG9w0BAQUFAAOCAQEADkTGJNdk
+VCmgQLEKNXBwLmjzKEaXVN0oDkycey2WzqnVFErveI5WUtUwbyTX6gvX34495dHf
+PpOEHBqBsTLug4ecwWrfurwupVHEpnHXQISO3MfTFuASxSkKg7jCWG1yslmdR6ua
++EYRyYeZT7PsLRDvvsSHfgs29dx+L20LOqTv7KZ2q24TEEjQpzg0umSvfJH6iSwe
+k4efOHibLlXTz1Di9jVrchyw0Ix95i2tRAhkw9MLw37NX7hw73quN3/V1Tg8vNoW
+UwfIvWcdU+rI3r0sj0XzUxvuWt2E34dY7iRDZMqs9x1IBcLg00oRH3Hc2jvF6Ytw
+R4xWKyqWIGnn4g==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEdTCCA12gAwIBAgICDKYwDQYJKoZIhvcNAQEEBQAwUDELMAkGA1UEBhMCRlIx
+DDAKBgNVBAoTA0NSVTETMBEGA1UEAxMKYWMtc2VydmV1cjEeMBwGCSqGSIb3DQEJ
+ARYPY2EtYWRtaW5AY3J1LmZyMB4XDTA3MDIwOTEzNDEwMFoXDTEwMDIwOTEzNDEw
+MFowdDELMAkGA1UEBhMCRlIxETAPBgNVBAoTCDAzNDE4MThTMScwJQYDVQQDEx5m
+ZWRlcmF0aW9uLm1vbnRwZWxsaWVyLml1Zm0uZnIxKTAnBgkqhkiG9w0BCQEWGmlu
+Zm9ybUBtb250cGVsbGllci5pdWZtLmZyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCB
+iQKBgQCzkuQU982HLqlyiPNS1KhtfTw3F94aI+GELkvvRy+rtR7z0J9yZy4DfsqW
+OM6rTmWNfw5RafnX5UAoyoNvvvP8f9BMmJ7jQE45D+Q3yzgHmHF2F1tL92eTz7we
+AhaPlZiOXdQO5IBI6LAruUGs5wRdper+6u6lbB+j6z7ylajO1wIDAQABo4IBtzCC
+AbMwDAYDVR0TAQH/BAIwADARBglghkgBhvhCAQEEBAMCBsAwDgYDVR0PAQH/BAQD
+AgXgMCwGCWCGSAGG+EIBDQQfFh1DZXJ0aWZpY2F0IHNlcnZldXIgYWMtc2VydmV1
+cjAdBgNVHQ4EFgQU5hAjNm223ufj8bnpCHS7Gm6wCKswdwYDVR0jBHAwboAUcQc/
+B7Tpf84zBWgE8jSmUL6s9qChU6RRME8xCzAJBgNVBAYTAkZSMQwwCgYDVQQKEwND
+UlUxEjAQBgNVBAMTCWFjLXJhY2luZTEeMBwGCSqGSIb3DQEJARYPY2EtYWRtaW5A
+Y3J1LmZyggEDMEsGA1UdHwREMEIwQKA+oDyGOmh0dHA6Ly9pZ2MuY3J1LmZyL2Nn
+aS1iaW4vbG9hZGNybD9DQT1hYy1zZXJ2ZXVyJmZvcm1hdD1ERVIwHQYDVR0lBBYw
+FAYIKwYBBQUHAwEGCCsGAQUFBwMCME4GA1UdIARHMEUwQwYOKQMGAQQAAbdfAwEE
+AAQwMTAvBggrBgEFBQcCARYjaHR0cDovL2lnYy5jcnUuZnIvcmVmZXJlbmNlcy9w
+Yy5wZGYwDQYJKoZIhvcNAQEEBQADggEBAMdTx24FtReSqJ4TpDYYHkLQFp3m1lNn
+wwTJXDsmqyuVgG+UDC/2ob3M/fB3ffV7trmBMYDp/36SK9sdOM+KAeJTkFbDiBVr
+O0uozxNSHj13VqGw7UHcFCX1AykmoYCrSDVL2U8NovZsb9lZfu+dI9JtvLDAF0Sq
+3BCJEzlOjHfwWq8rzQYzhXKVeXRZ3nKd1iKLQdg1biltlbgh+IXzj0P9W++TBSEa
+7XBGhp2qum5kAy76u2NwWcunMJM7fmExJF+SjGUXtKQ6wxnXQ1zcAJ7atuyPPfEA
+ST1d3qLq8ftDvKa7Edva60Iw8nCcEd5b4I7ZSlYhFpX7KlK/HNZu6Mk=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.montpellier.iufm.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IUFM de Montpellier</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">IUFM de Montpellier</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-admin@montpellier.iufm.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
new file mode 100644
index 00000000..c9ab4bdc
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-uhb.fr.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:uhb.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-23T13:48:41Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uhb.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes2.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-haute-bretagne.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Rennes 2 - Haute Bretagne</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIElDCCA3ygAwIBAgIQLdnpFQuu69xl9z7dAWPZhzANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDQwMjAwMDAwMFoXDTE2MDQwMTIzNTk1OVowSDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSMwIQYDVQQDExpzaGliYm9sZXRo
+LnVuaXYtcmVubmVzMi5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AKFFb2IxKCffcTQOFyEl2g99rJUdjkOchNMt7alge6/T4/wRxcl7G/2Q+DahU6s9
+i4lUCYFV9iKi7Ia2eYUfn69r3KjN9q+h2fbb/BMyKt6lZicqQkrU1Kk3NSzQWiCZ
+quB8hy8W8sW7qZ2kfgCR3AZ+0bHchCMwYTDI+MKe0NURzxf/PiqSWe8PvYo0fs6L
+RAqwLW6X6DOfF8CbOVlHf8MpUaFLXWn5XZ8iEMA4+EnaJ1uxMqVeLNqU1jTQqKni
+dQ+JFCZvMJqRtuXeVvBawkTsCh1JWAUU/2FcnD7RN340aLC5V3F3ZN3hZCjJiXv7
+boO5MMJpIJkbrtHJJw+Mo7kCAwEAAaOCAYowggGGMB8GA1UdIwQYMBaAFAy9k2gM
+896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBSyIireJ6nPkGljLFuPuPxNpmdY7zAO
+BgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcD
+AQYIKwYBBQUHAwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEw
+OgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJF
+TkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8v
+Y3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYa
+aHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwOAYDVR0RBDEwL4Iac2hpYmJvbGV0
+aC51bml2LXJlbm5lczIuZnKCEXNoaWJib2xldGgudWhiLmZyMA0GCSqGSIb3DQEB
+BQUAA4IBAQCgvAbpw5E3Kf9+PokHstck4ysikCjOebRAFilM9lu8xRc4lyuMTlr9
+eMdckFM3kO7wa6iiNPieFCnCsok8ZZ1wGI1qUkKYKE2DtxbEiTVfPtwQhnGQPDp4
+rnneYYlTeIQawTxr9kf+uwiaTKm1AGU1gMcT2tM9dfnQ+5Zt1DukJUWLMxq5upmz
+fhb8GprtsM8qv0z2+6Fat+iIu0GfmOaDZ/gDsW++cOD9P6K25GrdmVk20rC3oyy1
+OABUhu/g7vs9SnH4R/DZfgZ3U2WrVo8n/P9zcmNwfefBBC267M8I7c73wxZza+fb
+/K7h56t2aaVkVbRdvi8tEncI1Fzw5lq5
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.uhb.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.uhb.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.uhb.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Rennes 2 - Haute Bretagne</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Rennes 2 - Haute Bretagne</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>admin-unix@uhb.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml
new file mode 100644
index 00000000..d40ba335
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unice.fr.xml
@@ -0,0 +1,174 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:unice.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-08-07T17:06:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unice.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Nice-Sophia Antipolis - UNICE</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEfjCCA2agAwIBAgIQK5pZmStu+KqrJYOJR81rjjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDMyODAwMDAwMFoXDTE1MDMyODIzNTk1OVowXTELMAkGA1UE
+BhMCRlIxKTAnBgNVBAoTIFVOSVZFUlNJVEUgTklDRSBTT1BISUEgQU5USVBPTElT
+MQwwCgYDVQQLEwNEU0kxFTATBgNVBAMTDGlkcC51bmljZS5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMIkuN4X1g+AUaePtx/CPvwT6jkVGwUkC8d3
+oxB/unX3ro66bdIEfIO+xePOyS/74i8Z0FqVpS0IzaA5bBTs6eCD4rhvio/eABqJ
+eKQWXNgqzJOSo1ALQmwgcu0yuzJPxMFK4WnYgbobs+PiRuZ50Sdg6kBOIYw9uIMI
+SeojiAXFjcWXMN69dEYOgzngJzD48tRLmab91YqlBxV8fOSXxjII29GOcOCVVgNN
+S/EDZWH4GiVk21tAOGOQCk9Yba6hSRBCONuNFQOcl56vMAkgnBFuVLL0e23t3lMI
+En6lkUF6e7sgA9Plqx40pJwglP8uAPhBdBkvnO+ecUKh2UaYZaECAwEAAaOCAV8w
+ggFbMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQv
+CXPMKuozAiWF4sbusopCVz3YLDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAXBgNVHREEEDAO
+ggxpZHAudW5pY2UuZnIwDQYJKoZIhvcNAQEFBQADggEBAIKDpaOBUHy14EHCqNCv
+ScM6d6MEqFzFZJ6Ivgg95BMro4ER/IJ++C+XAp5urJTT81ET/EicqOcC48c0YRfs
+/liIZZ8hIhLKjBTHuzWKGTW6beHFhbIgxfXaNvKrfL4l+0VW44jP8k73Igke1b1f
+48xNbhphqTxvud4q/rubPSY5cThxB8b3sGAY5omnk2WB5MXoU7lmrfHqhqsZlW1A
+6Pu0FsD/3LAE1+gukv18IWUlH3GCzPl6/wCHoqPzg/vAMtWNJyTsApn7GCrusG0Q
+UQTgz12SiPZLPPVl+GvhFvwfEweyCqyswQnjk2F0S5PisFlcrW6iAnBi1T6RcJfL
+dw0=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEfzCCA2egAwIBAgIQSotNoT7PriEYt2exFs1UFDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDIxMjAwMDAwMFoXDTEyMDIxMjIzNTk1OVowXjELMAkGA1UE
+BhMCRlIxDTALBgNVBAcTBE5JQ0UxKTAnBgNVBAoTIFVOSVZFUlNJVEUgTklDRSBT
+T1BISUEgQU5USVBPTElTMRUwEwYDVQQDEwxpZHAudW5pY2UuZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3qmnC1dm6p8MREZA89vNwF4LwqTIvWsZL
+FVUnHNHTAuQBVoyaU7XVRYNBj26GWYZ6uLsCBhIjBv61ooVini9644GufHLuUMgx
++pR/v0Ho92w+MOENkLbEjwFF00szAmPEgK1PlLMFEOPpfC10z9VSnwUe0Xn316Kn
+DS5/c3Dhp3a2zmIr19JeNgme/Xj4FeLOU/e7ZpuALBqnoarActz3aifB46LwhUYz
+d0/SXbOHwIi9jpgE/Hrlg0TL+OpoIEJVjjaL5jyujMY6b9RPvbv9eOqERUUbT45y
+YNTimL0P4BQRpWToRl0IQYbEgCOGzyLd/wEn/ptCmxgCDrl/3CMdAgMBAAGjggFf
+MIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+SlH8XEydtUtztNNGp80FE30LblIwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAw
+DoIMaWRwLnVuaWNlLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCk2KDWfolmFNEJy5OQ
+PMZ5EJVuJQi6b3wUQaGeBt6esfs333q4w57gQmm1dq1wmiZjsBUgN/d9CCPugK/9
+/KpoG4sUDEAo5Lx9GktpaRzG9dMbm6uQ07T1VZAHC9RiXuImRD1hOU1VPq1PlCDC
+9Uy7nl3o0ShOAjNX+e/cC3A+K8R3XYDsV9wYaTNSMvQrkmrW9M1t+Gt6KWC5DJcs
+VuYEmDLEXN09X2MBgHAwkTDgHlzhNSTXBBYoWVIDF+uuAyQxJl+D80moz+tE7c/x
+u5W/LMh8OtGE22Mm0hd7yB0U9sPfkobXWE25qkX8cGb3G7bTBGZN1QiQskwp6iCE
+mgL9
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.unice.fr/renater/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.unice.fr/renater/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.unice.fr/renater/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unice.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEfjCCA2agAwIBAgIQK5pZmStu+KqrJYOJR81rjjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMDMyODAwMDAwMFoXDTE1MDMyODIzNTk1OVowXTELMAkGA1UE
+BhMCRlIxKTAnBgNVBAoTIFVOSVZFUlNJVEUgTklDRSBTT1BISUEgQU5USVBPTElT
+MQwwCgYDVQQLEwNEU0kxFTATBgNVBAMTDGlkcC51bmljZS5mcjCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMIkuN4X1g+AUaePtx/CPvwT6jkVGwUkC8d3
+oxB/unX3ro66bdIEfIO+xePOyS/74i8Z0FqVpS0IzaA5bBTs6eCD4rhvio/eABqJ
+eKQWXNgqzJOSo1ALQmwgcu0yuzJPxMFK4WnYgbobs+PiRuZ50Sdg6kBOIYw9uIMI
+SeojiAXFjcWXMN69dEYOgzngJzD48tRLmab91YqlBxV8fOSXxjII29GOcOCVVgNN
+S/EDZWH4GiVk21tAOGOQCk9Yba6hSRBCONuNFQOcl56vMAkgnBFuVLL0e23t3lMI
+En6lkUF6e7sgA9Plqx40pJwglP8uAPhBdBkvnO+ecUKh2UaYZaECAwEAAaOCAV8w
+ggFbMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQWBBQv
+CXPMKuozAiWF4sbusopCVz3YLDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/BAIw
+ADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzANBgsr
+BgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJl
+bmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUH
+MAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYG
+CCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAXBgNVHREEEDAO
+ggxpZHAudW5pY2UuZnIwDQYJKoZIhvcNAQEFBQADggEBAIKDpaOBUHy14EHCqNCv
+ScM6d6MEqFzFZJ6Ivgg95BMro4ER/IJ++C+XAp5urJTT81ET/EicqOcC48c0YRfs
+/liIZZ8hIhLKjBTHuzWKGTW6beHFhbIgxfXaNvKrfL4l+0VW44jP8k73Igke1b1f
+48xNbhphqTxvud4q/rubPSY5cThxB8b3sGAY5omnk2WB5MXoU7lmrfHqhqsZlW1A
+6Pu0FsD/3LAE1+gukv18IWUlH3GCzPl6/wCHoqPzg/vAMtWNJyTsApn7GCrusG0Q
+UQTgz12SiPZLPPVl+GvhFvwfEweyCqyswQnjk2F0S5PisFlcrW6iAnBi1T6RcJfL
+dw0=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEfzCCA2egAwIBAgIQSotNoT7PriEYt2exFs1UFDANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDIxMjAwMDAwMFoXDTEyMDIxMjIzNTk1OVowXjELMAkGA1UE
+BhMCRlIxDTALBgNVBAcTBE5JQ0UxKTAnBgNVBAoTIFVOSVZFUlNJVEUgTklDRSBT
+T1BISUEgQU5USVBPTElTMRUwEwYDVQQDEwxpZHAudW5pY2UuZnIwggEiMA0GCSqG
+SIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3qmnC1dm6p8MREZA89vNwF4LwqTIvWsZL
+FVUnHNHTAuQBVoyaU7XVRYNBj26GWYZ6uLsCBhIjBv61ooVini9644GufHLuUMgx
++pR/v0Ho92w+MOENkLbEjwFF00szAmPEgK1PlLMFEOPpfC10z9VSnwUe0Xn316Kn
+DS5/c3Dhp3a2zmIr19JeNgme/Xj4FeLOU/e7ZpuALBqnoarActz3aifB46LwhUYz
+d0/SXbOHwIi9jpgE/Hrlg0TL+OpoIEJVjjaL5jyujMY6b9RPvbv9eOqERUUbT45y
+YNTimL0P4BQRpWToRl0IQYbEgCOGzyLd/wEn/ptCmxgCDrl/3CMdAgMBAAGjggFf
+MIIBWzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQU
+SlH8XEydtUtztNNGp80FE30LblIwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQC
+MAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYL
+KwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVy
+ZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUF
+BzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAm
+BggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwFwYDVR0RBBAw
+DoIMaWRwLnVuaWNlLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQCk2KDWfolmFNEJy5OQ
+PMZ5EJVuJQi6b3wUQaGeBt6esfs333q4w57gQmm1dq1wmiZjsBUgN/d9CCPugK/9
+/KpoG4sUDEAo5Lx9GktpaRzG9dMbm6uQ07T1VZAHC9RiXuImRD1hOU1VPq1PlCDC
+9Uy7nl3o0ShOAjNX+e/cC3A+K8R3XYDsV9wYaTNSMvQrkmrW9M1t+Gt6KWC5DJcs
+VuYEmDLEXN09X2MBgHAwkTDgHlzhNSTXBBYoWVIDF+uuAyQxJl+D80moz+tE7c/x
+u5W/LMh8OtGE22Mm0hd7yB0U9sPfkobXWE25qkX8cGb3G7bTBGZN1QiQskwp6iCE
+mgL9
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.unice.fr:8443/renater/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Nice-Sophia Antipolis - UNICE</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Nice-Sophia Antipolis - UNICE</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Jean-Charles GODIEN</SurName>
+    <EmailAddress>Jean-Charles.Godien@unice.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Richard Manas</SurName>
+    <EmailAddress>Richard.Manas@unice.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml
new file mode 100644
index 00000000..6773be7a
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-unilim.fr.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:unilim.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-03T17:29:36Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">unilim.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Limoges</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDNzCCAh+gAwIBAgIUCJLJlFRsGEvjGAk03CmBdGzPqAswDQYJKoZIhvcNAQEF
+BQAwHjEcMBoGA1UEAxMTaWRlbnQtbmV3LnVuaWxpbS5mcjAeFw0xMTA0MDgwOTU1
+NDRaFw0zMTA0MDgwOTU1NDRaMB4xHDAaBgNVBAMTE2lkZW50LW5ldy51bmlsaW0u
+ZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCHrcGQOpTbOfurHfSP
+YaPZ/HFB3HJYouQKiNu3ZmG3f/jFB5MXJjjqA0ujs7Bgd6yq78ub/jQUANafNXFm
+r51YIHYLFWULQLBQEbN0wOj7q41UAi/Unw57WTQ7b878WGN1PF9IjrrQK5D7qxQD
+6B4rXYr0f6ke9RK6az0ukAESyvClxg2J9xLi+StcilwzD/hh1t4KkFcLCg7r7l+s
+MN+/NoDeiC9D5EI/GdVnAcyVhlBqH3lvhEAd2/d0coTs11IOcuNQV9UD7G1FZxVW
+XRgKEysU+9kwK0OJcXIO4ECr35MZZKJzp/qJ6sq1LVeGYW4ceSJphlKk1EBIPS2H
+VAj3AgMBAAGjbTBrMEoGA1UdEQRDMEGCE2lkZW50LW5ldy51bmlsaW0uZnKGKmh0
+dHBzOi8vaWRlbnQtbmV3LnVuaWxpbS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4E
+FgQUORrgoAo4rJzB+VbHl2vNbQUkEYAwDQYJKoZIhvcNAQEFBQADggEBACJSI3QE
+HRMtzbd1h4fRrefD3DRSpg/W6nOEAFNseTeShU6xwBQPI/U+GGOCCPgNF1cdMSFB
+wnRPLlFjcNDfah2SznWI2yCjz/Lh4Zb+8xmWMUnQ/Rg5ECKahbMQY81xCWDVIOff
+fr3TPxIcSEJT8CRz7HhIqcnQ6Svuu+Aj6l0wx7lSa/45MhlxMC0gyQeWvjG9i1VO
+wixNzp6SP7pbBch2TajO9mKgGh15wzU/aO19dXpUO/bpAgNfcOlpd+LlRtQ6AaO+
+/rzAmJBWj5oXmNLIuWfDZDz9I6/SSJmsK3i8tTAKxKK3YslapJiwApPNPfAbH5Ac
+4dTyIRHkjWvItKk=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident2.unilim.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident2.unilim.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident2.unilim.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Limoges</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Limoges</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-admin@unilim.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml
new file mode 100644
index 00000000..637e41ff
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-angers.fr.xml
@@ -0,0 +1,144 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-angers.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-23T11:48:50Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-angers.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Angers</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Employees and students from the University of Angers</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université d'Angers</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Les personnels et étudiants de l'Université d'Angers</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDUDCCAjigAwIBAgIVAMabeXzhOvplUR9r4t9fsuUrWixGMA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1hbmdlcnMuZnIwHhcNMTQw
+NDE4MDY1MzI1WhcNMzQwNDE4MDY1MzI1WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
+LnVuaXYtYW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+njrHW1QuXFlucp6z9Q5qwHBNer+ZquJPEs1detiZARHyigMJILaslGc8b6FwA+xC
+pam+vAnnhFVXLI7iR4G7chrAl0cpiuBLifK3uMFKo+a7NTOBT4N9UNSyWPuVoF23
+kq+cPptIw01BV4jp4A4QoZbfqr4ueeY3oujYi4HhAZS3Twh+EByeJb208XZJjE78
+pokPWU//uWpLdVWm+fq8X9HOBhyMaFqsbBV0pRI72rYiSUifPrws5EI6aWonLt9R
+59HcvN0bx+k3dlMgEBOx9y1B2189/8bLVAg1wM2zaKlyGMbmzlJ5PwzjVUAs5G/J
+EMaRfdVHCNiX3r33XO4ZYQIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+LnVuaXYtYW5nZXJzLmZyhjBodHRwczovL3NoaWJib2xldGgudW5pdi1hbmdlcnMu
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAKn+28vOVV2v3JY1xRWVCTpRbI6
+MA0GCSqGSIb3DQEBBQUAA4IBAQB+45tSXigpVOHs6oJCae7LyB97FXb2w2TTkYsI
+XD1hgEszYlaxjEF1Y1+GYX9eC7EX+al9pil/3buaFHcd5hi7NeY8HBsNqTjXI8kr
+4/vaJqT/RhnWHb9ylDweiCtIDu6W2NjUw1zEehgtG1WbxeERvggVZw6p4B5U3WQ5
+EW8UH2uweFDWwfDBLnYAiX2IYiHzvR1+N1CHFXs1x7JeatpsHtOJeoaYfWDtBHVu
+R2mmF7L5xU2Vz6xEp0X4OUPKsBXAaRBFHs+2LIY+wAdwM3tjjUxCYgwp5uOoX2dk
+SIWEfxyrSc9yevZKOFUP04Oi4b6WcQbgRl5bIy6PHi2kYiRe
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDRDCCAiygAwIBAgIVAMHj2Cu/7KEX13/aTUHqdXfb3tFgMA0GCSqGSIb3DQEB
+BQUAMCExHzAdBgNVBAMTFmZyb250YWwudW5pdi1hbmdlcnMuZnIwHhcNMTAwOTA5
+MTAzMjQyWhcNMzAwOTA5MTAzMjQyWjAhMR8wHQYDVQQDExZmcm9udGFsLnVuaXYt
+YW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjIh2qi8D
+qFiSERXM4uugvV8s4OBCMbosII48TW6O0zG5KMtaLDnTDatBTchVONzQ7M5IEg/7
+nM90aocij3FZxWqDnV/o5A/MMuBoB8/J9oWgMVPnB+sBlixpQiWc5L/31HQgVPtL
+7AOuyC9xxldTx1e5kDBpW0QDyqZdtbApqAI0N4pCtrIKm8lYTYJ28eZQDUF7nu/h
+hw6HgSRY3qtCWnpkahaRziIFfsxyt1PJQSmaEdkHheFJWuoW8ptt3DwVn+ywBkX4
+EkZnBkuHZ3E5CMWXMz8WzfSqeJj+epi1vCDr80R6v7wKez7CWLt+uit7ZFyjjv+l
+zKa9OHlDCG52qQIDAQABo3MwcTBQBgNVHREESTBHghZmcm9udGFsLnVuaXYtYW5n
+ZXJzLmZyhi1odHRwczovL2Zyb250YWwudW5pdi1hbmdlcnMuZnIvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFJC10iOKAVjMBWfVlXG7viH4rneDMA0GCSqGSIb3DQEB
+BQUAA4IBAQBXoZx/uNmrVDdvRMUZL0ZVPP0XtHRngakIEi0ADSAh2zHAhvMgybDE
+W2EprWWG3CEltjt59/ugMV7y7/VkAuw2CMcFiKWGNYrlyXqx+u045lFxaB1VEkyH
+NFCBhYR00KhKcsyLZFGRhjJsRF8BrPPk4APrhMzKMm7yyysWgK8zaIx1G1vWG5FD
+e2SaH84F6OdHlwY/DFR+h6JFkH7FrBoJxKcnlCTL8NGhH2Kc15JweNdb7aTthrqb
+85iK6ee+lD481XBORDuJ9IueWi+kuDTSoTCP403vuFXe3SCMDi5ifHnw+7CH/jd8
++2aam5wgFGGrA1qTjyQEFHulpuQ6mnIK
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-angers.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-angers.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDUDCCAjigAwIBAgIVAMabeXzhOvplUR9r4t9fsuUrWixGMA0GCSqGSIb3DQEB
+BQUAMCQxIjAgBgNVBAMTGXNoaWJib2xldGgudW5pdi1hbmdlcnMuZnIwHhcNMTQw
+NDE4MDY1MzI1WhcNMzQwNDE4MDY1MzI1WjAkMSIwIAYDVQQDExlzaGliYm9sZXRo
+LnVuaXYtYW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+njrHW1QuXFlucp6z9Q5qwHBNer+ZquJPEs1detiZARHyigMJILaslGc8b6FwA+xC
+pam+vAnnhFVXLI7iR4G7chrAl0cpiuBLifK3uMFKo+a7NTOBT4N9UNSyWPuVoF23
+kq+cPptIw01BV4jp4A4QoZbfqr4ueeY3oujYi4HhAZS3Twh+EByeJb208XZJjE78
+pokPWU//uWpLdVWm+fq8X9HOBhyMaFqsbBV0pRI72rYiSUifPrws5EI6aWonLt9R
+59HcvN0bx+k3dlMgEBOx9y1B2189/8bLVAg1wM2zaKlyGMbmzlJ5PwzjVUAs5G/J
+EMaRfdVHCNiX3r33XO4ZYQIDAQABo3kwdzBWBgNVHREETzBNghlzaGliYm9sZXRo
+LnVuaXYtYW5nZXJzLmZyhjBodHRwczovL3NoaWJib2xldGgudW5pdi1hbmdlcnMu
+ZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFAKn+28vOVV2v3JY1xRWVCTpRbI6
+MA0GCSqGSIb3DQEBBQUAA4IBAQB+45tSXigpVOHs6oJCae7LyB97FXb2w2TTkYsI
+XD1hgEszYlaxjEF1Y1+GYX9eC7EX+al9pil/3buaFHcd5hi7NeY8HBsNqTjXI8kr
+4/vaJqT/RhnWHb9ylDweiCtIDu6W2NjUw1zEehgtG1WbxeERvggVZw6p4B5U3WQ5
+EW8UH2uweFDWwfDBLnYAiX2IYiHzvR1+N1CHFXs1x7JeatpsHtOJeoaYfWDtBHVu
+R2mmF7L5xU2Vz6xEp0X4OUPKsBXAaRBFHs+2LIY+wAdwM3tjjUxCYgwp5uOoX2dk
+SIWEfxyrSc9yevZKOFUP04Oi4b6WcQbgRl5bIy6PHi2kYiRe
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDRDCCAiygAwIBAgIVAMHj2Cu/7KEX13/aTUHqdXfb3tFgMA0GCSqGSIb3DQEB
+BQUAMCExHzAdBgNVBAMTFmZyb250YWwudW5pdi1hbmdlcnMuZnIwHhcNMTAwOTA5
+MTAzMjQyWhcNMzAwOTA5MTAzMjQyWjAhMR8wHQYDVQQDExZmcm9udGFsLnVuaXYt
+YW5nZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAjIh2qi8D
+qFiSERXM4uugvV8s4OBCMbosII48TW6O0zG5KMtaLDnTDatBTchVONzQ7M5IEg/7
+nM90aocij3FZxWqDnV/o5A/MMuBoB8/J9oWgMVPnB+sBlixpQiWc5L/31HQgVPtL
+7AOuyC9xxldTx1e5kDBpW0QDyqZdtbApqAI0N4pCtrIKm8lYTYJ28eZQDUF7nu/h
+hw6HgSRY3qtCWnpkahaRziIFfsxyt1PJQSmaEdkHheFJWuoW8ptt3DwVn+ywBkX4
+EkZnBkuHZ3E5CMWXMz8WzfSqeJj+epi1vCDr80R6v7wKez7CWLt+uit7ZFyjjv+l
+zKa9OHlDCG52qQIDAQABo3MwcTBQBgNVHREESTBHghZmcm9udGFsLnVuaXYtYW5n
+ZXJzLmZyhi1odHRwczovL2Zyb250YWwudW5pdi1hbmdlcnMuZnIvaWRwL3NoaWJi
+b2xldGgwHQYDVR0OBBYEFJC10iOKAVjMBWfVlXG7viH4rneDMA0GCSqGSIb3DQEB
+BQUAA4IBAQBXoZx/uNmrVDdvRMUZL0ZVPP0XtHRngakIEi0ADSAh2zHAhvMgybDE
+W2EprWWG3CEltjt59/ugMV7y7/VkAuw2CMcFiKWGNYrlyXqx+u045lFxaB1VEkyH
+NFCBhYR00KhKcsyLZFGRhjJsRF8BrPPk4APrhMzKMm7yyysWgK8zaIx1G1vWG5FD
+e2SaH84F6OdHlwY/DFR+h6JFkH7FrBoJxKcnlCTL8NGhH2Kc15JweNdb7aTthrqb
+85iK6ee+lD481XBORDuJ9IueWi+kuDTSoTCP403vuFXe3SCMDi5ifHnw+7CH/jd8
++2aam5wgFGGrA1qTjyQEFHulpuQ6mnIK
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.univ-angers.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université d'Angers</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université d'Angers</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>ddn-ssr@listes.univ-angers.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml
new file mode 100644
index 00000000..97160f69
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lemans.fr.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lemans.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-16T12:04:57Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lemans.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université du Maine - Le Mans</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEBzCCAu+gAwIBAgIJAPJkjMeKwz+TMA0GCSqGSIb3DQEBBQUAMIGZMQswCQYD
+VQQGEwJmcjEUMBIGA1UECAwLdW5pdi1sZW1hbnMxEDAOBgNVBAcMB0xFIE1BTlMx
+HDAaBgNVBAoME1VOSVZFUlNJVEUgRFUgTUFJTkUxHDAaBgNVBAMME2lkcDIudW5p
+di1sZW1hbnMuZnIxJjAkBgkqhkiG9w0BCQEWF2ZlZC10ZWNoQHVuaXYtbGVtYW5z
+LmZyMB4XDTE0MDQxNDEwMDkzNFoXDTM0MDQxNDEwMDkzNFowgZkxCzAJBgNVBAYT
+AmZyMRQwEgYDVQQIDAt1bml2LWxlbWFuczEQMA4GA1UEBwwHTEUgTUFOUzEcMBoG
+A1UECgwTVU5JVkVSU0lURSBEVSBNQUlORTEcMBoGA1UEAwwTaWRwMi51bml2LWxl
+bWFucy5mcjEmMCQGCSqGSIb3DQEJARYXZmVkLXRlY2hAdW5pdi1sZW1hbnMuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDBgciAAr1+6sMGIFgYHYju
+l57S7ReTKO8qbyJ6QfVfrzQHSspk+Hfx8FxLTlP1yR59mO0PmTL3zxJr9rXvIBzw
+G1HyzZw3K6QLL02u4SAFcQRET8CmlXKM18JbmyF+WyQ1xBGfzpHXQGszHVQ/TihW
+eEQat8D2ALVscAxxKpyFZsJWB9StyDPc/gYsqSU77GnXwun5p5SO10F2Ag+hWpzP
+Gj5hHn2KVQdqP/rdDryi6WNN3Nk1niyecbxpPkomGg8n3ZAojulNYsn8bVkMB9I0
+1+1OCGcr1IMDiZVADDQ9tdO6c/ftFZMUNsOayYXsQsDnaW7LbvSIABBPQvGuBLDx
+AgMBAAGjUDBOMB0GA1UdDgQWBBRt0PUs8HKbUTeuD+959t8js76s5jAfBgNVHSME
+GDAWgBRt0PUs8HKbUTeuD+959t8js76s5jAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
+DQEBBQUAA4IBAQArAai8yD7FfetenGqoPKTUt9fWdBN4tArGV++NydXdBjCC5E8S
+IML/iFVPuuCWC2kWI7b39UjnvrSCtzvkCjjcSA7ThkW9+0CdT6ohD8lh0TE34VQo
+UH4OnFMgI9iwhYEzJbcqDl3oGCtSLg482SU9YgdSLbSWQCYmJOWKtrnE5VGtHKba
+VAgkzA5irhs1FL1lhLrN0VP0Zl41cckZtAamNcc4xJ+HXPk0jCRtEIRdoBCF+4fL
+0Kczl19r1JsQ1/qYuSzYFoSeMonfQMzNswe2JMhVtem/X76sSLk9sXf/DGLBdxO5
+psTKLRse8C18pocxxBm/KWroiZrNIExoq6GB
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDODCCAiCgAwIBAgIVAOfG5aIZ6Aohb63NMTtvPZ3HLBWfMA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2lkcDIudW5pdi1sZW1hbnMuZnIwHhcNMTAwNDEyMTE1
+ODExWhcNMzAwNDEyMTE1ODExWjAeMRwwGgYDVQQDExNpZHAyLnVuaXYtbGVtYW5z
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmmABnRWyz2lm0ged
+F4Prv9GO+Z914ed7yVYJJi3jlCLejmkcDWpfTVm7rRalLX/3sO5KdE7dnXEBxdYf
+AluI409b9yNcDi8iTcRgQA233FnJxSkYf7yEKFVc5ZWhCvpbvda4NfxPHAi7E3LD
+1Rzji0PT+KYzElb/eTPmVl85LCeKK5aM9ILv8b5ziFC70t3JdaNsoXR0esC+5r8o
+nI80ICke0tibfbHrwlyldiJb/po9m9tSEB3i8NkEOgFXwz7X/fdGHur5gfJwvEXS
+MXzgSoq9DbpjWKR6/g46hABdmv8+C/+N+mxp4KehoyDcFPbED8pH9cqw9QtLKLgE
+SXy8uQIDAQABo20wazBKBgNVHREEQzBBghNpZHAyLnVuaXYtbGVtYW5zLmZyhipo
+dHRwczovL2lkcDIudW5pdi1sZW1hbnMuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFMjVlzAX+5XMpiXoz2pkh/xv8xpAMA0GCSqGSIb3DQEBBQUAA4IBAQB+5SH/
+ygI70ba2rP2hmL3klQ1md/zIaK7p3MOOkDy5lkIH31oI6lIFTrKyZg7ML19gMVeA
+uZhIO9ZWJDrFtBxgDGYeishp1zEctX+ExWuVU9rtWzgCQ7GlqpnJLDAjxCVotdTG
+oEa3NbsjuPm4R3FaHiEAcVWGun8edQztZ9PRGxk7KDsT7+omuABB80mrvtYHGNCZ
+lKgdL3SFqkTQMbBvs4ouAnxw++YMfvcqUtxZJZKIKF7QTPeDOPLHLwHEZl6yL/kl
+dkydWQ+SmHuq9+cAfmW7kzferGnkRoHvIPVNtgGNo7kvQieeLbnGrLYpRWeMFt3f
+4weH5Ji9r7v8/chk
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp2.univ-lemans.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp2.univ-lemans.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp2.univ-lemans.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université du Maine - Le Mans</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université du Maine - Le Mans</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-tech@univ-lemans.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
new file mode 100644
index 00000000..e7d74f5f
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lille1.fr.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lille1.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-20T17:10:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université Lille 1,  Sciences et Technologies</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMjCCAhqgAwIBAgIUFVDNOdEJbuHwIfdnn+cRYs6xfq0wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZyMB4XDTA5MTAwODA5MTU1
+NVoXDTI5MTAwODA5MTU1NVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZy
+MIIBITANBgkqhkiG9w0BAQEFAAOCAQ4AMIIBCQKCAQBsQS+H4uWYOep74yJQf5us
+pkTg19tZEZUjtqkUCBjLt1UJdH1hDiaK+/4qWudwEjcMDvnxBUL8xbIfDDJOXvgh
+bPKYRJMLTEBmBnt5dslkT46+47cTSPDqK748qbBzrucnbhHuWJ7mG9KG9qTXmiLi
+09uwCjeGjnnFu11CKKt1XMJ40/B55W2j1SXiqDHMbdbjRjhfyniVt9t3yp/b4IGh
+79UivcebLkPTpAjLp7TMG4VAUXq6oVwfCLkjH8kzZsO0MJ+IAeX0iTIULONw3E0E
+VAErKUj9FPV9C3zAlPL0oZomDrd0tu7CdreGZRz2u6DCT38XLsVbMumSnvfYFjBF
+AgMBAAGjazBpMEgGA1UdEQRBMD+CEmlkcC51bml2LWxpbGxlMS5mcoYpaHR0cHM6
+Ly9pZHAudW5pdi1saWxsZTEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYf
+a9RpwCPFriHOSMKJSQ9gQ6vzMA0GCSqGSIb3DQEBBQUAA4IBAQBBv8iK1b67jhuz
+ZT6LHjtmHgovO7Qa74jggtKblhiqHAMRZWPCep1fleDjR27rYSvfRGzdSug7tfbl
+EsPyeVqcyKJvD9GXPJuPs/s4VdQmKbldGbBuuFQU6WVGoBlZOXq7wjRMqKd15TK/
+6wE/J0J2TieuAJpFKd6oiPV3YT4ggn6G2lilP1rv2cX6a2qK/j82M7wTLg1rLe5e
+ocgQGRZdfk7m+u4pfrJr1Dsjy7uOjA0QWzfG5jPSFLV8DiliDDPejz+eDyaz2kib
+w3l6kfiJYiwyVlk+O2O5ocwTmZtnVvTo3KAvIZwluV6OKXJXB7+mkU5dPtXHmooU
++HT9dOog
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lille1.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lille1.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lille1.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMjCCAhqgAwIBAgIUFVDNOdEJbuHwIfdnn+cRYs6xfq0wDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZyMB4XDTA5MTAwODA5MTU1
+NVoXDTI5MTAwODA5MTU1NVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbGlsbGUxLmZy
+MIIBITANBgkqhkiG9w0BAQEFAAOCAQ4AMIIBCQKCAQBsQS+H4uWYOep74yJQf5us
+pkTg19tZEZUjtqkUCBjLt1UJdH1hDiaK+/4qWudwEjcMDvnxBUL8xbIfDDJOXvgh
+bPKYRJMLTEBmBnt5dslkT46+47cTSPDqK748qbBzrucnbhHuWJ7mG9KG9qTXmiLi
+09uwCjeGjnnFu11CKKt1XMJ40/B55W2j1SXiqDHMbdbjRjhfyniVt9t3yp/b4IGh
+79UivcebLkPTpAjLp7TMG4VAUXq6oVwfCLkjH8kzZsO0MJ+IAeX0iTIULONw3E0E
+VAErKUj9FPV9C3zAlPL0oZomDrd0tu7CdreGZRz2u6DCT38XLsVbMumSnvfYFjBF
+AgMBAAGjazBpMEgGA1UdEQRBMD+CEmlkcC51bml2LWxpbGxlMS5mcoYpaHR0cHM6
+Ly9pZHAudW5pdi1saWxsZTEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFGYf
+a9RpwCPFriHOSMKJSQ9gQ6vzMA0GCSqGSIb3DQEBBQUAA4IBAQBBv8iK1b67jhuz
+ZT6LHjtmHgovO7Qa74jggtKblhiqHAMRZWPCep1fleDjR27rYSvfRGzdSug7tfbl
+EsPyeVqcyKJvD9GXPJuPs/s4VdQmKbldGbBuuFQU6WVGoBlZOXq7wjRMqKd15TK/
+6wE/J0J2TieuAJpFKd6oiPV3YT4ggn6G2lilP1rv2cX6a2qK/j82M7wTLg1rLe5e
+ocgQGRZdfk7m+u4pfrJr1Dsjy7uOjA0QWzfG5jPSFLV8DiliDDPejz+eDyaz2kib
+w3l6kfiJYiwyVlk+O2O5ocwTmZtnVvTo3KAvIZwluV6OKXJXB7+mkU5dPtXHmooU
++HT9dOog
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-lille1.fr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université Lille 1,  Sciences et Technologies</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université Lille 1,  Sciences et Technologies</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>claude vieville</SurName>
+    <EmailAddress>claude.vieville@univ-lille1.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>brigitte wallaert</SurName>
+    <EmailAddress>brigitte.wallaert@univ-lille1.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
new file mode 100644
index 00000000..6043eba6
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-littoral.fr.xml
@@ -0,0 +1,95 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-littoral.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-15T17:26:21Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-littoral.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université du Littoral Côte d'Opale</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEhTCCA22gAwIBAgIQM3C+kyGnfSc/kTiiA9+naTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTIxMDAwMDAwMFoXDTE2MDEwNTIzNTk1OVowXDELMAkGA1UE
+BhMCRlIxLjAsBgNVBAoMJVVuaXZlcnNpdMOpIGR1IExpdHRvcmFsIEPDtHRlIGQn
+T3BhbGUxHTAbBgNVBAMTFGlkcC51bml2LWxpdHRvcmFsLmZyMIIBIjANBgkqhkiG
+9w0BAQEFAAOCAQ8AMIIBCgKCAQEA6Y8qpaVAflGpxbB3TnbUs5joUdDB0IVfB0fl
+ZJd3tjqgBEbLFtt7KPWZqmy2C7RsQEmOoSk6mtZAVzZ8BbudN+nE6nbiGSKQ1KIk
+adkMTm3ZtFAw1xpxcRzYnxAiOVTRjH9pZ8nSQ42eL7jXopqEzDOaPVF2GK89OzaE
+sH+LfjworttwEu7US4O2EOPD8OQ0fYozuDL1Rk3YWcPfeOzvPIf4htAipt2Vh0fP
+wsHBqBcF23UtYX+aUB4KQ0fpGOr5OTRycs0FjLHfpNVFZQSbP4SGcqVMbUk24Xnh
+HhbUovsCemIzzcvddaCN6esVX8Gun7v7YxQJiDpLxQZMpYtfMwIDAQABo4IBZzCC
+AWMwHwYDVR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFAXl
+Y/77ZkqLrPn2HgWzot+iF/5uMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAA
+MB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysG
+AQQBsjEBAgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVu
+YS5vcmcvVEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcw
+AoYpaHR0cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYI
+KwYBBQUHMAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMB8GA1UdEQQYMBaC
+FGlkcC51bml2LWxpdHRvcmFsLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQBBUBAyoNKF
+lwkQYMHoAbYg2qSx1LJ/Od3kG6sPf6kXwkYJEvqCx3dPJnQeM+ZgUCs/o/y7WzvE
+gNQgYz5mNVN0GAUZ2EpnuybzUvTVm3fPcSs1aLjP3fxECkw10Cp++P0GFDXSHoqc
+KC6nNahBlNSK2SOr7E+tDC19AYGgI7aK/Kzr7SmePIhisdH/qup+b5XpguA0r1rq
+aWEV9NoSDZaqIJdSdKD9M5mWRV4z7RPQUTzW131WZUgTEjoWu7uLSf35wH1oAnxo
+we5qOyV4yEtVosxilJRh/BQNAwcQSAo/OMCjOPfzz0Vs8aUbukcnN122p23wbyPI
+HRSh/cWFEY7F
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEmTCCA4GgAwIBAgIQNpYV+0q076RVhq9vmZRQ+DANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDEwNzAwMDAwMFoXDTEzMDEwNjIzNTk1OVowcDELMAkGA1UE
+BhMCRlIxEjAQBgNVBAcTCUR1bmtlcnF1ZTEuMCwGA1UECgwlVW5pdmVyc2l0w6kg
+ZHUgTGl0dG9yYWwgQ8O0dGUgZCdPcGFsZTEdMBsGA1UEAxMUaWRwLnVuaXYtbGl0
+dG9yYWwuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDFN1xJBItC
+vBt4knmQ8KL9bIdE/Yv8EZJwUMmYf++f2b2RFjE2soBocszLWcZ+quqSbZDQPsY2
+JujFa8R3whpl08u7LcNTp6KLuh4yLYd/tDaGMMR71HVdKVCqrfJGlyjnW0DRBDRB
+rNkACsplQ8Wr1WkGYco23Vvrlwq4n+Qquth4Xekkle5G/BmSZF9+kVbsrYQaXUiI
+leRaR3wCvfyxKDy8XnbqrU+HaWvC6kows9RxmjCi9cYEWPHXS4qQ4HCDLc3p8CEX
+tUyNQf19DgZcb818aEslvoxynVe5pWbA2pab3J3B2DnIU5jx+Ehcn46SjUTKRb+J
+8ZsGaqUuEiYhAgMBAAGjggFnMIIBYzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUSD9mGXXrZO7cy8URPaeoW6aW2fMwDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4Yp
+aHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYB
+BQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRl
+cmVuYS5vcmcwHwYDVR0RBBgwFoIUaWRwLnVuaXYtbGl0dG9yYWwuZnIwDQYJKoZI
+hvcNAQEFBQADggEBAHqmDSP8dBvNyB/gjkjZ8UW2Adyc6Qgb58XpKcR81tbmsCeC
+9vF5IZFawucCNLXk7btI6YG3RRM9jMDIB1vLjWawqzv38OJcwGx45BeZdKAinjbP
++CH5i6OymdC10ubFTt2fn0O/PB85r9UtrNghieDqx3rOmdnMenCp4iwj1K5OKDVE
+eWxjgJM/CWtaOwp/WWryTvTo85ZIvtgI6ejTSaDqHcJBftitunJawQrdixijaWpB
+RjIAXHurXBitq29gYTxwLspYLpYBWUykotkfhu19lZpmgQVF43Ll1saLE4EhB9tk
+PXRmrWMW/YbGP711MGAIUhDdGKBmZUWgZ73cI+I=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-littoral.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-littoral.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université du Littoral Côte d'Opale</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université du Littoral Côte d'Opale</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-admin@univ-littoral.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
new file mode 100644
index 00000000..65055196
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-lyon1.fr.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-lyon1.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-10-26T16:20:23Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-lyon1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Lyon 1 - Claude Bernard</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIErjCCA5agAwIBAgIRAJaT1KIfHVmld1Ki1N6X4JEwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA0MjQwMDAwMDBaFw0xNjA0MjMyMzU5NTlaMD8xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEaMBgGA1UEAxMRaWRwLnVuaXYt
+bHlvbjEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDtWeh0Zke9
+VBmOOwQUqf25+aw8KTGC/6gwSoj48vGDm6Oo0u8TiEplFSzBBd2CZK2A4vO2iNHz
+tlxBw01s9BDKIS4A9cnGTr9KQXbJj05BfPfwnlAhMexADwxKc24v3w2tZnALLRLp
+xD1tpfP3JRf2TDFCq1y1pVN0HplxNjWq7AT2bSJUmostjN4SXLVHg40boGJSc6b3
+c4CdvhkTa/PjCCkyNO1tVLTRgpQIUelsPAsgAbRlzH/S34s4GmmkL5oUAO0W2vnf
+0giExMB5QP4byQ+SFIJiaJw5ZrCe7RcxXZt1hFLCJ/0sX3oHDXZQJElF1FpDpt8S
+U/EB6tT8iVQhAgMBAAGjggGsMIIBqDAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3
+V0fqkOO57TAdBgNVHQ4EFgQUE4rmZUoHIwpShp68L3WD9y55Ns4wDgYDVR0PAQH/
+BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUF
+BwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQz
+MDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0Eu
+Y3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3Mu
+dGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9v
+Y3NwLnRjcy50ZXJlbmEub3JnMFoGA1UdEQRTMFGCEWlkcC51bml2LWx5b24xLmZy
+gh1kc2ktYXV0aC1pZHAtMDEudW5pdi1seW9uMS5mcoIdZHNpLWF1dGgtaWRwLTAy
+LnVuaXYtbHlvbjEuZnIwDQYJKoZIhvcNAQEFBQADggEBALIuJEuGICDAEKB10oVx
+GgSCfY2N00sOT860fZaylYXy96htcUDVvRoRZSo7OuRVk96f+U4HZRSEkvD3bhsX
+/oZUquuVhRbhPcSCe73Qz4sF+2B1wOg6CL5BE858+1eJOPAwK20JfnDmccQzvHoX
+3xa4LljRG+Z4OkdEuDNzYmAgXHMkA2IORjN8uvySFMP03wweZsyL5fBgA0IT8Qke
+VqZtCnPLGw0lpJMz0tCH9WZRMyNTtYJzW0GThz2c3fyHHDNY0vwKTq8nB7Pjfrx3
+EIUd53kRJ1997x3KgQj/cLYxglqpnTSxvDbGXuXUEIZHPxwbk9mlLnyXNhPHQc/w
+sE4=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEzTCCA7WgAwIBAgIQDpHzR56it3k1iP23BSdZxjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEwMDUwNTAwMDAwMFoXDTEzMDUwNDIzNTk1OVowbTELMAkGA1UE
+BhMCRlIxFTATBgNVBAcTDFZpbGxldXJiYW5uZTEqMCgGA1UECgwhVW5pdmVyc2l0
+w6kgTHlvbiAxIENsYXVkZSBCZXJuYXJkMRswGQYDVQQDExJhdXRoLnVuaXYtbHlv
+bjEuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQD0pbguRU4Yjru0
+zIAA9BAgNnYR2WmyTQHR0PdXmL6Tib/IMoSgZeNH742uP3AYlFsGRqhS0SD28OjB
+ZEbuL+OyZO9UvI6g5XOllI62qnN+J4n3rJP4NpBquUhack3Nch5qOqdHcrBfIANP
++41V991u2SsqCTAEA8mN/rGy/oX+C6OFMKd6WLJv9e1k23WKAi1GOkVz2YaacMhY
+YvXtomDCyMrsU0Nivmh+N6OklZoqha+9XT37/Qr9pEsBw9KhZopx9W5kQzguX27N
+TrVCM4jJZz0INkSWmQ8HraoLO92C5Rj+N2KTojniZ8Yvtc+ID/t4OmHzgM/f/JnN
+TuLPpWslAgMBAAGjggGeMIIBmjAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+kOO57TAdBgNVHQ4EFgQUQjRVTRrWuH87FAYSuQbVGNEixSswDgYDVR0PAQH/BAQD
+AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+MBgGA1UdIAQRMA8wDQYLKwYBBAGyMQECAh0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0
+cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUH
+AQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50ZXJlbmEub3JnL1RF
+UkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29jc3AudGNzLnRlcmVu
+YS5vcmcwVgYDVR0RBE8wTYISYXV0aC51bml2LWx5b24xLmZyghFjYXMudW5pdi1s
+eW9uMS5mcoIRaWRwLnVuaXYtbHlvbjEuZnKCEXNzby51bml2LWx5b24xLmZyMA0G
+CSqGSIb3DQEBBQUAA4IBAQBnCANmoLIMKSGdqNR7PbrAIUXC2O8H4eYs9I+dpHgv
++P52Xlsr5xRE+XH2SQYqdc0MCYuRz/f16AkaQv3QZ8LIWHYbpXAhEQRnPNz7xqHi
+DCqFI4WaxnrOmvvZXiUQSFP8yTLmVHc0jDd45I99lRgxSNTgocZBatK6QIzF4V0R
+xhJiASJIjpShZtNHNKAZ+inJuEzw4dkxxsmAxPadkrGbcatXBYWmuu/CSzkQ7R5F
+Zc9Pfq13d0fZ6k1NqSMN0rVrhbyPGYG1ImK1vhYzGuWtbBmpr8OtzGnAlp84MXP7
+1AMeI4u0CsqPYY5yGurJs5GHV9nsmWhGZrgmg5Yb4dOh
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-lyon1.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-lyon1.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-lyon1.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Lyon 1 - Claude Bernard</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Lyon 1 - Claude Bernard</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>shibboleth@univ-lyon1.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
new file mode 100644
index 00000000..4e68cf6c
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp1.fr.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-montp1.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-02T12:01:22Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Montpellier 1</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEhDCCA2ygAwIBAgIRAKpYore6nLYzJ1HYT2nH1gswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjA5MTgwMDAwMDBaFw0xNTA5MTgyMzU5NTlaMFUxCzAJBgNV
+BAYTAkZSMSIwIAYDVQQKDBlVbml2ZXJzaXTDqSBNb250cGVsbGllciAxMSIwIAYD
+VQQDExlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA1TylXSc95u78Z43vjEaVfFXrimIOL2g92d+HPKapzCFg
+rEZp91lPuKDlo9ryirOCoAvHpAZvkxb8mqqwiyetnRWKr3dawWLH+/TbdURt+oyO
+FLsa+VuQhIMWwfB86pYY5y0fhT1ghrE2w9TJyJxX7GORwcJ4iRXX+IDlaOyZaNhO
+JLo6ORgGUmLwrt7BSEmpuMyK0k5r4w+IcD6XZA7B7K8E/sJcgF8P4jtKSEAo6Rxj
+Udjc/4T8mbkUVWrteB6BQjgedM9iZ0UdBwgggfuH1HTOMYjVw3FcZtxTTbYWTXIC
+lsm6KiHArCyXm2R1BJBbUw8DJLY93mU6H61wpVLrhQIDAQABo4IBbDCCAWgwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFO+5OtvVKUU7
+jC5UIDKWpwe+czr6MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
+AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCQGA1UdEQQdMBuCGWZlZGVy
+YXRpb24udW5pdi1tb250cDEuZnIwDQYJKoZIhvcNAQEFBQADggEBAKl6lJSfuM5j
+6zTCkHtAkEf3mVENsIb+NX6DTTvfpDAWtp8XVxbc4z31PLpwvgprifGeSXqmRK1S
+3OXIOhARSMR2JYr/uJeoN/ihMSrYt980CWTHMXRQFpBjzvLWZj51vQds3akj1WYF
+PeoBbBeQkUQ9N+nN/8D0RbXW+jODNxc31m7YXHHP/mygS2SxcvccGoBpc62w6EV1
+sBOQY3TDmlBIfuv8MUWqlULjhOELiezkhOidHlaYBPEszFzwnKDtCzWlMv39Jbg5
+UUJVZH1qyRe9cvC+LBH/kmXE9pM8j5mTDqmzmYNsYm677gOGflojwgvwHIDg/j2L
+tMVy28FqAhY=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEmjCCA4KgAwIBAgIRAPySCVGZx84C0a/SjMDoFYUwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTEyMTAwMDAwMDBaFw0xMjEyMDkyMzU5NTlaMGsxCzAJBgNV
+BAYTAkZSMRQwEgYDVQQHEwtNb250cGVsbGllcjEiMCAGA1UECgwZVW5pdmVyc2l0
+w6kgTW9udHBlbGxpZXIgMTEiMCAGA1UEAxMZZmVkZXJhdGlvbi51bml2LW1vbnRw
+MS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU8pV0nPebu/GeN
+74xGlXxV64piDi9oPdnfhzymqcwhYKxGafdZT7ig5aPa8oqzgqALx6QGb5MW/Jqq
+sIsnrZ0Viq93WsFix/v023VEbfqMjhS7GvlbkISDFsHwfOqWGOctH4U9YIaxNsPU
+ycicV+xjkcHCeIkV1/iA5WjsmWjYTiS6OjkYBlJi8K7ewUhJqbjMitJOa+MPiHA+
+l2QOweyvBP7CXIBfD+I7SkhAKOkcY1HY3P+E/Jm5FFVq7XgegUI4HnTPYmdFHQcI
+IIH7h9R0zjGI1cNxXGbcU022Fk1yApbJuiohwKwsl5tkdQSQW1MPAyS2Pd5lOh+t
+cKVS64UCAwEAAaOCAWwwggFoMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBTvuTrb1SlFO4wuVCAylqcHvnM6+jAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
+Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
+AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
+Lm9yZzAkBgNVHREEHTAbghlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMA0GCSqG
+SIb3DQEBBQUAA4IBAQBs719Xv+zweuNrvdoss2F0iOkIyyUp9dM5lHKU4gRqfgfo
+liHFw2K2kISgVEFN1LItH22Il/XQI/GmkCA77SIAFH4e56iavZXhLLXrTRItyEy7
+hytw5E1pOoujgA7muJHOVZC9YPKfxM0Jm+/+AYnvg0gx5XztpIhFiJNrfWCsa4B8
+bxjNOQD/A7ABQ8QB8o/SlbOg5JRvdicRxiJ8b1TJ+qC5amcwyIy2kSUKDlUCB5YG
+dxgENHByQ2jDFbk7bab8C0FqCTYvXDC3zVF3O8teAcLVVqgx77rxi0QaiXglSG5O
+blhyWpP4kTIvlkwJhn8FGdWa7UIrQP4W68yhBSIz
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp1.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEhDCCA2ygAwIBAgIRAKpYore6nLYzJ1HYT2nH1gswDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMjA5MTgwMDAwMDBaFw0xNTA5MTgyMzU5NTlaMFUxCzAJBgNV
+BAYTAkZSMSIwIAYDVQQKDBlVbml2ZXJzaXTDqSBNb250cGVsbGllciAxMSIwIAYD
+VQQDExlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEA1TylXSc95u78Z43vjEaVfFXrimIOL2g92d+HPKapzCFg
+rEZp91lPuKDlo9ryirOCoAvHpAZvkxb8mqqwiyetnRWKr3dawWLH+/TbdURt+oyO
+FLsa+VuQhIMWwfB86pYY5y0fhT1ghrE2w9TJyJxX7GORwcJ4iRXX+IDlaOyZaNhO
+JLo6ORgGUmLwrt7BSEmpuMyK0k5r4w+IcD6XZA7B7K8E/sJcgF8P4jtKSEAo6Rxj
+Udjc/4T8mbkUVWrteB6BQjgedM9iZ0UdBwgggfuH1HTOMYjVw3FcZtxTTbYWTXIC
+lsm6KiHArCyXm2R1BJBbUw8DJLY93mU6H61wpVLrhQIDAQABo4IBbDCCAWgwHwYD
+VR0jBBgwFoAUDL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFO+5OtvVKUU7
+jC5UIDKWpwe+czr6MA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1Ud
+JQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAYBgNVHSAEETAPMA0GCysGAQQBsjEB
+AgIdMDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcv
+VEVSRU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0
+cDovL2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUH
+MAGGGmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCQGA1UdEQQdMBuCGWZlZGVy
+YXRpb24udW5pdi1tb250cDEuZnIwDQYJKoZIhvcNAQEFBQADggEBAKl6lJSfuM5j
+6zTCkHtAkEf3mVENsIb+NX6DTTvfpDAWtp8XVxbc4z31PLpwvgprifGeSXqmRK1S
+3OXIOhARSMR2JYr/uJeoN/ihMSrYt980CWTHMXRQFpBjzvLWZj51vQds3akj1WYF
+PeoBbBeQkUQ9N+nN/8D0RbXW+jODNxc31m7YXHHP/mygS2SxcvccGoBpc62w6EV1
+sBOQY3TDmlBIfuv8MUWqlULjhOELiezkhOidHlaYBPEszFzwnKDtCzWlMv39Jbg5
+UUJVZH1qyRe9cvC+LBH/kmXE9pM8j5mTDqmzmYNsYm677gOGflojwgvwHIDg/j2L
+tMVy28FqAhY=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEmjCCA4KgAwIBAgIRAPySCVGZx84C0a/SjMDoFYUwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0wOTEyMTAwMDAwMDBaFw0xMjEyMDkyMzU5NTlaMGsxCzAJBgNV
+BAYTAkZSMRQwEgYDVQQHEwtNb250cGVsbGllcjEiMCAGA1UECgwZVW5pdmVyc2l0
+w6kgTW9udHBlbGxpZXIgMTEiMCAGA1UEAxMZZmVkZXJhdGlvbi51bml2LW1vbnRw
+MS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANU8pV0nPebu/GeN
+74xGlXxV64piDi9oPdnfhzymqcwhYKxGafdZT7ig5aPa8oqzgqALx6QGb5MW/Jqq
+sIsnrZ0Viq93WsFix/v023VEbfqMjhS7GvlbkISDFsHwfOqWGOctH4U9YIaxNsPU
+ycicV+xjkcHCeIkV1/iA5WjsmWjYTiS6OjkYBlJi8K7ewUhJqbjMitJOa+MPiHA+
+l2QOweyvBP7CXIBfD+I7SkhAKOkcY1HY3P+E/Jm5FFVq7XgegUI4HnTPYmdFHQcI
+IIH7h9R0zjGI1cNxXGbcU022Fk1yApbJuiohwKwsl5tkdQSQW1MPAyS2Pd5lOh+t
+cKVS64UCAwEAAaOCAWwwggFoMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ
+47ntMB0GA1UdDgQWBBTvuTrb1SlFO4wuVCAylqcHvnM6+jAOBgNVHQ8BAf8EBAMC
+BaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIw
+GAYDVR0gBBEwDzANBgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRw
+Oi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcB
+AQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5h
+Lm9yZzAkBgNVHREEHTAbghlmZWRlcmF0aW9uLnVuaXYtbW9udHAxLmZyMA0GCSqG
+SIb3DQEBBQUAA4IBAQBs719Xv+zweuNrvdoss2F0iOkIyyUp9dM5lHKU4gRqfgfo
+liHFw2K2kISgVEFN1LItH22Il/XQI/GmkCA77SIAFH4e56iavZXhLLXrTRItyEy7
+hytw5E1pOoujgA7muJHOVZC9YPKfxM0Jm+/+AYnvg0gx5XztpIhFiJNrfWCsa4B8
+bxjNOQD/A7ABQ8QB8o/SlbOg5JRvdicRxiJ8b1TJ+qC5amcwyIy2kSUKDlUCB5YG
+dxgENHByQ2jDFbk7bab8C0FqCTYvXDC3zVF3O8teAcLVVqgx77rxi0QaiXglSG5O
+blhyWpP4kTIvlkwJhn8FGdWa7UIrQP4W68yhBSIz
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://federation.univ-montp1.fr/shibboleth2-idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Montpellier 1</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Montpellier 1</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-admin@univ-montp1.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
new file mode 100644
index 00000000..34abce37
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-montp3.fr.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-montp3.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-03-23T15:18:07Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp3.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Montpellier 3</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEhzCCA2+gAwIBAgIQBUjO9AwbhRtr7tjGUg65IjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTExMDIzNTk1OVowYDELMAkGA1UE
+BhMCRlIxNDAyBgNVBAoMK1VuaXZlcnNpdMOpIGRlIE1vbnRwZWxsaWVyIElJSSBQ
+YXVsLVZhbMOpcnkxGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALZpRdTpeBT0QYYouJQgkJ8LsaGs/23e
+olnt9n23TfoECwAYnGNcK7+SeNPemO7gngsyU07ckiuuaxN19scxvIJ26Zi5a44s
+R1sIBNkTS9WL8bZeTBVZ3cwJMcMU/WyOG0MkzwuWfBSP0IihzvwWILDJgbz0BWTk
+L23+YPeRvsLcymStS9uNc9Cu5ak70LoCN8sEGVEAXilJP85cgMSLyJz33fK0ohsK
+6uIG4RVb8TdsVkZ5uWMAVZuiNKhwEHcLDPXIcZe9q7Wlz0sUrsrnN4GvpWCDk3oJ
+VhKQ95+4OYbC7iBGW7i0WyRNcG8zm0uHjwJAJAGHXKYHjRDcEBDZhFMCAwEAAaOC
+AWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQW
+BBT5oJbLv8ba7NKHSMXohclUTLaclDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
+BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzAN
+BgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
+BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
+MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREE
+FjAUghJpZHAudW5pdi1tb250cDMuZnIwDQYJKoZIhvcNAQEFBQADggEBAIxg44rF
+Ee0d90B3u9ZiGAhDOOKlU1TkVZ0fA7HFq6C+AYafAw9jac4sn8ZnYFZMHgZwvl6z
+OLW97uhQRL5MJ9w3ArZSQvumiD+DwVRn8V7bBN/mzUR/jIl3U4VQ9YcYk3vx2dzw
++YnZGQLJGuiE9wcH5+Z3/oNBw9o5DB8juU9W/H/a2xGksZ8WbUnJW3kfcdIKqclr
+Ev9JomAr2LzGTLq7YTwT9nuN0PgFXNMI/aM3ci5ni9DEfmNdfk1qn7HZLLqLAtPH
+94QXFSgFfkI0r/NMpslNQGn0NKSFItkhJGX5Su0RFEmX8kjNpYt6oPlXW7Vr7389
+9m9urGFyfVe5MQM=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDNDCCAhygAwIBAgIVAJwJ10KIuByUPhJVuj+7HqVzV+6RMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0wOTExMjQxMDE0
+MTNaFw0yOTExMjQxMDE0MTNaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMTccbqO8bGcrHNnBsYU
+BzWltaO1wKAcRrxca80YuL1OFrwtpBWEDgGE6cUPm7cL4ykHd24XzvbjUCNI7NBa
+C9XTU4LNE/A2k4X58Fx4HcQuefKctEun63MxVbjQVrlxH/Z/brtcHp/TSj0sYwNF
+CzBo1My09sCLtKbFNkmVguny94AJNW6MJHZCrud5C7fZLd6/+wJ+WryFhJw1tjxf
+hwsxQ3Y4024PWnHdAfyiLjS7I3AdyvsB0KiHRa8rmf75LxPCe3v6jZjGXbmG0ZUW
+7tQML4PBGm8WJKlXVLOEQnPxLR1kN/+a1ekGuza7jZY3TElPIP1cR3YbAZMD4o1a
+DYsCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnVuaXYtbW9udHAzLmZyhilodHRw
+czovL2lkcC51bml2LW1vbnRwMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+yZI0ysdigysg4IxXXXaXXJnQIxkwDQYJKoZIhvcNAQEFBQADggEBAGDmbv5WKi8X
+sX0lEJDbHWPHv9zV0DEZcgLDyUN6jzLkldcTNhc2nRY718X+CEMZjwUtGjyrZ6Nz
+ZrPxy1UTyhxNKBm6YDATPaI3JAKnEcd9P7I/an8M7dPBVLYYU7NxzILG4s4t8Rxu
+bRtWJ4K9jC1TiBxzd2RBiVEocAKIFceeJfUnpFkn8vEw76TYGF5rmRk6dWoMrjSs
+LhYBU3U0i6D4AqaPiT3/I7g50VJpzta9zid/fYOLcnSUYXIhkszm6dSG5BV3c57y
+MkXSNKdtjN34kK2zYFBN7AuP0uFcY+A17JFhotMTIrddHvqq4vTsnW4TBBJ+ulgu
+MTnHi6+rYEQ=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-montp3.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-montp3.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-montp3.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEhzCCA2+gAwIBAgIQBUjO9AwbhRtr7tjGUg65IjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEyMTAwNTAwMDAwMFoXDTE1MTExMDIzNTk1OVowYDELMAkGA1UE
+BhMCRlIxNDAyBgNVBAoMK1VuaXZlcnNpdMOpIGRlIE1vbnRwZWxsaWVyIElJSSBQ
+YXVsLVZhbMOpcnkxGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBALZpRdTpeBT0QYYouJQgkJ8LsaGs/23e
+olnt9n23TfoECwAYnGNcK7+SeNPemO7gngsyU07ckiuuaxN19scxvIJ26Zi5a44s
+R1sIBNkTS9WL8bZeTBVZ3cwJMcMU/WyOG0MkzwuWfBSP0IihzvwWILDJgbz0BWTk
+L23+YPeRvsLcymStS9uNc9Cu5ak70LoCN8sEGVEAXilJP85cgMSLyJz33fK0ohsK
+6uIG4RVb8TdsVkZ5uWMAVZuiNKhwEHcLDPXIcZe9q7Wlz0sUrsrnN4GvpWCDk3oJ
+VhKQ95+4OYbC7iBGW7i0WyRNcG8zm0uHjwJAJAGHXKYHjRDcEBDZhFMCAwEAAaOC
+AWUwggFhMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdXR+qQ47ntMB0GA1UdDgQW
+BBT5oJbLv8ba7NKHSMXohclUTLaclDAOBgNVHQ8BAf8EBAMCBaAwDAYDVR0TAQH/
+BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwGAYDVR0gBBEwDzAN
+BgsrBgEEAbIxAQICHTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYB
+BQUHMAKGKWh0dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0
+MCYGCCsGAQUFBzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzAdBgNVHREE
+FjAUghJpZHAudW5pdi1tb250cDMuZnIwDQYJKoZIhvcNAQEFBQADggEBAIxg44rF
+Ee0d90B3u9ZiGAhDOOKlU1TkVZ0fA7HFq6C+AYafAw9jac4sn8ZnYFZMHgZwvl6z
+OLW97uhQRL5MJ9w3ArZSQvumiD+DwVRn8V7bBN/mzUR/jIl3U4VQ9YcYk3vx2dzw
++YnZGQLJGuiE9wcH5+Z3/oNBw9o5DB8juU9W/H/a2xGksZ8WbUnJW3kfcdIKqclr
+Ev9JomAr2LzGTLq7YTwT9nuN0PgFXNMI/aM3ci5ni9DEfmNdfk1qn7HZLLqLAtPH
+94QXFSgFfkI0r/NMpslNQGn0NKSFItkhJGX5Su0RFEmX8kjNpYt6oPlXW7Vr7389
+9m9urGFyfVe5MQM=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDNDCCAhygAwIBAgIVAJwJ10KIuByUPhJVuj+7HqVzV+6RMA0GCSqGSIb3DQEB
+BQUAMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5mcjAeFw0wOTExMjQxMDE0
+MTNaFw0yOTExMjQxMDE0MTNaMB0xGzAZBgNVBAMTEmlkcC51bml2LW1vbnRwMy5m
+cjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMTccbqO8bGcrHNnBsYU
+BzWltaO1wKAcRrxca80YuL1OFrwtpBWEDgGE6cUPm7cL4ykHd24XzvbjUCNI7NBa
+C9XTU4LNE/A2k4X58Fx4HcQuefKctEun63MxVbjQVrlxH/Z/brtcHp/TSj0sYwNF
+CzBo1My09sCLtKbFNkmVguny94AJNW6MJHZCrud5C7fZLd6/+wJ+WryFhJw1tjxf
+hwsxQ3Y4024PWnHdAfyiLjS7I3AdyvsB0KiHRa8rmf75LxPCe3v6jZjGXbmG0ZUW
+7tQML4PBGm8WJKlXVLOEQnPxLR1kN/+a1ekGuza7jZY3TElPIP1cR3YbAZMD4o1a
+DYsCAwEAAaNrMGkwSAYDVR0RBEEwP4ISaWRwLnVuaXYtbW9udHAzLmZyhilodHRw
+czovL2lkcC51bml2LW1vbnRwMy5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+yZI0ysdigysg4IxXXXaXXJnQIxkwDQYJKoZIhvcNAQEFBQADggEBAGDmbv5WKi8X
+sX0lEJDbHWPHv9zV0DEZcgLDyUN6jzLkldcTNhc2nRY718X+CEMZjwUtGjyrZ6Nz
+ZrPxy1UTyhxNKBm6YDATPaI3JAKnEcd9P7I/an8M7dPBVLYYU7NxzILG4s4t8Rxu
+bRtWJ4K9jC1TiBxzd2RBiVEocAKIFceeJfUnpFkn8vEw76TYGF5rmRk6dWoMrjSs
+LhYBU3U0i6D4AqaPiT3/I7g50VJpzta9zid/fYOLcnSUYXIhkszm6dSG5BV3c57y
+MkXSNKdtjN34kK2zYFBN7AuP0uFcY+A17JFhotMTIrddHvqq4vTsnW4TBBJ+ulgu
+MTnHi6+rYEQ=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-montp3.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Montpellier 3</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Montpellier 3</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-admin@univ-montp3.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml
new file mode 100644
index 00000000..001a7c8c
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-nantes.fr.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-nantes.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-02-23T15:56:05Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-nantes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Nantes (FRANCE)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Students and staff belonging to University of Nantes</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Nantes</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Etudiants et personnels de l'Université de Nantes</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMzCCAhugAwIBAgIUXhtC9sGfg8MZ1QOlWpmnARmmHMYwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtbmFudGVzLmZyMB4XDTA5MDMzMTA4MTA1
+OVoXDTI5MDMzMTA4MTA1OVowHTEbMBkGA1UEAxMSaWRwLnVuaXYtbmFudGVzLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAktwRMpbzUDURWbJkTiTj
+24JSlknu7dufbohqxC5S5MDGpRx4kZFZFIy+adMWMV/DhS85ggU059xm4PGdoWSd
+nLfYxWNFma2elqpE4ErVbrRyo66m5wP3Xs2VCQQJqcb9YUM5+8yBU04yXAEPYGUv
+QX4R6F2J4K6l2xFlX95aHycjJoAqFq3EPkBs3B8svjK3DWZAYPQP0LbxI1VGvzDn
+Dkl4LrzwOPXTdGuJIQUWULWq1KV/RK9mdTTW7Xm5QBh61U1WQLl3EKJJUD5ziaq0
+KttLIND72IKHWYiU5YgC28J6J31BzI2L/TeKk0jmEJl34G6AJ/T82ulrpLZwzu3o
+1wIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1uYW50ZXMuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtbmFudGVzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBR0
+v7zvoB8/1wVaVqBJiix3/eDmPTANBgkqhkiG9w0BAQUFAAOCAQEAY7x0Byy9iv25
+8QhZ7CAD5B0ewKhgS1UO4wmr5UC9bpCAqLdJ1B0PyMZ1Bx3c/TzGloEBoGfiJLu5
+DXg61rAdqYa4ihIC5hXCpt9l02EWxWXintKDZ07kcG2aama1EBRh0s3usR8QzLyB
+giEcLiXmysSZgy1k/VAx2R5DaHimMFk9vJkTckprB/mSlB4aFFVtfsk6b6dxf0JY
+pF1bmgLeWzeQlAtCz8sNNPwXDvAVbBLLHXnOUa8V9TzhaPlInHHhUs6DLNdGml/9
+fLM8XuyqV7zxR0P8IGEgoEuNDgaBilEU3IeExFo/eOojuKJbQkV9w18Q5cxIzGPR
+9yMUR1nBIg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-nantes.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-nantes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-nantes.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Nantes</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Nantes</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>shibboleth@univ-nantes.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
new file mode 100644
index 00000000..4e41d199
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-paris1.fr.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-paris1.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-30T20:41:43Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université Paris 1 Panthéon-Sorbonne</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Personnels, enseignants, chercheurs, étudiants, hébergés et invités de l'université Paris 1 Panthéon-Sorbonne</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMzCCAhugAwIBAgIUN4OD7GwJor5x7X/cdaXgiF8OElUwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZyMB4XDTA5MDYzMDE4MjIx
+OFoXDTI5MDYzMDE4MjIxOFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7DsGWWjsYm1Rn/nFfrg
+Ff25b3uadZLPdzBgYurzqIDAZ9Sc39MwxchyFmblmFSqb8vLHM36XKESMWUgmCO7
+5GOFv7AsxhbtcXgLVohVKS47ZkTXnSbjg3eUww7s51lirQViAuA8iqRAZvnvPMFa
+JAbiXe54SIuDI7SQlTfNhpWGUaooDMfmHrgMOkB8MFk0nFDfN1oefPGIUtQ4LKXl
+0Ua1paLUFF1Du76lakyiZ+ssZ3EkIy8pN1OssR/3rHmYDfqodgUeexSikB8IsdHp
+rNU+6NKfVzGQiZtjTT1cqMRBU7ElHtGyliuelZTGN2rWV9pxxDMBCVrCqvBM9yym
+PwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1wYXJpczEuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtcGFyaXMxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRs
+oNzyg0MZ2ce2hy2748tOvP/+LTANBgkqhkiG9w0BAQUFAAOCAQEAkyfipm/mh/Kt
+jiFkg7p4oQPJkqoBAMEhv1hNqf+8bWBcbhBwrkJUG/MfR3KWfHgnHexPU6Ri35aF
+NOFN5mNQvM8DSTdKvRhZV5cM9+s5x1WGSCnsBrRE/QcV0nhm5Kozlbkki93nPBOF
+YcX73QCPD/T1ewnjA8Pyh8rPoKrT9nOLAdxyENRCucOaXWMM8SAS3wcEuBPIrWX3
+0MjL6pTwDGdoRCZ36w+hP802gvZMKu6GlRudUVPdKa0DYqDcTicA5drs0TnuQnBU
+Q0868rBTfR4z8pLRKvaADmYGslrdNQaXIK9yzi9qzGFQrBUEKJboWW/6hUR7NXuM
+yutCRUw+eg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-paris1.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-paris1.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-paris1.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris1.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMzCCAhugAwIBAgIUN4OD7GwJor5x7X/cdaXgiF8OElUwDQYJKoZIhvcNAQEF
+BQAwHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZyMB4XDTA5MDYzMDE4MjIx
+OFoXDTI5MDYzMDE4MjIxOFowHTEbMBkGA1UEAxMSaWRwLnVuaXYtcGFyaXMxLmZy
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAk7DsGWWjsYm1Rn/nFfrg
+Ff25b3uadZLPdzBgYurzqIDAZ9Sc39MwxchyFmblmFSqb8vLHM36XKESMWUgmCO7
+5GOFv7AsxhbtcXgLVohVKS47ZkTXnSbjg3eUww7s51lirQViAuA8iqRAZvnvPMFa
+JAbiXe54SIuDI7SQlTfNhpWGUaooDMfmHrgMOkB8MFk0nFDfN1oefPGIUtQ4LKXl
+0Ua1paLUFF1Du76lakyiZ+ssZ3EkIy8pN1OssR/3rHmYDfqodgUeexSikB8IsdHp
+rNU+6NKfVzGQiZtjTT1cqMRBU7ElHtGyliuelZTGN2rWV9pxxDMBCVrCqvBM9yym
+PwIDAQABo2swaTBIBgNVHREEQTA/ghJpZHAudW5pdi1wYXJpczEuZnKGKWh0dHBz
+Oi8vaWRwLnVuaXYtcGFyaXMxLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRs
+oNzyg0MZ2ce2hy2748tOvP/+LTANBgkqhkiG9w0BAQUFAAOCAQEAkyfipm/mh/Kt
+jiFkg7p4oQPJkqoBAMEhv1hNqf+8bWBcbhBwrkJUG/MfR3KWfHgnHexPU6Ri35aF
+NOFN5mNQvM8DSTdKvRhZV5cM9+s5x1WGSCnsBrRE/QcV0nhm5Kozlbkki93nPBOF
+YcX73QCPD/T1ewnjA8Pyh8rPoKrT9nOLAdxyENRCucOaXWMM8SAS3wcEuBPIrWX3
+0MjL6pTwDGdoRCZ36w+hP802gvZMKu6GlRudUVPdKa0DYqDcTicA5drs0TnuQnBU
+Q0868rBTfR4z8pLRKvaADmYGslrdNQaXIK9yzi9qzGFQrBUEKJboWW/6hUR7NXuM
+yutCRUw+eg==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-paris1.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université Paris 1 Panthéon-Sorbonne</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université Paris 1 Panthéon-Sorbonne</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-admin@univ-paris1.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
new file mode 100644
index 00000000..1f5219ea
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-poitiers.fr.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-poitiers.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-18T10:46:20Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-poitiers.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">etu.univ-poitiers.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Poitiers</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEsDCCA5igAwIBAgIQUMcwKhTYAJRU4aUw5HaMrDANBgkqhkiG9w0BAQsFADBk
+MQswCQYDVQQGEwJOTDEWMBQGA1UECBMNTm9vcmQtSG9sbGFuZDESMBAGA1UEBxMJ
+QW1zdGVyZGFtMQ8wDQYDVQQKEwZURVJFTkExGDAWBgNVBAMTD1RFUkVOQSBTU0wg
+Q0EgMjAeFw0xNDEwMjEwMDAwMDBaFw0xNzEwMjAyMzU5NTlaMEkxITAfBgNVBAsT
+GERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEkMCIGA1UEAxMbc2hpYmJvbGV0aC51
+bml2LXBvaXRpZXJzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA
+1RVveanaMybAIRz/nZF/4XqBKU2rMLEbis9diusj/44VXzaRlXcjyfaoZa+SK8bI
+JQVsT/yGXI/WWaqhHXXaB0chqkrYfHZPdoYweFwTjynD1hJUhxamlGSBD30u0BPD
+7jTPKZxYvjwLJqppV9oZsCMSfWTznFotfBtmxIWMlF6bpR5c1foca0IL620MUzLC
+DBz4f0UyiWOL3kOkd4b8OauXR/YwfJiVckJjkk0F5WffPRDnDNj3/pLd+PFbhShS
+qT8gRkx7pF/XlJwTrXZMnQpcSNbY9XF6tkhaaLoA18XC7iWgsOhIjzJbDYuaFRQd
+XGlzCbWkM+dqX+vKPWgy8wIDAQABo4IBdzCCAXMwHwYDVR0jBBgwFoAUW9CKHJoy
+W+C13ZZUG+GGKLD9tr0wHQYDVR0OBBYEFGvidQi286gq4y5V1p4rm72/NncwMA4G
+A1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMB
+BggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6
+BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnVzZXJ0cnVzdC5jb20vVEVSRU5B
+U1NMQ0EyLmNybDBsBggrBgEFBQcBAQRgMF4wNQYIKwYBBQUHMAKGKWh0dHA6Ly9j
+cnQudXNlcnRydXN0LmNvbS9URVJFTkFTU0xDQTIuY3J0MCUGCCsGAQUFBzABhhlo
+dHRwOi8vb2NzcC51c2VydHJ1c3QuY29tMCYGA1UdEQQfMB2CG3NoaWJib2xldGgu
+dW5pdi1wb2l0aWVycy5mcjANBgkqhkiG9w0BAQsFAAOCAQEAP4KsWoHSMRjZYLyu
+BuoF2RGmBsH02+QB9og6g6FBGEzSoFlKTonSOzSINKVI8hLSAG/AH0qEoscIRHkU
+tg1DWMbvz5m6vH3jBX35hjY9W2R2ajE0UBRXAjJG7duQ0t5qb5OlOO8OUcsVp8hq
+fZ321PY8oouA8yDBPL+G1k/Qf5rPZKfTG2l9CTjW3biiKHY8jyJBQIT8UQTFKX2j
+WxJcX4OyP3Ryyoc1e+ElHZdGRjKKpDd24hKUHiBtwaiio4jXRSzVw7dUUblKCMVN
+27h8pxrE4bUEWHkfxXKfWihDx6GPfk+exNY0mhn1Eunh288jAyt96C7uq2rXL9wg
+Yjdn9A==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEhTCCA22gAwIBAgIQBJ1RI0pR2rrSRRLdVKx5rTANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTExMTAyMDAwMDAwMFoXDTE0MTAxOTIzNTk1OVowVTELMAkGA1UE
+BhMCRlIxIDAeBgNVBAoMF1VuaXZlcnNpdMOpIGRlIFBvaXRpZXJzMSQwIgYDVQQD
+ExtzaGliYm9sZXRoLnVuaXYtcG9pdGllcnMuZnIwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQC1XxY06+ZPTDJka2NP1PlhuHEcWC/21H1BsZGGrxbrHlbz
+s4sYedSqLpR3Zt9wsPrkXGnyIenQNG1v5u3UjTSal94cWpkuRJGXHxBzIqFlrgdP
+fFYHn97O4efhzE/vI5tCmX8goWN/o6dTYqCXI2p0zBg/QVmkSWsNbCxj/jx/V2eZ
+70lMqt5HdJKrAEEBx6Tfn1Ru4+8Bq4YovcSMDf72PBvasCxoQVrmeJ9sJhLopv2r
+4+Rp1PTyuHTd1byJCi5/0ljpT83UrTmhJUMwWJxWMA9YMLmOBhIeB6k4/azxdrne
+Dnu9ahLuM9jhzJazuPebmc74IMe17vzclelyx8+7AgMBAAGjggFuMIIBajAfBgNV
+HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUj3qD3F4yQ3cR
+udqfsQda8hqTZ/8wDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQEC
+Ah0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
+RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
+Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
+AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwJgYDVR0RBB8wHYIbc2hpYmJv
+bGV0aC51bml2LXBvaXRpZXJzLmZyMA0GCSqGSIb3DQEBBQUAA4IBAQB35DdMvMd/
+G/GOPo1URiKh4LWbGQ1P6AcYNwuhCMr4DZaiQX00sezEizuAjnFjnc/wax3zaESS
+IvpJEuuAM7rIrwLGm9zcKPhbceus9OiMffWENEB0sKT0fAZBsfuO4Q8akk2EfoUp
+sYq3kH65TYG4BLtYzVdY0MkE/fUxNT97YLoVwFgIglQPhvamLi1xFnEc5H/1mLHQ
+Hg1wq8LaDsoAUv1hG6Oalvl56Sa3y9FIhueUv0Z+kNvvTyK9hHtC1iDRyoLANajH
+ag7GwpQkZHUpuTGM1wrdwNJAN7lcXenuuAivqj6wxk11YMxw/38jH2rKtpXyxdnv
+1eZuFfizJq0c
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.univ-poitiers.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.univ-poitiers.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.univ-poitiers.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Poitiers</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Poitiers</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Duthilleul Benjamin</SurName>
+    <EmailAddress>benjamin.duthilleul@univ-poitiers.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Lionel Lombardi</SurName>
+    <EmailAddress>lionel.lombardi@univ-poitiers.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml
new file mode 100644
index 00000000..78aa2e10
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reims.fr.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-reims.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-27T15:31:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Reims Champagne-Ardenne</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMDCCAhigAwIBAgIVAL2jIgsvdHaiW3jhATYWI0XNX8mEMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LXJlaW1zLmZyMB4XDTA5MDQwOTA3MDY1
+MloXDTI5MDQwOTA3MDY1MlowHDEaMBgGA1UEAxMRaWRwLnVuaXYtcmVpbXMuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAzPcBanTJ7Dz5EJtyHuRo
+jH43UwmGsVSmYXYHCBS5dR/OmxClgdsAnFAfLadx37gO4Ib60Rut5Fj8VzMMNZSY
+7QMoxxswchbFWfeQ+Ouo7f78XFlr3uvrREjdBy6wOG9AKpFdoXN1YqDLmSJ8NUXS
+tLHIqfuG1LQuBGvZeFTd8Aq1KluFbUBlDgJeqfXASR+f+NeRhfi4+/neUsmffOJs
+cF4LLR9htO8wAQ5jqT38g6Mef15m2YbvfbamS1K0gJ+xkUHdfn2QEChXgBUEA07e
+BbhhtyO5hF7NdoDwmChrUwOLa19DzvXsq+NtPFXgNyzhrWDWHcxQyNbqif558Agp
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bml2LXJlaW1zLmZyhihodHRwczov
+L2lkcC51bml2LXJlaW1zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTGzm17
+rh/LTbtXmOsK6s5WTYAj4DANBgkqhkiG9w0BAQUFAAOCAQEAVcEL+y4/0UQ7glis
+R63eyvaAwsHWpxxHgCCOeKLzEUI1psi/vysmlWJa5R/EE+yJZqTvUyGEurZLgIJv
+OFxmQBsasPsFKvrvFvwBDuJsC49sYjQeNw30iro9lGNqsqQ9dzVSrGEgqF67uYeV
+3wDkziL1KeqOs+Rx6m6YFRGsDbkZ6iQ9G7PFvD6XbNkKscox94T768AFvF69hVTJ
+L2xmGFNJLLSoZPnMUL2K3EcXychLRIfAzaK0hRvJUrx8HTcHVmdh477BespRaHsB
+/M7dFoRtQlh4cfry/iAqcvigNqzLB2d2cs52M+VdtWuXnG96iRnCQohf1+u6Tnor
+Eby/Nw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-reims.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-reims.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-reims.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reims.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMDCCAhigAwIBAgIVAL2jIgsvdHaiW3jhATYWI0XNX8mEMA0GCSqGSIb3DQEB
+BQUAMBwxGjAYBgNVBAMTEWlkcC51bml2LXJlaW1zLmZyMB4XDTA5MDQwOTA3MDY1
+MloXDTI5MDQwOTA3MDY1MlowHDEaMBgGA1UEAxMRaWRwLnVuaXYtcmVpbXMuZnIw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCAzPcBanTJ7Dz5EJtyHuRo
+jH43UwmGsVSmYXYHCBS5dR/OmxClgdsAnFAfLadx37gO4Ib60Rut5Fj8VzMMNZSY
+7QMoxxswchbFWfeQ+Ouo7f78XFlr3uvrREjdBy6wOG9AKpFdoXN1YqDLmSJ8NUXS
+tLHIqfuG1LQuBGvZeFTd8Aq1KluFbUBlDgJeqfXASR+f+NeRhfi4+/neUsmffOJs
+cF4LLR9htO8wAQ5jqT38g6Mef15m2YbvfbamS1K0gJ+xkUHdfn2QEChXgBUEA07e
+BbhhtyO5hF7NdoDwmChrUwOLa19DzvXsq+NtPFXgNyzhrWDWHcxQyNbqif558Agp
+AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEWlkcC51bml2LXJlaW1zLmZyhihodHRwczov
+L2lkcC51bml2LXJlaW1zLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBTGzm17
+rh/LTbtXmOsK6s5WTYAj4DANBgkqhkiG9w0BAQUFAAOCAQEAVcEL+y4/0UQ7glis
+R63eyvaAwsHWpxxHgCCOeKLzEUI1psi/vysmlWJa5R/EE+yJZqTvUyGEurZLgIJv
+OFxmQBsasPsFKvrvFvwBDuJsC49sYjQeNw30iro9lGNqsqQ9dzVSrGEgqF67uYeV
+3wDkziL1KeqOs+Rx6m6YFRGsDbkZ6iQ9G7PFvD6XbNkKscox94T768AFvF69hVTJ
+L2xmGFNJLLSoZPnMUL2K3EcXychLRIfAzaK0hRvJUrx8HTcHVmdh477BespRaHsB
+/M7dFoRtQlh4cfry/iAqcvigNqzLB2d2cs52M+VdtWuXnG96iRnCQohf1+u6Tnor
+Eby/Nw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reims.fr/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Reims Champagne-Ardenne</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Reims Champagne-Ardenne</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Monclin Yannick</SurName>
+    <EmailAddress>yannick.monclin@univ-reims.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Canart Arnaud</SurName>
+    <EmailAddress>arnaud.canart@univ-reims.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml
new file mode 100644
index 00000000..fe2fe465
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rennes1.fr.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-rennes1.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-19T16:25:25Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes1.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">University of Rennes 1</mdui:DisplayName>
+        <mdui:Description xml:lang="en">University of Rennes 1</mdui:Description>
+        <mdui:DisplayName xml:lang="fr">Université de Rennes 1</mdui:DisplayName>
+        <mdui:Description xml:lang="fr">Université de Rennes 1</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDUzCCAjugAwIBAgIUAOfkyDP7IZUpxjLBqzh2u2A52aEwDQYJKoZIhvcNAQEF
+BQAwJTEjMCEGA1UEAxMaaWRlbnQtc2hpYi51bml2LXJlbm5lczEuZnIwHhcNMDkw
+MzAyMTE1ODE5WhcNMjkwMzAyMTE1ODE5WjAlMSMwIQYDVQQDExppZGVudC1zaGli
+LnVuaXYtcmVubmVzMS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AIgsyIsKtRo7oQxJsA+lI4Yr616n8irMvAEkvp22Z3Qp891HG5Jz3g7UMOv0ec+F
+LKRLNWoV6+DkM2TZiAji42ltH9pj5t27JhRZ2RMbpOOi37KYGKjUUSK5AVznwutp
+lvW2p4pYCR8TSuZMaFCxjTz4Re43HYLdH/rS1IjKF8LZPV5ymmHJRIEsC50VPx6S
+LLqEz46AxgNWc15oBEvLeBwHKQVC170RLAsFxUjQeuUXVTwaSpd9mwgkbzH28w6p
+dp3q9uAy2iKWXqLUvCIqTuH9u5+iNhnD4ZOYdFb8wW1Ebkbpsb0Vp6Uh64K60n/4
+Q/+mpg/CVGDdOkFppYFATa8CAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRlbnQtc2hp
+Yi51bml2LXJlbm5lczEuZnKGMWh0dHBzOi8vaWRlbnQtc2hpYi51bml2LXJlbm5l
+czEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJWD/tJoDhnkOpuBRxm6nBAi
+AwlPMA0GCSqGSIb3DQEBBQUAA4IBAQAnSdwW+9NJWxtugXueUnfSQttGDOUmQIie
+gUHPCRj8VEbPG6upxZnFC/slOfR+dUeP6hIyCIE1pzqjCe8Lmc9wrKvee3nBPnCf
+gXMbzpVCNYXOMM8DhikOdBwGOfCWsK5cdkDVz5OWHv+gU/kgo1mcN6EQI8rzSi0h
+SvwYWTv/BTnA3R/idih2dS8sZDISLsBJnXtIWZTH28S4NX3sttHZSjyALT2nJbLD
++2Xhef7YCNxkQshmTU9MI7TzdTNBEQS3p82TT9N4oXNVH0WPY3l0YLKBNzQSvNj2
+rkwHcu+LmiqBbNYaIImujo8IZ7laiF30+nPuPGRfCqU7IEjA7cga
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://ident-shib.univ-rennes1.fr/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://ident-shib.univ-rennes1.fr/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://ident-shib.univ-rennes1.fr/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rennes1.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDUzCCAjugAwIBAgIUAOfkyDP7IZUpxjLBqzh2u2A52aEwDQYJKoZIhvcNAQEF
+BQAwJTEjMCEGA1UEAxMaaWRlbnQtc2hpYi51bml2LXJlbm5lczEuZnIwHhcNMDkw
+MzAyMTE1ODE5WhcNMjkwMzAyMTE1ODE5WjAlMSMwIQYDVQQDExppZGVudC1zaGli
+LnVuaXYtcmVubmVzMS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
+AIgsyIsKtRo7oQxJsA+lI4Yr616n8irMvAEkvp22Z3Qp891HG5Jz3g7UMOv0ec+F
+LKRLNWoV6+DkM2TZiAji42ltH9pj5t27JhRZ2RMbpOOi37KYGKjUUSK5AVznwutp
+lvW2p4pYCR8TSuZMaFCxjTz4Re43HYLdH/rS1IjKF8LZPV5ymmHJRIEsC50VPx6S
+LLqEz46AxgNWc15oBEvLeBwHKQVC170RLAsFxUjQeuUXVTwaSpd9mwgkbzH28w6p
+dp3q9uAy2iKWXqLUvCIqTuH9u5+iNhnD4ZOYdFb8wW1Ebkbpsb0Vp6Uh64K60n/4
+Q/+mpg/CVGDdOkFppYFATa8CAwEAAaN7MHkwWAYDVR0RBFEwT4IaaWRlbnQtc2hp
+Yi51bml2LXJlbm5lczEuZnKGMWh0dHBzOi8vaWRlbnQtc2hpYi51bml2LXJlbm5l
+czEuZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJWD/tJoDhnkOpuBRxm6nBAi
+AwlPMA0GCSqGSIb3DQEBBQUAA4IBAQAnSdwW+9NJWxtugXueUnfSQttGDOUmQIie
+gUHPCRj8VEbPG6upxZnFC/slOfR+dUeP6hIyCIE1pzqjCe8Lmc9wrKvee3nBPnCf
+gXMbzpVCNYXOMM8DhikOdBwGOfCWsK5cdkDVz5OWHv+gU/kgo1mcN6EQI8rzSi0h
+SvwYWTv/BTnA3R/idih2dS8sZDISLsBJnXtIWZTH28S4NX3sttHZSjyALT2nJbLD
++2Xhef7YCNxkQshmTU9MI7TzdTNBEQS3p82TT9N4oXNVH0WPY3l0YLKBNzQSvNj2
+rkwHcu+LmiqBbNYaIImujo8IZ7laiF30+nPuPGRfCqU7IEjA7cga
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://ident-shib.univ-rennes1.fr/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Rennes 1</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Rennes 1</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-admin@listes.univ-rennes1.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
new file mode 100644
index 00000000..37f02dff
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-reunion.fr.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-reunion.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-10T15:52:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de la Réunion</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDODCCAiCgAwIBAgIVAL8dyCz520Rx/kdyqcI4TXpOUd79MA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LXJldW5pb24uZnIwHhcNMDkwMzE2MTQz
+OTQ5WhcNMjkwMzE2MTQzOTQ5WjAeMRwwGgYDVQQDExNpZHAudW5pdi1yZXVuaW9u
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWm8P30Q7FaWJ7EX
+QBT412i9UZUVcab0hEu7aVY5y7Oz8SH4Pmnku33as+c1mMb/VC502aU/znQY3neO
+1uI/b/4w1FCPLbB3ZVz9klXGuj6/HSxWqYwCLbQQBlwpGACXsrTBfu8b3tK+MSYD
+K77TXECDQA2U4PFIKnpuBZB6cgJpBORthkKb3tg+oBeWj14CgMz5+2w1ouuRsQ6K
+GiZXf2z1RiqyODnsDst2ml4RrmQzbDFURJ0gdL6qsaUB+SGJqaabo7iYZZKgK/EA
+9+jzXCzG97jAyTyse00LliLMOc5/fAY5GLhkpVV5/9rt0W9mXbbRV4TGA6iaJGKZ
+9Y6CtQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1yZXVuaW9uLmZyhipo
+dHRwczovL2lkcC51bml2LXJldW5pb24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFBbec4spkaLKldRGAyIDjSfMSJzNMA0GCSqGSIb3DQEBBQUAA4IBAQBSjuGF
+qqn1aEmcSAArdDkgvmAZbCnvUeZuHUEdXufrZ6JMYGS742f3A6onSAK0WZmyg0Tf
+bS7YQhEdR3NwlFNhkoCCY0IewEp1pRuKxE+u8VD1372JLCOtIRWTgxvc/VPDdw0C
+UjQmucMfyAn+/mNiR4XRPqOYm1BXvM4RDwTTmYKvaWhUAjnFgr4LTckjS4z6nMfx
+hYC3u9/xmqRAR2bDXeRB4poDfLVXfGKureDZPWw72aPvzjJ4XGf/aaHI3AmL5zmR
+gBZQE0UE++9BzuSgkbANei54g+uo5zgXNgeJT15B9waWhUpo8AMbzOKpXgmCAp51
+FChXMMiPA+POOLIC
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-reunion.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-reunion.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-reunion.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-reunion.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDODCCAiCgAwIBAgIVAL8dyCz520Rx/kdyqcI4TXpOUd79MA0GCSqGSIb3DQEB
+BQUAMB4xHDAaBgNVBAMTE2lkcC51bml2LXJldW5pb24uZnIwHhcNMDkwMzE2MTQz
+OTQ5WhcNMjkwMzE2MTQzOTQ5WjAeMRwwGgYDVQQDExNpZHAudW5pdi1yZXVuaW9u
+LmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqWm8P30Q7FaWJ7EX
+QBT412i9UZUVcab0hEu7aVY5y7Oz8SH4Pmnku33as+c1mMb/VC502aU/znQY3neO
+1uI/b/4w1FCPLbB3ZVz9klXGuj6/HSxWqYwCLbQQBlwpGACXsrTBfu8b3tK+MSYD
+K77TXECDQA2U4PFIKnpuBZB6cgJpBORthkKb3tg+oBeWj14CgMz5+2w1ouuRsQ6K
+GiZXf2z1RiqyODnsDst2ml4RrmQzbDFURJ0gdL6qsaUB+SGJqaabo7iYZZKgK/EA
+9+jzXCzG97jAyTyse00LliLMOc5/fAY5GLhkpVV5/9rt0W9mXbbRV4TGA6iaJGKZ
+9Y6CtQIDAQABo20wazBKBgNVHREEQzBBghNpZHAudW5pdi1yZXVuaW9uLmZyhipo
+dHRwczovL2lkcC51bml2LXJldW5pb24uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0O
+BBYEFBbec4spkaLKldRGAyIDjSfMSJzNMA0GCSqGSIb3DQEBBQUAA4IBAQBSjuGF
+qqn1aEmcSAArdDkgvmAZbCnvUeZuHUEdXufrZ6JMYGS742f3A6onSAK0WZmyg0Tf
+bS7YQhEdR3NwlFNhkoCCY0IewEp1pRuKxE+u8VD1372JLCOtIRWTgxvc/VPDdw0C
+UjQmucMfyAn+/mNiR4XRPqOYm1BXvM4RDwTTmYKvaWhUAjnFgr4LTckjS4z6nMfx
+hYC3u9/xmqRAR2bDXeRB4poDfLVXfGKureDZPWw72aPvzjJ4XGf/aaHI3AmL5zmR
+gBZQE0UE++9BzuSgkbANei54g+uo5zgXNgeJT15B9waWhUpo8AMbzOKpXgmCAp51
+FChXMMiPA+POOLIC
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-reunion.fr/idp/AA"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de la Réunion</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de la Réunion</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-idp@univ-reunion.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml
new file mode 100644
index 00000000..4538e841
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-rouen.fr.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-rouen.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-05-20T15:48:10Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rouen.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Rouen</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDLzCCAhegAwIBAgIUWvf6hiSiI4KjS/n+xqAFPbKt2r0wDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtcm91ZW4uZnIwHhcNMTEwNTE3MDk1NTQz
+WhcNMzEwNTE3MDk1NTQzWjAcMRowGAYDVQQDExFpZHAudW5pdi1yb3Vlbi5mcjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxi7qpcaAsjhQquoELWUEsz
+PZGyg/5lT6KAAfryX17brdK0cQytLZXyqCOsCSYDi8T3dJwrEKUfzMqf4Rvxhzve
+fFB6fz22+RkLHezLuywNpICo3qBntqY9ZiIgBV4X2AS6jt5Szbm18qSL5xoxQ+DA
+93WKffpCeE9eELWRnu5RKxXam10JBUEMfLxEY+e8ToOcoAU8n/nC7ytE8ReXwcWh
+/eqyt3Usf+MwG6qAPNvRvG3quKEcF+7fbpU4RmZz+na49OLoLhoHCyWHdmmL4lIw
+U2jRo+7IjD3DJMG3pUjqnKbsLrhyk4McwuN4TCiC2KhKWGFSnzXcjNfcYZsK3MsC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtcm91ZW4uZnKGKGh0dHBzOi8v
+aWRwLnVuaXYtcm91ZW4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJZ4dOPm
+rji8bFb79aNq2VybCh8RMA0GCSqGSIb3DQEBBQUAA4IBAQADYQEXRdgzmhCNw3RI
+4NCayLgtaaCdwG/sYEzxXss5CQ2t8jRn1yQpXxoGSwtROZM/w/L8gtWjSpUSB8av
+cKdAZBRB5ojESTkd28/tv3jtA1bjt6OeZwjsCr0RRMBN2A12t4BLfSG7VAKGyE+B
+dQ8p2l7xN23XN9sIAxJNcxtK7w85Or6Y8C9iwApqhMihTLWLQPQGSM1pRUKHTInI
+XgsbhADqatOXXzkizis9PK9Tf8jFSl9Hcye3gJrgYnn3F7qxvMGzm1KqmsAG3Xnr
+yxCa3HYJJd9oze0GYQ3AyxViyin1T4daHyQVMRlC4rjCpVd2f0gp6zX37uF8/i4z
+jf6+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-rouen.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-rouen.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-rouen.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-rouen.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDLzCCAhegAwIBAgIUWvf6hiSiI4KjS/n+xqAFPbKt2r0wDQYJKoZIhvcNAQEF
+BQAwHDEaMBgGA1UEAxMRaWRwLnVuaXYtcm91ZW4uZnIwHhcNMTEwNTE3MDk1NTQz
+WhcNMzEwNTE3MDk1NTQzWjAcMRowGAYDVQQDExFpZHAudW5pdi1yb3Vlbi5mcjCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAIxi7qpcaAsjhQquoELWUEsz
+PZGyg/5lT6KAAfryX17brdK0cQytLZXyqCOsCSYDi8T3dJwrEKUfzMqf4Rvxhzve
+fFB6fz22+RkLHezLuywNpICo3qBntqY9ZiIgBV4X2AS6jt5Szbm18qSL5xoxQ+DA
+93WKffpCeE9eELWRnu5RKxXam10JBUEMfLxEY+e8ToOcoAU8n/nC7ytE8ReXwcWh
+/eqyt3Usf+MwG6qAPNvRvG3quKEcF+7fbpU4RmZz+na49OLoLhoHCyWHdmmL4lIw
+U2jRo+7IjD3DJMG3pUjqnKbsLrhyk4McwuN4TCiC2KhKWGFSnzXcjNfcYZsK3MsC
+AwEAAaNpMGcwRgYDVR0RBD8wPYIRaWRwLnVuaXYtcm91ZW4uZnKGKGh0dHBzOi8v
+aWRwLnVuaXYtcm91ZW4uZnIvaWRwL3NoaWJib2xldGgwHQYDVR0OBBYEFJZ4dOPm
+rji8bFb79aNq2VybCh8RMA0GCSqGSIb3DQEBBQUAA4IBAQADYQEXRdgzmhCNw3RI
+4NCayLgtaaCdwG/sYEzxXss5CQ2t8jRn1yQpXxoGSwtROZM/w/L8gtWjSpUSB8av
+cKdAZBRB5ojESTkd28/tv3jtA1bjt6OeZwjsCr0RRMBN2A12t4BLfSG7VAKGyE+B
+dQ8p2l7xN23XN9sIAxJNcxtK7w85Or6Y8C9iwApqhMihTLWLQPQGSM1pRUKHTInI
+XgsbhADqatOXXzkizis9PK9Tf8jFSl9Hcye3gJrgYnn3F7qxvMGzm1KqmsAG3Xnr
+yxCa3HYJJd9oze0GYQ3AyxViyin1T4daHyQVMRlC4rjCpVd2f0gp6zX37uF8/i4z
+jf6+
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-rouen.fr/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Rouen</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Rouen</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>systeme@univ-rouen.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml
new file mode 100644
index 00000000..b70808a5
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-st-etienne.fr.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-st-etienne.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-07-17T14:19:31Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-st-etienne.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Saint-Etienne - Jean Monnet</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDWDCCAkCgAwIBAgIVAM60eJPNg42CHzM+jgGiPUF8XxVEMA0GCSqGSIb3DQEB
+BQUAMCYxJDAiBgNVBAMTG2lwZC10ZXN0LnVuaXYtc3QtZXRpZW5uZS5mcjAeFw0x
+MDAxMjcxMzMzMTNaFw0zMDAxMjcxMzMzMTNaMCYxJDAiBgNVBAMTG2lwZC10ZXN0
+LnVuaXYtc3QtZXRpZW5uZS5mcjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
+ggEBAL/9p3g2bat/dj9BdEBKhJMfh6ruQAb/WENj8VDd69vd0qlg7gBFdcUAlrWu
+lWbGxIGSike4JKk/BflJvJsOw56tqdVOgX574nhz74t7wq3bb4oy4+z6QBU4D4fi
+s81DGmDlYLM+99wTXEeXu6U7MYUoHve76yRLP3tJ/JupT4JVmfWLbmfWpWdaIXTu
+GIMhPPuZ+tlZyVMUy4Yisj1+hxJkC0XbZ/Tt0k/U6ibmFw2RgMZ4e9I/F5XAAuIL
+ntj94ucDfkak5IjzdazgL2hyPhRs5HCl8fM02xH3Hiy54o6/ol4Bht3KUotnQ7hf
+dYDxIxHdAkHqDx7rQuSpyTSZckECAwEAAaN9MHswWgYDVR0RBFMwUYIbaXBkLXRl
+c3QudW5pdi1zdC1ldGllbm5lLmZyhjJodHRwczovL2lwZC10ZXN0LnVuaXYtc3Qt
+ZXRpZW5uZS5mci9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU71M58iX9SWskgRx3
+iaqLJvvFm+swDQYJKoZIhvcNAQEFBQADggEBAKcebag8459paefinfIIkTj5eZPx
+7PMt8G3Qn2wdSOCdUqi+wB/ouR9R005RJe2MEZgixUNc2umwTZuO3MR5Rc4+TjyI
+XzRKyPJ2OmxEL3ly8pKUd0a3fXJZTOikICLLYezOdV2V/QLheIvMfZlhZ1uUhVGB
+0uoJRHu/zdhfGClj4eYML47y5EanadjY3nQ91GcDYxFeEFIGtcy+xp+CbEeFeqEH
+J/tcRGvcPSvO9TGVGz+0YVsDmcGrfiHcokztEZ6Z7ADLep/iXMTpS331wYizQ7Oc
+I5j1CmAlzfvcYGPy6fOMCjINmd75Sez4RvGbVAQE/tRIM+6ButzQ6Lymrk4=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIC4TCCAkqgAwIBAgIJAKP6b3sDhrcdMA0GCSqGSIb3DQEBBQUAMFUxEjAQBgoJ
+kiaJk/IsZAEZFgJGUjEeMBwGCgmSJomT8ixkARkWDlVOSVYtU1QtRVRJRU5FMR8w
+HQYDVQQDExZpZHAudW5pdi1zdC1ldGllbm5lLmZyMB4XDTEwMDIwNTE0MjkzNVoX
+DTMwMDEzMTE0MjkzNVowVTESMBAGCgmSJomT8ixkARkWAkZSMR4wHAYKCZImiZPy
+LGQBGRYOVU5JVi1TVC1FVElFTkUxHzAdBgNVBAMTFmlkcC51bml2LXN0LWV0aWVu
+bmUuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAK230ru2DZhNVr4lLk97
+HkWLsOkkO5aBM7H6APtlLV7UAKcxPk9sOnDcbe/xtONRGBhPtFoiW2MmyywbrJkc
+afOmUQnOvAbs3n/4lDwdecln+BjTpvU+n6xr7TDzCdV+gOcG6N2kF3pGHpPSvEHi
+3ZrO0AInO/PFfy/ycbdiAl1hAgMBAAGjgbgwgbUwHQYDVR0OBBYEFHSHvTF7w+i2
+SyZzd/bSNCg0VAWUMIGFBgNVHSMEfjB8gBR0h70xe8Potksmc3f20jQoNFQFlKFZ
+pFcwVTESMBAGCgmSJomT8ixkARkWAkZSMR4wHAYKCZImiZPyLGQBGRYOVU5JVi1T
+VC1FVElFTkUxHzAdBgNVBAMTFmlkcC51bml2LXN0LWV0aWVubmUuZnKCCQCj+m97
+A4a3HTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAHynvHowT2/OUT69
+1iIuxxfOmCxO5EgELXu8rELm2TZqMoFrrnTI0KjJuI8biewAaz502Fl8sJU0AiPd
+9OKy/g/dfPh8JsUiUfimXwjLr+x0o0R0a3MPUt9v+KpdB/p59Taa3zSHn0nJhc6o
+Uo0ryH7NTSXhOWxZyz9Mao/M9HHX
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-st-etienne.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-st-etienne.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-st-etienne.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Saint-Etienne - Jean Monnet</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Saint-Etienne - Jean Monnet</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Murgue Thierry</SurName>
+    <EmailAddress>thierry.murgue@univ-st-etienne.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Valeille Jean-François</SurName>
+    <EmailAddress>jean.francois.valeille@univ-st-etienne.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml
new file mode 100644
index 00000000..d4105eb1
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-tln.fr.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-tln.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-09-28T11:55:09Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-tln.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université du Sud Toulon Var</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDQzCCAiugAwIBAgIURrZcRMW1GJitmEg2t0KC308pj88wDQYJKoZIhvcNAQEF
+BQAwITEfMB0GA1UEAxMWZmVkZXJhdGlvbi51bml2LXRsbi5mcjAeFw0wOTA5MDYx
+OTIyNDFaFw0yOTA5MDYxOTIyNDFaMCExHzAdBgNVBAMTFmZlZGVyYXRpb24udW5p
+di10bG4uZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCv3ysyMoZY
+CtKudxYcuuSgnBe7k0bF/kNt+EeszFZt7XviNAi50wIAvqt0J4yd43v1SJ9rL2XD
+pWeC4Xdxblp0yn5DVqnSbmM9ySSocYEhZK32Jo2qidk3KB981R1GaSE74DNxSC5F
+MxnNq39Jx8tDEGi+9sEXLU4nRqkznuB0NiDIprehTk5nrrH8LyiC4mBVnTWHlaVN
+oycrr9bfVm/4lXePYEBQFec1q509Mdi6v9+8rb/WSVXEhmmjtKAJGm1Sx3mi2GlY
+o0cMIraJqYMyKxy6y4uLzx/EpFxjDD1WG4w9qz47BXJ6yELqZftPfSrYyuhxV0u3
+3kGdY9pn6bpvAgMBAAGjczBxMFAGA1UdEQRJMEeCFmZlZGVyYXRpb24udW5pdi10
+bG4uZnKGLWh0dHBzOi8vZmVkZXJhdGlvbi51bml2LXRsbi5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUlfrA9u+WyKMcIN3NB1/XDYtdLl8wDQYJKoZIhvcNAQEF
+BQADggEBAATpBMb4mUELL5uZ3FvMdEtGK23nRU8SSTmqt3rypazcMlWevgq60mHm
+CBD4E+bFvvKMAWUx3+jpQzbV2M7I2OMto95G4MVTEnr+vugeQHEDcWIBUo5yjLb6
+4qDZ8YWBmzSE/iV8Pbx+6RsLgPcTfXzbClZO/stfspDJhwCrLuMv36xCQcm88Y5Z
+eHcjM5wZ+FrykOxUsv663wJowcCE0aRkAUnyg1rUfYy4sRJh3EP/MXQpb4/ePTCg
+lAu3e0usivWcDm0/WX2N6oA9cp0sUsegYtoBY7tmPtml4yMRODG7ZSDqUmLlB3PZ
+FIrOgN1sOW6bInYYilkc/7jjHW5T6AQ=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://federation.univ-tln.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://federation.univ-tln.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://federation.univ-tln.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université du Sud Toulon Var</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université du Sud Toulon Var</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>federation@univ-tln.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml
new file mode 100644
index 00000000..cd216be6
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-ubs.fr.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-ubs.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-09T16:11:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-ubs.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Bretagne Sud</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDJzCCAg+gAwIBAgIUQf+bgYI+pflZTXe6Sw+Ijq7sDuwwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLnVuaXYtdWJzLmZyMB4XDTA5MDMyNjA5MzUxM1oX
+DTI5MDMyNjA4MzUxM1owGjEYMBYGA1UEAxMPaWRwLnVuaXYtdWJzLmZyMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAzjVVD6f/m26YrFIXqyAhIIZOl5Jy
+KT/06NrJReinTL27+4mGRcK2Hy3CN412n3FLUlSra1E+1KtgdSXLGH0aipopxsF1
+4tNnr7XUGzX3jYLwEf9JAvMjkrmfg6XV+tRM0aEVhbk6T/0kSUVSu0OuY1OtnWMX
+tEOI5lxBIFiiF2IjkzXfT3IXtn43BLurAtwGEjVcU/h9p4XKAv1vXDnSZIYMV68h
+Rfnt37Jbk4MOZC5G/b6ruegAWylpZ6/xd3eToWiTf6jf7cTL1rvVCBshyumkgF1z
+GUzmsUPIieAO2K1cAj6YSYO39Ya+TSpwmeGHfHU2ptmm0Pg+3FgVcQd0vQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAudW5pdi11YnMuZnKGJmh0dHBzOi8vaWRwLnVu
+aXYtdWJzLmZyL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBRJzRQHNoeR8yfWTVGV
+cZxCUNFlVTANBgkqhkiG9w0BAQUFAAOCAQEAoKKviDAjDppeG/HLfBnHEGk3huwy
+QS7vwSXR8iQCkJeFzYJbQNW3C0pZ3gbTjXEwR8a7zyLm08LNTJy1b03oHEZvLf+5
+ozxzL0Sj0L8eH/Edra2le2VYp7OpAIKXbktQ7tov7OrNjwvnEThp4emd6ffMNKBy
+tuagpJOU3yH1CJ1aV9Za1cvobQJryWlwGgvw2Z2ALFs5/BT435lBJbMjuNAR9mC8
+GKrzVJxuCZuaFkCNIGIA2lPmHA755Vf5rKi2/4A+qBzN9XJc1RBzTlg9PF1WQzb3
+KsqVsaQhhLja8zwz5NlpcXN89WMIL/Bg6T3t5KN4ajbKbWxX/7uMAVsEUw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-ubs.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-ubs.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-ubs.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Bretagne Sud</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Bretagne Sud</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-admin@univ-ubs.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml
new file mode 100644
index 00000000..42c1323a
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-univ-valenciennes.fr.xml
@@ -0,0 +1,151 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:univ-valenciennes.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-04-17T13:52:02Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-valenciennes.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Valenciennes</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDSzCCAjOgAwIBAgIUf/+c8ye6SzH67ieu864mtMPYXlswDQYJKoZIhvcNAQEF
+BQAwIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMB4XDTA5MTAx
+MzEzMTA0M1oXDTI5MTAxMzEzMTA0M1owIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFs
+ZW5jaWVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhhYP
+J3k8hdOdhcye6mC5zPykjAy9JesMuIR/AYr+tWUpeYNbQeVPyMiqQduhBO08Z1Tz
+sRV/hsuIYv3eD5O+DXFn6U+sY63CzxQrIQ1SC+hIMlzdw7yvdnlkBodgZg6J7LjF
+bpJvpwhtFp84cxy0g/s6oUy/CUg4gMWwnsoah+dacay1GSvqOHo1lu9pdptHmK7h
+VGL5DAsw3Mt3Lb5KK9DlLffd6umayoI9f7Gt8Kouxa1HURuiebxRHmDDJXdzNZ94
+6IzRoFE3SUi1z3iGVDv8TDp1XLSUhNdYR8Plm84GHs03F3hIU1MKxEscFTd/U4zs
+hqKfK/mRqE7OvydIRQIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudW5pdi12YWxl
+bmNpZW5uZXMuZnKGL2h0dHBzOi8vaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBTNbFHRtwU+XlpYz+rxvTgavdfoJTANBgkq
+hkiG9w0BAQUFAAOCAQEAb+WTNz5aJNRd/eYTsbgcd/zQLxPssQUgIfW35D2l37r5
+uUI/lTvzCS/XGjleZirVlg1I2BcuLyKNXbyc29OYjWXABBZ3pGX4BD3K+/xEMGwN
+XMQWw4ZdDDfU9Q7jqRog9WIuOcTb/7fRthOOdRPxOnUdl+XfpAqcqpYGPnqX+mXk
+VRZHYIjjVYLKY1Ye3jUPg3n4/hldWYSy2TxMlMbudAV01tb5jzz3k4c/AwzA5Q9i
+sch9WHg5TO5d2L1B6b44aMkefP9u+GBNaLZx1B+hb2b6ZCkxHojPHVeUSi1Hpz17
+lHNKGM/S8lXO2ADLPujRZnzHaBVAwxxAlSgX+PHvqw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIELjCCAxagAwIBAgILAQAAAAABHCKPrcgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
+MDkwMjEwMTU1M1oXDTExMDkwMjEwMTU1M1owVTELMAkGA1UEBhMCRlIxIzAhBgNV
+BAoTGlVuaXZlcnNpdGUgZGUgVmFsZW5jaWVubmVzMSEwHwYDVQQDExhpZHAudW5p
+di12YWxlbmNpZW5uZXMuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANSf
+5C9eFVHbRpt28W4z/U+bm/VvkgHNdQEZPQ2pqXEEu+iNKJaG8lybcidsRyYvhZ14
+6ZYizS5LqJNSidHTmOTl+YPLvlp8vJlTMGHtPSKQ4VMW00SXyR3aSNW1o6BPYsbH
+QJrymiW258t3vucIJXhvxFUf4Lu/inXi1BbdzJMPAgMBAAGjggF3MIIBczBQBgNV
+HSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9i
+YWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8G
+A1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBSU9Be0EaWm
+H7oW2x/Lx7QpYKy1dTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2Jh
+bHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYB
+BQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNh
+dGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIwYDVR0R
+BBwwGoIYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMA0GCSqGSIb3DQEBBQUAA4IB
+AQArisANwDwXThEFPPcPSkY0cu9T/j2CpNRBGTqoJoT7LRh1/99B3LRRw0b9l/IO
+WuJKRxMLzbPjluyIs60LAzCXqbztIB41TgwzeyiHAEo3osVehBR4gFHialPVngDv
+r9UfbLCo796mLEXz437DiDEyGfTexppm/BFKNJNnb2TvlzKtGHFs78NYXHTeBHvs
+F2XJpzo8oyTFKRpjM5hWwLNCRina0Clsu07wcMEFtt8VQe7Kuy6eeR87HB/jVLIy
+NxraMQwWgk4zdVwLLxVBKpz2G67WvqI4vVqjcvavJY7rdKbvV9ImXWltKuJsh8ZU
+UxhrIap6n+MSA85kMvjxjmUG
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.univ-valenciennes.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.univ-valenciennes.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-valenciennes.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDSzCCAjOgAwIBAgIUf/+c8ye6SzH67ieu864mtMPYXlswDQYJKoZIhvcNAQEF
+BQAwIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMB4XDTA5MTAx
+MzEzMTA0M1oXDTI5MTAxMzEzMTA0M1owIzEhMB8GA1UEAxMYaWRwLnVuaXYtdmFs
+ZW5jaWVubmVzLmZyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAhhYP
+J3k8hdOdhcye6mC5zPykjAy9JesMuIR/AYr+tWUpeYNbQeVPyMiqQduhBO08Z1Tz
+sRV/hsuIYv3eD5O+DXFn6U+sY63CzxQrIQ1SC+hIMlzdw7yvdnlkBodgZg6J7LjF
+bpJvpwhtFp84cxy0g/s6oUy/CUg4gMWwnsoah+dacay1GSvqOHo1lu9pdptHmK7h
+VGL5DAsw3Mt3Lb5KK9DlLffd6umayoI9f7Gt8Kouxa1HURuiebxRHmDDJXdzNZ94
+6IzRoFE3SUi1z3iGVDv8TDp1XLSUhNdYR8Plm84GHs03F3hIU1MKxEscFTd/U4zs
+hqKfK/mRqE7OvydIRQIDAQABo3cwdTBUBgNVHREETTBLghhpZHAudW5pdi12YWxl
+bmNpZW5uZXMuZnKGL2h0dHBzOi8vaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyL2lk
+cC9zaGliYm9sZXRoMB0GA1UdDgQWBBTNbFHRtwU+XlpYz+rxvTgavdfoJTANBgkq
+hkiG9w0BAQUFAAOCAQEAb+WTNz5aJNRd/eYTsbgcd/zQLxPssQUgIfW35D2l37r5
+uUI/lTvzCS/XGjleZirVlg1I2BcuLyKNXbyc29OYjWXABBZ3pGX4BD3K+/xEMGwN
+XMQWw4ZdDDfU9Q7jqRog9WIuOcTb/7fRthOOdRPxOnUdl+XfpAqcqpYGPnqX+mXk
+VRZHYIjjVYLKY1Ye3jUPg3n4/hldWYSy2TxMlMbudAV01tb5jzz3k4c/AwzA5Q9i
+sch9WHg5TO5d2L1B6b44aMkefP9u+GBNaLZx1B+hb2b6ZCkxHojPHVeUSi1Hpz17
+lHNKGM/S8lXO2ADLPujRZnzHaBVAwxxAlSgX+PHvqw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIELjCCAxagAwIBAgILAQAAAAABHCKPrcgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
+MDkwMjEwMTU1M1oXDTExMDkwMjEwMTU1M1owVTELMAkGA1UEBhMCRlIxIzAhBgNV
+BAoTGlVuaXZlcnNpdGUgZGUgVmFsZW5jaWVubmVzMSEwHwYDVQQDExhpZHAudW5p
+di12YWxlbmNpZW5uZXMuZnIwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANSf
+5C9eFVHbRpt28W4z/U+bm/VvkgHNdQEZPQ2pqXEEu+iNKJaG8lybcidsRyYvhZ14
+6ZYizS5LqJNSidHTmOTl+YPLvlp8vJlTMGHtPSKQ4VMW00SXyR3aSNW1o6BPYsbH
+QJrymiW258t3vucIJXhvxFUf4Lu/inXi1BbdzJMPAgMBAAGjggF3MIIBczBQBgNV
+HSAESTBHMEUGByqGSLE+AQAwOjA4BggrBgEFBQcCARYsaHR0cDovL3d3dy5nbG9i
+YWxzaWduLm5ldC9yZXBvc2l0b3J5L2Nwcy5jZm0wDgYDVR0PAQH/BAQDAgWgMB8G
+A1UdIwQYMBaAFGVloz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBSU9Be0EaWm
+H7oW2x/Lx7QpYKy1dTA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2Jh
+bHNpZ24ubmV0L2VkdWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYB
+BQUHMAKGM2h0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNh
+dGlvbmFsLmNydDAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwIwYDVR0R
+BBwwGoIYaWRwLnVuaXYtdmFsZW5jaWVubmVzLmZyMA0GCSqGSIb3DQEBBQUAA4IB
+AQArisANwDwXThEFPPcPSkY0cu9T/j2CpNRBGTqoJoT7LRh1/99B3LRRw0b9l/IO
+WuJKRxMLzbPjluyIs60LAzCXqbztIB41TgwzeyiHAEo3osVehBR4gFHialPVngDv
+r9UfbLCo796mLEXz437DiDEyGfTexppm/BFKNJNnb2TvlzKtGHFs78NYXHTeBHvs
+F2XJpzo8oyTFKRpjM5hWwLNCRina0Clsu07wcMEFtt8VQe7Kuy6eeR87HB/jVLIy
+NxraMQwWgk4zdVwLLxVBKpz2G67WvqI4vVqjcvavJY7rdKbvV9ImXWltKuJsh8ZU
+UxhrIap6n+MSA85kMvjxjmUG
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.univ-valenciennes.fr:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Valenciennes</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Valenciennes</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>fed-admin@univ-valenciennes.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml
new file mode 100644
index 00000000..69382bd5
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utc.fr.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:utc.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-06-04T14:19:04Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utc.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">UTC - Université de Technologie de Compiègne</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDEzCCAfugAwIBAgIUUqqJXvb5AbgkDCOIeaTw+AhDKzQwDQYJKoZIhvcNAQEF
+BQAwFTETMBEGA1UEAxMKaWRwLnV0Yy5mcjAeFw0xMDA4MjUxMTQ5MDZaFw0zMDA4
+MjUxMTQ5MDZaMBUxEzARBgNVBAMTCmlkcC51dGMuZnIwggEiMA0GCSqGSIb3DQEB
+AQUAA4IBDwAwggEKAoIBAQCojFMzoxsidrJQ9wH9yaoI8+/iIHmuJltBFTNRmoY/
+XkUy/F+C8DW1O+eTIx8LG9d3NnviN/tVM7IxKez9D5V6lCfEiOPmmHiPc13LFC+G
+v6rwF5tc6mEf66xubrqCGt3VKH8ywQ5iBfKmvpzvduKI/0K3c3a+l6kzp55AdVxV
+Y/O29zkDy0FcBF4ubfOG8PMhA8n7Siba5/S7S4jm2RcJgDD0XSyBLpCoKXy7KKHm
+25wuzaOYZqlYUspdKqw8CHZjT6dxA9Lqg9o2PxBDQdlKuexpEkdSHrE43hisiEVp
+UgDmh4qWqnKpVrQ8auO4mun0FXGiwppLOOy2PXM0KUwVAgMBAAGjWzBZMDgGA1Ud
+EQQxMC+CCmlkcC51dGMuZnKGIWh0dHBzOi8vaWRwLnV0Yy5mci9pZHAvc2hpYmJv
+bGV0aDAdBgNVHQ4EFgQUR6AWFGlHjGLErFUx+0BoK7+w85QwDQYJKoZIhvcNAQEF
+BQADggEBAF7QWy+SJcgFefxn7IJE6bPUhgiFUkesUd46sudhxT3oxF/17TXqogdN
+ezuRx9wXOcPrFkW2cEe7aTkDsFPukkwo2BYc2m9dREfuotl6pI73CsVvYXEjmTY3
+mGTNKVxb7j2dc9EfJEsTOXc0J7d2S+T92CB4rZ+wC2fj21G4/WQ30lXooXy/kvdW
+327nk2WhrA21GfxVga3DRe4N5WTZG/2j2XCfa+TxXGTW66qJ86fB5ormrVFC4ofL
+oUcxy/ZBMc0HizwoTm7s1siWvszzg2kzOgdywf98wghDNKJ2AtsEZ17KouVxhvDk
+hChKBBWarG/QuOFPQPpaPOLrhW//PAU=
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIEpzCCA4+gAwIBAgIRANd0mx2mkE7UNMEtPiP7uCUwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMDAxMDYwMDAwMDBaFw0xMzAxMDUyMzU5NTlaMIGDMQswCQYD
+VQQGEwJGUjESMBAGA1UEBxMJQ09NUElFR05FMTcwNQYDVQQKDC5VVEMgLSBVbml2
+ZXJzaXTDqSBkZSBUZWNobm9sb2dpZSBkZSBDb21wacOoZ25lMQ8wDQYDVQQLEwZE
+U0ktU1IxFjAUBgNVBAMTDWN5Z251cy51dGMuZnIwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQCfzE1gPe7FIJZn0JPMyeIvqCDe51rVuVzTi9IbzO9LwHWN
+JJZkyCkK1bDRgKJUo/VO49814N1N4G4onuwIDau3cOyxoFBP9HqCDLAXwOA5KPFS
+aZ2onp2T2eWz7KG80J0YoVvOf0eB0ybRaS/ieKq7Z6IYQqSOSv6YDUq2ii+LRqf8
+2MihOcVch71VCSWwQBAxvk29h6/i4vzbRTgxYTepR9YiIzSXJkCkhVwqTrmenYzK
+3DJJcyVutm3V5NfOqP3HXlaFvmhwtir8KupIGU1LPXAdQFgTUZnvzyA0JBeSbghA
+pHcwdrL+euqo59WOfqSXjOjlEaTXL6D0WqlGdxGLAgMBAAGjggFgMIIBXDAfBgNV
+HSMEGDAWgBQMvZNoDPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUsja5CEnf5Buw
+Av4vEgeVrygsJNIwDgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0l
+BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMBgGA1UdIAQRMA8wDQYLKwYBBAGyMQEC
+Ah0wOgYDVR0fBDMwMTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9U
+RVJFTkFTU0xDQS5jcmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRw
+Oi8vY3J0LnRjcy50ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcw
+AYYaaHR0cDovL29jc3AudGNzLnRlcmVuYS5vcmcwGAYDVR0RBBEwD4INY3lnbnVz
+LnV0Yy5mcjANBgkqhkiG9w0BAQUFAAOCAQEAIcSJcfcR9Z7gMcOOGl/NjVBZklF0
+ATUKJTb7Dr0cJRPTHfEANWNsn3eQSHwf2y+p7ukyGL6PXEngsEDm+CavxamVbGB2
+9cknfnrden8tYy924dq2uwxniWuNoIHuoEXrK1/tj126PYAWPLZgs2WAbw/+hGpM
+ar9vD4k5grT+DwTqh9GiAIh3EQXj11e03h0fhVlHa/WpbD8zMQLSy7KiLfAVUJmk
+mhQLQG+GOfNlx3IujS9j/7gE2cI5OTBUrImHjPH41SHCVF8ZOqzyg1v0Xc7JYgTj
+70kZXvt58HpgN/IqMlNyBtYCRE5+SVCIaX4bEA0qyOTKwLEZIwZNh3LWQw==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.utc.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.utc.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.utc.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">UTC - Université de Technologie de Compiègne</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">UTC - Université de Technologie de Compiègne</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>David Lewis</SurName>
+    <EmailAddress>david.lewis@utc.fr</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <SurName>Jean-Marc Berenguier</SurName>
+    <EmailAddress>jmb@utc.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml
new file mode 100644
index 00000000..ac330d99
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-cru.fr-federation-utt.fr.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:cru.fr:federation:utt.fr">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://federation.renater.fr/" registrationInstant="2009-08-14T19:52:27Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utt.fr</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="fr">Université de Technologie de Troyes</mdui:DisplayName>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMDCCAhigAwIBAgIVALZ63CJZA7jvuPJPdCpjCqCwtzUcMA0GCSqGSIb3DQEBBQUAMBwxGjAY
+BgNVBAMTEXNoaWJib2xldGgudXR0LmZyMB4XDTA5MDgxMzE1Mzc0NVoXDTI5MDgxMzE1Mzc0NVow
+HDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dHQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDRy7HRMvRk5btG8GGPHKQVA6k3fFlikIFGHJx+B7Uo+kNdQInrMcixfhrqY8bnu66ljQKB
+vZ0yMEZfXJTofRfqBePOgtHEwLcgqQm68kRr4q8oLUdS/+XpK4EdPW6UIrFmA1KkcOfC/Jysn4f7
+KoFKDpTFmNnl7TGVu9GM/tl3yKGFEbuH8kNvG3uaJJVC59ZE2s/xoMcslriXytje2WP4F95DEYVn
+ddkYaw86ZHjjxVumcz7nndInsI8j5EVseK8Ch7cSqlmNA44GJ0kdikv4CphntgBIOvoG2ZvvAIW4
+DGFdMhZieqtwQ2FEKRxAujWY/Sxq6Zsd5anLj7DL8s09AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNo
+aWJib2xldGgudXR0LmZyhihodHRwczovL3NoaWJib2xldGgudXR0LmZyL2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBSt5O7Bubm1wxc8OOwz6hgpfVwMtTANBgkqhkiG9w0BAQUFAAOCAQEApDpM7DKM
+7GJs3m+yjN9xIaAVIIUAe+pcIybt8E02fa4+QVaB2RdPvCTgL3cfLZ2ONMEbMqYlWJz0J41P/TaZ
+x4Sxqv/ih2F1pmFks5UUaMbapNzOX3lL1FfBc718kTLAPLt4m9Gm741A/kx83CS0Q2U4mLXp8I5f
+fYMgN8FRoxHJOGsBSGs11nl32pzAiai069ZutsSp2mdyRovyNHS2Oxdumai87AHr1JiC3C8mwvQm
+Sh/3RmGTbPNeXL1AL2zzeKPcSqsEISEVUNbqQFKs37kcfAvy05jGGcfNHtq5GALqx/qhBeXMiVEB
+BcaKxmhZ8LPhUPppbcjFuLXlaNAphQ==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://shibboleth.utt.fr/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://shibboleth.utt.fr/idp/profile/SAML2/Redirect/SSO"/>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://shibboleth.utt.fr/idp/profile/Shibboleth/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">utt.fr</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+					      MIIDMDCCAhigAwIBAgIVALZ63CJZA7jvuPJPdCpjCqCwtzUcMA0GCSqGSIb3DQEBBQUAMBwxGjAY
+BgNVBAMTEXNoaWJib2xldGgudXR0LmZyMB4XDTA5MDgxMzE1Mzc0NVoXDTI5MDgxMzE1Mzc0NVow
+HDEaMBgGA1UEAxMRc2hpYmJvbGV0aC51dHQuZnIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
+AoIBAQDRy7HRMvRk5btG8GGPHKQVA6k3fFlikIFGHJx+B7Uo+kNdQInrMcixfhrqY8bnu66ljQKB
+vZ0yMEZfXJTofRfqBePOgtHEwLcgqQm68kRr4q8oLUdS/+XpK4EdPW6UIrFmA1KkcOfC/Jysn4f7
+KoFKDpTFmNnl7TGVu9GM/tl3yKGFEbuH8kNvG3uaJJVC59ZE2s/xoMcslriXytje2WP4F95DEYVn
+ddkYaw86ZHjjxVumcz7nndInsI8j5EVseK8Ch7cSqlmNA44GJ0kdikv4CphntgBIOvoG2ZvvAIW4
+DGFdMhZieqtwQ2FEKRxAujWY/Sxq6Zsd5anLj7DL8s09AgMBAAGjaTBnMEYGA1UdEQQ/MD2CEXNo
+aWJib2xldGgudXR0LmZyhihodHRwczovL3NoaWJib2xldGgudXR0LmZyL2lkcC9zaGliYm9sZXRo
+MB0GA1UdDgQWBBSt5O7Bubm1wxc8OOwz6hgpfVwMtTANBgkqhkiG9w0BAQUFAAOCAQEApDpM7DKM
+7GJs3m+yjN9xIaAVIIUAe+pcIybt8E02fa4+QVaB2RdPvCTgL3cfLZ2ONMEbMqYlWJz0J41P/TaZ
+x4Sxqv/ih2F1pmFks5UUaMbapNzOX3lL1FfBc718kTLAPLt4m9Gm741A/kx83CS0Q2U4mLXp8I5f
+fYMgN8FRoxHJOGsBSGs11nl32pzAiai069ZutsSp2mdyRovyNHS2Oxdumai87AHr1JiC3C8mwvQm
+Sh/3RmGTbPNeXL1AL2zzeKPcSqsEISEVUNbqQFKs37kcfAvy05jGGcfNHtq5GALqx/qhBeXMiVEB
+BcaKxmhZ8LPhUPppbcjFuLXlaNAphQ==
+					    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://shibboleth.utt.fr:8443/shibboleth-idp/AA"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Université de Technologie de Troyes</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Université de Technologie de Troyes</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://unknown.site.com</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>cri@utt.fr</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml
new file mode 100644
index 00000000..36c1d868
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.test.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:com.itslearning.test">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://test.itslearning.com/elogin/logout.aspx"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://test.itslearning.com/elogin/default.aspx" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">itslearning is a virtual learning environment specifically designed for schools and universities.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">itslearning er et virtuelt læringsmiljø, spesielt utformet for skoler og universiteter.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml
new file mode 100644
index 00000000..dfecea53
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-feide.no-services-com.itslearning.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:com.itslearning">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.itslearning.com/elogin/logout.aspx"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.itslearning.com/elogin/default.aspx" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">itslearning</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">itslearning is a virtual learning environment specifically designed for schools and universities.</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="no">itslearning er et virtuelt læringsmiljø, spesielt utformet for skoler og universiteter.</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" FriendlyName="eduPersonPrincipalName"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">itslearning</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">itslearning</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.itslearning.eu/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:Company>itslearning</md:Company>
+    <md:GivenName>itslearning Support</md:GivenName>
+    <md:EmailAddress>support@itslearning.com</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
new file mode 100644
index 00000000..91df1aea
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-feide.no-services-no.uio.hpc.lap.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="urn:mace:feide.no:services:no.uio.hpc.lap">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://feide.no/" registrationInstant="2014-07-29T14:36:18Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://www.feide.no/files/feide/metadata-registration-practice-statement.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:SPSSODescriptor AuthnRequestsSigned="false" WantAssertionsSigned="true" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Language Analysis Portal (LAP)</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="no">Språkanalyseportalen (LAP)</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
+          centralized repository of a wide range of language technology tools, all installed on a high-performance
+          computing cluster.</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
+            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+            IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
+            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
+            aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
+            qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
+            iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
+            GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
+            a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
+            p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
+            RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+            kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
+            AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+            MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+            L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+            MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+            ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+            LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
+            SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
+            XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
+            5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
+            58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
+            Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
+            agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEajCCA1KgAwIBAgIRAMVHA4IY5XFLOosTgfuQPmcwDQYJKoZIhvcNAQEFBQAw
+            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+            IFNTTCBDQTAeFw0xNDAxMjgwMDAwMDBaFw0xNzAxMjcyMzU5NTlaMDwxITAfBgNV
+            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEXMBUGA1UEAxMObGFwLmhwYy51
+            aW8ubm8wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDq4Y49ee0/FCRp
+            qOL9nwfg3ldH3Ae9Cpe1KoeTnA+NCvWfEoT/wPHCMXU+YIzEhhaxlLJR9jNFJXoD
+            iCwxJeYfP65rXBXG4WgsTI4ZyFLAOIBoMS/edBXeIC0vHg91Gdkvs38aOTICfszS
+            GaDN0DEBD4o/LJQB92zqwxiwtFtv3456W3j57yf8wLy2mtYAV5oeZqmnIw7ad4lb
+            a3ekfzm7pfkrvAq98V582AY9CrW3GDrfK7Kd16xgUL+CUODqP2ZipALYXzSmm/Tl
+            p9jp6Gk5qbjNBPOfE7LB8asvR7fCCbOOw2VYMEwt1bhooTi7CuDpQKJrph0/VSTl
+            RcQSMo5jAgMBAAGjggFrMIIBZzAfBgNVHSMEGDAWgBQMvZNoDPPeq6NJays3V0fq
+            kOO57TAdBgNVHQ4EFgQU07YQAws6go2irRjTep1SFVt1R28wDgYDVR0PAQH/BAQD
+            AgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMC
+            MCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIBMDoGA1UdHwQzMDEw
+            L6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3Js
+            MG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDovL2NydC50Y3MudGVy
+            ZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGGGmh0dHA6Ly9vY3Nw
+            LnRjcy50ZXJlbmEub3JnMBkGA1UdEQQSMBCCDmxhcC5ocGMudWlvLm5vMA0GCSqG
+            SIb3DQEBBQUAA4IBAQCiktTWZpTXpCWH51n7EFwiXdg6wkOwpPB25xrvppc2+rNk
+            XAPjaki2cl6Ur5+7qc/OYRTBA7BVUiF2khd0GJ/jIaIgDNV56T21R9LU851ZmdpR
+            5lG19lXxy3FVrswiK7+JtYNMQOgFy5qCJ7/zSByGuQtcrj/0Jhl+gm7kEje5yy68
+            58q2XrgmJTTnCITg/HU1pNjiGbL2jhJtBF/UeWoXWdPpPU1oBMB1+iZqxWrPbV0L
+            Jp+SZC9Jr+UQHZO/9RHVo7vVtpBpoq0qy1r9v4q1ErksqVJlNd/MNkjYi5TMbtqz
+            agXV7Nv0+lQImU1b6gHzmrZC8Th4SmH6dwj/xA6p
+          </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://lap.hpc.uio.no/user/logout_feide_user"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://lap.hpc.uio.no/user/feide_auth" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">Language Analysis Portal (LAP)</md:ServiceName>
+      <md:ServiceName xml:lang="no">Språkanalyseportalen (LAP)</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">The portal provides an intuitive and easily accessible web interface to a
+        centralized repository of a wide range of language technology tools, all installed on a high-performance
+        computing cluster.</md:ServiceDescription>
+      <md:RequestedAttribute FriendlyName="surname" Name="urn:oid:2.5.4.4" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="givenname" Name="urn:oid:2.5.4.42" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="edupersonaffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <md:RequestedAttribute FriendlyName="title" Name="urn:oid:2.5.4.12" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">University of Oslo</md:OrganizationName>
+    <md:OrganizationName xml:lang="no">Universitetet i Oslo</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Oslo</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="no">Universitet i Oslo</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.uio.no/english/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="no">http://www.uio.no/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Nikolay</md:GivenName>
+    <md:SurName>Vazov</md:SurName>
+    <md:EmailAddress>n.a.vazov@usit.uio.no</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml
new file mode 100644
index 00000000..97b65bba
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-khleuven.be.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="urn:mace:kuleuven.be:kulassoc:khleuven.be">
+  <Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">associatie.kuleuven.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">KHLeuven</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Katholieke Hogeschool Leuven</mdui:Description>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>idp.khleuven.be</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
+	MIIDKDCCAhCgAwIBAgIVAIEBQgacYZ+Obt/8LGcNE9xCxtg1MA0GCSqGSIb3DQEB
+	BQUAMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTAeFw0wOTEyMTUwOTI5Mjla
+	Fw0yOTEyMTUwOTI5MjlaMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTCCASIw
+	DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo7I1DRJ2ulw9KOgJGEX3Yo+Oi1
+	axnNmLMaJQGWHIuKOih7ePjvm2MuGaFHZZLHsa3yI6JMsi6OWoh4FnUTfU8t+lSc
+	i9Mn4zjQBIGQK6HAQiFjouUuMAKGD0hvXuqtIbw7cNK6dABRuZx6xbJ7HveUAb2W
+	iLshYnfJ5smDY44UN68eOZfRS941NE+hY2EESWfRtHj3bF8K1eClv9DKaxB7A6zA
+	3A0kZrum6K2DiyiN4gj9pUpC0w86jdXmPq+/8XXHLnX2RTBJE55KNzNe82n0DomT
+	qVXGZ5bxBNuSuS+IGKQpxNDO6py7wKxUVMdIRHoy2xUqU62JunMyfExCgwcCAwEA
+	AaNlMGMwQgYDVR0RBDswOYIPaWRwLmtobGV1dmVuLmJlhiZodHRwczovL2lkcC5r
+	aGxldXZlbi5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU6LNVU7ay63LW4qY9
+	gmQd70bUxXQwDQYJKoZIhvcNAQEFBQADggEBABGQdtkb/TncVxlIi0ejI3AHUYmG
+	RT05mU0Cmt1SEKybN6/VvwamKPWc9bmJu+uxJo3bxRVzOfUdXExZCe9KoLugj7KJ
+	ECH1yRDSb+s9TV2djqGEQO104Ol6fhDRH1YV7FWGjQ79Roddu6IwEawek4VEY4om
+	rQmBOTjKUb10v9xTTX28PsTM7e8Avbu9BujIgeX4KcsUWqDDsX8r9P8hK7aOS7Ym
+	XPLrSitrNNrQYr9FzuRm995nQ20lVTjh83TiPADSXUXDkebI9GcKqDA662HTNpNp
+	5Dpn+ZM2hbJN+AbA9QdpVSb+MJCzpRyh2AlN8simVEiciy1+p5tWR3iLwv8=	
+				    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.khleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.khleuven.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.khleuven.be/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.khleuven.be/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.khleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.khleuven.be/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">associatie.kuleuven.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:KeyName>idp.khleuven.be</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509Certificate>
+	MIIDKDCCAhCgAwIBAgIVAIEBQgacYZ+Obt/8LGcNE9xCxtg1MA0GCSqGSIb3DQEB
+	BQUAMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTAeFw0wOTEyMTUwOTI5Mjla
+	Fw0yOTEyMTUwOTI5MjlaMBoxGDAWBgNVBAMTD2lkcC5raGxldXZlbi5iZTCCASIw
+	DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJo7I1DRJ2ulw9KOgJGEX3Yo+Oi1
+	axnNmLMaJQGWHIuKOih7ePjvm2MuGaFHZZLHsa3yI6JMsi6OWoh4FnUTfU8t+lSc
+	i9Mn4zjQBIGQK6HAQiFjouUuMAKGD0hvXuqtIbw7cNK6dABRuZx6xbJ7HveUAb2W
+	iLshYnfJ5smDY44UN68eOZfRS941NE+hY2EESWfRtHj3bF8K1eClv9DKaxB7A6zA
+	3A0kZrum6K2DiyiN4gj9pUpC0w86jdXmPq+/8XXHLnX2RTBJE55KNzNe82n0DomT
+	qVXGZ5bxBNuSuS+IGKQpxNDO6py7wKxUVMdIRHoy2xUqU62JunMyfExCgwcCAwEA
+	AaNlMGMwQgYDVR0RBDswOYIPaWRwLmtobGV1dmVuLmJlhiZodHRwczovL2lkcC5r
+	aGxldXZlbi5iZS9pZHAvc2hpYmJvbGV0aDAdBgNVHQ4EFgQU6LNVU7ay63LW4qY9
+	gmQd70bUxXQwDQYJKoZIhvcNAQEFBQADggEBABGQdtkb/TncVxlIi0ejI3AHUYmG
+	RT05mU0Cmt1SEKybN6/VvwamKPWc9bmJu+uxJo3bxRVzOfUdXExZCe9KoLugj7KJ
+	ECH1yRDSb+s9TV2djqGEQO104Ol6fhDRH1YV7FWGjQ79Roddu6IwEawek4VEY4om
+	rQmBOTjKUb10v9xTTX28PsTM7e8Avbu9BujIgeX4KcsUWqDDsX8r9P8hK7aOS7Ym
+	XPLrSitrNNrQYr9FzuRm995nQ20lVTjh83TiPADSXUXDkebI9GcKqDA662HTNpNp
+	5Dpn+ZM2hbJN+AbA9QdpVSb+MJCzpRyh2AlN8simVEiciy1+p5tWR3iLwv8=			    
+				    </ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.khleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.khleuven.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Katholieke Hogeschool Leuven</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">KHLeuven</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.khleuven.be/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <SurName>Technical Support</SurName>
+    <EmailAddress>support@khleuven.be</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml
new file mode 100644
index 00000000..ee14d6ae
--- /dev/null
+++ b/swamid-interfederations-2.0/urn-mace-kuleuven.be-kulassoc-kuleuven.be.xml
@@ -0,0 +1,161 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" entityID="urn:mace:kuleuven.be:kulassoc:kuleuven.be">
+  <Extensions>
+    <mdrpi:RegistrationInfo registrationAuthority="http://federation.belnet.be/" registrationInstant="2012-03-27T12:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://federation.belnet.be/files/Belnet-metadata-registration-practice-statement.txt</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">kuleuven.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">groept.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">odisee.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">vives.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">KU Leuven Association</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="nl">Associatie KU Leuven</mdui:DisplayName>
+        <mdui:Description xml:lang="en">KU Leuven and the associated university colleges</mdui:Description>
+        <mdui:Description xml:lang="en">KU Leuven en de geassocieerde hogescholen</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://associatie.kuleuven.be/eng</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="nl">http://associatie.kuleuven.be/over</mdui:InformationURL>
+        <mdui:Logo height="16" width="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA3BpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wUmlnaHRzPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvcmlnaHRzLyIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcFJpZ2h0czpNYXJrZWQ9IlRydWUiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6RDUwMUMyNENENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6RDUwMUMyNERENTYzMTFFM0FEMDM5OUJEM0Y1NDQ1OUYiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDpENTAxQzI0QUQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDpENTAxQzI0QkQ1NjMxMUUzQUQwMzk5QkQzRjU0NDU5RiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PnDgVQAAAAIVSURBVHjadFLNaxNBFJ+dnd3ZbDeaRJuvGhoPGqGt0iqpgpJ68NRj8aIInsSLqFSPFf8CPXrwIB6KYCXSqwcVpILUQz0EvJaINYY0CU33a3ZmfJtE3UL7Y5mdeR/zfu/9Rrn9vokiUBBiQoq/ew0raC9I9ABen0s3kKQfx6WElaqKkAck+Bx5HN2bPpyOqXB0Avl0o7vLZIz8r4OjZFouLyW1s2laiBP4Tia1mTRtOjxKC0fp24EsZ2i05vksJRjJfRNsJgsWuZDbkzCR0k8k9K4nIn32gbHScsX0qG5p4RW/bFHv8cEYZjO040uMh5HETCVDOio20G45O5zBVxu3fXTDCvflLF3dkjRlYRHWIZ9fLMOv1bWL+eTMpauDhMdLz+vNnesr9+Ha8TgRXz6uftvMpA9BN6T27gNU69Q25xYXcH/8LOCTJiseQa7HTEMHy5TuvFqutiaLUkhlbO4h4+J3o71efXRuYhzth/rWdml+iRr6CO1L32x0Ls6eOigaUMil5iunOz+3w6ZBdtmz71y7/M+9cPfZj0YbnkVx7OjrJ7cGxsWbV968XQsCQXwWJAqjwHXjex0csFZXPqFYSH19rfayMnWmdCx8NSzIH885jqfkKw90XXNcv2d74BBCJOImUTEID913dxxQAOwxqlkmhTQCtBh4uDBoKIKKsapiAYRggqoaHzG4GMrsBxzG+EeAAQCt0M7G/zjX3wAAAABJRU5ErkJggg==</mdui:Logo>
+        <mdui:Logo height="75" width="153">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAMgAAABLCAYAAAA1fMjoAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA11pVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0idXVpZDozMkNEMEY5MDg3OUQxMURDOTFDN0UzMEIyRjdCQjM1QyIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo5QzUzODlCMkQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo5QzUzODlCMUQ2MDcxMUUzQjY2RUFDMkIyRTcwODk5QSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBJbGx1c3RyYXRvciBDUzUuMSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2IiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZEN0YxMTc0MDcyMDY4MTE4QzE0QUQ0NTU2MzQwN0Y2Ii8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+R5rIdQAADfdJREFUeNrsXV1oHNcVHtlSYtlyIrW1caChu41bSJw2kh/8EEorOQ8tdaBKUxIKBdslfSgJxKIBQ0tjy6UPhhS54LyVWC70IaHBNsQlfXBXgSYQPdhKK8tQN5WKCzF2QJv4R2tLtnq/2XvXV3fPnbnzu6vd88Gw2tHMmftz/s+dux3Ly8sesLVQnBcfIx//d27cS4gfnvl02WMwWgBrtL+nxHHska8USuIo8NAwGJqACMsxJD6eEUe/OM4JIdnHw8Nod3QoF6ujo8P/FILRKz4OiGOftCpl7Xq4YFPsYjHa0cWi0MtDxGhndOpfhPUYFh9j4kAMMiqsxUEeIgYLSFU4ToiPYelWDbi4UgxGO1mQYbYaDIZdQIpCOOaaoVGFnk5vQ1dH3fnz84vONHZsus/b1tvlFTeuNWgseR9eve3NXV/KhQawobOjRmtz972w78rCXe98edGbFLRuLEXLa1Btu7G4LNp0xyt9UvGuVO5GGtu5a0vWNqD9hY2ddeevLtype87mdWu8Td1rY899tQ9LVjp6O7f1dcV+TlB/dazIYgk3q19akpOg4VWzWThXltbFye1KmsX647e/4E+KiaMXrovJvxXKOHu/tsEf4CCAMY/OXCcZKQ0aCs8X13u7Hl5H9qfGFGKiTl+qeG/O3nQSDJe2QegwXiYTHNr+gC9YJl4997lVAT0t2o9nmkC/f/7BfF1/nyt2x557jOmrZz+30tHb+fbOL8Z+TlB/dazRYhC4VuekUOATMYmqhQyKoyRTwJkCDGBjph1fui/w3qGH7vf2f2NjKPP42kcwyWs7euuuTYOG0rq/2/GgP8lBwqGuxXVg3qBrX3q0x7ltGMcweq7AmFBAO2CRWhn6SP9AWo4+WAspFCOygDjgVVO+/Vk3aGjL/bGEB+cpLRfGmC891pMqDYX939wYmXkgcBACCmiXjVGDXFW0I6m7G9SPqG1azQIC5j8lBALu1BF5znep8opNlK8ephltE0UJD1wMmG1bvODHBVIjp0FDuSSUG+NqQU2mg68NmnGAdiTx1cMEIGy+WilI92TcAYEoC3cq98a4DDbcLCoOoe6Fj/zKZLnmh9t8aQSgVyq3U6EB7Hq42xprvCXijFkRSBd71gq3aj0pkDiv9/HpL68LjF2mhfBCQNEuih7uj5LgiDInys1SyuNK5Y6vTOqCfMIKYWyviut1zF67k4iHMCYuyRMkA+IISEMRFmPobpZLBsKfPMG4ijmm55fqJk9NYFo00D4qRkB7EXyqyQM90KLiBNwPOgi0g6zq4X9eq7XrvGQuxD11ViSmBQFTu8Q7sDLHLlb7BcE2FRief2jggbr7JsR1LomJSNkpMb4Y56wsSMmwHKW8LImLe6ULSVg2q5a1ERMDTQVmUxmSqIhCw+ZaQdObmg3f0Q/KfSoK5sTzbMyNdphWAfRwjzmOcQN11/iiKiA3Wt7FGnUR0MyCc2IyoHUpBsJ3U0B8ZrIwJ7Qg7lF0cO3kp7czoWHWTBRQN6EAGpSAbOsTUzNbFRRSQOaXrFYlyzl5a3ahLv2qlNukpY95AvMXlv5FH1wtV230G11BpyZDaWyTgZTp1+sPYFSbT09ZIBy4/vA/rtU0exo0gkw/zejxYoPp8mKm82HLGKIIuWNTV11MAfe4GQQkyyxWw2DLp1NuhC14NH181+ciBlDPToNGq4CKB6GQqq7mYttks5pCQGyDq5ZgUEExZXHA2L+Y/MyvILtqM2jJn359fao0osZeed6XZE7UeExbkhStKCRNofYoZodQqEwVFRtQbpbubuHQ10AFFRnxfzMzFpeG1TcWwTZlDW1BuEpD3li6a30eJcBwRylGfeNfN50to62fiJeUW4ixMq9pBjfLJc17pXJn9QiIrVLrEmxhIt+5VPEFjBIyxeR+IH2hKoi2WoG/vql7TSIa1XTwEhnoY4UAJSC21LaymqiZ2PpOZY5Qg6FSszeX7rorLMtqBipVWydYFzsiL7xME1mnedWCxUHv3tuEEyKAn8jTergCzAAB2bxuLcmU1aLTrRXMjudR14Lhk9KA1ke2ilpkh3vA9HrWyybYujtj09aqMKgLCayHrQYTtKAyLVdJ3euagl91LpYQjmPiY49xzQFxHktO9mbxElUSv1UF9/CJn/NoplS1BvXdlsZ9538Vsi1RaNSKgKI91DVYZ+ULCqxMX6eVDu7XGRo1FEroIBCP93X6QXOhZ21gLJfHfCiL2EgBcfE8ANdUr/5G4T4pHKiHHJFrsnAe5/AaLoRnIG33yqVSG2aBoEXBUCYtfyGhYErbAkCdgaCpk9JQeFMM/qGBLusEhq3TQrywQngvLViXzIctJqwyw81IDJ5U4bmudFhtFgSrecfNegg2khNCMudVq+r9aVoRm3sBhjd9bww6lnrbfHEc1P9dgjowtHpuUhrKLaIKai5A9swMMkEf5+O0Dfclda/Qnjcu1gsZ1nhR17eSm6WrS8Qd71EXaTFIqu+D2KrniCvAZPoxaXmDT7lZ6gWhqIytM2QaNO5ZkZuRl18EvRCGtqFKHkUzQ0ijMKpNYYGGOR84SpdvZWKFmjYG8TJcSuKcSgzwl7G4j3In1GI5TCSC6ueF5g7ypcFkeA5cD1O7pkHjnmtU8dscRgt0YIHC0pO47pVrZb96H5TcQAwDelGr9Daa0/PRVgG0kpvVoe3Niz9GPPkOCKVIMIYuGa1m2DhOvUf9uObvo6YA182VcdKgsSJL1te1Ym3VrBAIlaVKo3/+UvP5RWeXihFdQEKVzGoREAYjbRdryOF63iuL0Z4WRO3NmwbYgjBaBfquJsviGNS+H9R/BsH8P4PRVgJCANv/FHiIGCwgDAaDBYTBiIpMlrtj20gGoxWQSR1kWRFlMFrIgqS2q8no8b/xyDJay4KkWQfxBn/JFoTRWkE61zkYjAABYTAYLCAMRuwgHQjbi3coyw0cGIxmF5Cg90E8j1fzMtpcQKbYQjAYHIMwGJEtyFCeLtTBPU95B3bvrDuPIuPB8TO17/1bH/JKYy94vT30rywNjfzBm5iarQZQ4rrB/mLdNR1Dv6o7Z7tWp+eK5dJvyfPUc6PScIE5ZhQt9Al9i9L2fT960ht7cVfd/478+QNv5PXTzrSKP37NK2zp9cc8LvR5wbzZaOFZc5fnQ9tljlmoBZGuVa/cH8uHfCcEgfsJueNiroBQHNv/rFU49h5+OzIzM9xx8u8XyPOUYqHO+T77vz+pY9gsQSndVFwsuUEcuG1MCYdXfSdE/bptLj8DrQPaCxaEAjTY+LtnmYszBBibYm7Miam0Bvu/StI49f6FXNu853vbhbXqyyQGgWDAiijq2EgO+/JiN0W1o+Jwnh3FQQGCATPPaKQVWSkQ33miaLl/Jvc2j734/UwEBNZhVP7CrbIax6X7VZbxSSGPDkJDUb6vEg64Vox88N5HtAtrCgTlYpWvV3wXK28Mf+sxq8uXJEhf0V8V2xkClDke3GCPOzDYVHDYyogS6GdjQWYsTPhobS5szOhiPWzJg+SxyFOCdnK6ugWBldgtrcfLcEGF5ZiT8cigtCiZZ7mQOaHiDggHBhJaidF4IYGfr3z9Zok/TIuWhhXRLQiq6PrPH4xK4ShJi4Ii4slGdRhuVTsKR1hqNA+rCjcLbgvFhOPvzlvjj4mp/zi502F9PP7Xs7ESMmlYEf1Xbsfl74AME8Lg/yRCIxll93e3C2Y43XYCkpYvnTRQp2JCCAYYl2ojrI6LQoMrHdZHWxyUhxVZEYPInzaYMs4NNQOjwPU69f4M1z0aAJXuNdOnQQwYl6mTAAJpxq6wImnFIHCnUCg8Jo5Z+QLVsiwSDjfDRAUVDRnZWxEqDoFld70+a8CamXWbpBZELxQiCJ+VMciE5lbhPIRkrNGThAmJoxFYqJKPgc0iULWqvKvnCp/dqKS+H4LuYkEAkMkaUNkrFbzL3y7cJz5/b/wvE6AICMmnsllxXC3QMa/H2iDanSg3FWOnlealxtJWcaaYO0rBL8rcpJ3mhRXBcpO0qunmL0yNUAIgzu31qjua7MnelM/4WZmgzExUV8tMQ4JZojBHqwb8qGVEURKuQoKsUyMx8vpfMrEgnrQg1lgtj8599PHlmmaBNqBMuHK1TCGCG0D5nGoBG9KO1Xt35iIcYelLF83psgLWTPVi7KhxOPGbn/jXoZ9QGi8/+2SkcbCle81AOUr13CXNq4TONdULQbaNQVIBKQT1RRyn8tUEp/0JoawF5WphYGzMj/NhKz3TzpClMUFxaGBcqPvU6ui48YbL+ERde+WS5g1qkw2jx88Iui8kHn/dxULdY4xa1i5jkF55TW6ANoriakFzJWHyVtnwDpo2blEV1sOmqV2C70ZWz01hTkPh6QIyIl2sc/IdkIMy5TsvY4+9eQTo1GTbOkplteJW3HFfq8Qf6H+cBZ2475lf/ymRlXWpnufpgaQmIJL5saxdbUF6QLpVsBrYzWS8GTtqrt0Ckw/87Kiz9sD1YIpWe7cErg5iHFehV9mksPghyEK4Vs/zAvqSdF4btvVodbFbL5lBcX1Jx+UexDBPPLJF3Ntd59NiANN4XyFurKELcZJ4JSwwxhhgLMw1U+XrC35SBGPgGlhjDmwvsdnmIew+N0V2j7aNFvX8KNcGCsjWQnHQRSjluyGJBYTBWA3Qs1glh+uxLmuCh43RjgJiLkosefUbyfHGcYz2FBBzwzi5BSlvJMdoa/DGcQwGCwiDkdDFsvx4Tr+x27tbFovBaMEgncpime+AcBaL0Vb4vwADAI6r9hTmuAw9AAAAAElFTkSuQmCC</mdui:Logo>
+      </mdui:UIInfo>
+      <mdui:DiscoHints>
+        <mdui:DomainHint>kuleuven.be</mdui:DomainHint>
+        <mdui:IPHint>134.58.0.0/16</mdui:IPHint>
+        <mdui:IPHint>193.190.168.0/23</mdui:IPHint>
+        <mdui:IPHint>193.190.176.0/22</mdui:IPHint>
+        <mdui:IPHint>193.190.180.0/23</mdui:IPHint>
+        <mdui:IPHint>193.190.253.0/24</mdui:IPHint>
+        <mdui:IPHint>193.190.146.160/27</mdui:IPHint>
+        <mdui:IPHint>193.190.57.0/26</mdui:IPHint>
+        <mdui:IPHint>193.190.57.192/27</mdui:IPHint>
+        <mdui:IPHint>193.190.57.224/27</mdui:IPHint>
+        <mdui:IPHint>193.190.58.0/26</mdui:IPHint>
+        <mdui:IPHint>193.190.59.0/24</mdui:IPHint>
+        <mdui:IPHint>193.190.255.0/25</mdui:IPHint>
+        <mdui:IPHint>193.190.138.0/24</mdui:IPHint>
+        <mdui:IPHint>193.191.187.0/25</mdui:IPHint>
+        <mdui:IPHint>193.190.77.0/26</mdui:IPHint>
+        <mdui:IPHint>193.190.224.0/24</mdui:IPHint>
+        <mdui:IPHint>193.190.225.0/24</mdui:IPHint>
+        <mdui:IPHint>193.190.130.128/26</mdui:IPHint>
+        <mdui:IPHint>2a02:2c40::/32</mdui:IPHint>
+        <mdui:GeolocationHint>geo:50.9378101,4.0409517000000505</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.2194475,4.40246430000002</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.209348,3.2246995000000424</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.84999999999999,4.350000000000023</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.91083,5.4133600000000115</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.98965,5.050160000000005</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.8464506,4.262063000000012</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.16257,4.990839999999935</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.0543422,3.717424299999948</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.93069,5.332480000000032</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.8194776,3.2577263000000584</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.87822088437878,4.702697216918987</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.1302138,4.571509200000037</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.0258761,4.477536200000031</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.2166667,2.8999999999999772</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.94990869999999,3.129447099999993</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.8674164,4.377298099999962</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.07045,4.53135999999995</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.1558839,4.15444100000002</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.940892,4.904695599999968</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.06498,3.101570000000038</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.3216509,4.93755770000007</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:51.2025247,4.770882700000016</mdui:GeolocationHint>
+        <mdui:GeolocationHint>geo:50.8134333,4.324834399999986</mdui:GeolocationHint>
+      </mdui:DiscoHints>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
+DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
+WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
+CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
+KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
+GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
+d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
+bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
+llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
+AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
+vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
++yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
+yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
+5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://idp.kuleuven.be/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://idp.kuleuven.be/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://idp.kuleuven.be/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <shibmd:Scope regexp="false">kuleuven.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">groept.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">hubkaho.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">odisee.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">vives.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">luca-arts.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">khlim.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">khleuven.be</shibmd:Scope>
+      <shibmd:Scope regexp="false">thomasmore.be</shibmd:Scope>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIDJzCCAg+gAwIBAgIUJCkaCLjPZevQdbFbyV/aX8+ObfEwDQYJKoZIhvcNAQEF
+BQAwGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMB4XDTEwMTIwNjEwMzY1MFoX
+DTMwMTIwNjEwMzY1MFowGjEYMBYGA1UEAxMPaWRwLmt1bGV1dmVuLmJlMIIBIjAN
+BgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAoIYa2FxhIfJ7Sy1RhWTmUObGUJRO
+WkyRuQ8colNagd7LgtmV1QMtzO7ZBrzUtJYtl65JJdGa0bN3k2UotpvB2qu77n8g
+CenFr2QgOxbf+7uadVkxAYaow0GA1u3a9c4TaHn4Y8WazR1SN386VKGwZcKEGGsV
+KWnC3gXGLar2p1Oqd69l68nSXQ98O6GgmGbnDVbN/VgNI2Vqe5dpu4tAQQoH6gPH
+GPl4xTeffAI/Vcy7OveAEXlz1nGTxJlwZ9/+RmEV8ub553ZYeojaceMqrHDSpkzu
+d8fwWsifjdZS7jfxFuhlbiPh67aa4y1jskGmviWOENCNZU246TyPuSE9nQIDAQAB
+o2UwYzBCBgNVHREEOzA5gg9pZHAua3VsZXV2ZW4uYmWGJmh0dHBzOi8vaWRwLmt1
+bGV1dmVuLmJlL2lkcC9zaGliYm9sZXRoMB0GA1UdDgQWBBQ3Wq3jKozzu+nRqPAm
+llWj/cBVAjANBgkqhkiG9w0BAQUFAAOCAQEANGAtqMje2/kEPetXA0AOesJ0OYxh
+AaKIAawXwUQcvAEW+uO879UEppsq3VMXrX9VqXrXY47o5B2+/NtvSls7U0FeA/QE
+vBEeFteBO7NxKY7VasCCfYI7mT0LUr3MgIPDnENq4ymNyLVgAhxOK4Vu43mtPz8D
++yUwJwUPelIPJsW994v3EXGFSN8XYoxZcWfub41JBTSCcUPEeRllizGgTgFpZdGw
+yBBF0f9qs7xieTqsGGijXddW2178IDQV0l3abTnhZZW+FWO5pKOYwkRaLD092RVh
+5WD5+lg0EzoMXE00cBUlt6+K8JNWQARxL7MYUMX0ciUUP+XCSFsiYVHX4w==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://idp.kuleuven.be:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://idp.kuleuven.be:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="nl">KU Leuven / Associatie KU Leuven</OrganizationName>
+    <OrganizationDisplayName xml:lang="nl">KU Leuven / Associatie KU Leuven</OrganizationDisplayName>
+    <OrganizationURL xml:lang="nl">https://admin.kuleuven.be/icts/servicepunt</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>AAI team</GivenName>
+    <EmailAddress>shib@kuleuven.be</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>ICTS Servicepunt</GivenName>
+    <EmailAddress>servicepunt@icts.kuleuven.be</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/utwente.nl-.xml b/swamid-interfederations-2.0/utwente.nl-.xml
new file mode 100644
index 00000000..a521921a
--- /dev/null
+++ b/swamid-interfederations-2.0/utwente.nl-.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://utwente.nl/">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.surfconext.nl/" registrationInstant="2014-09-09T08:40:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://wiki.surfnetlabs.nl/display/eduGAIN/EduGAIN</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="nl">Universiteit Twente</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Twente</mdui:DisplayName>
+        <mdui:Description xml:lang="nl">Universiteit Twente</mdui:Description>
+        <mdui:Description xml:lang="en">Universiteit Twente</mdui:Description>
+        <mdui:Logo height="9" width="108">https://static.surfconext.nl/media/idp/utwente.png</mdui:Logo>
+        <mdui:Keywords xml:lang="nl">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
+        <mdui:Keywords xml:lang="en">University of Twente Universiteit Twente ut utwente</mdui:Keywords>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIID3zCCAsegAwIBAgIJAMVC9xn1ZfsuMA0GCSqGSIb3DQEBCwUAMIGFMQswCQYD
+VQQGEwJOTDEQMA4GA1UECAwHVXRyZWNodDEQMA4GA1UEBwwHVXRyZWNodDEVMBMG
+A1UECgwMU1VSRm5ldCBCLlYuMRMwEQYDVQQLDApTVVJGY29uZXh0MSYwJAYDVQQD
+DB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAyMDE0MDUwNTAeFw0xNDA1MDUxNDIyMzVa
+Fw0xOTA1MDUxNDIyMzVaMIGFMQswCQYDVQQGEwJOTDEQMA4GA1UECAwHVXRyZWNo
+dDEQMA4GA1UEBwwHVXRyZWNodDEVMBMGA1UECgwMU1VSRm5ldCBCLlYuMRMwEQYD
+VQQLDApTVVJGY29uZXh0MSYwJAYDVQQDDB1lbmdpbmUuc3VyZmNvbmV4dC5ubCAy
+MDE0MDUwNTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKthMDbB0jKH
+efPzmRu9t2h7iLP4wAXr42bHpjzTEk6gttHFb4l/hFiz1YBI88TjiH6hVjnozo/Y
+HA2c51us+Y7g0XoS7653lbUN/EHzvDMuyis4Xi2Ijf1A/OUQfH1iFUWttIgtWK9+
+fatXoGUS6tirQvrzVh6ZstEp1xbpo1SF6UoVl+fh7tM81qz+Crr/Kroan0UjpZOF
+TwxPoK6fdLgMAieKSCRmBGpbJHbQ2xxbdykBBrBbdfzIX4CDepfjE9h/40ldw5jR
+n3e392jrS6htk23N9BWWrpBT5QCk0kH3h/6F1Dm6TkyG9CDtt73/anuRkvXbeygI
+4wml9bL3rE8CAwEAAaNQME4wHQYDVR0OBBYEFD+Ac7akFxaMhBQAjVfvgGfY8hNK
+MB8GA1UdIwQYMBaAFD+Ac7akFxaMhBQAjVfvgGfY8hNKMAwGA1UdEwQFMAMBAf8w
+DQYJKoZIhvcNAQELBQADggEBAC8L9D67CxIhGo5aGVu63WqRHBNOdo/FAGI7LURD
+FeRmG5nRw/VXzJLGJksh4FSkx7aPrxNWF1uFiDZ80EuYQuIv7bDLblK31ZEbdg1R
+9LgiZCdYSr464I7yXQY9o6FiNtSKZkQO8EsscJPPy/Zp4uHAnADWACkOUHiCbcKi
+UUFu66dX0Wr/v53Gekz487GgVRs8HEeT9MU1reBKRgdENR8PNg4rbQfLc3YQKLWK
+7yWnn/RenjDpuCiePj8N8/80tGgrNgK/6fzM3zI18sSywnXLswxqDb/J+jgVxnQ6
+MrsTf1urM8MnfcxG/82oHIwfMh/sXPCZpo+DTLkhQxctJ3M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:NameIDFormat xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://engine.surfconext.nl/authentication/idp/single-sign-on/771fcfef97ddd691af69d7a52b7d2457"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">Universiteit Twente</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universiteit Twente</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.utwente.nl/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="administrative">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>support@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>SURFconext support</md:GivenName>
+    <md:EmailAddress>help@surfconext.nl</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/verify.studentbeans.com.xml b/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml
index b80dd9eb..b80dd9eb 100644
--- a/swamid-interfederations-2.0/verify.studentbeans.com.xml
+++ b/swamid-interfederations-2.0/verify.studentbeans.com-shibboleth.xml
diff --git a/swamid-interfederations-2.0/vip.espci.fr.xml b/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml
index 5fdbf711..30b1bf33 100644
--- a/swamid-interfederations-2.0/vip.espci.fr.xml
+++ b/swamid-interfederations-2.0/vip.espci.fr-saml2-idp-metadata.php.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">espci.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr.xml b/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml
index 2d6d515b..5316e48c 100644
--- a/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr.xml
+++ b/swamid-interfederations-2.0/vm-idp.paris-sorbonne.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">paris-sorbonne.fr</shibmd:Scope>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-paris4.fr</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/vmfetid.iamm.fr.xml b/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml
index 23531845..6bd007b9 100644
--- a/swamid-interfederations-2.0/vmfetid.iamm.fr.xml
+++ b/swamid-interfederations-2.0/vmfetid.iamm.fr-idp-shibboleth.xml
@@ -5,9 +5,9 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">univ-test.fr</shibmd:Scope>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">iamm.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">CIHEAM / IAMM</mdui:DisplayName>
         <mdui:Description xml:lang="en">Personnel du CIHEAM / IAMM</mdui:Description>
diff --git a/swamid-interfederations-2.0/vmshib.ufrpe.br.xml b/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
index 3d626ef5..3d626ef5 100644
--- a/swamid-interfederations-2.0/vmshib.ufrpe.br.xml
+++ b/swamid-interfederations-2.0/vmshib.ufrpe.br-idp-shibboleth.xml
diff --git a/swamid-interfederations-2.0/vvc.niif.hu.xml b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
index 96bdff14..34d74f75 100644
--- a/swamid-interfederations-2.0/vvc.niif.hu.xml
+++ b/swamid-interfederations-2.0/vvc.niif.hu-shibboleth.xml
@@ -4,7 +4,7 @@
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">niifi</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2010-02-03T00:00:00Z"/>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml b/swamid-interfederations-2.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml
new file mode 100644
index 00000000..982ad3d1
--- /dev/null
+++ b/swamid-interfederations-2.0/wayf.card.kilroy.eu-module.php-saml-sp-metadata.php-default-sp.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" entityID="https://wayf.card.kilroy.eu/module.php/saml/sp/metadata.php/default-sp">
+  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIDBzsnMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTIwNzAzMDgwOTA4WhcNMTUwNzA2MTc1NDEyWjCBwjEpMCcGA1UEBRMgd1RxM1dxT29VbXM3LzdCNGZwTGlmRG5aZzY0UXlmd0oxEzARBgNVBAsTCkdUNDYwOTc1MjAxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRwwGgYDVQQDExN3YXlmLmNhcmQua2lscm95LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9fd2gHID42NGr4JlilVuhYe8FvUcJP2Yh5o84ORh6C+xrJ3KAhfwpngAvsk5rdK4BckqVU1dVVWfd4+4QRiyA+1y2BifhsGlJ+eYqrjLN1sbIYz0Yn/LxXzPJ0iDNOOaPLbv4pu5vD7Sz6HFoLjm9KTFatuodLgHODaJnApCbsmBkus+XMcLeeLl6vN+YHmXtyw+IcbrO1OBGEObPONZ0UAEelRwKv72ZfsSPUsdNW+Y07xctbTZ6YlEu0wYKUjDn73zYlc5mdujqS5yR457EnpYeLXNCFkQkdGGbMP06eCqFJ1yyMPOsNww4kMkQnzrnTI0xxAp/9xf1vBQm7bPQIDAQABo4IBrjCCAaowHwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAeBgNVHREEFzAVghN3YXlmLmNhcmQua2lscm95LmV1MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBSHTlIt4wQMdYb46vD06/5hog1U4zAMBgNVHRMBAf8EAjAAMHgGCCsGAQUFBwEBBGwwajAtBggrBgEFBQcwAYYhaHR0cDovL3JhcGlkc3NsLW9jc3AuZ2VvdHJ1c3QuY29tMDkGCCsGAQUFBzAChi1odHRwOi8vcmFwaWRzc2wtYWlhLmdlb3RydXN0LmNvbS9yYXBpZHNzbC5jcnQwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9jcHMwDQYJKoZIhvcNAQEFBQADggEBAFH0+k/LHg5e8KkhwsTEtI3ZOiG/6ZMrdB0wyJhO4dr5iEHgyKYe4ZpEu4/FP0Gx63CFid7oR48ukuT5pJS+FcT9GXZwCmO9X2Jyir45MTksKP5QjAz538JUoc5KmodgJIUw7/JIIYbHGGnlEHB18MrjnPJIDUU3hPAenbxgnQNnjUKFUkKMH+iiFmnyOlqvQDG7HGkMlWEnLNrO1+Xl4nfNJ4wLwUDxJmfRuv8NKgL+xFC2CsRsC5AiRH9j+r75ax3lES9jao/1LzcA3XZGnNneXXlHqS6NBwOKgbjBbT8zwYZj5yTVw51YBUufFyB5iGR4gKUaBaXfs5yBorr4pJM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>MIIFLDCCBBSgAwIBAgIDBzsnMA0GCSqGSIb3DQEBBQUAMDwxCzAJBgNVBAYTAlVTMRcwFQYDVQQKEw5HZW9UcnVzdCwgSW5jLjEUMBIGA1UEAxMLUmFwaWRTU0wgQ0EwHhcNMTIwNzAzMDgwOTA4WhcNMTUwNzA2MTc1NDEyWjCBwjEpMCcGA1UEBRMgd1RxM1dxT29VbXM3LzdCNGZwTGlmRG5aZzY0UXlmd0oxEzARBgNVBAsTCkdUNDYwOTc1MjAxMTAvBgNVBAsTKFNlZSB3d3cucmFwaWRzc2wuY29tL3Jlc291cmNlcy9jcHMgKGMpMTIxLzAtBgNVBAsTJkRvbWFpbiBDb250cm9sIFZhbGlkYXRlZCAtIFJhcGlkU1NMKFIpMRwwGgYDVQQDExN3YXlmLmNhcmQua2lscm95LmV1MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAx9fd2gHID42NGr4JlilVuhYe8FvUcJP2Yh5o84ORh6C+xrJ3KAhfwpngAvsk5rdK4BckqVU1dVVWfd4+4QRiyA+1y2BifhsGlJ+eYqrjLN1sbIYz0Yn/LxXzPJ0iDNOOaPLbv4pu5vD7Sz6HFoLjm9KTFatuodLgHODaJnApCbsmBkus+XMcLeeLl6vN+YHmXtyw+IcbrO1OBGEObPONZ0UAEelRwKv72ZfsSPUsdNW+Y07xctbTZ6YlEu0wYKUjDn73zYlc5mdujqS5yR457EnpYeLXNCFkQkdGGbMP06eCqFJ1yyMPOsNww4kMkQnzrnTI0xxAp/9xf1vBQm7bPQIDAQABo4IBrjCCAaowHwYDVR0jBBgwFoAUa2k9ahhCSt2PAmU5/TUkhniRFjAwDgYDVR0PAQH/BAQDAgWgMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggrBgEFBQcDAjAeBgNVHREEFzAVghN3YXlmLmNhcmQua2lscm95LmV1MEMGA1UdHwQ8MDowOKA2oDSGMmh0dHA6Ly9yYXBpZHNzbC1jcmwuZ2VvdHJ1c3QuY29tL2NybHMvcmFwaWRzc2wuY3JsMB0GA1UdDgQWBBSHTlIt4wQMdYb46vD06/5hog1U4zAMBgNVHRMBAf8EAjAAMHgGCCsGAQUFBwEBBGwwajAtBggrBgEFBQcwAYYhaHR0cDovL3JhcGlkc3NsLW9jc3AuZ2VvdHJ1c3QuY29tMDkGCCsGAQUFBzAChi1odHRwOi8vcmFwaWRzc2wtYWlhLmdlb3RydXN0LmNvbS9yYXBpZHNzbC5jcnQwTAYDVR0gBEUwQzBBBgpghkgBhvhFAQc2MDMwMQYIKwYBBQUHAgEWJWh0dHA6Ly93d3cuZ2VvdHJ1c3QuY29tL3Jlc291cmNlcy9jcHMwDQYJKoZIhvcNAQEFBQADggEBAFH0+k/LHg5e8KkhwsTEtI3ZOiG/6ZMrdB0wyJhO4dr5iEHgyKYe4ZpEu4/FP0Gx63CFid7oR48ukuT5pJS+FcT9GXZwCmO9X2Jyir45MTksKP5QjAz538JUoc5KmodgJIUw7/JIIYbHGGnlEHB18MrjnPJIDUU3hPAenbxgnQNnjUKFUkKMH+iiFmnyOlqvQDG7HGkMlWEnLNrO1+Xl4nfNJ4wLwUDxJmfRuv8NKgL+xFC2CsRsC5AiRH9j+r75ax3lES9jao/1LzcA3XZGnNneXXlHqS6NBwOKgbjBbT8zwYZj5yTVw51YBUufFyB5iGR4gKUaBaXfs5yBorr4pJM=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-logout.php/default-sp"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-acs.php/default-sp" index="2"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml1-acs.php/default-sp" index="1"/>
+    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wayf.card.kilroy.eu/module.php/saml/sp/saml2-acs.php/default-sp" index="0"/>
+    <md:AttributeConsumingService index="0">
+      <md:ServiceName xml:lang="en">ISIC – Student Verification Service</md:ServiceName>
+      <md:ServiceName xml:lang="da">ISIC – Student Verification Service</md:ServiceName>
+      <md:ServiceDescription xml:lang="en">to verify that you are a student</md:ServiceDescription>
+      <md:ServiceDescription xml:lang="da">at verificere at du er studerende</md:ServiceDescription>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.25178.1.2.9" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+      <md:RequestedAttribute Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.5" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri"/>
+    </md:AttributeConsumingService>
+  </md:SPSSODescriptor>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Webmaster</md:GivenName>
+    <md:EmailAddress>jesper@accedo.dk</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wayf.wayf.dk.xml b/swamid-interfederations-2.0/wayf.wayf.dk.xml
index 9c0b696d..98ceefcf 100644
--- a/swamid-interfederations-2.0/wayf.wayf.dk.xml
+++ b/swamid-interfederations-2.0/wayf.wayf.dk.xml
@@ -110,7 +110,6 @@
       <shibmd:Scope regexp="false">frsgym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">cbs.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">sosuesbjerg.dk</shibmd:Scope>
-      <shibmd:Scope regexp="false">deff.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">uniit.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">dskd.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">ku.dk</shibmd:Scope>
@@ -175,6 +174,7 @@
       <shibmd:Scope regexp="false">campusvejle.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">rosborg-gym.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">fhavnhs.dk</shibmd:Scope>
+      <shibmd:Scope regexp="false">ah.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">adm.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">aub.aau.dk@aau.dk</shibmd:Scope>
       <shibmd:Scope regexp="false">civil.aau.dk@aau.dk</shibmd:Scope>
diff --git a/swamid-interfederations-2.0/webinar.nordu.net.xml b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
index 46d23a2e..46d23a2e 100644
--- a/swamid-interfederations-2.0/webinar.nordu.net.xml
+++ b/swamid-interfederations-2.0/webinar.nordu.net-shibboleth.xml
diff --git a/swamid-interfederations-2.0/weblogin.uu.se.xml b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
index 61be6344..1b0956e5 100644
--- a/swamid-interfederations-2.0/weblogin.uu.se.xml
+++ b/swamid-interfederations-2.0/weblogin.uu.se-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.swamid.se/download/18.248ad5af12aa8136533800012293/SWAMID+Metadata+Registration+Practice+Statement-20110714.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
     <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+      <samla:Attribute xmlns:samla="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category-support" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
         <samla:AttributeValue>http://refeds.org/category/research-and-scholarship</samla:AttributeValue>
       </samla:Attribute>
     </mdattr:EntityAttributes>
diff --git a/swamid-interfederations-2.0/weblogin2.geant.net.xml b/swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml
index 58c8e156..58c8e156 100644
--- a/swamid-interfederations-2.0/weblogin2.geant.net.xml
+++ b/swamid-interfederations-2.0/weblogin2.geant.net-adfs-services-trust.xml
diff --git a/swamid-interfederations-2.0/whoami.cesnet.cz.xml b/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
index e0dfb5e0..916401f6 100644
--- a/swamid-interfederations-2.0/whoami.cesnet.cz.xml
+++ b/swamid-interfederations-2.0/whoami.cesnet.cz-idp-shibboleth.xml
@@ -1,17 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://whoami.cesnet.cz/idp/shibboleth">
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" entityID="https://whoami.cesnet.cz/idp/shibboleth">
   <Extensions>
     <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
       <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
     </eduidmd:RepublishRequest>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-15T11:47:38Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/cesnet</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </Extensions>
   <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cesnet.cz</shibmd:Scope>
+      <shibmd:Scope regexp="false">cesnet.cz</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
         <mdui:DisplayName xml:lang="en">CESNET</mdui:DisplayName>
         <mdui:DisplayName xml:lang="cs">CESNET</mdui:DisplayName>
@@ -50,6 +55,9 @@ i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
     </KeyDescriptor>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
     <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://whoami.cesnet.cz/idp/profile/SAML2/Redirect/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://whoami.cesnet.cz/idp/profile/SAML2/POST/SLO"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://whoami.cesnet.cz:8443/idp/profile/SAML2/SOAP/SLO"/>
     <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</NameIDFormat>
     <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
@@ -61,7 +69,7 @@ i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
   </IDPSSODescriptor>
   <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
-      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">cesnet.cz</shibmd:Scope>
+      <shibmd:Scope regexp="false">cesnet.cz</shibmd:Scope>
     </Extensions>
     <KeyDescriptor>
       <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
@@ -101,13 +109,13 @@ i/DVjni4yQ3gisrqPcpvzGZCN/doncbNZ5ZRUerR17Waeg==
     <OrganizationURL xml:lang="cs">http://www.cesnet.cz/</OrganizationURL>
   </Organization>
   <ContactPerson contactType="technical">
-    <GivenName>Ivan</GivenName>
-    <SurName>Novakov</SurName>
-    <EmailAddress>novakoi@fel.cvut.cz</EmailAddress>
+    <GivenName>Jan</GivenName>
+    <SurName>Oppolzer</SurName>
+    <EmailAddress>jan.oppolzer@cesnet.cz</EmailAddress>
   </ContactPerson>
   <ContactPerson contactType="technical">
     <GivenName>Jan</GivenName>
-    <SurName>Tomášek</SurName>
+    <SurName>Tomasek</SurName>
     <EmailAddress>jan.tomasek@cesnet.cz</EmailAddress>
   </ContactPerson>
 </EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml b/swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml
new file mode 100644
index 00000000..69cd0528
--- /dev/null
+++ b/swamid-interfederations-2.0/wifi.dir.garr.it:12081-shibboleth.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://wifi.dir.garr.it:12081/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-30T15:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">WIFI provided by GARR</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">WIFI erogato da GARR</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Wi-Fi connection to the wireless network in GARR (Rome, IT). This service enables the authentication by IDEM credentials at wireless network in GARR</mdui:Description>
+        <mdui:Description xml:lang="it">Connessione Wi-Fi alla rete wireless di GARR nella sede di Roma (IT). Questo servizio abilita l'autenticazione mediante credenziali IDEM presso la rete wireless della Direzione GARR</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.garr.it/wifi/info</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.garr.it/wifi/info</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Login"/>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/WAYF"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEbjCCA1agAwIBAgIRALxMXgZtagsFRXGxHmc7ojQwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xMzA3MDUwMDAwMDBaFw0xNjA3MDQyMzU5NTlaMD4xITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQd2lmaS5kaXIu
+Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1nKllgz7Q6
+u14Q9efpbAAculFFENIAIIJQVCU/rE7HFPGxxaEDxpBWpq7oUAd9wYT+sFiQk1Zf
+kFwWCxbpwqftLBytbCpOFmzqxcKqtaBX4d8qkBI8v4fIOjYPeC6inMXLZOf+3/QL
+ITNjj70N2S3GXm+JvNBhVik1UiQ3HxVJbjUHAyj33RaMfQGQNonu4H1YOBWTTtXw
+FY1hHAERTRfJBDv7LzGoYo1e6gOYyz2QHNJO3hzHWG+MHZfAA1RpIHO6v9Xs67ZG
+uN9FoeAQMZ89L7Xc8a4b+paS2ShD4BZcw5Htxn8qhdbWfhBfZOUbK+8TQWUO6MNT
+ri2whivd78cCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
+R+qQ47ntMB0GA1UdDgQWBBR6K1Z+w6BoJOYYHclzDHTOD4QsETAOBgNVHQ8BAf8E
+BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
+AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
+MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
+cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
+ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
+c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQd2lmaS5kaXIuZ2Fyci5pdDAN
+BgkqhkiG9w0BAQUFAAOCAQEApWK44BT0P8QiG0UbsMl3x8nW93tHdrIeuXd/2ET1
+43pIBU6o+cvCZolOzzmU5D3tQuvG3+Uhs5aBKDA3sdklV1wK85Tf/FrVGw5OFlxn
+UCXWIXAHYqZrUZVSBJiUsGLhyNxtME/wL5vgjBFtnBUagkYZAoSI6HIAPFC4WmAG
+T7jgUwih9oD9bZqNGy3q8QsJZlAuj65RmLJUTz4XUcS5RJrePlQSMj3WQklkoKkO
+3/o35Z0PboOdmDyvBkGP7vdkZ3xuBH9F8C3FZ91t5F0hieeFnFOEXyZcPq14vQ5C
+Jp4P35Fmyp0bxWiEwrpCwV8TZ5lpllIJvrB1rVPxSYE80w==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
+    <ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/Artifact" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/POST" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/Artifact" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">WIFI connection provided by GARR</ServiceName>
+      <ServiceDescription xml:lang="en">Wifi access for guests in the GARR wireless network (Rome)</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Consortium GARR</OrganizationName>
+    <OrganizationName xml:lang="it">Consortium GARR</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Wi-Fi provided by Consortium GARR</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">Wi-Fi erogato da Consortium GARR</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.garr.it</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.garr.it/b/eng</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>system.support@garr.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml b/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml
deleted file mode 100644
index d7c7b735..00000000
--- a/swamid-interfederations-2.0/wifi.dir.garr.it:12081.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://wifi.dir.garr.it:12081/shibboleth">
-  <Extensions xmlns="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2013-07-30T13:14:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">WIFI - GARR</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">WIFI - GARR</mdui:DisplayName>
-        <mdui:Description xml:lang="en">This service enables the authentication by IDEM credentials at wireless network in GARR</mdui:Description>
-        <mdui:Description xml:lang="it">Questo servizio abilita l'autenticazione mediante credenziali IDEM presso la rete wireless della Direzione GARR</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.garr.it/wifi/info</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.garr.it/wifi/info</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.garr.it/wifi/privacy</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Login"/>
-      <init:RequestInitiator xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/WAYF"/>
-    </md:Extensions>
-    <md:KeyDescriptor>
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>wifi.dir.garr.it</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=wifi.dir.garr.it,OU=Domain Control Validated</ds:X509SubjectName>
-          <ds:X509Certificate>MIIEbjCCA1agAwIBAgIRALxMXgZtagsFRXGxHmc7ojQwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xMzA3MDUwMDAwMDBaFw0xNjA3MDQyMzU5NTlaMD4xITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEZMBcGA1UEAxMQd2lmaS5kaXIu
-                            Z2Fyci5pdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM1nKllgz7Q6
-                            u14Q9efpbAAculFFENIAIIJQVCU/rE7HFPGxxaEDxpBWpq7oUAd9wYT+sFiQk1Zf
-                            kFwWCxbpwqftLBytbCpOFmzqxcKqtaBX4d8qkBI8v4fIOjYPeC6inMXLZOf+3/QL
-                            ITNjj70N2S3GXm+JvNBhVik1UiQ3HxVJbjUHAyj33RaMfQGQNonu4H1YOBWTTtXw
-                            FY1hHAERTRfJBDv7LzGoYo1e6gOYyz2QHNJO3hzHWG+MHZfAA1RpIHO6v9Xs67ZG
-                            uN9FoeAQMZ89L7Xc8a4b+paS2ShD4BZcw5Htxn8qhdbWfhBfZOUbK+8TQWUO6MNT
-                            ri2whivd78cCAwEAAaOCAW0wggFpMB8GA1UdIwQYMBaAFAy9k2gM896ro0lrKzdX
-                            R+qQ47ntMB0GA1UdDgQWBBR6K1Z+w6BoJOYYHclzDHTOD4QsETAOBgNVHQ8BAf8E
-                            BAMCBaAwDAYDVR0TAQH/BAIwADAdBgNVHSUEFjAUBggrBgEFBQcDAQYIKwYBBQUH
-                            AwIwIgYDVR0gBBswGTANBgsrBgEEAbIxAQICHTAIBgZngQwBAgEwOgYDVR0fBDMw
-                            MTAvoC2gK4YpaHR0cDovL2NybC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5j
-                            cmwwbQYIKwYBBQUHAQEEYTBfMDUGCCsGAQUFBzAChilodHRwOi8vY3J0LnRjcy50
-                            ZXJlbmEub3JnL1RFUkVOQVNTTENBLmNydDAmBggrBgEFBQcwAYYaaHR0cDovL29j
-                            c3AudGNzLnRlcmVuYS5vcmcwGwYDVR0RBBQwEoIQd2lmaS5kaXIuZ2Fyci5pdDAN
-                            BgkqhkiG9w0BAQUFAAOCAQEApWK44BT0P8QiG0UbsMl3x8nW93tHdrIeuXd/2ET1
-                            43pIBU6o+cvCZolOzzmU5D3tQuvG3+Uhs5aBKDA3sdklV1wK85Tf/FrVGw5OFlxn
-                            UCXWIXAHYqZrUZVSBJiUsGLhyNxtME/wL5vgjBFtnBUagkYZAoSI6HIAPFC4WmAG
-                            T7jgUwih9oD9bZqNGy3q8QsJZlAuj65RmLJUTz4XUcS5RJrePlQSMj3WQklkoKkO
-                            3/o35Z0PboOdmDyvBkGP7vdkZ3xuBH9F8C3FZ91t5F0hieeFnFOEXyZcPq14vQ5C
-                            Jp4P35Fmyp0bxWiEwrpCwV8TZ5lpllIJvrB1rVPxSYE80w==
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/Artifact" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML2/ECP" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/POST" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://wifi.dir.garr.it:12081/Shibboleth.sso/SAML/Artifact" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">WIFI-GARR</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">Wifi access for guests</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedID" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">Consortium GARR</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">Consortium GARR</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">Consortium GARR</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.garr.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.garr.it/b/eng</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>system.support@garr.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/wifi.espci.fr.xml b/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
index d687efe0..d687efe0 100644
--- a/swamid-interfederations-2.0/wifi.espci.fr.xml
+++ b/swamid-interfederations-2.0/wifi.espci.fr-saml-metadata.xml
diff --git a/swamid-interfederations-2.0/wiki.edugain.org.xml b/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
index f1104ea4..f1104ea4 100644
--- a/swamid-interfederations-2.0/wiki.edugain.org.xml
+++ b/swamid-interfederations-2.0/wiki.edugain.org-shibboleth.xml
diff --git a/swamid-interfederations-2.0/wiki.helsinki.fi.xml b/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml
index 74102223..74102223 100644
--- a/swamid-interfederations-2.0/wiki.helsinki.fi.xml
+++ b/swamid-interfederations-2.0/wiki.helsinki.fi-shibboleth.xml
diff --git a/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml b/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml
index 07ddffee..07ddffee 100644
--- a/swamid-interfederations-2.0/wiki.moonshot.ja.net.xml
+++ b/swamid-interfederations-2.0/wiki.moonshot.ja.net-shibboleth.xml
diff --git a/swamid-interfederations-2.0/wiki.shibboleth.net.xml b/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml
index 48b067cb..48b067cb 100644
--- a/swamid-interfederations-2.0/wiki.shibboleth.net.xml
+++ b/swamid-interfederations-2.0/wiki.shibboleth.net-shibboleth.xml
diff --git a/swamid-interfederations-2.0/wiki2.redclara.net.xml b/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
index a1f6a97c..be3ccc86 100644
--- a/swamid-interfederations-2.0/wiki2.redclara.net.xml
+++ b/swamid-interfederations-2.0/wiki2.redclara.net-shibboleth.xml
@@ -23,42 +23,42 @@
         <ds:KeyName>redclara.net</ds:KeyName>
         <ds:KeyName>wiki2.redclara.net</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=postmaster@redclara.net,CN=wiki2.redclara.net,C=CL,description=1xSAzgjAHzw7woBb</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGXjCCBUagAwIBAgIDCtWmMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+          <ds:X509SubjectName>emailAddress=webmaster@redclara.net,CN=wiki2.redclara.net,C=CO,description=QfHSXQ3yP741Ruct</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGXTCCBUWgAwIBAgIDEP1PMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
 TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNjIwMjExNzM0
-WhcNMTQwNjIyMTgyNjQ1WjBtMRkwFwYDVQQNExAxeFNBemdqQUh6dzd3b0JiMQsw
-CQYDVQQGEwJDTDEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSYwJAYJKoZI
-hvcNAQkBFhdwb3N0bWFzdGVyQHJlZGNsYXJhLm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAL7eM4xGr8OfOcdgXfqzCOz313uNIf7EFwoG52lk6r59
-S+gc4TKvDRDDsESFKLYrtkl2YfxuUfgZ8SgoLtDIVGOF+O4fsxTieI5nNFdBbpBb
-KzzIb6rZkSVAwvKL6ys3XSEf9ctv61QNSVaDSAuPGUC9ABZStHw5TpazDKk6diDH
-S8s23WeVNidmseX8Q+2FqotVT1kruUD5uyh1i1Xih9dv5CGk3kqYKCJ0sQj+cUT2
-Y/0uVRDj130UZIP/9k8IYGZP70d/euHHrKv/CWQ2T4h7bSZaQpJ1btqkeeUJ5q9a
-phxS4P/PFLPf3/DQmPXZeozIPEg2mzjU2CQmtl+WECUCAwEAAaOCAuUwggLhMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBRGemL+9llQ+fg2vILc9RJa1xteATAfBgNVHSMEGDAWgBTrQjTQmLCrn/Qb
-awj3zGQu7w4sRTArBgNVHREEJDAighJ3aWtpMi5yZWRjbGFyYS5uZXSCDHJlZGNs
-YXJhLm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3
-AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9s
-aWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBh
-Y2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMg
-b2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhl
-IGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBw
-YXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5z
-dGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
-AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2
-ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRz
-L3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3
-LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBACrk1OrD+wo423QhsB9M
-7N8HfLUyAz9H4wsxDS0QyB1a63cJSxumCra9Jy8YYyb4DjOs7LhSEf2amYN//Gy/
-uWPyLVrmYHMl1WAAyTgaW/omoS/EZgkgIplkSqtLnwBPk55juuU8H+fwG9NQWh6+
-eupTB261Nb4d1Wxyhpty7uoDqMaT2BHLhdxUT/GAfV9znjdYhnMdkipGKm7LtL5/
-dXb0gsyp+eHHpb7k6/2i4j7nAhYTHze2ee5Ht2bGYFzXQuv5M8WJT5yzvwuRC7F5
-OGwMN1u8sCxrMjv/FLRPzSJNMmq9+IL2sEcwKt1o0FjVq+S//abbHNpYFHTGg31E
-U/M=
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNjEwMTI1ODM0
+WhcNMTUwNjExMDI1MjI0WjBsMRkwFwYDVQQNExBRZkhTWFEzeVA3NDFSdWN0MQsw
+CQYDVQQGEwJDTzEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSUwIwYJKoZI
+hvcNAQkBFhZ3ZWJtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAvBhJOyV89jNU927Mxwn+DvisAsJZdwvYlV87LmOC970Y
+FACoyMNAW9HKUw14/eiGigtUSzIpc/sLqLWfdSOLvutMIS9l65iM5u6KVztBrqyA
+KHTQiYDgcSbBUe1oCvNfYfLVw0t14oIQwcw+JzjYK9QFsJ/v6ECvnUs0/IOXCfmD
+l4NHrNd3KJcvsHAkuRogEOXfAWSBc7xbT92ljjThTGrEwPJ8WJoXgRrEM5YUl1E4
+dEUgdoZ4ACKq8GxQR0et74+9ffamxRn+i5tIRcSeUJLo9DWCw14iTgnPpdJI6Tpb
+GcMmRh51rIodv1rmuRX/1UiJ+1+VmeJ0spWPma2lGwIDAQABo4IC5TCCAuEwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFKe6dZTQ54y1INi3qhIu62ZJdJ7DMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
+CPfMZC7vDixFMCsGA1UdEQQkMCKCEndpa2kyLnJlZGNsYXJhLm5ldIIMcmVkY2xh
+cmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcB
+AgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xp
+Y3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFj
+Y29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBv
+ZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUg
+aW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBh
+cnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0
+YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYB
+BQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZl
+ci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMv
+c3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cu
+c3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAEXXajM3y024WuHBS9KX4
+D1mJgqJC3BN/0V6mCbrrtp7naDyg7mGdLEAkR403WwpR7cQlcopwCjzlVaaIM45d
+yiaMgJSxTcZHL5XD77nV7LjtgZDSDasmpIcvKezSwOqrdZgouukWUB4bcjpK8+JS
+vDhW4/nxjS85s0iQzM97y4AlunatpcVUkZmqOvpmoLtXofyRnP6fMXPkyGav1UUa
+rsIJlrC7xLyj8uLmF8SBQw5XqhJ3CieeYEWl9Oodqb9NPnW8+FJ/UPm2yjNbUo3q
+wnUR/FUAapCESXV1HZIoixTWrUlxCUVXJuMP58wjykYc/J6O5vV8I0HaAzQFG/lc
+2g==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
@@ -68,42 +68,42 @@ U/M=
         <ds:KeyName>redclara.net</ds:KeyName>
         <ds:KeyName>wiki2.redclara.net</ds:KeyName>
         <ds:X509Data>
-          <ds:X509SubjectName>emailAddress=postmaster@redclara.net,CN=wiki2.redclara.net,C=CL,description=1xSAzgjAHzw7woBb</ds:X509SubjectName>
-          <ds:X509Certificate>MIIGXjCCBUagAwIBAgIDCtWmMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
+          <ds:X509SubjectName>emailAddress=webmaster@redclara.net,CN=wiki2.redclara.net,C=CO,description=QfHSXQ3yP741Ruct</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGXTCCBUWgAwIBAgIDEP1PMA0GCSqGSIb3DQEBBQUAMIGMMQswCQYDVQQGEwJJ
 TDEWMBQGA1UEChMNU3RhcnRDb20gTHRkLjErMCkGA1UECxMiU2VjdXJlIERpZ2l0
 YWwgQ2VydGlmaWNhdGUgU2lnbmluZzE4MDYGA1UEAxMvU3RhcnRDb20gQ2xhc3Mg
-MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTMwNjIwMjExNzM0
-WhcNMTQwNjIyMTgyNjQ1WjBtMRkwFwYDVQQNExAxeFNBemdqQUh6dzd3b0JiMQsw
-CQYDVQQGEwJDTDEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSYwJAYJKoZI
-hvcNAQkBFhdwb3N0bWFzdGVyQHJlZGNsYXJhLm5ldDCCASIwDQYJKoZIhvcNAQEB
-BQADggEPADCCAQoCggEBAL7eM4xGr8OfOcdgXfqzCOz313uNIf7EFwoG52lk6r59
-S+gc4TKvDRDDsESFKLYrtkl2YfxuUfgZ8SgoLtDIVGOF+O4fsxTieI5nNFdBbpBb
-KzzIb6rZkSVAwvKL6ys3XSEf9ctv61QNSVaDSAuPGUC9ABZStHw5TpazDKk6diDH
-S8s23WeVNidmseX8Q+2FqotVT1kruUD5uyh1i1Xih9dv5CGk3kqYKCJ0sQj+cUT2
-Y/0uVRDj130UZIP/9k8IYGZP70d/euHHrKv/CWQ2T4h7bSZaQpJ1btqkeeUJ5q9a
-phxS4P/PFLPf3/DQmPXZeozIPEg2mzjU2CQmtl+WECUCAwEAAaOCAuUwggLhMAkG
-A1UdEwQCMAAwCwYDVR0PBAQDAgOoMBMGA1UdJQQMMAoGCCsGAQUFBwMBMB0GA1Ud
-DgQWBBRGemL+9llQ+fg2vILc9RJa1xteATAfBgNVHSMEGDAWgBTrQjTQmLCrn/Qb
-awj3zGQu7w4sRTArBgNVHREEJDAighJ3aWtpMi5yZWRjbGFyYS5uZXSCDHJlZGNs
-YXJhLm5ldDCCAVYGA1UdIASCAU0wggFJMAgGBmeBDAECATCCATsGCysGAQQBgbU3
-AQIDMIIBKjAuBggrBgEFBQcCARYiaHR0cDovL3d3dy5zdGFydHNzbC5jb20vcG9s
-aWN5LnBkZjCB9wYIKwYBBQUHAgIwgeowJxYgU3RhcnRDb20gQ2VydGlmaWNhdGlv
-biBBdXRob3JpdHkwAwIBARqBvlRoaXMgY2VydGlmaWNhdGUgd2FzIGlzc3VlZCBh
-Y2NvcmRpbmcgdG8gdGhlIENsYXNzIDEgVmFsaWRhdGlvbiByZXF1aXJlbWVudHMg
-b2YgdGhlIFN0YXJ0Q29tIENBIHBvbGljeSwgcmVsaWFuY2Ugb25seSBmb3IgdGhl
-IGludGVuZGVkIHB1cnBvc2UgaW4gY29tcGxpYW5jZSBvZiB0aGUgcmVseWluZyBw
-YXJ0eSBvYmxpZ2F0aW9ucy4wNQYDVR0fBC4wLDAqoCigJoYkaHR0cDovL2NybC5z
-dGFydHNzbC5jb20vY3J0MS1jcmwuY3JsMIGOBggrBgEFBQcBAQSBgTB/MDkGCCsG
-AQUFBzABhi1odHRwOi8vb2NzcC5zdGFydHNzbC5jb20vc3ViL2NsYXNzMS9zZXJ2
-ZXIvY2EwQgYIKwYBBQUHMAKGNmh0dHA6Ly9haWEuc3RhcnRzc2wuY29tL2NlcnRz
-L3N1Yi5jbGFzczEuc2VydmVyLmNhLmNydDAjBgNVHRIEHDAahhhodHRwOi8vd3d3
-LnN0YXJ0c3NsLmNvbS8wDQYJKoZIhvcNAQEFBQADggEBACrk1OrD+wo423QhsB9M
-7N8HfLUyAz9H4wsxDS0QyB1a63cJSxumCra9Jy8YYyb4DjOs7LhSEf2amYN//Gy/
-uWPyLVrmYHMl1WAAyTgaW/omoS/EZgkgIplkSqtLnwBPk55juuU8H+fwG9NQWh6+
-eupTB261Nb4d1Wxyhpty7uoDqMaT2BHLhdxUT/GAfV9znjdYhnMdkipGKm7LtL5/
-dXb0gsyp+eHHpb7k6/2i4j7nAhYTHze2ee5Ht2bGYFzXQuv5M8WJT5yzvwuRC7F5
-OGwMN1u8sCxrMjv/FLRPzSJNMmq9+IL2sEcwKt1o0FjVq+S//abbHNpYFHTGg31E
-U/M=
+MSBQcmltYXJ5IEludGVybWVkaWF0ZSBTZXJ2ZXIgQ0EwHhcNMTQwNjEwMTI1ODM0
+WhcNMTUwNjExMDI1MjI0WjBsMRkwFwYDVQQNExBRZkhTWFEzeVA3NDFSdWN0MQsw
+CQYDVQQGEwJDTzEbMBkGA1UEAxMSd2lraTIucmVkY2xhcmEubmV0MSUwIwYJKoZI
+hvcNAQkBFhZ3ZWJtYXN0ZXJAcmVkY2xhcmEubmV0MIIBIjANBgkqhkiG9w0BAQEF
+AAOCAQ8AMIIBCgKCAQEAvBhJOyV89jNU927Mxwn+DvisAsJZdwvYlV87LmOC970Y
+FACoyMNAW9HKUw14/eiGigtUSzIpc/sLqLWfdSOLvutMIS9l65iM5u6KVztBrqyA
+KHTQiYDgcSbBUe1oCvNfYfLVw0t14oIQwcw+JzjYK9QFsJ/v6ECvnUs0/IOXCfmD
+l4NHrNd3KJcvsHAkuRogEOXfAWSBc7xbT92ljjThTGrEwPJ8WJoXgRrEM5YUl1E4
+dEUgdoZ4ACKq8GxQR0et74+9ffamxRn+i5tIRcSeUJLo9DWCw14iTgnPpdJI6Tpb
+GcMmRh51rIodv1rmuRX/1UiJ+1+VmeJ0spWPma2lGwIDAQABo4IC5TCCAuEwCQYD
+VR0TBAIwADALBgNVHQ8EBAMCA6gwEwYDVR0lBAwwCgYIKwYBBQUHAwEwHQYDVR0O
+BBYEFKe6dZTQ54y1INi3qhIu62ZJdJ7DMB8GA1UdIwQYMBaAFOtCNNCYsKuf9Btr
+CPfMZC7vDixFMCsGA1UdEQQkMCKCEndpa2kyLnJlZGNsYXJhLm5ldIIMcmVkY2xh
+cmEubmV0MIIBVgYDVR0gBIIBTTCCAUkwCAYGZ4EMAQIBMIIBOwYLKwYBBAGBtTcB
+AgMwggEqMC4GCCsGAQUFBwIBFiJodHRwOi8vd3d3LnN0YXJ0c3NsLmNvbS9wb2xp
+Y3kucGRmMIH3BggrBgEFBQcCAjCB6jAnFiBTdGFydENvbSBDZXJ0aWZpY2F0aW9u
+IEF1dGhvcml0eTADAgEBGoG+VGhpcyBjZXJ0aWZpY2F0ZSB3YXMgaXNzdWVkIGFj
+Y29yZGluZyB0byB0aGUgQ2xhc3MgMSBWYWxpZGF0aW9uIHJlcXVpcmVtZW50cyBv
+ZiB0aGUgU3RhcnRDb20gQ0EgcG9saWN5LCByZWxpYW5jZSBvbmx5IGZvciB0aGUg
+aW50ZW5kZWQgcHVycG9zZSBpbiBjb21wbGlhbmNlIG9mIHRoZSByZWx5aW5nIHBh
+cnR5IG9ibGlnYXRpb25zLjA1BgNVHR8ELjAsMCqgKKAmhiRodHRwOi8vY3JsLnN0
+YXJ0c3NsLmNvbS9jcnQxLWNybC5jcmwwgY4GCCsGAQUFBwEBBIGBMH8wOQYIKwYB
+BQUHMAGGLWh0dHA6Ly9vY3NwLnN0YXJ0c3NsLmNvbS9zdWIvY2xhc3MxL3NlcnZl
+ci9jYTBCBggrBgEFBQcwAoY2aHR0cDovL2FpYS5zdGFydHNzbC5jb20vY2VydHMv
+c3ViLmNsYXNzMS5zZXJ2ZXIuY2EuY3J0MCMGA1UdEgQcMBqGGGh0dHA6Ly93d3cu
+c3RhcnRzc2wuY29tLzANBgkqhkiG9w0BAQUFAAOCAQEAEXXajM3y024WuHBS9KX4
+D1mJgqJC3BN/0V6mCbrrtp7naDyg7mGdLEAkR403WwpR7cQlcopwCjzlVaaIM45d
+yiaMgJSxTcZHL5XD77nV7LjtgZDSDasmpIcvKezSwOqrdZgouukWUB4bcjpK8+JS
+vDhW4/nxjS85s0iQzM97y4AlunatpcVUkZmqOvpmoLtXofyRnP6fMXPkyGav1UUa
+rsIJlrC7xLyj8uLmF8SBQw5XqhJ3CieeYEWl9Oodqb9NPnW8+FJ/UPm2yjNbUo3q
+wnUR/FUAapCESXV1HZIoixTWrUlxCUVXJuMP58wjykYc/J6O5vV8I0HaAzQFG/lc
+2g==
 </ds:X509Certificate>
         </ds:X509Data>
       </ds:KeyInfo>
diff --git a/swamid-interfederations-2.0/www.ebi.ac.uk.xml b/swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml
index 7f0a5924..7f0a5924 100644
--- a/swamid-interfederations-2.0/www.ebi.ac.uk.xml
+++ b/swamid-interfederations-2.0/www.ebi.ac.uk-ega-.xml
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com.xml b/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml
index b054384f..b054384f 100644
--- a/swamid-interfederations-2.0/www.emeraldinsight.com.xml
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com-entity.xml
diff --git a/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml b/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
new file mode 100644
index 00000000..2e117403
--- /dev/null
+++ b/swamid-interfederations-2.0/www.emeraldinsight.com-shibboleth.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.emeraldinsight.com/shibboleth">
+  <!--
+		This is an "Emerald Insight" OpenSAML SP for Atypon Systems, Inc.
+	-->
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://ukfederation.org.uk" registrationInstant="2014-07-14T14:43:12Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">http://ukfederation.org.uk/doc/mdrps-20130902</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Emerald Insight</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Emerald is a global publisher linking research and practice to the benefit of society.</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.emeraldinsight.com</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+						MIIDNDCCAhygAwIBAgIJAOZnCXnWu9vRMA0GCSqGSIb3DQEBBQUAMCExHzAdBgNV
+						BAMTFnd3dy5lbWVyYWxkaW5zaWdodC5jb20wHhcNMTMwNjI3MjEyNjI2WhcNMTYw
+						NjI2MjEyNjI2WjAhMR8wHQYDVQQDExZ3d3cuZW1lcmFsZGluc2lnaHQuY29tMIIB
+						IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAq4IsI4kV+i/3gsIg9iZa+8DZ
+						NgVbnzpIeD+QnzXt4HeUb/3ga4kn6Vc6WwnMFkFlvpoVucD7nkENzvjc5LpVsuJ7
+						LKCyCUJspB9BQRX0N23tV0nzT/w35p1VbgFRXB2o4teW3ymXzTLYmKfiMy0dYO5Y
+						KFFudXk2vdqHLrspDvbPLpuGhkLwstmaHhIbMmFe5jQuXyNaPl7iGBE8KXKqFtZ4
+						acINV0R7xnQBMvshileah1UznEmd7JEGdNDMFf1o2fAvGa9xcfwD5yXTEzaT178K
+						fsGGhpEO0aW/cFvFupOXDJJTB6aeeS43qeFsKJkJXPWkUr8TFKsQs06NTksAUQID
+						AQABo28wbTBMBgNVHREERTBDghZ3d3cuZW1lcmFsZGluc2lnaHQuY29thilodHRw
+						czovL3d3dy5lbWVyYWxkaW5zaWdodC5jb20vc2hpYmJvbGV0aDAdBgNVHQ4EFgQU
+						j3L5syzTbNpvdAwMEX/ALDDmM6IwDQYJKoZIhvcNAQEFBQADggEBAGkoaPoDQeZ+
+						F7B81Bvt2pjRjtDhWqUeQRy1YphyVXiNRM+/1RAKPq+Ltr5Cpt/ytP06uPZ2YM9B
+						0LMo/iAqrgP7LsCo2wxQojOhUhCfzX4ICjZB1WRhTt4qjOFuQM6lYka9JxgZUDxu
+						01V8YRawDs9iFJuslzYrnRGMI9lJLgwUlBLKMQ3pM1TzwY0bTDvun4HofPID193f
+						f50smOG9qh99rReZ9tTM9odW942gZijzbxJBqKuSU10r556kff6RrjVmTjTAEhGY
+						Maa83O3lH1JgvsqB77ONG7svDudp1Zfc5GEJV5F2rwfGSUoIURH3z69Ewdd1lo3d
+						Bt7qcpd9uOc=
+					</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.emeraldinsight.com/action/samlACS" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.emeraldinsight.com/action/saml2post" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.emeraldinsight.com/action/saml2artifact" index="3"/>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Atypon Systems, Inc</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">Emerald Insight</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.emeraldgrouppublishing.com/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="support">
+    <GivenName>SSO-Support</GivenName>
+    <EmailAddress>mailto:SSO-Support@atypon.com</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <GivenName>SSO-Tech</GivenName>
+    <EmailAddress>mailto:SSO-Tech@atypon.com</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.knodium.com.xml b/swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml
index 7edb7e2a..7edb7e2a 100644
--- a/swamid-interfederations-2.0/www.knodium.com.xml
+++ b/swamid-interfederations-2.0/www.knodium.com-Shibboleth.sso-Metadata.xml
diff --git a/swamid-interfederations-2.0/www.meertens.knaw.nl.xml b/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
index 2c569b58..469e3ed0 100644
--- a/swamid-interfederations-2.0/www.meertens.knaw.nl.xml
+++ b/swamid-interfederations-2.0/www.meertens.knaw.nl-Shibboleth.sso-Metadata.xml
@@ -5,11 +5,6 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml b/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
new file mode 100644
index 00000000..8f2ba283
--- /dev/null
+++ b/swamid-interfederations-2.0/www.openaccessrepository.it-shibboleth.xml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://www.openaccessrepository.it/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-10-10T08:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">Open Access Repository</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">Open Access Repository</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</mdui:Description>
+        <mdui:Description xml:lang="it">Archivio Open Access dei prodotti della ricerca (pubblicazioni, software, dati, ecc.) dell'INFN ed altri organismi di ricerca italiani</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.openaccessrepository.it/service/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.openaccessrepository.it/service/</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.openaccessrepository.it/help/privacy-policy?ln=en</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.openaccessrepository.it/help/privacy-policy?ln=it</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+      <init:RequestInitiator Binding="urn:oasis:names:tc:SAML:profiles:SSO:request-init" Location="https://www.openaccessrepository.it/Shibboleth.sso/Login"/>
+      <idpdisc:DiscoveryResponse Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www.openaccessrepository.it/Shibboleth.sso/Login" index="1"/>
+    </Extensions>
+    <KeyDescriptor>
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEgzCCA2ugAwIBAgIQAcOBBEDrU0NaTC9JniJAAjANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTE0MDYyMzAwMDAwMFoXDTE3MDYyMjIzNTk1OVowSTEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMSQwIgYDVQQDExt3d3cub3BlbmFj
+Y2Vzc3JlcG9zaXRvcnkuaXQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB
+AQC5FlOs0obBs1hyIZkL9ZIySN0OIOIRr0FMaxM2X0ROLUruSg7FvLuMtBf6a5EC
+ELEpkasqJU/T7MoHhOTG1S1pAcx9aQ1AfKB1fJPu7//s6nLMvDV8GzrV9dhEl7MW
+hqHobSjBQsq2cfdic9YvFMW2+dY/fvS0Cqlk0Ga9edM7HFDJ9gVKl6j6G4HbMXXA
+ln/0HplJCG1PyZ50URd3giVuM38SSkQ2V9WtsL4cjENJ7XECFXh1uikqPTsnRHD+
+7dJPw8c+j3/MKqk1d/ZMZ0CnuWsNWD6g+a2TpADUssioabQ9FxyJk4UNdGrqdVIc
+Hpj1Ah+bwMvR1rBY08E+Gi2lAgMBAAGjggF4MIIBdDAfBgNVHSMEGDAWgBQMvZNo
+DPPeq6NJays3V0fqkOO57TAdBgNVHQ4EFgQUjtXXHKbMBYRtpsvnZvTF0zJ+oaQw
+DgYDVR0PAQH/BAQDAgWgMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUH
+AwEGCCsGAQUFBwMCMCIGA1UdIAQbMBkwDQYLKwYBBAGyMQECAh0wCAYGZ4EMAQIB
+MDoGA1UdHwQzMDEwL6AtoCuGKWh0dHA6Ly9jcmwudGNzLnRlcmVuYS5vcmcvVEVS
+RU5BU1NMQ0EuY3JsMG0GCCsGAQUFBwEBBGEwXzA1BggrBgEFBQcwAoYpaHR0cDov
+L2NydC50Y3MudGVyZW5hLm9yZy9URVJFTkFTU0xDQS5jcnQwJgYIKwYBBQUHMAGG
+Gmh0dHA6Ly9vY3NwLnRjcy50ZXJlbmEub3JnMCYGA1UdEQQfMB2CG3d3dy5vcGVu
+YWNjZXNzcmVwb3NpdG9yeS5pdDANBgkqhkiG9w0BAQUFAAOCAQEAPJVl6xygzniD
+Zd+1rE7mCqLa4b/by2up2mg4CGED05mIX+XD3XFlVnHY2S4KM/E8Ac0VkiLZmDdG
+dm0Z2MDBSbDZKFfdNvC3/8kFYMtXhhk8Owrg+l+MY1QxjzlC0BD9eisIL7uSf7p0
+W580j+lzHziV0KDB//HekpLtRgJHoYOxMxrvhIYexiptNuhRswO6Og8UZ7CsrA5q
+h/rBSQ+HrCM6vkeKTW79h7Wy6u3dlag1vD2ToM/0Sp7x16auORbwST05kRr83pJB
+xoOiE+hrgoBGwJidjNIMD641bADIz8WXCWpy0QVCuBzdufaa1vJszW3r1Y6cVyBL
+VGXrPl4Lcw==
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/Artifact/SOAP" index="0"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/SOAP"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Redirect"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/POST"/>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SLO/Artifact"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST" index="0"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/POST-SimpleSign" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www.openaccessrepository.it/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">Open Access Repository</ServiceName>
+      <ServiceDescription xml:lang="en">Open Access repository of INFN and other Italian research organisations' research products (publications, software, data, etc.)</ServiceDescription>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eppn" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.6" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">Italian National Institute for Nuclear Physics</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">INFN</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.infn.it/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <EmailAddress>mailto:credentials-admin@ct.infn.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.portal.euromonitor.com.xml b/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml
index 53dbc143..53dbc143 100644
--- a/swamid-interfederations-2.0/www.portal.euromonitor.com.xml
+++ b/swamid-interfederations-2.0/www.portal.euromonitor.com-shibboleth.xml
diff --git a/swamid-interfederations-2.0/www.qoam.eu.xml b/swamid-interfederations-2.0/www.qoam.eu-.xml
index 33074fb8..33074fb8 100644
--- a/swamid-interfederations-2.0/www.qoam.eu.xml
+++ b/swamid-interfederations-2.0/www.qoam.eu-.xml
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml
new file mode 100644
index 00000000..7caf6988
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-rediristestidp.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/rediristestidp">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">RedIRIS - Spanish Research and Academic Network</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">RedIRIS - Red académica y de investigación española</mdui:DisplayName>
+        <mdui:Description xml:lang="en">Identity provider run by RedIRIS</mdui:Description>
+        <mdui:Description xml:lang="es">Proveedor de identidad operado por RedIRIS</mdui:Description>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
+c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
+DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
+c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
+DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/simplesamlphp/saml2/idp/SingleLogoutService.php"/>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://sir.rediris.es/simplesamlphp/saml2/idp/SSOService.php"/>
+  </md:IDPSSODescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">RedIRIS</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">RedIRIS</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml
new file mode 100644
index 00000000..eac93c8d
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-umaidp.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/umaidp">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">Universidad de Málaga</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">Universidad de Málaga</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of Universidad de Málaga</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad de la Universidad de Málaga</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uma.es</shibmd:Scope>
+    </md:Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
+c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
+DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/uma/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uma/shib13/idp/SSOService.php"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uma/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uma/shib13/idp/aa.php"/>
+  </AttributeAuthorityDescriptor>
+  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <md:OrganizationName xml:lang="en">RedIRIS</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">RedIRIS</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">University of Malaga</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">Universidad de Málaga</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml
new file mode 100644
index 00000000..a34f5f55
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-unedidp.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/unedidp">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UNED - National Distance Education University</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UNED - Universidad Nacional de Educación a Distancia</mdui:DisplayName>
+        <mdui:Description xml:lang="en">The Identity Provider of UNED</mdui:Description>
+        <mdui:Description xml:lang="es">El proveedor de identidad de UNED</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uned.es</shibmd:Scope>
+    </md:Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
+c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
+DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/uned/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uned/shib13/idp/SSOService.php"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uned/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uned/shib13/idp/aa.php"/>
+  </AttributeAuthorityDescriptor>
+  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <md:OrganizationName xml:lang="en">UNED</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">UNED</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">Universidad Nacional de Educación a Distancia</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">National Distance Education University</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml b/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml
new file mode 100644
index 00000000..760c0822
--- /dev/null
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-uocidp.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.rediris.es/sir/uocidp">
+  <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.rediris.es/" registrationInstant="2012-10-09T13:08:24Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.rediris.es/sir/edugain/SIR_MRPS.pdf</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <IDPSSODescriptor WantAuthnRequestsSigned="false" protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="en">UOC - Universitat Oberta de Catalunya</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="es">UOC - Universitat Oberta de Catalunya</mdui:DisplayName>
+        <mdui:Description xml:lang="en">UOC Identity Provider</mdui:Description>
+        <mdui:Description xml:lang="es">Proveedor de identidad de UOC</mdui:Description>
+      </mdui:UIInfo>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uoc.edu</shibmd:Scope>
+    </md:Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>MIIEeTCCA2GgAwIBAgIQCP9faAGj247/+QVzgpX08zANBgkqhkiG9w0BAQUFADA2
+MQswCQYDVQQGEwJOTDEPMA0GA1UEChMGVEVSRU5BMRYwFAYDVQQDEw1URVJFTkEg
+U1NMIENBMB4XDTEzMDcwMTAwMDAwMFoXDTE2MDYzMDIzNTk1OVowRDEhMB8GA1UE
+CxMYRG9tYWluIENvbnRyb2wgVmFsaWRhdGVkMR8wHQYDVQQDExZzYW1saWRwLnNp
+ci5yZWRpcmlzLmVzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5tO6
+tYAdozpFMDwS7QH1qm7eECkY05lG1sp14vcVOdyN0mAf8oai+M8dCQ5iyMxD/RaG
+oSmhXfHUvJ+0x8Cp/NHYbKr0cXskANcYTI0JFMFypn9Uac62CGxUYZRhHQ/2LxiE
+vzNgKrm2JiXCvOQbWrbg0sZDEsONv2G1Ln3fvOLiSiO1AjWLvOeYFPNgkNy5dxxt
+7ms7mZ0bFth6Cj38BBL0I1RebVnMgAKZWSgICUXDx35nkB+iLtidIykBgz92ZQ5h
+UrVNndP5+lraoMRuIewESSFt+LBYVeUZFTBGlupiUZ/bi7rhtIuhMM8ahaKIstbu
+IgfQBHPqRkkiiKOJawIDAQABo4IBczCCAW8wHwYDVR0jBBgwFoAUDL2TaAzz3quj
+SWsrN1dH6pDjue0wHQYDVR0OBBYEFARoBLDWcsveEZQhaMVIR9mmJkUkMA4GA1Ud
+DwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
+BgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeBDAECATA6BgNV
+HR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3JnL1RFUkVOQVNT
+TENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0dHA6Ly9jcnQu
+dGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUFBzABhhpodHRw
+Oi8vb2NzcC50Y3MudGVyZW5hLm9yZzAhBgNVHREEGjAYghZzYW1saWRwLnNpci5y
+ZWRpcmlzLmVzMA0GCSqGSIb3DQEBBQUAA4IBAQB0gmr232YgpUC4HkwAHXaH91Zx
+8ZrwiEc8c4jGLh5VsaO0OqMfUEIXMuqZ+P9JNWVwlc6VLtmsypqTuqb9a06DS88q
+2o5sAUpbXZwhArhQs1bQnu5HJ6S84Ajn+NfMOyaO7NF8Colq/9lf3DihkT0jlD7i
+PHPMw2zauvtR/WPwdPszgfIOV/vkJ0rq9AjOXxSX7V2jpkxISGW/m93iahwXEoVF
+c8VXQhNjEfcm6uawmISjsyp6ta/U3e/8GJka2csDrF/bfipMBDSdWcLMscpYO8cb
+DC0L6vehZJ+lPz3wPH6YJmlstICZUdJIgDV3TUhmji6NNKa4p6by34QdYcDH</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uoc/saml2/idp/SingleLogoutService.php" ResponseLocation="http://sir.rediris.es/uoc/saml2/idp/SingleLogoutService.php"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="http://sir.rediris.es/uoc/shib13/idp/SSOService.php"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="http://sir.rediris.es/uoc/saml2/idp/SSOService.php"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol">
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="http://sir.rediris.es/uoc/shib13/idp/aa.php"/>
+  </AttributeAuthorityDescriptor>
+  <md:Organization xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
+    <md:OrganizationName xml:lang="en">UOC</md:OrganizationName>
+    <md:OrganizationName xml:lang="es">UOC</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="en">UOC - Universitat Oberta de Catalunya</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="es">UOC - Universitat Oberta de Catalunya</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="en">http://www.rediris.es/index.php.en</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="es">http://www.rediris.es/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" contactType="technical">
+    <md:GivenName>SIR helpdesk</md:GivenName>
+    <md:EmailAddress>sir@rediris.es</md:EmailAddress>
+  </md:ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www.rediris.es.xml b/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml
index 57083f85..57083f85 100644
--- a/swamid-interfederations-2.0/www.rediris.es.xml
+++ b/swamid-interfederations-2.0/www.rediris.es-sir-urvidp.xml
diff --git a/swamid-interfederations-2.0/www.researchprofessional.com.xml b/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml
index 5713a3c1..5713a3c1 100644
--- a/swamid-interfederations-2.0/www.researchprofessional.com.xml
+++ b/swamid-interfederations-2.0/www.researchprofessional.com-shibboleth.xml
diff --git a/swamid-interfederations-2.0/www.scran.ac.uk.xml b/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml
index 62c6ab3a..62c6ab3a 100644
--- a/swamid-interfederations-2.0/www.scran.ac.uk.xml
+++ b/swamid-interfederations-2.0/www.scran.ac.uk-shibboleth.xml
diff --git a/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml b/swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml
index 6b1694cc..6b1694cc 100644
--- a/swamid-interfederations-2.0/www.sso.uni-erlangen.de.xml
+++ b/swamid-interfederations-2.0/www.sso.uni-erlangen.de-simplesaml-saml2-idp-metadata.php.xml
diff --git a/swamid-interfederations-2.0/www.uco.fr.xml b/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml
index 3967d9a8..e2c112ed 100644
--- a/swamid-interfederations-2.0/www.uco.fr.xml
+++ b/swamid-interfederations-2.0/www.uco.fr-idp-shibboleth.xml
@@ -5,7 +5,7 @@
       <mdrpi:RegistrationPolicy xml:lang="en">https://services.renater.fr/federation/en/metadata_registration_practice_statement</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
   </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0  urn:oasis:names:tc:SAML:2.0:protocol">
+  <IDPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
       <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uco.fr</shibmd:Scope>
       <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
diff --git a/swamid-interfederations-2.0/www.vho.de.xml b/swamid-interfederations-2.0/www.vho.de-idpvzg.xml
index 5c9f0003..5c9f0003 100644
--- a/swamid-interfederations-2.0/www.vho.de.xml
+++ b/swamid-interfederations-2.0/www.vho.de-idpvzg.xml
diff --git a/swamid-interfederations-2.0/www.videotorium.hu.xml b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
index ccf32e1b..d8b681b0 100644
--- a/swamid-interfederations-2.0/www.videotorium.hu.xml
+++ b/swamid-interfederations-2.0/www.videotorium.hu-shibboleth.xml
@@ -5,7 +5,7 @@
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">href-edugain</ns9:MetadataSet>
     <ns9:MetadataSet xmlns:ns9="urn:geant:niif.hu:eduid.hu:entity-attributes:processing-info">sulinet</ns9:MetadataSet>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu"/>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.hu" registrationInstant="2009-11-20T00:00:00Z"/>
   </Extensions>
   <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/www.vutbr.cz.xml b/swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml
index ae19b13e..d505f235 100644
--- a/swamid-interfederations-2.0/www.vutbr.cz.xml
+++ b/swamid-interfederations-2.0/www.vutbr.cz-SSO-saml2-idp.xml
@@ -1,10 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www.vutbr.cz/SSO/saml2/idp">
   <md:Extensions xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata">
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2010-09-22T12:05:52Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://eduid.cz/uri/idp-group/university</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
   </md:Extensions>
   <IDPSSODescriptor xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol">
     <Extensions>
diff --git a/swamid-interfederations-2.0/www2.eduroam.cz.xml b/swamid-interfederations-2.0/www2.eduroam.cz.xml
deleted file mode 100644
index 1d980d9e..00000000
--- a/swamid-interfederations-2.0/www2.eduroam.cz.xml
+++ /dev/null
@@ -1,115 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www2.eduroam.cz/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
-      <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </md:Extensions>
-  <md:SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <DiscoveryResponse xmlns="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Binding="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" Location="https://www2.eduroam.cz/Shibboleth.sso/DS" index="1"/>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="en">eduroam.cz</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="cs">eduroam.cz</mdui:DisplayName>
-        <mdui:Description xml:lang="en">Informational web of the eduroam.cz project. It brings informations to end users and to technical staff at end institutions.</mdui:Description>
-        <mdui:Description xml:lang="cs">Informační web projektu eduroam.cz, který přináší informace jak pro koncové uživatele tak pro správce eduroamu na jednotlivých institucích.</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://eduroam.cz/en/start</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="cs">http://eduroam.cz/cs/start</mdui:InformationURL>
-        <mdui:Logo height="130" width="300">https://www.eduroam.org/downloads/logo/PNG/eduroam_trans_300pix.png</mdui:Logo>
-      </mdui:UIInfo>
-      <eduidmd:RepublishRequest xmlns:eduidmd="http://eduid.cz/schema/metadata/1.0">
-        <eduidmd:RepublishTarget>http://edugain.org/</eduidmd:RepublishTarget>
-      </eduidmd:RepublishRequest>
-    </md:Extensions>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www2.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www2.cesnet.cz,O=CESNET,ST=Czech Republic,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIID1zCCAr+gAwIBAgIJAN4GczKVBwklMA0GCSqGSIb3DQEBBQUAMFAxCzAJBgNV
-BAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzEPMA0GA1UEChMGQ0VTTkVU
-MRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejAeFw0xMjExMjIwOTI1NDJaFw0yMjEx
-MjAwOTI1NDJaMFAxCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1Ymxp
-YzEPMA0GA1UEChMGQ0VTTkVUMRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4C2p84KKhJE2AkwuGExdVFQEJk
-C/N71KGtmsqxu0u6AotEJanK6CgalKE3J9kVHz7pi2jbBTVFEz5Ng4g2XGMHkjxE
-AIa1zt6Vj3QPQQZVjTjlqMy8e/emdmH0sxkRC48vOuifcwnfFZ8oH9AkQ9HY1PwM
-gfNZ/PA8uNRQjspVs2pdIkheFzVFKbv8tbqwggArwDIS5MKIHSYeYR7jdvQ+KmEy
-rMW30ke8QEa4WiNjWvClKoUNPYBUeSpBvi4XyubG6iA72gOusoyM0yqUbJFrSYDv
-X5HKtFmIiZmZX3a+0AnO4DrbLxnjtAdaENCekaxEwpcvqWG73T3QYY/f8DkCAwEA
-AaOBszCBsDAdBgNVHQ4EFgQU3HKUUWpDGlK1khcUhb4TpLqsnMgwgYAGA1UdIwR5
-MHeAFNxylFFqQxpStZIXFIW+E6S6rJzIoVSkUjBQMQswCQYDVQQGEwJDWjEXMBUG
-A1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAoTBkNFU05FVDEXMBUGA1UEAxMO
-d3d3Mi5jZXNuZXQuY3qCCQDeBnMylQcJJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQAzEeRxovASPHS1BwWDpJCz4ui05Fht0IekYi42PqWxmIfQClW5
-KZLRb3N1L6zHpNjeJYVCuMjn0FdCShgHrormyUNZU9TJMbrrjXmV+IZ2FiPqsaj4
-aOBQzRXuN6uq0+4q1iHRFQxzsxmYLmfrHShccGIH3Oe2tWeSFr5vfR7n/e8k8CFW
-PZjO9EXRa0Gt6tRTPHbweVjDSItxf7zbHn+861stvFhBfgKoTyhR/BgIsPQBHe33
-wNzhlgq87jxyV7mFD1koSU13CBTzatU92ZEweNIPhPsviDwFS6uFJmATTQvbW51h
-NMGlYGvOFgmJL+u2sfhAr3F9JJDjPfSUR/9i
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>www2.cesnet.cz</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=www2.cesnet.cz,O=CESNET,ST=Czech Republic,C=CZ</ds:X509SubjectName>
-          <ds:X509Certificate>MIID1zCCAr+gAwIBAgIJAN4GczKVBwklMA0GCSqGSIb3DQEBBQUAMFAxCzAJBgNV
-BAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1YmxpYzEPMA0GA1UEChMGQ0VTTkVU
-MRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejAeFw0xMjExMjIwOTI1NDJaFw0yMjEx
-MjAwOTI1NDJaMFAxCzAJBgNVBAYTAkNaMRcwFQYDVQQIEw5DemVjaCBSZXB1Ymxp
-YzEPMA0GA1UEChMGQ0VTTkVUMRcwFQYDVQQDEw53d3cyLmNlc25ldC5jejCCASIw
-DQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM4C2p84KKhJE2AkwuGExdVFQEJk
-C/N71KGtmsqxu0u6AotEJanK6CgalKE3J9kVHz7pi2jbBTVFEz5Ng4g2XGMHkjxE
-AIa1zt6Vj3QPQQZVjTjlqMy8e/emdmH0sxkRC48vOuifcwnfFZ8oH9AkQ9HY1PwM
-gfNZ/PA8uNRQjspVs2pdIkheFzVFKbv8tbqwggArwDIS5MKIHSYeYR7jdvQ+KmEy
-rMW30ke8QEa4WiNjWvClKoUNPYBUeSpBvi4XyubG6iA72gOusoyM0yqUbJFrSYDv
-X5HKtFmIiZmZX3a+0AnO4DrbLxnjtAdaENCekaxEwpcvqWG73T3QYY/f8DkCAwEA
-AaOBszCBsDAdBgNVHQ4EFgQU3HKUUWpDGlK1khcUhb4TpLqsnMgwgYAGA1UdIwR5
-MHeAFNxylFFqQxpStZIXFIW+E6S6rJzIoVSkUjBQMQswCQYDVQQGEwJDWjEXMBUG
-A1UECBMOQ3plY2ggUmVwdWJsaWMxDzANBgNVBAoTBkNFU05FVDEXMBUGA1UEAxMO
-d3d3Mi5jZXNuZXQuY3qCCQDeBnMylQcJJTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3
-DQEBBQUAA4IBAQAzEeRxovASPHS1BwWDpJCz4ui05Fht0IekYi42PqWxmIfQClW5
-KZLRb3N1L6zHpNjeJYVCuMjn0FdCShgHrormyUNZU9TJMbrrjXmV+IZ2FiPqsaj4
-aOBQzRXuN6uq0+4q1iHRFQxzsxmYLmfrHShccGIH3Oe2tWeSFr5vfR7n/e8k8CFW
-PZjO9EXRa0Gt6tRTPHbweVjDSItxf7zbHn+861stvFhBfgKoTyhR/BgIsPQBHe33
-wNzhlgq87jxyV7mFD1koSU13CBTzatU92ZEweNIPhPsviDwFS6uFJmATTQvbW51h
-NMGlYGvOFgmJL+u2sfhAr3F9JJDjPfSUR/9i
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduroam.cz/Shibboleth.sso/Artifact/SOAP" index="1"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/SOAP"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/Redirect"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/POST"/>
-    <md:SingleLogoutService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduroam.cz/Shibboleth.sso/SLO/Artifact"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/SOAP"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/Redirect"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/POST"/>
-    <md:ManageNameIDService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduroam.cz/Shibboleth.sso/NIM/Artifact"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www.eduroam.cz/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://wiki.eduroam.cz/Shibboleth.sso/SAML2/POST" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://eduroam.cz/Shibboleth.sso/SAML2/POST" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/POST-SimpleSign" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/Artifact" index="6"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML2/ECP" index="7"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML/POST" index="8"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://www2.eduroam.cz/Shibboleth.sso/SAML/Artifact" index="9"/>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">CESNET, z.s.p.o.</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="cs">CESNET</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.cesnet.cz/</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="technical">
-    <md:GivenName>Jan</md:GivenName>
-    <md:SurName>Tomášek</md:SurName>
-    <md:EmailAddress>jan.tomasek@cesnet.cz</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/www3.eduid.cz.xml b/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml
index 9ccbd082..9c1874fb 100644
--- a/swamid-interfederations-2.0/www3.eduid.cz.xml
+++ b/swamid-interfederations-2.0/www3.eduid.cz-shibboleth.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://www3.eduid.cz/shibboleth">
   <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/">
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.eduid.cz/" registrationInstant="2014-02-03T10:42:36Z">
       <mdrpi:RegistrationPolicy xml:lang="en">http://www.eduid.cz/wiki/_media/en/eduid/policy/policy_eduid_en-1_1.pdf</mdrpi:RegistrationPolicy>
       <mdrpi:RegistrationPolicy xml:lang="cs">http://www.eduid.cz/wiki/_media/eduid/policy/policy_eduid_cz-1_1-3.pdf</mdrpi:RegistrationPolicy>
     </mdrpi:RegistrationInfo>
diff --git a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml
new file mode 100644
index 00000000..353bb8a3
--- /dev/null
+++ b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081-shibboleth.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" xmlns:alg="urn:oasis:names:tc:SAML:metadata:algsupport" xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:idpdisc="urn:oasis:names:tc:SAML:profiles:SSO:idp-discovery-protocol" xmlns:init="urn:oasis:names:tc:SAML:profiles:SSO:request-init" xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" xmlns:xenc="http://www.w3.org/2001/04/xmlenc#" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-06-04T10:00:00Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+    <mdattr:EntityAttributes>
+      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
+        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
+      </saml:Attribute>
+    </mdattr:EntityAttributes>
+  </Extensions>
+  <SPSSODescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
+    <Extensions>
+      <mdui:UIInfo>
+        <mdui:DisplayName xml:lang="en">WIFI powered by IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="it">WIFI erogato da IRCCS Fondazione Stella Maris</mdui:DisplayName>
+        <mdui:Description xml:lang="en">IRCCS Fondazione Stella Maris, WiFi network access</mdui:Description>
+        <mdui:Description xml:lang="it">Accesso alla rete WiFi di IRCCS Fondazione Stella Maris</mdui:Description>
+        <mdui:InformationURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:InformationURL>
+        <mdui:PrivacyStatementURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:PrivacyStatementURL>
+        <mdui:PrivacyStatementURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:PrivacyStatementURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
+LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
+DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
+eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
+bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
+oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
+tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
+DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
+C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
+DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
+c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
+aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
+sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
+RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
+2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
+CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
+EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo>
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
+NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
+IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
+BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
+LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
+DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
+eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
+bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
+oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
+tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
+DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
+C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
+AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
+DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
+L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
+dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
+BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
+c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
+aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
+sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
+RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
+2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
+CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
+EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/Artifact" index="5"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/POST" index="4"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/ECP" index="3"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/Artifact" index="2"/>
+    <AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
+    <AttributeConsumingService index="1">
+      <ServiceName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</ServiceName>
+      <ServiceDescription xml:lang="en">WiFi IRCCS Fondazione Stella Maris</ServiceDescription>
+      <RequestedAttribute FriendlyName="eduPersonTargetedId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
+      <RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
+    </AttributeConsumingService>
+  </SPSSODescriptor>
+  <Organization>
+    <OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</OrganizationName>
+    <OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</OrganizationName>
+    <OrganizationDisplayName xml:lang="en">WiFi provided by IRCCS Fondazione Stella Maris</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="it">WiFi erogato da IRCCS Fondazione Stella Maris</OrganizationDisplayName>
+    <OrganizationURL xml:lang="en">http://www.fsm.unipi.it</OrganizationURL>
+    <OrganizationURL xml:lang="it">http://www.fsm.unipi.it</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="administrative">
+    <SurName>Massimo Del Sarto</SurName>
+    <EmailAddress>ced@fsm.unipi.it</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="technical">
+    <EmailAddress>ced@fsm.unipi.it</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml b/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml
deleted file mode 100644
index f4104361..00000000
--- a/swamid-interfederations-2.0/zeroshell.irccs-stellamaris.it:12081.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zeroshell.irccs-stellamaris.it:12081/shibboleth">
-  <md:Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://www.idem.garr.it/" registrationInstant="2014-06-04T10:00:00Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.idem.garr.it/idem-metadata-registration-practice-statement</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-    <mdattr:EntityAttributes xmlns:mdattr="urn:oasis:names:tc:SAML:metadata:attribute">
-      <saml:Attribute xmlns:saml="urn:oasis:names:tc:SAML:2.0:assertion" Name="http://macedir.org/entity-category" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri">
-        <saml:AttributeValue>http://www.geant.net/uri/dataprotection-code-of-conduct/v1</saml:AttributeValue>
-      </saml:Attribute>
-    </mdattr:EntityAttributes>
-  </md:Extensions>
-  <md:SPSSODescriptor xmlns:ds="http://www.w3.org/2000/09/xmldsig#" xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui" protocolSupportEnumeration="urn:oasis:names:tc:SAML:2.0:protocol urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:1.0:protocol">
-    <md:Extensions>
-      <mdui:UIInfo>
-        <mdui:DisplayName xml:lang="en">WIFI powered by IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="it">WIFI erogato da IRCCS Fondazione Stella Maris</mdui:DisplayName>
-        <mdui:Description xml:lang="en">IRCCS Fondazione Stella Maris, WiFi network access</mdui:Description>
-        <mdui:Description xml:lang="it">Accesso alla rete WiFi di IRCCS Fondazione Stella Maris</mdui:Description>
-        <mdui:InformationURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:InformationURL>
-        <mdui:PrivacyStatementURL xml:lang="en">http://www.fsm.unipi.it/idem/servizio_wifi_en.html</mdui:PrivacyStatementURL>
-        <mdui:PrivacyStatementURL xml:lang="it">http://www.fsm.unipi.it/idem/servizio_wifi.html</mdui:PrivacyStatementURL>
-      </mdui:UIInfo>
-    </md:Extensions>
-    <md:KeyDescriptor use="encryption">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
-                            LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-                            CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
-                            DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
-                            eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
-                            bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
-                            oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
-                            tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
-                            DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
-                            C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-                            AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
-                            DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-                            L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-                            dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-                            BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
-                            c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
-                            aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
-                            sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
-                            RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
-                            2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
-                            CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
-                            EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:KeyDescriptor use="signing">
-      <ds:KeyInfo>
-        <ds:X509Data>
-          <ds:X509Certificate>
-                            MIIEpTCCA42gAwIBAgIRAK+9wyhwi2cPugqoTWMzt7wwDQYJKoZIhvcNAQEFBQAw
-                            NjELMAkGA1UEBhMCTkwxDzANBgNVBAoTBlRFUkVOQTEWMBQGA1UEAxMNVEVSRU5B
-                            IFNTTCBDQTAeFw0xNDA0MTAwMDAwMDBaFw0xNzA0MDkyMzU5NTlaMEwxITAfBgNV
-                            BAsTGERvbWFpbiBDb250cm9sIFZhbGlkYXRlZDEnMCUGA1UEAxMeemVyb3NoZWxs
-                            LmlyY2NzLXN0ZWxsYW1hcmlzLml0MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
-                            CgKCAQEAovLKJXlXtWpDN5QxJI/gsBNZb1qMKFC28k/8KNMWRK1J7iJnvSB10qxY
-                            DIp/N9f5KuOfE/LWEpn0CRYczS0lKvT9ZHxvu//dXF83+CTuwLdYLInlx98gS47K
-                            eKoJkTSCS3i6nXXu5pkZ3r73eO4Q9F78kWhZp9VGO6FXcqpAWPDXPiX4tySlnZHE
-                            bVcgKzrop4mYMEwj6/etuqid2FIEE8cttyn0TSZIAqQpvQl6ny53Ew/zNYrfT2yY
-                            oJhWt7tdGo+icZJ8ajJU1QTAZjGdrxZOcdrVTO8+2G3p6wXIBApEOlY1GtpVvSHy
-                            tQbatYv3lqykV7sU4fWYcAJ0c1XyIQIDAQABo4IBljCCAZIwHwYDVR0jBBgwFoAU
-                            DL2TaAzz3qujSWsrN1dH6pDjue0wHQYDVR0OBBYEFBSOJjQD1lbPrYadWn8cPsv5
-                            C+CBMA4GA1UdDwEB/wQEAwIFoDAMBgNVHRMBAf8EAjAAMB0GA1UdJQQWMBQGCCsG
-                            AQUFBwMBBggrBgEFBQcDAjAiBgNVHSAEGzAZMA0GCysGAQQBsjEBAgIdMAgGBmeB
-                            DAECATA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLnRjcy50ZXJlbmEub3Jn
-                            L1RFUkVOQVNTTENBLmNybDBtBggrBgEFBQcBAQRhMF8wNQYIKwYBBQUHMAKGKWh0
-                            dHA6Ly9jcnQudGNzLnRlcmVuYS5vcmcvVEVSRU5BU1NMQ0EuY3J0MCYGCCsGAQUF
-                            BzABhhpodHRwOi8vb2NzcC50Y3MudGVyZW5hLm9yZzBEBgNVHREEPTA7gh56ZXJv
-                            c2hlbGwuaXJjY3Mtc3RlbGxhbWFyaXMuaXSCGXdpZmkuaXJjY3Mtc3RlbGxhbWFy
-                            aXMuaXQwDQYJKoZIhvcNAQEFBQADggEBABmEJgMv0YbYXVbsojatdIXj8AJo0E9Z
-                            sCjTrGicfPXMqCBo1/h+k2fKfkBEZHgMH+bg/VwSzwnU6LSMnMPZWsHQ6dof697Y
-                            RLeYr22GJWHkTrHWH+ur2FaB/VzMaRMpBnK084mSrnKmKI2hTHdrv7wYX8lnuYhs
-                            2k87PGWZAyyfdes9ciVS+wtLVpiauMYkvbdeiYwFkjQaRAWfxzfuXLlDfHT6OD/2
-                            CYFaxF/RoF9vvQeQQnKwXv3l6SZHei08SgLClw5oWXiwwv8i0cgKNmf0rvXooZJa
-                            EBqhfy4T1t3TB0ARzgnn8tJ8VwrzLlEJBiy/h77aZregVImJIX6t20M=
-                        </ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </md:KeyDescriptor>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST" index="1"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:artifact-01" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/Artifact" index="5"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:1.0:profiles:browser-post" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML/POST" index="4"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:PAOS" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/ECP" index="3"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Artifact" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/Artifact" index="2"/>
-    <md:AssertionConsumerService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zeroshell.irccs-stellamaris.it:12081/Shibboleth.sso/SAML2/POST-SimpleSign" index="6"/>
-    <md:AttributeConsumingService index="1">
-      <md:ServiceName xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceName>
-      <md:ServiceDescription xml:lang="en">WiFi IRCCS Fondazione Stella Maris</md:ServiceDescription>
-      <md:RequestedAttribute FriendlyName="eduPersonTargetedId" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.10" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="eduPersonScopedAffiliation" Name="urn:oid:1.3.6.1.4.1.5923.1.1.1.1" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="true"/>
-      <md:RequestedAttribute FriendlyName="mail" Name="urn:oid:0.9.2342.19200300.100.1.3" NameFormat="urn:oasis:names:tc:SAML:2.0:attrname-format:uri" isRequired="false"/>
-    </md:AttributeConsumingService>
-  </md:SPSSODescriptor>
-  <md:Organization>
-    <md:OrganizationName xml:lang="en">IRCCS Fondazione Stella Maris</md:OrganizationName>
-    <md:OrganizationName xml:lang="it">IRCCS Fondazione Stella Maris</md:OrganizationName>
-    <md:OrganizationDisplayName xml:lang="en">WiFi provided by IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-    <md:OrganizationDisplayName xml:lang="it">WiFi erogato da IRCCS Fondazione Stella Maris</md:OrganizationDisplayName>
-    <md:OrganizationURL xml:lang="en">http://www.fsm.unipi.it</md:OrganizationURL>
-    <md:OrganizationURL xml:lang="it">http://www.fsm.unipi.it</md:OrganizationURL>
-  </md:Organization>
-  <md:ContactPerson contactType="administrative">
-    <md:SurName>Massimo Del Sarto</md:SurName>
-    <md:EmailAddress>ced@fsm.unipi.it</md:EmailAddress>
-  </md:ContactPerson>
-  <md:ContactPerson contactType="technical">
-    <md:EmailAddress>ced@fsm.unipi.it</md:EmailAddress>
-  </md:ContactPerson>
-</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml b/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml
new file mode 100644
index 00000000..c10b18fc
--- /dev/null
+++ b/swamid-interfederations-2.0/zididp.uni-graz.at-idp-shibboleth.xml
@@ -0,0 +1,170 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<md:EntityDescriptor xmlns:md="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zididp.uni-graz.at/idp/shibboleth">
+  <md:Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="http://eduid.at" registrationInstant="2009-01-29T22:40:01Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://eduid.at/policy/mdrps-20140606</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </md:Extensions>
+  <md:IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-graz.at</shibmd:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Graz</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">University of Graz</mdui:DisplayName>
+      </mdui:UIInfo>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID8TCCAtmgAwIBAgILAQAAAAABHJ3GXLgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
+MDkyNjA4Mjg1NFoXDTExMDkyNjA4Mjg1NFowgZwxCzAJBgNVBAYTAkFUMSgwJgYD
+VQQKEx9LYXJsLUZyYW56ZW5zLVVuaXZlcnNpdGFldCBHcmF6MQwwCgYDVQQLEwNa
+SUQxHjAcBgNVBAMTFXppZDEyOTE1Mi51bmktZ3Jhei5hdDEYMBYGA1UEAxMPaWRw
+LnVuaS1ncmF6LmF0MRswGQYDVQQDExJ6aWRpZHAudW5pLWdyYXouYXQwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBALtSK1LsNVQ3eyIh4bS3fAmwjAHCzq1jd9NU
+wQFHrFPTzhObsZQM1Pc//QnTXH3x9bSAebR8WI+SmlRpe/p7BvGkEQDS45k6UZ7Y
+CicOizdCqN/iLr/XqwkUFcmVXN/mcoWFsc+637MUqj6O/Yl3f5jTRwacxUgn9pSs
+JHw9FAIrAgMBAAGjgfMwgfAwDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVl
+oz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTeRMWMrXJOPmghKlcEp0lPrACE
+8jA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2Vk
+dWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6
+Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAR
+BglghkgBhvhCAQEEBAMCBsAwDQYJKoZIhvcNAQEFBQADggEBAGI02zqTHQP4SHrF
+cCE35HpamKHY3c6EqsiLVVInsKAK3XGSlJgbr+ao7WryiXuayxopO/z+ioNxzeve
+Z8r7MUtlx/WjTq05kxdzVEjqCZvTjIe0rfpI6vnaoOW2BLkhnLk63pq9Yv0wUtA2
+WvfWgO+7ckZvWr1lAY4ZtM8ReSzSpE2Zgzj8LVegu5ZllBTdq0HK8FuLvjfBD5BM
+R05jQr92kSpWuJP3W73z5eJmhRjfkrsA/amYJ2tmR2cpOchaVUF/aWqifql4T4w9
+iwXgV22Ekaxei+vI9Lfz5w9hD/mLbFGUlA3TAs1c+7bYYCzkrpa1s0FE287zOLAL
+9QEPjwI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID2DCCAsACCQC6ske5V5+nWTANBgkqhkiG9w0BAQUFADCBrTEaMBgGA1UEChMR
+VW5pdmVyc2l0YWV0IEdyYXoxHzAdBgNVBAsTFkluZm9ybWF0aW9uc21hbmFnZW1l
+bnQxJDAiBgkqhkiG9w0BCQEWFWNlcnRhZG1pbkB1bmktZ3Jhei5hdDENMAsGA1UE
+BxMER3JhejEPMA0GA1UECBMGc3R5cmlhMQswCQYDVQQGEwJBVDEbMBkGA1UEAxMS
+emlkaWRwLnVuaS1ncmF6LmF0MB4XDTE0MDkxNzExMjU1OVoXDTM0MDkxMjExMjU1
+OVowga0xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBHcmF6MR8wHQYDVQQLExZJbmZv
+cm1hdGlvbnNtYW5hZ2VtZW50MSQwIgYJKoZIhvcNAQkBFhVjZXJ0YWRtaW5AdW5p
+LWdyYXouYXQxDTALBgNVBAcTBEdyYXoxDzANBgNVBAgTBnN0eXJpYTELMAkGA1UE
+BhMCQVQxGzAZBgNVBAMTEnppZGlkcC51bmktZ3Jhei5hdDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKdi7feZnBDwtrWaXh17FKpVELVl+G+nCoAQ+6W9
+/Ypxhnil/DTw5FeTbEGsRY0FeaNuSCalAbnRoujSevkEfbnXEVjHH7Kenvq11N5J
+EWmt9im07Ed3DkI0CTBLKDsX/PSlORYC4wEttv2owTxXeb57uvcgBjx4kVjeYoFQ
+pgM2lOGy3Hor9t8rQPhggjBgsEi6tzz5BfTUiy/xDP6Ghxkrk33f7rHhRhR759u4
+xXGzdzgUsZtriMVnoOsqWk39SiFYB0p8RQOComQlp0B8sOuco6lP7X4bta90K5nI
+x2dPqrMjSBdCH+k1EQoqhwIqZSdiJvYqY1ujs8mSTsthq6sCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAUGdarc5KLh56hxfUD77PfvTO/N1t/mRyCxa+scH7EMr+98PW
+kktOoT3UOoAA9Z6A26wIVUBWCna551+Nd3MCBSooVPFxqWo+mGIj4ySnzslJbbv2
+pizCZc6ah4wTpgubjx8vp6fNuLiyXuaOcJqbYJEGzm7gH+gGXKs0C5L9wpPhQ4dG
+fiNgJG5ke2PFmkBH5uc5rAjV+eutWnwB2x4xLEtIlPoQINUJd4ZtfcOQH/G11rTI
+lwIys35bnmIF1VwgYaZJcB0+QBBhZ4KmC9ktOQbi6rKEQzwfbBosZHmgjo+V7hrW
+qtWKibftATdhRMkGvf8LQMI34BK8fGQw9VA3Vg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <md:ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+    <md:SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zididp.uni-graz.at/idp/profile/Shibboleth/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zididp.uni-graz.at/idp/profile/SAML2/POST/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zididp.uni-graz.at/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <md:SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zididp.uni-graz.at/idp/profile/SAML2/Redirect/SSO"/>
+  </md:IDPSSODescriptor>
+  <md:AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <md:Extensions>
+      <shibmd:Scope xmlns:shibmd="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-graz.at</shibmd:Scope>
+    </md:Extensions>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID8TCCAtmgAwIBAgILAQAAAAABHJ3GXLgwDQYJKoZIhvcNAQEFBQAwXzELMAkG
+A1UEBhMCQkUxEzARBgNVBAoTCkN5YmVydHJ1c3QxFzAVBgNVBAsTDkVkdWNhdGlv
+bmFsIENBMSIwIAYDVQQDExlDeWJlcnRydXN0IEVkdWNhdGlvbmFsIENBMB4XDTA4
+MDkyNjA4Mjg1NFoXDTExMDkyNjA4Mjg1NFowgZwxCzAJBgNVBAYTAkFUMSgwJgYD
+VQQKEx9LYXJsLUZyYW56ZW5zLVVuaXZlcnNpdGFldCBHcmF6MQwwCgYDVQQLEwNa
+SUQxHjAcBgNVBAMTFXppZDEyOTE1Mi51bmktZ3Jhei5hdDEYMBYGA1UEAxMPaWRw
+LnVuaS1ncmF6LmF0MRswGQYDVQQDExJ6aWRpZHAudW5pLWdyYXouYXQwgZ8wDQYJ
+KoZIhvcNAQEBBQADgY0AMIGJAoGBALtSK1LsNVQ3eyIh4bS3fAmwjAHCzq1jd9NU
+wQFHrFPTzhObsZQM1Pc//QnTXH3x9bSAebR8WI+SmlRpe/p7BvGkEQDS45k6UZ7Y
+CicOizdCqN/iLr/XqwkUFcmVXN/mcoWFsc+637MUqj6O/Yl3f5jTRwacxUgn9pSs
+JHw9FAIrAgMBAAGjgfMwgfAwDgYDVR0PAQH/BAQDAgWgMB8GA1UdIwQYMBaAFGVl
+oz3XOxGjCgclN8lCSlt2d1DhMB0GA1UdDgQWBBTeRMWMrXJOPmghKlcEp0lPrACE
+8jA6BgNVHR8EMzAxMC+gLaArhilodHRwOi8vY3JsLmdsb2JhbHNpZ24ubmV0L2Vk
+dWNhdGlvbmFsLmNybDBPBggrBgEFBQcBAQRDMEEwPwYIKwYBBQUHMAKGM2h0dHA6
+Ly9zZWN1cmUuZ2xvYmFsc2lnbi5uZXQvY2FjZXJ0L2VkdWNhdGlvbmFsLmNydDAR
+BglghkgBhvhCAQEEBAMCBsAwDQYJKoZIhvcNAQEFBQADggEBAGI02zqTHQP4SHrF
+cCE35HpamKHY3c6EqsiLVVInsKAK3XGSlJgbr+ao7WryiXuayxopO/z+ioNxzeve
+Z8r7MUtlx/WjTq05kxdzVEjqCZvTjIe0rfpI6vnaoOW2BLkhnLk63pq9Yv0wUtA2
+WvfWgO+7ckZvWr1lAY4ZtM8ReSzSpE2Zgzj8LVegu5ZllBTdq0HK8FuLvjfBD5BM
+R05jQr92kSpWuJP3W73z5eJmhRjfkrsA/amYJ2tmR2cpOchaVUF/aWqifql4T4w9
+iwXgV22Ekaxei+vI9Lfz5w9hD/mLbFGUlA3TAs1c+7bYYCzkrpa1s0FE287zOLAL
+9QEPjwI=</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:X509Data>
+          <ds:X509Certificate>
+MIID2DCCAsACCQC6ske5V5+nWTANBgkqhkiG9w0BAQUFADCBrTEaMBgGA1UEChMR
+VW5pdmVyc2l0YWV0IEdyYXoxHzAdBgNVBAsTFkluZm9ybWF0aW9uc21hbmFnZW1l
+bnQxJDAiBgkqhkiG9w0BCQEWFWNlcnRhZG1pbkB1bmktZ3Jhei5hdDENMAsGA1UE
+BxMER3JhejEPMA0GA1UECBMGc3R5cmlhMQswCQYDVQQGEwJBVDEbMBkGA1UEAxMS
+emlkaWRwLnVuaS1ncmF6LmF0MB4XDTE0MDkxNzExMjU1OVoXDTM0MDkxMjExMjU1
+OVowga0xGjAYBgNVBAoTEVVuaXZlcnNpdGFldCBHcmF6MR8wHQYDVQQLExZJbmZv
+cm1hdGlvbnNtYW5hZ2VtZW50MSQwIgYJKoZIhvcNAQkBFhVjZXJ0YWRtaW5AdW5p
+LWdyYXouYXQxDTALBgNVBAcTBEdyYXoxDzANBgNVBAgTBnN0eXJpYTELMAkGA1UE
+BhMCQVQxGzAZBgNVBAMTEnppZGlkcC51bmktZ3Jhei5hdDCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAKdi7feZnBDwtrWaXh17FKpVELVl+G+nCoAQ+6W9
+/Ypxhnil/DTw5FeTbEGsRY0FeaNuSCalAbnRoujSevkEfbnXEVjHH7Kenvq11N5J
+EWmt9im07Ed3DkI0CTBLKDsX/PSlORYC4wEttv2owTxXeb57uvcgBjx4kVjeYoFQ
+pgM2lOGy3Hor9t8rQPhggjBgsEi6tzz5BfTUiy/xDP6Ghxkrk33f7rHhRhR759u4
+xXGzdzgUsZtriMVnoOsqWk39SiFYB0p8RQOComQlp0B8sOuco6lP7X4bta90K5nI
+x2dPqrMjSBdCH+k1EQoqhwIqZSdiJvYqY1ujs8mSTsthq6sCAwEAATANBgkqhkiG
+9w0BAQUFAAOCAQEAUGdarc5KLh56hxfUD77PfvTO/N1t/mRyCxa+scH7EMr+98PW
+kktOoT3UOoAA9Z6A26wIVUBWCna551+Nd3MCBSooVPFxqWo+mGIj4ySnzslJbbv2
+pizCZc6ah4wTpgubjx8vp6fNuLiyXuaOcJqbYJEGzm7gH+gGXKs0C5L9wpPhQ4dG
+fiNgJG5ke2PFmkBH5uc5rAjV+eutWnwB2x4xLEtIlPoQINUJd4ZtfcOQH/G11rTI
+lwIys35bnmIF1VwgYaZJcB0+QBBhZ4KmC9ktOQbi6rKEQzwfbBosZHmgjo+V7hrW
+qtWKibftATdhRMkGvf8LQMI34BK8fGQw9VA3Vg==</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </md:KeyDescriptor>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <md:AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zididp.uni-graz.at:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <md:NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:1.1:nameid-format:unspecified</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</md:NameIDFormat>
+    <md:NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:persistent</md:NameIDFormat>
+  </md:AttributeAuthorityDescriptor>
+  <md:Organization>
+    <md:OrganizationName xml:lang="de">Universität Graz</md:OrganizationName>
+    <md:OrganizationName xml:lang="en">University of Graz</md:OrganizationName>
+    <md:OrganizationDisplayName xml:lang="de">Universität Graz</md:OrganizationDisplayName>
+    <md:OrganizationDisplayName xml:lang="en">University of Graz</md:OrganizationDisplayName>
+    <md:OrganizationURL xml:lang="de">http://www.uni-graz.at/</md:OrganizationURL>
+    <md:OrganizationURL xml:lang="en">http://www.uni-graz.at/E/</md:OrganizationURL>
+  </md:Organization>
+  <md:ContactPerson contactType="technical">
+    <md:GivenName>Technical</md:GivenName>
+    <md:SurName>Support</md:SurName>
+    <md:EmailAddress>mailto:guenther.berthold@uni-graz.at</md:EmailAddress>
+  </md:ContactPerson>
+  <md:ContactPerson contactType="support">
+    <md:GivenName>IT-Support</md:GivenName>
+    <md:SurName>Helpdesk</md:SurName>
+    <md:EmailAddress>mailto:helpdesk@uni-graz.at</md:EmailAddress>
+  </md:ContactPerson>
+</md:EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml b/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml
new file mode 100644
index 00000000..0be3354a
--- /dev/null
+++ b/swamid-interfederations-2.0/zividp.uni-muenster.de-idp-shibboleth.xml
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zividp.uni-muenster.de/idp/shibboleth">
+  <Extensions>
+    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-08-09T14:28:54Z">
+      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
+      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
+    </mdrpi:RegistrationInfo>
+  </Extensions>
+  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</saml1md:Scope>
+      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
+        <mdui:DisplayName xml:lang="de">Universität Münster</mdui:DisplayName>
+        <mdui:DisplayName xml:lang="en">Universität Münster</mdui:DisplayName>
+        <mdui:Description xml:lang="de">Identity Provider der Westfälischen Wilhelms-Universität Münster.</mdui:Description>
+        <mdui:Description xml:lang="en">Identity Provider of the Westfälische Wilhelms-Universität Münster.</mdui:Description>
+        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
+        <mdui:Logo height="60" width="278">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu_logo.png</mdui:Logo>
+        <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
+        <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
+      </mdui:UIInfo>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
+MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
+dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
+YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
+q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
+rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
+u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
+ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
+AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
+BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
+FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
+bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
+AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
+uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
+5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
+GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
+3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
+UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
+MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
+dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
+YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
+q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
+rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
+u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
+ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
+AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
+BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
+FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
+bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
+AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
+uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
+5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
+GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
+3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
+UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
+    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zividp.uni-muenster.de/idp/profile/Shibboleth/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
+    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/Redirect/SSO"/>
+  </IDPSSODescriptor>
+  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
+    <Extensions>
+      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</saml1md:Scope>
+    </Extensions>
+    <KeyDescriptor use="signing">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
+MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
+dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
+YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
+q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
+rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
+u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
+ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
+AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
+BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
+FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
+bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
+AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
+uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
+5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
+GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
+3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
+UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <KeyDescriptor use="encryption">
+      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
+        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
+        <ds:X509Data>
+          <ds:X509SubjectName>emailAddress=wwwadmin@uni-muenster.de,CN=zividp.uni-muenster.de,OU=Zentrum fuer Informationsverarbeitung,O=Universitaet Muenster,L=Muenster,ST=Nordrhein-Westfalen,C=DE</ds:X509SubjectName>
+          <ds:X509Certificate>MIIGIzCCBQugAwIBAgIHGFeCtRUcrzANBgkqhkiG9w0BAQsFADCBjDELMAkGA1UE
+BhMCREUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMx
+WmVydGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcw
+MjEhMB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTE0MTAxMDE2
+MTExN1oXDTE5MDcwOTIzNTkwMFowgdgxCzAJBgNVBAYTAkRFMRwwGgYDVQQIExNO
+b3JkcmhlaW4tV2VzdGZhbGVuMREwDwYDVQQHEwhNdWVuc3RlcjEeMBwGA1UEChMV
+VW5pdmVyc2l0YWV0IE11ZW5zdGVyMS4wLAYDVQQLEyVaZW50cnVtIGZ1ZXIgSW5m
+b3JtYXRpb25zdmVyYXJiZWl0dW5nMR8wHQYDVQQDExZ6aXZpZHAudW5pLW11ZW5z
+dGVyLmRlMScwJQYJKoZIhvcNAQkBFhh3d3dhZG1pbkB1bmktbXVlbnN0ZXIuZGUw
+ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDs1fLiqaQJyAodfjyh3/G5
+YN6BhkHxnfeqmvoq9IgdJdn4X/kYPo2Mm/qE1qKebW73YJcgJJ6UoIfORVdZIpdu
+q/0ijQQVwkplC07RGzhhlhgIOGmybMpHt4e5LTnmI1aBLI+ZFsLkc2nEY9lEhRBH
+rSsMfQS/2qNJ5Hd71X/ITjwIByDpjsorHBfa8qQfJWsa+C/M3NjP7maITpDVPZ2k
+u1wwoenTZRMn3Tzzte9nP+GcHxG+hMx5qCNKQPblBnuUinYvAPirMsMQZGM/ZthN
+ujIAkzq7wzLP5z+H9icc4Ap9vEoEWdBhvZY5aZU7HwFm6MnNOBYkRl/SMjNGOwvf
+AgMBAAGjggI6MIICNjBPBgNVHSAESDBGMBEGDysGAQQBga0hgiwBAQQDAjARBg8r
+BgEEAYGtIYIsAgEEAwEwDwYNKwYBBAGBrSGCLAEBBDANBgsrBgEEAYGtIYIsHjAJ
+BgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYB
+BQUHAwEwHQYDVR0OBBYEFNq4Ch52JoFfVrqS4GJd45Hr9MMgMB8GA1UdIwQYMBaA
+FL6eUaLJkny7YIvmsGhkd1pSGaEAMCEGA1UdEQQaMBiCFnppdmlkcC51bmktbXVl
+bnN0ZXIuZGUwewYDVR0fBHQwcjA3oDWgM4YxaHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDA3oDWgM4YxaHR0cDovL2NkcDIu
+cGNhLmRmbi5kZS93d3UtY2EvcHViL2NybC9nX2NhY3JsLmNybDCBywYIKwYBBQUH
+AQEEgb4wgbswMwYIKwYBBQUHMAGGJ2h0dHA6Ly9vY3NwLnBjYS5kZm4uZGUvT0NT
+UC1TZXJ2ZXIvT0NTUDBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEucGNhLmRmbi5k
+ZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYBBQUHMAKGNWh0
+dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQvZ19jYWNlcnQu
+Y3J0MA0GCSqGSIb3DQEBCwUAA4IBAQBVWV/BKM9kUH2geEkG7sa9DYJwvkJgZvmZ
+uSs96xhhHGvJ/8q5ZDMc1C5bFYjdOW9oGz6wtMTaj/Re7KbhMDi4M7WMjQX4hYx+
+5WFoCdhgRIBkXS6Nfi+UHEWVo/BLUZzZiwg2bG5Z0RPIcaxJUq387s+Qf76SHm3f
+GMFVt+1XRhsLaruEPfIH6xKwQ2/gf5XJVMsSP/zD5C71oEcimWpSOwYEE974ju+Z
+3f83SMO1Uj4iOtd3WJqQCbCL9u5xIyjXmxWobmTvub/dLs50YvZgBln7nwn227gr
+UuIMesitYxmNwjNX1FjrXtjuGk3ECJ7oJd2ixdXgr6KwPZwVG5VX
+</ds:X509Certificate>
+        </ds:X509Data>
+      </ds:KeyInfo>
+    </KeyDescriptor>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
+    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
+    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
+    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
+  </AttributeAuthorityDescriptor>
+  <Organization>
+    <OrganizationName xml:lang="de">e247</OrganizationName>
+    <OrganizationName xml:lang="en">e247</OrganizationName>
+    <OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
+    <OrganizationURL xml:lang="de">http://www.uni-muenster.de/</OrganizationURL>
+    <OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</OrganizationURL>
+  </Organization>
+  <ContactPerson contactType="technical">
+    <GivenName>Christian</GivenName>
+    <SurName>Schild</SurName>
+    <EmailAddress>mailto:schild@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+  <ContactPerson contactType="support">
+    <GivenName>Christian</GivenName>
+    <SurName>Schild</SurName>
+    <EmailAddress>mailto:schild@uni-muenster.de</EmailAddress>
+  </ContactPerson>
+</EntityDescriptor>
diff --git a/swamid-interfederations-2.0/zividp.uni-muenster.de.xml b/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
deleted file mode 100644
index 1639bd4d..00000000
--- a/swamid-interfederations-2.0/zividp.uni-muenster.de.xml
+++ /dev/null
@@ -1,203 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<EntityDescriptor xmlns="urn:oasis:names:tc:SAML:2.0:metadata" entityID="https://zividp.uni-muenster.de/idp/shibboleth">
-  <Extensions>
-    <mdrpi:RegistrationInfo xmlns:mdrpi="urn:oasis:names:tc:SAML:metadata:rpi" registrationAuthority="https://www.aai.dfn.de" registrationInstant="2012-08-09T14:28:54Z">
-      <mdrpi:RegistrationPolicy xml:lang="en">https://www.aai.dfn.de/en/join/</mdrpi:RegistrationPolicy>
-      <mdrpi:RegistrationPolicy xml:lang="de">https://www.aai.dfn.de/teilnahme/</mdrpi:RegistrationPolicy>
-    </mdrpi:RegistrationInfo>
-  </Extensions>
-  <IDPSSODescriptor protocolSupportEnumeration="urn:mace:shibboleth:1.0 urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</saml1md:Scope>
-      <mdui:UIInfo xmlns:mdui="urn:oasis:names:tc:SAML:metadata:ui">
-        <mdui:DisplayName xml:lang="de">Universität Münster</mdui:DisplayName>
-        <mdui:DisplayName xml:lang="en">Universität Münster</mdui:DisplayName>
-        <mdui:Description xml:lang="de">Identity Provider der Westfälischen Wilhelms-Universität Münster.</mdui:Description>
-        <mdui:Description xml:lang="en">Identity Provider of the Westfälische Wilhelms-Universität Münster.</mdui:Description>
-        <mdui:Logo height="32" width="32">https://www.uni-muenster.de/imperia/md/content/allgemein/farbunabhaengig/favicon.ico</mdui:Logo>
-        <mdui:Logo height="60" width="278">https://www.uni-muenster.de/imperia/md/images/allgemein/farbunabhaengig/wwu_logo.png</mdui:Logo>
-        <mdui:InformationURL xml:lang="de">http://www.uni-muenster.de/</mdui:InformationURL>
-        <mdui:InformationURL xml:lang="en">http://www.uni-muenster.de/en/</mdui:InformationURL>
-      </mdui:UIInfo>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
-dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
-MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
-MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
-cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
-5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
-fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
-D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
-brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
-/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
-h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
-3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
-FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
-hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
-BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
-Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
-fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
-2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
-DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
-v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
-pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
-dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
-MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
-MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
-cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
-5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
-fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
-D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
-brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
-/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
-h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
-3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
-FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
-hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
-BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
-Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
-fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
-2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
-DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
-v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
-pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/ArtifactResolution" index="1"/>
-    <ArtifactResolutionService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/ArtifactResolution" index="2"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-    <SingleSignOnService Binding="urn:mace:shibboleth:1.0:profiles:AuthnRequest" Location="https://zividp.uni-muenster.de/idp/profile/Shibboleth/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-POST-SimpleSign" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/POST-SimpleSign/SSO"/>
-    <SingleSignOnService Binding="urn:oasis:names:tc:SAML:2.0:bindings:HTTP-Redirect" Location="https://zividp.uni-muenster.de/idp/profile/SAML2/Redirect/SSO"/>
-  </IDPSSODescriptor>
-  <AttributeAuthorityDescriptor protocolSupportEnumeration="urn:oasis:names:tc:SAML:1.1:protocol urn:oasis:names:tc:SAML:2.0:protocol">
-    <Extensions>
-      <saml1md:Scope xmlns:saml1md="urn:mace:shibboleth:metadata:1.0" regexp="false">uni-muenster.de</saml1md:Scope>
-    </Extensions>
-    <KeyDescriptor use="signing">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
-dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
-MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
-MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
-cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
-5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
-fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
-D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
-brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
-/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
-h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
-3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
-FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
-hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
-BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
-Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
-fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
-2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
-DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
-v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
-pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <KeyDescriptor use="encryption">
-      <ds:KeyInfo xmlns:ds="http://www.w3.org/2000/09/xmldsig#">
-        <ds:KeyName>zividp.uni-muenster.de</ds:KeyName>
-        <ds:X509Data>
-          <ds:X509SubjectName>CN=zividp.uni-muenster.de,O=Universitaet Muenster,C=DE</ds:X509SubjectName>
-          <ds:X509Certificate>MIIFDDCCA/SgAwIBAgIEEFumyzANBgkqhkiG9w0BAQUFADCBjDELMAkGA1UEBhMC
-REUxHjAcBgNVBAoTFVVuaXZlcnNpdGFldCBNdWVuc3RlcjE6MDgGA1UEAxMxWmVy
-dGlmaXppZXJ1bmdzc3RlbGxlIFVuaXZlcnNpdGFldCBNdWVuc3RlciAtIEcwMjEh
-MB8GCSqGSIb3DQEJARYSY2FAdW5pLW11ZW5zdGVyLmRlMB4XDTEwMDcxMzA4NTIx
-MVoXDTE1MDcxMjA4NTIxMVowTjELMAkGA1UEBhMCREUxHjAcBgNVBAoTFVVuaXZl
-cnNpdGFldCBNdWVuc3RlcjEfMB0GA1UEAxMWeml2aWRwLnVuaS1tdWVuc3Rlci5k
-ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBALDzZll7Nu40htfyaAJa
-5ktjkB3o1kTqinoHRq4/a2ZQYAuZxLmpZ5MHdIX/KpPMS/quBUVku94r5B6lsOBk
-fbKEGQUPui0MScn64DREAloo/ybJu7pEz30YXDbw2wALVut3aDU8RsCo1y9fkp33
-D7VMlVF6XChS6WopaUywSNZp/EZiw7ex7FrStAvOZOJf2hP6yd2hFIaQ22paykTa
-brpz6FCzbcZ0F7iZZylbYTnYhGhHhra3S3HJedJujJePbC4yBC9hV06UkqBjBCjl
-/JPf9XnoZHdjrJujg8otyN37Wvgmg//PMquCWaFNTy9gklHCBjWoO9lwAzyuMpOK
-h6sCAwEAAaOCAbEwggGtMAkGA1UdEwQCMAAwCwYDVR0PBAQDAgXgMB0GA1UdJQQW
-MBQGCCsGAQUFBwMCBggrBgEFBQcDATAdBgNVHQ4EFgQUlXHNYvE87U69i2vA+cTc
-3mDDLfAwHwYDVR0jBBgwFoAUvp5RosmSfLtgi+awaGR3WlIZoQAwHgYDVR0RBBcw
-FYETc3lzQHVuaS1tdWVuc3Rlci5kZTB7BgNVHR8EdDByMDegNaAzhjFodHRwOi8v
-Y2RwMS5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2FjcmwuY3JsMDegNaAz
-hjFodHRwOi8vY2RwMi5wY2EuZGZuLmRlL3d3dS1jYS9wdWIvY3JsL2dfY2Fjcmwu
-Y3JsMIGWBggrBgEFBQcBAQSBiTCBhjBBBggrBgEFBQcwAoY1aHR0cDovL2NkcDEu
-cGNhLmRmbi5kZS93d3UtY2EvcHViL2NhY2VydC9nX2NhY2VydC5jcnQwQQYIKwYB
-BQUHMAKGNWh0dHA6Ly9jZHAyLnBjYS5kZm4uZGUvd3d1LWNhL3B1Yi9jYWNlcnQv
-Z19jYWNlcnQuY3J0MA0GCSqGSIb3DQEBBQUAA4IBAQBTLaMcfprssiEbRXF65Wi1
-fFpwL9645sbNu13A8wK4qiQCljJrAKlKgE6QvncZrQj4P2wifvMkcGKiiWFDe8cu
-2jUq8jgZAlqWagh89vcUVmEIWa5dXV0gtJozvBwDjqjtoV7Rh89xs8EYFmuH68Di
-DCEOhD0hWE36zsA+HM/ngP74sXut3btWF5Z+8lzGwrP2kxyVaD1/Fhx7M8G4x/6X
-v6T3BQ8NOoLOYrZvdF2ecW362ADe7QsnitMobEFT2YxQHjBRD9+JlZ2izRQyNGwZ
-pKHWXA8DsJnXLqGvaG86WEIUkJD4NhYvi4LYvJ2NJW8T/OTCNvW3KBshzxonnB3P
-</ds:X509Certificate>
-        </ds:X509Data>
-      </ds:KeyInfo>
-    </KeyDescriptor>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:1.0:bindings:SOAP-binding" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML1/SOAP/AttributeQuery"/>
-    <AttributeService Binding="urn:oasis:names:tc:SAML:2.0:bindings:SOAP" Location="https://zividp.uni-muenster.de:8443/idp/profile/SAML2/SOAP/AttributeQuery"/>
-    <NameIDFormat>urn:mace:shibboleth:1.0:nameIdentifier</NameIDFormat>
-    <NameIDFormat>urn:oasis:names:tc:SAML:2.0:nameid-format:transient</NameIDFormat>
-  </AttributeAuthorityDescriptor>
-  <Organization>
-    <OrganizationName xml:lang="de">e247</OrganizationName>
-    <OrganizationName xml:lang="en">e247</OrganizationName>
-    <OrganizationDisplayName xml:lang="de">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
-    <OrganizationDisplayName xml:lang="en">Westfälische Wilhelms-Universität Münster</OrganizationDisplayName>
-    <OrganizationURL xml:lang="de">http://www.uni-muenster.de/</OrganizationURL>
-    <OrganizationURL xml:lang="en">http://www.uni-muenster.de/en/</OrganizationURL>
-  </Organization>
-  <ContactPerson contactType="technical">
-    <GivenName>Christian</GivenName>
-    <SurName>Schild</SurName>
-    <EmailAddress>mailto:schild@uni-muenster.de</EmailAddress>
-  </ContactPerson>
-  <ContactPerson contactType="support">
-    <GivenName>Christian</GivenName>
-    <SurName>Schild</SurName>
-    <EmailAddress>mailto:schild@uni-muenster.de</EmailAddress>
-  </ContactPerson>
-</EntityDescriptor>
diff --git a/swamid-sp-2.0.mxml b/swamid-sp-2.0.mxml
index f4694465..71e9636c 100644
--- a/swamid-sp-2.0.mxml
+++ b/swamid-sp-2.0.mxml
@@ -324,4 +324,5 @@
   <xi:include href="swamid-2.0/expert.uhrdemo.antagning.se_aws-sp-en.txt"/>
   <xi:include href="swamid-2.0/expert.uhrdemo.antagning.se_aws-sp.txt"/>
   <xi:include href="swamid-2.0/expert.uhrdemo.antagning.se_ecs-sp.txt"/>
+  <xi:include href="swamid-2.0/passporttest.lu.se-activateaccount-shibboleth.xml"/>
 </md:EntitiesDescriptor>
diff --git a/xslt/import-metadata.xsl b/xslt/import-metadata.xsl
index 7c3a9991..f67d1921 100644
--- a/xslt/import-metadata.xsl
+++ b/xslt/import-metadata.xsl
@@ -21,12 +21,7 @@
     <!-- xsl:param name="output"/ -->
     <xsl:variable name="uri"><xsl:value-of select="substring-after(@entityID,'://')"/></xsl:variable>
     <xsl:variable name="host">
-      <xsl:if test="contains($uri,'/')">
-	<xsl:value-of select="substring-before($uri,'/')"/>
-      </xsl:if>
-      <xsl:if test="not(contains($uri,'/'))">
-	<xsl:value-of select="$uri"/>
-      </xsl:if>
+      <xsl:value-of select="translate($uri,'/','-')"/>
     </xsl:variable>
     <xsl:variable name="file" select="concat($output,'/',$host,'.xml')"/>
     <exsl:document method="xml" indent="yes" href="{$file}">